cluster: master - build: allow system to use zlib in non standard paths

cluster: master - build: allow system to use zlib in non standard paths

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3e71f2f07889e6fb99a2c22b3dd1d54091bd3945
Commit:        3e71f2f07889e6fb99a2c22b3dd1d54091bd3945
Parent:        67abd322b536360a3c63b906722ea7b4513692b8
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Thu Nov 20 08:31:47 2008 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Nov 20 08:31:47 2008 +0100

build: allow system to use zlib in non standard paths

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/qdisk/Makefile   |    6 ++++--
 configure             |   14 ++++++++++++++
 make/defines.mk.input |    2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile
index 971dffd..47bfc61 100644
--- a/cman/qdisk/Makefile
+++ b/cman/qdisk/Makefile
@@ -13,11 +13,13 @@ include $(OBJDIR)/make/uninstall.mk
 
 CFLAGS += -D_GNU_SOURCE
 CFLAGS += -Werror -Wstrict-prototypes -Wshadow
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${corosyncincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${zlibincdir} -I${corosyncincdir}
 CFLAGS += -I$(S)
 CFLAGS += -I${incdir}
 
-LDFLAGS += -L${corosynclibdir} -llogsys -lpthread -lz
+LDFLAGS += -L${corosynclibdir} -llogsys -lpthread
+LDFLAGS += -L${zliblibdir} -lz
 LDFLAGS += -L${libdir}
 
 EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
diff --git a/configure b/configure
index 7ced400..31128aa 100755
--- a/configure
+++ b/configure
@@ -60,6 +60,8 @@ my %options = (
 	corosyncbin => \$corosyncbin,
 	virtincdir => \$virtincdir,
 	virtlibdir => \$virtlibdir,
+	zlibincdir => \$zlibincdir,
+	zliblibdir => \$zliblibdir,
 	nssincdir => \$nssincdir,
 	nsslibdir => \$nsslibdir,
 	nsprincdir => \$nsprincdir,
@@ -148,6 +150,8 @@ my $err = &GetOptions (\%options,
 		    'corosyncbin=s',
 		    'virtincdir=s',
 		    'virtlibdir=s',
+		    'zlibincdir=s',
+		    'zliblibdir=s',
 		    'nssincdir=s',
 		    'nsslibdir=s',
 		    'nsprincdir=s',
@@ -264,6 +268,8 @@ if ($help || !$err) {
   print "--nsprlibdir=\tthe base directory for libnspr libraries.  (Default: {libdir})\n";
   print "--virtincdir=\tthe base directory for libvirt include files.  (Default: {incdir}/libvirt)\n";
   print "--virtlibdir=\tthe base directory for libvirt libraries.  (Default: {libdir})\n";
+  print "--zlibincdir=\tthe base directory for libz include files.  (Default: {incdir})\n";
+  print "--zliblibdir=\tthe base directory for libz libraries.  (Default: {libdir})\n";
   print "--xenincdir=\tthe base directory for xen include files.  (Default: {incdir}/xen)\n";
   print "--xenlibdir=\tthe base directory for xen libraries.  (Default: {libdir})\n";
   print "--ldapincdir=\tthe base directory for ldap include files.  (Default: {incdir})\n";
@@ -534,6 +540,12 @@ if (!$virtincdir) {
 if (!$virtlibdir) {
   $virtlibdir="${libdir}";
 }
+if (!$zlibincdir) {
+  $zlibincdir="${incdir}";
+}
+if (!$zliblibdir) {
+  $zliblibdir="${libdir}";
+}
 if (!$xenincdir) {
   $xenincdir="${incdir}/xen";
 }
@@ -740,6 +752,8 @@ while (<IFILE>) {
   $_ =~ s/\@NSPRLIBDIR\@/$nsprlibdir/;
   $_ =~ s/\@VIRTINCDIR\@/$virtincdir/;
   $_ =~ s/\@VIRTLIBDIR\@/$virtlibdir/;
+  $_ =~ s/\@ZLIBINCDIR\@/$zlibincdir/;
+  $_ =~ s/\@ZLIBLIBDIR\@/$zliblibdir/;
   $_ =~ s/\@LIBEXECDIR\@/$libexecdir/;
   $_ =~ s/\@MANDIR\@/$mandir/;
   $_ =~ s/\@SBINDIR\@/$sbindir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 381aba6..59acf31 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -67,6 +67,8 @@ ldapincdir ?= @LDAPINCDIR@
 ldaplibdir ?= @LDAPLIBDIR@
 virtincdir ?= @VIRTINCDIR@
 virtlibdir ?= @VIRTLIBDIR@
+zlibincdir ?= @ZLIBINCDIR@
+zliblibdir ?= @ZLIBLIBDIR@
 fence_agents ?= @FENCE_AGENTS@
 fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
 experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@