[evolution-patches] Patch: kerberos library location patch

[Frederic Crozat <fcrozat mandrakesoft com>]

As part of our AMD64 port, here is a patch I'd like to merge in HEAD
branch (I have a similar one for 1.4 branch, but I don't think it is
worth merging it).

It is needed when dynamic library are stored in $prefix/lib64, as they
are on AMD64 platform.

Permission to commit ?

-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1319
diff -u -p -r1.1319 ChangeLog
--- ChangeLog	22 Mar 2004 18:34:37 -0000	1.1319
+++ ChangeLog	26 Mar 2004 15:35:41 -0000
@@ -1,3 +1,9 @@
+2004-03-26  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* configure.in:
+	Add option to specify location of kerberos 4/5 libraries.
+	Needed for 64bits support.
+
 2004-03-22  Radek Doulik  <rodo ximian com>
 
 	* configure.in: require gtkhtml 3.1.10, it's needed for composer
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.673
diff -u -p -r1.673 configure.in
--- configure.in	22 Mar 2004 18:34:39 -0000	1.673
+++ configure.in	26 Mar 2004 15:35:41 -0000
@@ -502,8 +502,10 @@ AC_SUBST(GNOME_PILOT_LIBS)
 dnl ********
 dnl Kerberos
 dnl ********
-AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 libs/includes], with_krb5="$withval", with_krb5="no")
-AC_ARG_WITH(krb4, [  --with-krb4=PREFIX      Location of Kerberos 4 libs/includes], with_krb4="$withval", with_krb4="no")
+AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 install dir], with_krb5="$withval", with_krb5="no")
+AC_ARG_WITH(krb5_libs, [  --with-krb5-libs=LIBDIR Location of Kerberos 5 libs], with_krb5_libs="$withval", with_krb5_libs="$with_krb5/lib")
+AC_ARG_WITH(krb4, [  --with-krb4=PREFIX      Location of Kerberos 4 install dir], with_krb4="$withval", with_krb4="no")
+AC_ARG_WITH(krb4_libs, [  --with-krb4-libs=LIBDIR Location of Kerberos 4 libs], with_krb4_libs="$withval", with_krb4_libs="$with_krb4/lib")
 
 msg_krb5="no"
 if test "x${with_krb5}" != "xno"; then
@@ -513,10 +515,10 @@ if test "x${with_krb5}" != "xno"; then
 	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
 	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
 	[
-		LDFLAGS="$LDFLAGS -L$with_krb5/lib $mitlibs"
+		LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
 		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
 		[
-			LDFLAGS="$LDFLAGS_save -L$with_krb5/lib $heimlibs"
+			LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
 			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no")
 		])
 		LDFLAGS="$LDFLAGS_save"
@@ -532,7 +534,7 @@ if test "x${with_krb5}" != "xno"; then
 			KRB5_CFLAGS="-I$with_krb5/include/heimdal"
 			msg_krb5="yes (Heimdal)"
 		fi
-		KRB5_LDFLAGS="-L$with_krb5/lib $ac_cv_lib_kerberos5"
+		KRB5_LDFLAGS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
 	fi
 else
 	AC_MSG_CHECKING(for Kerberos 5)
@@ -548,17 +550,17 @@ if test "x${with_krb4}" != "xno"; then
 
 		mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
 		# Look for MIT krb5 compat krb4
-		LDFLAGS="$LDFLAGS -L$with_krb4/lib $mitcompatlibs"
+		LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs"
 		AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs")
 		
 		if test "$ac_cv_lib_kerberos4" = "no"; then
 			# Look for KTH krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -lkrb -lcrypto -lcom_err -lroken"
+			LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
 			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken")
 		fi
 		if test "$ac_cv_lib_kerberos4" = "no"; then
 			# Look for old MIT krb4
-			LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -lkrb"
+			LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb"
 			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb",
 			[
 				LDFLAGS="$LDFLAGS -ldes"
@@ -576,7 +578,7 @@ if test "x${with_krb4}" != "xno"; then
 		if test -d "$with_krb4/include/kerberosIV"; then
 			KRB4_CFLAGS="$KRB4_CFLAGS -I$with_krb4/include/kerberosIV"
 		fi
-		KRB4_LDFLAGS="-L$with_krb4/lib $ac_cv_lib_kerberos4"
+		KRB4_LDFLAGS="-L$with_krb4_libs $ac_cv_lib_kerberos4"
 		
 		CFLAGS_save="$CFLAGS"
 		CFLAGS="$CFLAGS $KRB4_CFLAGS"