Re: [evolution-patches] Patch: kerberos library location patch

[Frederic Crozat <fcrozat mandrakesoft com>]

Le jeu 12/08/2004 à 17:21, Rodney Dawes a écrit :
> On Thu, 2004-08-12 at 10:18 +0200, Frederic Crozat wrote:
> > Le mer 11/08/2004 à 19:51, Rodney Dawes a écrit :
> > > This also needs to be done for the evolution-exchange module.
> > 
> > Never happy :))
> > 
> > PS : please, reply below quoted text..
> 
> 
> > +AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5
> > install dir], with_krb5="$withval", with_krb5="/usr")
> 
> This should probably say "Location of Kerberos 5 installation"
> 
> > +AC_ARG_WITH(krb5_libs, [  --with-krb5-libs=LIBDIR Location of
> > Kerberos 5 libs], with_krb5_libs="$withval",
> > with_krb5_libs="$with_krb5/lib")
> 
> Shouldn't this be "krb5-libs" as the first argument to AC_ARG_WITH?
> Also, it should say "Location of Kerberos 5 libraries" instead of "libs"
> I think.
> 
> We probably should have a --with-krb5-includes as well, to be complete.
> Another thing to mention is that the help summary should probably use
> =DIR, instead of =PREFIX and =LIBDIR, and such.
> 
> Other than that, it seems functionally fine though.

Since I already committed the first version, here is a patch for your
comments. 

-- 
Frederic Crozat <fcrozat mandrakesoft com>
Mandrakesoft

? evolution-exchange-1.5.92.2-lib64.patch
? evolution-exchange-lib64.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.109
diff -u -p -r1.109 ChangeLog
--- ChangeLog	12 Aug 2004 15:15:43 -0000	1.109
+++ ChangeLog	12 Aug 2004 16:13:28 -0000
@@ -1,6 +1,12 @@
 2004-08-12  Frederic Crozat  <fcrozat mandrakesoft com>
 
 	* configure.in:
+	Add another krb5 headers options, fix small errors
+	in previous commit.
+
+2004-08-12  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* configure.in:
 	Add option to specify location of kerberos 5 libraries.
 	Needed for 64bits support.
 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/configure.in,v
retrieving revision 1.24
diff -u -p -r1.24 configure.in
--- configure.in	12 Aug 2004 15:15:43 -0000	1.24
+++ configure.in	12 Aug 2004 16:13:28 -0000
@@ -174,8 +174,9 @@ LIBS="$SAVE_LIBS"
 dnl ********
 dnl Kerberos
 dnl ********
-AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 install dir], with_krb5="$withval", with_krb5="/usr")
-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(krb5, [  --with-krb5=DIR      Location of Kerberos 5 installation], with_krb5="$withval", with_krb5="/usr")
+AC_ARG_WITH(krb5-libs, [  --with-krb5-libs=DIR Location of Kerberos 5 libraries], with_krb5_libs="$withval", with_krb5_libs="$with_krb5/lib")
+AC_ARG_WITH(krb5-includes, [  --with-krb5-includes=DIR Location of Kerberos 5 headers], with_krb5_includes="$withval", with_krb5_includes="")
 
 
 mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -197,11 +198,20 @@ fi
 
 if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
 	AC_DEFINE(HAVE_MIT_KRB5,1,[Define if you have MIT Krb5])
-	KRB5_CFLAGS="-I$with_krb5/include"
-else
+	if test -z "$with_krb5_includes"; then
+		KRB5_CFLAGS="-I$with_krb5/include"
+	else
+		KRB5_CFLAGS="-I$with_krb5_includes"
+	fi
+  else
 	AC_DEFINE(HAVE_HEIMDAL_KRB5,1,[Define if you have Heimdal])
-	KRB5_CFLAGS="-I$with_krb5/include/heimdal"
-fi
+	if test -z "$with_krb5_includes"; then
+		KRB5_CFLAGS="-I$with_krb5/include/heimdal"
+	else
+		KRB5_CFLAGS="-I$with_krb5_includes"
+	fi
+  fi
+	
 KRB5_LIBS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
 AC_SUBST(KRB5_CFLAGS)
 AC_SUBST(KRB5_LIBS)