public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
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 Date: Fri, 27 Jun 2008 04:09:00 -0000 [thread overview] Message-ID: <20080627040912.25980.qmail@sourceware.org> (raw) 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 <fdinitto@redhat.com> 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 <fdinitto@redhat.com> ----------------------------------------------------------------------- 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 (<IFILE>) { $_ =~ 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
reply other threads:[~2008-06-27 4:09 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080627040912.25980.qmail@sourceware.org \ --to=fabbione@sourceware.org \ --cc=cluster-cvs@sources.redhat.com \ --cc=cluster-devel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).