From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26025 invoked by alias); 27 Jun 2008 04:09:14 -0000 Received: (qmail 25995 invoked by uid 9702); 27 Jun 2008 04:09:13 -0000 Date: Fri, 27 Jun 2008 04:09:00 -0000 Message-ID: <20080627040912.25980.qmail@sourceware.org> From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.05-26-g64ab697 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e384af6c4500feb13c3dfcb1e5aa5388d3fd7ac5 X-Git-Newrev: 64ab697e04242b96455dcb06b55c1dd2b12f30a5 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00557.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=64ab697e04242b96455dcb06b55c1dd2b12f30a5 The branch, master has been updated via 64ab697e04242b96455dcb06b55c1dd2b12f30a5 (commit) from e384af6c4500feb13c3dfcb1e5aa5388d3fd7ac5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 64ab697e04242b96455dcb06b55c1dd2b12f30a5 Author: Fabio M. Di Nitto Date: Fri Jun 27 06:05:02 2008 +0200 [BUILD] Add configure options for libldap required by config/plugins/ldap/ Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: config/plugins/ldap/Makefile | 3 ++- configure | 14 ++++++++++++++ make/defines.mk.input | 2 ++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/config/plugins/ldap/Makefile b/config/plugins/ldap/Makefile index efd764c..1589998 100644 --- a/config/plugins/ldap/Makefile +++ b/config/plugins/ldap/Makefile @@ -11,9 +11,10 @@ include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk CFLAGS += -fPIC +CFLAGS += -I${ldapincdir} CFLAGS += -I${incdir} -LDFLAGS += -lldap +LDFLAGS += -L${ldaplibdir} -lldap OBJS= configldap.o diff --git a/configure b/configure index 0b8b1dd..02bc57d 100755 --- a/configure +++ b/configure @@ -61,6 +61,8 @@ my %options = ( nsprlibdir => \$nsprlibdir, xenincdir => \$xenincdir, xenlibdir => \$xenlibdir, + ldapincdir => \$ldapincdir, + ldaplibdir => \$ldaplibdir, libexecdir => \$libexecdir, mandir => \$mandir, prefix => \$prefix, @@ -139,6 +141,8 @@ my $err = &GetOptions (\%options, 'nsprlibdir=s', 'xenincdir=s', 'xenlibdir=s', + 'ldapincdir=s', + 'ldaplibdir=s', 'libexecdir=s', 'mandir=s', 'prefix=s', @@ -237,6 +241,8 @@ if ($help || !$err) { print "--virtlibdir=\tthe base directory for libvirt 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"; + print "--ldaplibdir=\tthe base directory for ldap libraries. (Default: {libdir})\n"; print "--fence_agents=\tlist of fence agents to configure. (Default: all)\n"; print "\t\tUse --fence_agents=help for a list\n"; print "--fenceagentslibdir=\tspecify directory where to install common fence python lib. (Default: /usr/share/fence)\n"; @@ -494,6 +500,12 @@ if (!$xenincdir) { if (!$xenlibdir) { $xenlibdir="${libdir}"; } +if (!$ldapincdir) { + $ldapincdir="${incdir}"; +} +if (!$ldaplibdir) { + $ldaplibdir="${libdir}"; +} if (!$libexecdir) { $libexecdir="${prefix}/libexec"; } @@ -658,6 +670,8 @@ while () { $_ =~ s/\@AISEXECBIN\@/$aisexecbin/; $_ =~ s/\@XENINCDIR\@/$xenincdir/; $_ =~ s/\@XENLIBDIR\@/$xenlibdir/; + $_ =~ s/\@LDAPINCDIR\@/$ldapincdir/; + $_ =~ s/\@LDAPLIBDIR\@/$ldaplibdir/; $_ =~ s/\@NSSINCDIR\@/$nssincdir/; $_ =~ s/\@NSSLIBDIR\@/$nsslibdir/; $_ =~ s/\@NSPRINCDIR\@/$nsprincdir/; diff --git a/make/defines.mk.input b/make/defines.mk.input index b9c6c5f..16da217 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -57,6 +57,8 @@ openaislibdir ?= @OPENAISLIBDIR@ aisexecbin ?= @AISEXECBIN@ xenincdir ?= @XENINCDIR@ xenlibdir ?= @XENLIBDIR@ +ldapincdir ?= @LDAPINCDIR@ +ldaplibdir ?= @LDAPLIBDIR@ virtincdir ?= @VIRTINCDIR@ virtlibdir ?= @VIRTLIBDIR@ fence_agents ?= @FENCE_AGENTS@ hooks/post-receive -- Cluster Project