[evolution-patches] EVO_LDAP_CHECK changes to support lib64

[Rodney Dawes <dobey novell com>]

The following patches fix up the EVO_LDAP_CHECK macros in various
modules to work on 64-bit platforms where the libdir is $prefix/lib64.

-- dobey

Index: acinclude.m4
===================================================================
RCS file: /cvs/gnome/evolution-exchange/acinclude.m4,v
retrieving revision 1.2
diff -u -r1.2 acinclude.m4
--- acinclude.m4	3 Jun 2004 19:15:55 -0000	1.2
+++ acinclude.m4	10 Aug 2004 21:17:46 -0000
@@ -43,7 +43,12 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		if [ -d $ac_cv_with_openldap/lib64 ]; then
+		   LDAP_LIBDIR="$ac_cv_with_openldap/lib64"
+		else
+		   LDAP_LIBDIR="$ac_cv_with_openldap/lib"
+		fi
+		LDAP_LDFLAGS="-L$LDAP_LIBDIR"
 		;;
 	esac
 
@@ -52,7 +57,7 @@
 
 		case $with_static_ldap in
 		no|"")
-			if test -f $with_openldap/lib/libldap.la; then
+			if test -f $LDAP_LIBDIR/libldap.la; then
 				with_static_ldap=no
 			else
 				with_static_ldap=yes
@@ -83,13 +88,13 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$LDAP_LIBDIR/liblber.a $LDAP_LIBS"
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$LDAP_LIBDIR/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],

Index: acinclude.m4
===================================================================
RCS file: /cvs/gnome/evolution-data-server/acinclude.m4,v
retrieving revision 1.3
diff -u -r1.3 acinclude.m4
--- acinclude.m4	21 Apr 2004 19:19:01 -0000	1.3
+++ acinclude.m4	10 Aug 2004 21:16:05 -0000
@@ -98,7 +98,12 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		if [ -d $ac_cv_with_openldap/lib64 ]; then
+		   LDAP_LIBDIR="$ac_cv_with_openldap/lib64"
+		else
+		   LDAP_LIBDIR="$ac_cv_with_openldap/lib"
+		fi
+		LDAP_LDFLAGS="-L$LDAP_LIBDIR"
 		;;
 	esac
 
@@ -134,20 +139,20 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$LDAP_LIBDIR/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $LDAP_LIBDIR/libldap.la; then
+					LDAP_LIBS="`. $LDAP_LIBDIR/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$LDAP_LIBDIR/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],

Index: acinclude.m4
===================================================================
RCS file: /cvs/gnome/evolution/acinclude.m4,v
retrieving revision 1.6
diff -u -r1.6 acinclude.m4
--- acinclude.m4	4 Apr 2003 20:33:19 -0000	1.6
+++ acinclude.m4	10 Aug 2004 21:18:35 -0000
@@ -98,7 +98,12 @@
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		if [ -d $ac_cv_with_openldap/lib64 ]; then
+		   LDAP_LIBDIR="$ac_cv_with_openldap/lib64"
+		else
+		   LDAP_LIBDIR="$ac_cv_with_openldap/lib"
+		fi
+		LDAP_LDFLAGS="-L$LDAP_LIBDIR"
 		;;
 	esac
 
@@ -134,20 +139,20 @@
 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
 		AC_CHECK_LIB(lber, ber_get_tag, [
 			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+				LDAP_LIBS="$LDAP_LIBDIR/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $LDAP_LIBDIR/libldap.la; then
+					LDAP_LIBS="`. $LDAP_LIBDIR/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$LDAP_LIBDIR/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],