From ee860dc3de8647e67bc907bd9fd60650a22155ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Eivind=20N=C3=A6ss?= Date: Fri, 15 Jul 2022 07:46:43 -0700 Subject: [PATCH] Fix build for when --without-[srp|atm|pcap|pam]=no, the value would be "no" and not empty in that case MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eivind Næss --- m4/ax_check_atm.m4 | 4 ++-- m4/ax_check_pam.m4 | 4 ++-- m4/ax_check_pcap.m4 | 4 ++-- m4/ax_check_srp.m4 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/m4/ax_check_atm.m4 b/m4/ax_check_atm.m4 index 004fe9f..ddd0f53 100644 --- 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 edb30e3..b17a757 100644 --- 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 6d70ec1..379a113 100644 --- 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 631341d..11e66f5 100644 --- 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") ]) -- 2.39.2