[Fedora-directory-commits] ldapserver aclocal.m4, 1.57, 1.58 configure, 1.74, 1.75 missing, 1.42, 1.43 install-sh, 1.42, 1.43 depcomp, 1.42, 1.43 compile, 1.41, 1.42 Makefile.in, 1.78, 1.79 config.sub, 1.41, 1.42 config.guess, 1.41, 1.42

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20058/ldapserver

Modified Files:
	aclocal.m4 configure missing install-sh depcomp compile 
	Makefile.in config.sub config.guess 
Log Message:
Resolves: bug 340361
Bug Description: build links wrong libdb on 64-bit systems
Reviewed by: nhosoi (Thanks!)
Fix Description: Once again, libtool attempts to be helpful but is instead harmful.  If you have both db4-devel.i386 and db4-devel.x86_64 installed, this will install /usr/lib/libdb-4.N.la.  If you use libtool to link with -ldb-4.N, and you do not specify a search path, libtool will attempt to find this library in it's default search path, which is something like /usr/lib/gcc/x86_64/blahblahblah/../../../lib.  This will find /usr/lib/libdb-4.N.la and will use the information in that file and link the object with /usr/lib/libdb-4.N.so, instead of just passing -ldb-4.N through to the linker which is what it ought to do (darn libtool).  In order to make libtool do the right thing, we must pass in -L$libdir -ldb-4.N to libtool so that it will use $libdir first in its search path.
Platforms tested: RHEL5 x86_64, RHEL4 x86_64
Flag Day: yes - autotool file changes
Doc impact: no





Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- configure	19 Oct 2007 18:48:27 -0000	1.74
+++ configure	19 Oct 2007 20:05:12 -0000	1.75
@@ -24169,6 +24169,8 @@
         if test -f "/usr/include/db.h"; then
       db_incdir="/usr/include"
       db_inc="-I/usr/include"
+      db_lib='-L$(libdir)'
+      db_libdir='$(libdir)'
     else
       { { echo "$as_me:$LINENO: error: db.h not found" >&5
 echo "$as_me: error: db.h not found" >&2;}
@@ -24207,6 +24209,8 @@
 echo "${ECHO_T}using /usr/include/db.h" >&6
     db_incdir="/usr/include"
     db_inc="-I/usr/include"
+    db_lib='-L$(libdir)'
+    db_libdir='$(libdir)'
   else
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6