Fixes to --with-hesiod option. Sunil Shetye.

svn path=/trunk/; revision=4287

diff --git a/NEWS b/NEWS
index 3c6b3f3cef46ec2d3a87380f7a9ef85449c4794b..95ad9c5c417c2ce106959b3c74fcba772f39a257 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -194,6 +194,7 @@ fetchmail 6.3.0 (not yet released officially):
   brackets for consistency with Postfix.  Matthias Andree.
 * Operating systems that do not support at least one of gethostbyname,
   gethostbyname_r, getipnodebyname are no longer supported.  Matthias Andree.
+* Fixes to --with-hesiod option. Sunil Shetye. (MA)
 
 # INTERNAL CHANGES
 * Switched to automake. Matthias Andree.

diff --git a/configure.ac b/configure.ac
index f12aacf0c7b5b231adfb2c2ab55b984ae1638b13..700b58d574bc9055711e9687c2dc890b550464f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -487,7 +487,7 @@ else
   if test "$with_kerberos" != "yes" ; then
      searchdirs="$with_kerberos"
   else
-     searchdirs="$with_kerberos5 /usr/kerberos /usr/kerberosIV /usr/athena/usr"
+     searchdirs="$with_kerberos5 /usr/kerberos /usr/kerberosIV /usr/athena /usr"
   fi
   with_kerberos=
   ac_saveLDFLAGS="$LDFLAGS"

diff --git a/m4-local/ac_ma_search_package.m4 b/m4-local/ac_ma_search_package.m4
index 197f76c47b5c415a4fc6b64cf59b5586dbf7aa3f..5f3c8b117d080a3a6116130b795143fae9c7f59e 100644 (file)
--- a/m4-local/ac_ma_search_package.m4
+++ b/m4-local/ac_ma_search_package.m4
@@ -62,17 +62,20 @@ if test "${with_$1}" != no ; then
            $1_libdir=$i/lib
        fi
 
+       if ! test -f "${$1_include}/$5" -a -d "${$1_libdir}" ; then
+           continue
+       fi
+
        OLD_LIBS=$LIBS
        OLD_LDFLAGS=$LDFLAGS
        OLD_CFLAGS=$CFLAGS
        OLD_CPPFLAGS=$CPPFLAGS
 
-       if test "${$1_libdir}" ; then
+       if test -n "${$1_libdir}" -a "${$1_libdir}" != /usr/lib ; then
                LDFLAGS="$LDFLAGS -L${$1_libdir}"
        fi
-       if test "${$1_include}" ; then
+       if test -n "${$1_include}" -a "${$1_include}" != /usr/include ; then
                CPPFLAGS="$CPPFLAGS -I${$1_include}"
-               CFLAGS="$CFLAGS -I${$1_include}"
        fi
 
        success=no