Use pkgconfig to obtain corosync library details during configuration. (kabi)

diff --git a/WHATS_NEW b/WHATS_NEW
index 8c89bd7269cb49de80f4f970850852f200db65d8..07361c96aff4686e8c02e3908cd5ce0f42c36d99 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.45 - 
 ===================================
+  Use pkgconfig to obtain corosync library details during configuration.
   Fix error returns in clvmd-corosync interface to DLM.
   Add --refresh to vgchange and vgmknodes man pages.
   Fixed bug where lvresize option -t was not properly passed to fsadm.

diff --git a/configure.in b/configure.in
index a117deafe1e7116cf57b85e86a579cc72abe466a..1eaa2a072e1dad3014799d1f997ed92b714baae4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -338,6 +338,19 @@ if  test x$CLVMD != xnone && test x$CLUSTER = xnone; then
        CLUSTER=internal
 fi
 
+dnl -- Look for corosync libraries if required.
+if [[ "x$CLVMD" = xcorosync -o "x$CLVMD" = xall ]]; then
+       PKG_CHECK_MODULES(QUORUM, libquorum, [],
+               [AC_MSG_RESULT([no pkg for quorum library, using -lquorum]);
+               QUORUM_LIBS="-lquorum"])
+       PKG_CHECK_MODULES(CONFDB, libconfdb, [],
+               [AC_MSG_RESULT([no pkg for confdb library, using -lconfdb]);
+               CONFDB_LIBS="-lconfdb"])
+       PKG_CHECK_MODULES(CPG, libcpg, [],
+               [AC_MSG_RESULT([no pkg for libcpg library, using -lcpg]);
+               CPG_LIBS="-lcpg"])
+fi
+
 ################################################################################
 dnl -- Enable debugging
 AC_MSG_CHECKING(whether to enable debugging)
@@ -742,7 +755,12 @@ AC_SUBST(CLDWHOLEARCHIVE)
 AC_SUBST(CLUSTER)
 AC_SUBST(CLVMD)
 AC_SUBST(CMDLIB)
+AC_SUBST(CONFDB_CFLAGS)
+AC_SUBST(CONFDB_LIBS)
+AC_SUBST(CONFDIR)
 AC_SUBST(COPTIMISE_FLAG)
+AC_SUBST(CPG_CFLAGS)
+AC_SUBST(CPG_LIBS)
 AC_SUBST(CSCOPE_CMD)
 AC_SUBST(DEBUG)
 AC_SUBST(DEVMAPPER)
@@ -768,7 +786,6 @@ AC_SUBST(LIB_SUFFIX)
 AC_SUBST(LOCALEDIR)
 AC_SUBST(LVM1)
 AC_SUBST(LVM1_FALLBACK)
-AC_SUBST(CONFDIR)
 AC_SUBST(LVM_VERSION)
 AC_SUBST(LVM_MAJOR)
 AC_SUBST(LVM_MINOR)
@@ -780,6 +797,8 @@ AC_SUBST(MSGFMT)
 AC_SUBST(OWNER)
 AC_SUBST(PKGCONFIG)
 AC_SUBST(POOL)
+AC_SUBST(QUORUM_CFLAGS)
+AC_SUBST(QUORUM_LIBS)
 AC_SUBST(SNAPSHOTS)
 AC_SUBST(STATICDIR)
 AC_SUBST(STATIC_LINK)

diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index b7d8757e244146148819836db4988cd6efb6945f..a0755b1e6136bb54164ee0eb50bc15c5871124c1 100644 (file)
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -15,6 +15,13 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
+QUORUM_LIBS = @QUORUM_LIBS@
+QUORUM_CFLAGS = @QUORUM_CFLAGS@
+CONFDB_LIBS = @CONFDB_LIBS@
+CONFDB_CFLAGS = @CONFDB_CFLAGS@
+CPG_LIBS = @CPG_LIBS@
+CPG_CFLAGS = @CPG_CFLAGS@
+
 SOURCES = \
        clvmd-command.c  \
        clvmd.c          \
@@ -67,9 +74,10 @@ ifeq ("$(OPENAIS)", "yes")
 endif
 
 ifeq ("$(COROSYNC)", "yes")
-        SOURCES += clvmd-corosync.c
-        LMLIBS += -lquorum -lconfdb -lcpg -ldlm
-        DEFS += -DUSE_COROSYNC
+       SOURCES += clvmd-corosync.c
+       LMLIBS += $(QUORUM_LIBS) $(CONFDB_LIBS) $(CPG_LIBS) -ldlm
+       CFLAGS += $(QUORUM_CFLAGS) $(CONFDB_CFLAGS) $(CPG_CFLAGS)
+       DEFS += -DUSE_COROSYNC
 endif