[SCM] CTDB repository - branch master updated - ctdb-1.0.78-12-ga9f851c

[Ronnie Sahlberg]

The branch, master has been updated
       via  a9f851caec2525ccbb3a6d6283eaef52b89a4eb2 (commit)
       via  1b47ddc97373376b416a50939b74dc8c926fc917 (commit)
       via  7c4389cc0baa43a0ffa9fb08944c253db7885807 (commit)
       via  b0718551f55d5da9be0e6aba233f57c1ff8509be (commit)
      from  b8be5b06c3359d037db336dc12d38e0018349951 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a9f851caec2525ccbb3a6d6283eaef52b89a4eb2
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Apr 8 10:45:00 2009 +1000

    set libdir to ../lib64 on x86-64 platforms

commit 1b47ddc97373376b416a50939b74dc8c926fc917
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Apr 8 09:34:20 2009 +1000

    install ctdb.pc from the RPM

commit 7c4389cc0baa43a0ffa9fb08944c253db7885807
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Apr 8 09:21:11 2009 +1000

    From Mathieu Parent <math.parent at gmail.com>
    
    Install the pkgconfig file

commit b0718551f55d5da9be0e6aba233f57c1ff8509be
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Apr 8 09:14:20 2009 +1000

-----------------------------------------------------------------------

Summary of changes:
 .gitignore              |    1 +
 Makefile.in             |    4 +++-
 autogen.sh              |    2 +-
 configure.ac            |   11 ++++++++++-
 ctdb.pc.in              |   19 +++++++++++++++++++
 packaging/RPM/ctdb.spec |    1 +
 6 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 ctdb.pc.in


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 826bc1a..69d8093 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *~
 config.status
 configure
+ctdb.pc
 publish*.sh
 push*.sh
 web/packages
diff --git a/Makefile.in b/Makefile.in
index f1c596d..f1c5f36 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,12 +188,14 @@ distclean: clean
 	rm -f Makefile
 
 install: all
+	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
 	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(sbindir)
 	mkdir -p $(DESTDIR)$(includedir)
 	mkdir -p $(DESTDIR)$(etcdir)/ctdb
 	mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d
 	mkdir -p $(DESTDIR)$(docdir)/ctdb
+	${INSTALLCMD} -m 644 ctdb.pc $(DESTDIR)$(libdir)/pkgconfig
 	${INSTALLCMD} -m 755 bin/ctdb $(DESTDIR)$(bindir)
 	${INSTALLCMD} -m 755 bin/ctdb_ipmux $(DESTDIR)$(bindir)
 	${INSTALLCMD} -m 755 bin/ctdbd $(DESTDIR)$(sbindir)
@@ -233,4 +235,4 @@ valgrindtest: all
 
 
 realdistclean: distclean
-	rm -f configure config.h.in
+	rm -f configure config.h.in ctdb.pc
diff --git a/autogen.sh b/autogen.sh
index a361cd1..e333898 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 rm -rf autom4te.cache
-rm -f configure config.h.in
+rm -f configure config.h.in ctdb.pc
 
 IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
 IPATHS="$IPATHS -I lib/talloc -I talloc -I ../talloc"
diff --git a/configure.ac b/configure.ac
index 8b6102d..a7bd2bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,15 @@ AC_DEFUN([SMB_ENABLE], [echo -n ""])
 AC_INIT(ctdb.h)
 AC_CONFIG_SRCDIR([server/ctdbd.c])
 
+case `uname -m` in
+  x86_64)
+    libdir='${exec_prefix}/lib64'
+    ;;
+  *)
+    libdir='${exec_prefix}/lib'
+    ;;
+esac
+
 case `uname` in
   Linux*)
     CTDB_SYSTEM_OBJ=common/system_linux.o
@@ -84,4 +93,4 @@ AC_SUBST(CTDB_SYSTEM_OBJ)
 AC_SUBST(CTDB_SCSI_IO)
 AC_SUBST(CTDB_PCAP_LDFLAGS)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile ctdb.pc)
diff --git a/ctdb.pc.in b/ctdb.pc.in
new file mode 100644
index 0000000..5f5bfab
--- /dev/null
+++ b/ctdb.pc.in
@@ -0,0 +1,19 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+includedir=@includedir@
+libdir=@libdir@
+bindir=@bindir@
+sbindir=@sbindir@
+mandir=@mandir@
+localstatedir=@localstatedir@
+srcdir=@srcdir@
+etcdir=@sysconfdir@
+
+Name: ctdb
+Description: A clustered database to store temporary data
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir}
+Cflags: -I${includedir}
+URL: http://ctdb.samba.org/
+
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 7422150..3bedcc6 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -128,6 +128,7 @@ fi
 %{_mandir}/man1/onnode.1.gz
 %{_includedir}/ctdb.h
 %{_includedir}/ctdb_private.h
+%{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
 * Tue Mar 31 2009 : Version 1.0.78


-- 
CTDB repository