Ethereal-dev: [PATCH] acinclude.m4, configure.in (was: Re: [Ethereal-dev] base64_decode name c
Thomas Anders wrote:
AC_ETHEREAL_KRB5_CHECK already does:
LIBS="$LIBS $KRB5_LIBS"
which seems to cause the problems I mentioned.
The attached patch should stop the contamination of the "LIBS=" lines in
all Makefiles with Heimdal libs in case of "--with-krb5".
Works for me (tested on SuSE Linux 9.0 x86). Please review/test/apply.
There's still room for "--with-krb5" improvement, though. We currently
depend on krb5-config in PATH to detect the Heimdal version and bail
with a misleading message otherwise. :(
+Thomas
--
Thomas Anders (thomas.anders at blue-cable.de)
--- acinclude.m4.FCS 2004-04-22 22:02:58.000000000 +0200
+++ acinclude.m4 2004-05-13 14:59:59.000000000 +0200
@@ -878,10 +878,12 @@
CFLAGS="$CFLAGS -I$krb5_dir/include"
ethereal_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
- ethereal_save_LIBS="$LIBS"
- LIBS="$LIBS -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
+ #ethereal_save_LIBS="$LIBS"
+ #LIBS="$LIBS -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
ethereal_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$krb5_dir/lib"
+ # XXX: we should find a way to determine ac_krb5_version,
+ # otherwise we'll bail later
else
AC_PATH_PROG(KRB5_CONFIG, krb5-config)
if test -x $KRB5_CONFIG
@@ -900,7 +902,7 @@
AC_MSG_RESULT(Adding -lresolv to libs)
fi
- LIBS="$LIBS $KRB5_LIBS"
+ #LIBS="$LIBS $KRB5_LIBS"
ac_krb5_version=`$KRB5_CONFIG --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
fi
fi
@@ -949,7 +951,7 @@
if test "x$krb5_dir" != "x"
then
#
- # Put the "-I" and "-L" flags for pcre at
+ # Put the "-I" and "-L" flags for krb5 at
# the beginning of CFLAGS, CPPFLAGS,
# LDFLAGS, and LIBS.
#
@@ -969,11 +971,11 @@
CFLAGS="$ethereal_save_CFLAGS"
CPPFLAGS="$ethereal_save_CPPFLAGS"
LDFLAGS="$ethereal_save_LDFLAGS"
- LIBS="$ethereal_save_LIBS"
+ #LIBS="$ethereal_save_LIBS"
KRB5_LIBS=""
fi
want_krb5=no
- ])
+ ], $KRB5_LIBS)
AC_SUBST(KRB5_LIBS)
else
want_krb5=no
--- configure.in.FCS 2004-05-13 05:34:14.000000000 +0200
+++ configure.in 2004-05-13 12:33:30.000000000 +0200
@@ -734,12 +734,12 @@
then
want_krb5=yes
else
- want_krb5=no
+ want_krb5=yes
krb5_dir=$withval
fi
],[
#
- # Use kerberos/heimdal if it's present, otherwise don't.
+ # Use kerberos/heimdal if specified, otherwise don't.
#
want_krb5=no
krb5_dir=
