diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2005-09-11 17:58:20 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2005-09-11 17:58:20 +0000 |
| commit | 55a936b937b8be7d764f808eb33a0a706f6f0842 (patch) | |
| tree | d86124e92c95aeb7bbe81bbd4ec890cabf11abab | |
| parent | 9217194b5b6218d054735d7193d4638092f65c88 (diff) | |
| download | fetchmail-55a936b937b8be7d764f808eb33a0a706f6f0842.tar.gz fetchmail-55a936b937b8be7d764f808eb33a0a706f6f0842.tar.bz2 fetchmail-55a936b937b8be7d764f808eb33a0a706f6f0842.zip | |
Fixes to --with-hesiod option. Sunil Shetye.
svn path=/trunk/; revision=4287
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4-local/ac_ma_search_package.m4 | 9 |
3 files changed, 8 insertions, 4 deletions
@@ -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 f12aacf0..700b58d5 100644 --- 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 197f76c4..5f3c8b11 100644 --- 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 |