Credit John Beck's fixes.

[~andy/fetchmail] / m4-local / ac_ma_search_package.m4

diff --git a/m4-local/ac_ma_search_package.m4 b/m4-local/ac_ma_search_package.m4
index 553c96cca4c3e84afc9945c6280cc1689b232e72..f2af94240ef13baafb1ee3beb9c51cdf743d93d8 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" -o ! -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
@@ -83,6 +86,11 @@ dnl  fixed
                ifelse([$6], , , [$6])
                AC_DEFINE(HAVE_PKG_$1,1,[Define to 1 if you have the '$1' package.])
                break
+       else
+               LIBS=$OLD_LIBS
+               LDFLAGS=$OLD_LDFLAGS
+               CPPFLAGS=$OLD_CPPFLAGS
+               CFLAGS=$OLD_CFLAGS
        fi
     done
     if test "$success" = no ; then