Fix build for when --without-[srp|atm|pcap|pam]=no, the value would be "no" and not...

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>

diff --git a/m4/ax_check_atm.m4 b/m4/ax_check_atm.m4
index 004fe9f351a046ff92f6b864ff74005aa27c530c..ddd0f5376ee7dcd93fcc3f36bf782d2c49d3e1b0 100644 (file)
--- a/m4/ax_check_atm.m4
+++ b/m4/ax_check_atm.m4
@@ -77,7 +77,7 @@ AC_DEFUN([AX_CHECK_ATM], [
                 $1
             ], [
                 AC_MSG_RESULT([no])
-                with_atm=""
+                with_atm="no"
                 $2
             ])
         CPPFLAGS="$save_CPPFLAGS"
@@ -88,6 +88,6 @@ AC_DEFUN([AX_CHECK_ATM], [
         AC_SUBST([ATM_LIBS])
         AC_SUBST([ATM_LDFLAGS])
     fi
-    AM_CONDITIONAL(WITH_LIBATM, test -n "${with_atm}")
+    AM_CONDITIONAL(WITH_LIBATM, test "x${with_atm}" != "xno")
 ])
 

diff --git a/m4/ax_check_pam.m4 b/m4/ax_check_pam.m4
index edb30e348c31966d1e36e2cb2f1ea7508c176c6a..b17a7573c8741f3a379df93bc6bca501535985c3 100644 (file)
--- a/m4/ax_check_pam.m4
+++ b/m4/ax_check_pam.m4
@@ -77,7 +77,7 @@ AC_DEFUN([AX_CHECK_PAM], [
                 $1
             ], [
                 AC_MSG_RESULT([no])
-                with_pam=""
+                with_pam="no"
                 $2
             ])
         CPPFLAGS="$save_CPPFLAGS"
@@ -88,6 +88,6 @@ AC_DEFUN([AX_CHECK_PAM], [
         AC_SUBST([PAM_LIBS])
         AC_SUBST([PAM_LDFLAGS])
     fi
-    AM_CONDITIONAL(WITH_LIBPAM, test -n "${with_pam}")
+    AM_CONDITIONAL(WITH_LIBPAM, test "x${with_pam}" != "xno")
 ])
 

diff --git a/m4/ax_check_pcap.m4 b/m4/ax_check_pcap.m4
index 6d70ec128d2ec32aa64bb9abd8ce204592dfb343..379a1137f4e6d4064c899e1e805cfb4716a05b44 100644 (file)
--- a/m4/ax_check_pcap.m4
+++ b/m4/ax_check_pcap.m4
@@ -76,7 +76,7 @@ AC_DEFUN([AX_CHECK_PCAP], [
                 $1
             ], [
                 AC_MSG_RESULT([no])
-                with_pcap=""
+                with_pcap="no"
                 $2
             ])
         CPPFLAGS="$save_CPPFLAGS"
@@ -88,6 +88,6 @@ AC_DEFUN([AX_CHECK_PCAP], [
         AC_SUBST([PCAP_LDFLAGS])
     fi
 
-    AM_CONDITIONAL(WITH_PCAP, test -n "${with_pcap}")
+    AM_CONDITIONAL(WITH_PCAP, test "x${with_pcap}" != "xno")
 ])
 

diff --git a/m4/ax_check_srp.m4 b/m4/ax_check_srp.m4
index 631341d4ec6725fabd12a191479ea0f8f4ec8655..11e66f50936dca5fe66d127eeee70e21bc178860 100644 (file)
--- a/m4/ax_check_srp.m4
+++ b/m4/ax_check_srp.m4
@@ -77,7 +77,7 @@ AC_DEFUN([AX_CHECK_SRP], [
                 $1
             ], [
                 AC_MSG_RESULT([no])
-                with_srp=""
+                with_srp="no"
                 $2
             ])
         CPPFLAGS="$save_CPPFLAGS"
@@ -89,6 +89,6 @@ AC_DEFUN([AX_CHECK_SRP], [
         AC_SUBST([SRP_LDFLAGS])
     fi
 
-    AM_CONDITIONAL(WITH_SRP, test -n "${with_srp}")
+    AM_CONDITIONAL(WITH_SRP, test "x${with_srp}" != "xno")
 ])