svn commit: samba r25100 - in branches/SAMBA_4_0: . source/lib/ldb source/lib/ldb/tools

[jelmer at samba.org]

Author: jelmer
Date: 2007-09-11 18:24:09 +0000 (Tue, 11 Sep 2007)
New Revision: 25100

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25100

Log:
Include LDAP libs in .pc file so linking statically against libldb works again.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/configure.ac
   branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in
   branches/SAMBA_4_0/source/lib/ldb/tools/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-09-11 18:08:07 UTC (rev 25099)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-09-11 18:24:09 UTC (rev 25100)
@@ -30,11 +30,14 @@
 POPT_CFLAGS = @POPT_CFLAGS@
 POPT_OBJ = @POPT_OBJ@
 
+LDAP_LIBS = @LDAP_LIBS@
+
 CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
        $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \
 	-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
 
-LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TDB_LIBS)
+LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TDB_LIBS) \
+		  $(LDAP_LIBS)
 
 LDB_TDB_DIR=ldb_tdb
 LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \

Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.ac	2007-09-11 18:08:07 UTC (rev 25099)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.ac	2007-09-11 18:24:09 UTC (rev 25100)
@@ -53,9 +53,10 @@
 
 m4_include(ldap.m4)
 if test x"$with_ldap_support" = x"yes"; then
-   LIBS="$LIBS -llber -lldap"
    CFLAGS="$CFLAGS -DHAVE_LDB_LDAP=1"
    EXTRA_OBJ="$EXTRA_OBJ ldb_ldap/ldb_ldap.o"
+   LDAP_LIBS="-llber -lldap"
+   AC_SUBST(LDAP_LIBS)
    TESTS="$TESTS test-ldap.sh"
 fi
 

Modified: branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in	2007-09-11 18:08:07 UTC (rev 25099)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in	2007-09-11 18:24:09 UTC (rev 25100)
@@ -10,6 +10,7 @@
 Requires.private: tdb
 Requires: talloc
 Libs: -L${libdir} -lldb
+Libs.private: @LDAP_LIBS@
 Cflags: -I${includedir} 
 Modulesdir: ${modulesdir}
 URL: http://ldb.samba.org/

Modified: branches/SAMBA_4_0/source/lib/ldb/tools/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/config.mk	2007-09-11 18:08:07 UTC (rev 25099)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/config.mk	2007-09-11 18:24:09 UTC (rev 25100)
@@ -1,7 +1,7 @@
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
-CFLAGS = -Ilib/ldb
+CFLAGS = -Ilib/ldb -Ilib/ldb/include
 OBJ_FILES= \
 		cmdline.o
 PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT