Use AS_CASE when case/esac contains AC macros

This commit is contained in:
dmiller 2026-08-14 17:16:13 +00:00
parent 8c74077140
commit 3e2fc8533a
4 changed files with 231 additions and 175 deletions

208
configure vendored
View file

@ -5701,41 +5701,48 @@ LUA_CFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN"
case "$host" in
*alpha-dec-osf*)
case "$host" in #(
*alpha-dec-osf*) :
printf "%s\n" "#define DEC 1" >>confdefs.h
;;
*-netbsd* | *-knetbsd*-gnu)
;; #(
*-netbsd* | *-knetbsd*-gnu) :
printf "%s\n" "#define NETBSD 1" >>confdefs.h
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-openbsd*)
;; #(
*-openbsd*) :
printf "%s\n" "#define OPENBSD 1" >>confdefs.h
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
;; #(
*-freebsd* | *-kfreebsd*-gnu | *-dragonfly*) :
printf "%s\n" "#define FREEBSD 1" >>confdefs.h
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-bsdi*)
;; #(
*-bsdi*) :
printf "%s\n" "#define BSDI 1" >>confdefs.h
;;
*-sgi-irix5* | *-sgi-irix6*)
;; #(
*-sgi-irix5* | *-sgi-irix6*) :
printf "%s\n" "#define IRIX 1" >>confdefs.h
;;
*-hpux*)
;; #(
*-hpux*) :
printf "%s\n" "#define HPUX 1" >>confdefs.h
@ -5784,8 +5791,9 @@ then :
fi
;;
*-aix*)
;; #(
*-aix*) :
# use some AIX specific libraries
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odm_initialize in -lodm" >&5
printf %s "checking for odm_initialize in -lodm... " >&6; }
@ -5916,74 +5924,86 @@ then :
fi
;;
*-solaris2.1[1-9]*)
;; #(
*-solaris2.1[1-9]*) :
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
# Solaris 11 and later use BPF packet capture rather than DLPI.
printf "%s\n" "#define SOLARIS_BPF_PCAP_CAPTURE 1" >>confdefs.h
;;
*-solaris2.0*)
;; #(
*-solaris2.0*) :
printf "%s\n" "#define STUPID_SOLARIS_CHECKSUM_BUG 1" >>confdefs.h
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris2.[1-9][0-9]*)
;; #(
*-solaris2.[1-9][0-9]*) :
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris2.1*)
;; #(
*-solaris2.1*) :
printf "%s\n" "#define STUPID_SOLARIS_CHECKSUM_BUG 1" >>confdefs.h
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris2.2*)
;; #(
*-solaris2.2*) :
printf "%s\n" "#define STUPID_SOLARIS_CHECKSUM_BUG 1" >>confdefs.h
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris2.3*)
;; #(
*-solaris2.3*) :
printf "%s\n" "#define STUPID_SOLARIS_CHECKSUM_BUG 1" >>confdefs.h
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris2.4*)
;; #(
*-solaris2.4*) :
printf "%s\n" "#define STUPID_SOLARIS_CHECKSUM_BUG 1" >>confdefs.h
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris2.5.1)
;; #(
*-solaris2.5.1) :
printf "%s\n" "#define STUPID_SOLARIS_CHECKSUM_BUG 1" >>confdefs.h
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-solaris*)
;; #(
*-solaris*) :
printf "%s\n" "#define SOLARIS 1" >>confdefs.h
;;
*-sunos4*)
;; #(
*-sunos4*) :
printf "%s\n" "#define SUNOS 1" >>confdefs.h
printf "%s\n" "#define SPRINTF_RETURNS_STRING 1" >>confdefs.h
;;
*-linux*)
;; #(
*-linux*) :
printf "%s\n" "#define LINUX 1" >>confdefs.h
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-apple-darwin*)
;; #(
*-apple-darwin*) :
printf "%s\n" "#define MACOSX 1" >>confdefs.h
@ -6029,7 +6049,10 @@ fi
LUA_CFLAGS="-DLUA_USE_MACOSX"
needs_cpp_precomp=yes
;;
;; #(
*) :
;;
esac
@ -7208,8 +7231,9 @@ test "${with_libpcap+set}" != "set" && with_libpcap=yes
# Check whether --with-libpcap was given.
if test ${with_libpcap+y}
then :
withval=$with_libpcap; case "$with_libpcap" in
yes)
withval=$with_libpcap; case "$with_libpcap" in #(
yes) :
ac_fn_c_check_header_compile "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes
then :
@ -7256,11 +7280,13 @@ fi
fi
;;
included)
;; #(
included) :
have_libpcap=no
;;
*)
;; #(
*) :
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -7318,8 +7344,11 @@ fi
LDFLAGS=$_ldflags
CPPFLAGS=$_cppflags
;;
esac
;; #(
*) :
;;
esac
fi
@ -7810,16 +7839,20 @@ test "${with_libz+set}" != "set" && with_libz="yes"
if test ${with_libz+y}
then :
withval=$with_libz;
case "$with_libz" in
yes)
;;
no)
case "$with_libz" in #(
yes) :
;; #(
no) :
# Do nothing
;;
included)
;; #(
included) :
requested_included_libz="yes"
;;
*)
;; #(
*) :
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -7879,8 +7912,11 @@ fi
LDFLAGS=$_ldflags
CPPFLAGS=$_cppflags
;;
esac
;; #(
*) :
;;
esac
fi
@ -7998,16 +8034,20 @@ test "${with_libssh2+set}" != "set" && with_libssh2="yes"
# Check whether --with-libssh2 was given.
if test ${with_libssh2+y}
then :
withval=$with_libssh2; case "$with_libssh2" in
yes)
;;
no)
withval=$with_libssh2; case "$with_libssh2" in #(
yes) :
;; #(
no) :
use_libssh2="no"
;;
included)
;; #(
included) :
requested_included_libssh2="yes"
;;
*)
;; #(
*) :
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -8067,8 +8107,11 @@ fi
fi
;;
esac
;; #(
*) :
;;
esac
fi
@ -8245,10 +8288,12 @@ no_lua=no
# Check whether --with-liblua was given.
if test ${with_liblua+y}
then :
withval=$with_liblua; case "$with_liblua" in
yes)
;;
included)
withval=$with_liblua; case "$with_liblua" in #(
yes) :
;; #(
included) :
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="build-lua"
@ -8258,15 +8303,20 @@ then :
printf "%s\n" "#define LUA_INCLUDED 1" >>confdefs.h
;;
no)
;; #(
no) :
no_lua="yes"
;;
*)
;; #(
*) :
CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
LDFLAGS="-L$with_liblua/lib $LDFLAGS"
;;
esac
;; #(
*) :
;;
esac
fi

View file

@ -124,92 +124,92 @@ LUA_CFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN"
AH_TEMPLATE(SOLARIS, [Sun/Oracle Solaris])
AH_TEMPLATE(STUPID_SOLARIS_CHECKSUM_BUG, [],
[A bug in Solaris causing incorrect IP checksums])
case "$host" in
*alpha-dec-osf*)
AS_CASE(["$host"],
[*alpha-dec-osf*], [
AC_DEFINE(DEC, 1, [DEC Alpha])
;;
*-netbsd* | *-knetbsd*-gnu)
],
[*-netbsd* | *-knetbsd*-gnu], [
AC_DEFINE(NETBSD, 1, [NetBSD])
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-openbsd*)
],
[*-openbsd*], [
AC_DEFINE(OPENBSD, 1, [OpenBSD])
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-freebsd* | *-kfreebsd*-gnu | *-dragonfly*)
],
[*-freebsd* | *-kfreebsd*-gnu | *-dragonfly*], [
AC_DEFINE(FREEBSD, 1, [FreeBSD])
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-bsdi*)
],
[*-bsdi*], [
AC_DEFINE(BSDI, 1, [BSD/OS])
;;
*-sgi-irix5* | *-sgi-irix6*)
],
[*-sgi-irix5* | *-sgi-irix6*], [
AC_DEFINE(IRIX, 1, [IRIX])
;;
*-hpux*)
],
[*-hpux*], [
AC_DEFINE(HPUX, 1, [HP-UX])
# To link with libnet and NM (/usr/lib/libnm.sl) library
# on HP-UX 11.11 (other versions?) Mikhail Zakharov (zmey20000@yahoo.com)
AC_CHECK_LIB(nm, open_mib)
;;
*-aix*)
],
[*-aix*], [
# use some AIX specific libraries
AC_CHECK_LIB(odm, odm_initialize)
AC_CHECK_LIB(cfg, _system_configuration)
AC_CHECK_LIB(crypt, crypt_r)
;;
*-solaris2.1[[1-9]]*)
],
[*-solaris2.1[[1-9]]*], [
AC_DEFINE(SOLARIS)
# Solaris 11 and later use BPF packet capture rather than DLPI.
AC_DEFINE(SOLARIS_BPF_PCAP_CAPTURE, 1, [Solaris 11 and later use BPF packet capture rather than DLPI.])
;;
*-solaris2.0*)
],
[*-solaris2.0*], [
AC_DEFINE(STUPID_SOLARIS_CHECKSUM_BUG)
AC_DEFINE(SOLARIS)
;;
*-solaris2.[[1-9]][[0-9]]*)
],
[*-solaris2.[[1-9]][[0-9]]*], [
AC_DEFINE(SOLARIS)
;;
*-solaris2.1*)
],
[*-solaris2.1*], [
AC_DEFINE(STUPID_SOLARIS_CHECKSUM_BUG)
AC_DEFINE(SOLARIS)
;;
*-solaris2.2*)
],
[*-solaris2.2*], [
AC_DEFINE(STUPID_SOLARIS_CHECKSUM_BUG)
AC_DEFINE(SOLARIS)
;;
*-solaris2.3*)
],
[*-solaris2.3*], [
AC_DEFINE(STUPID_SOLARIS_CHECKSUM_BUG)
AC_DEFINE(SOLARIS)
;;
*-solaris2.4*)
],
[*-solaris2.4*], [
AC_DEFINE(STUPID_SOLARIS_CHECKSUM_BUG)
AC_DEFINE(SOLARIS)
;;
*-solaris2.5.1)
],
[*-solaris2.5.1], [
AC_DEFINE(STUPID_SOLARIS_CHECKSUM_BUG)
AC_DEFINE(SOLARIS)
;;
*-solaris*)
],
[*-solaris*], [
AC_DEFINE(SOLARIS)
;;
*-sunos4*)
],
[*-sunos4*], [
AC_DEFINE(SUNOS, 1, [SunOS 4])
AC_DEFINE(SPRINTF_RETURNS_STRING, 1,
[sprintf(9f) returns its first argument, not the number of characters printed])
;;
*-linux*)
],
[*-linux*], [
AC_DEFINE(LINUX, 1, [Linux])
LDFLAGS="-Wl,-E $LDFLAGS" # needed for nse-C-module support
;;
*-apple-darwin*)
],
[*-apple-darwin*], [
AC_DEFINE(MACOSX, 1, [Apple OS X])
dnl on Mac OSX the math library seems to contain unwanted getopt cruft
AC_CHECK_LIB(m, main)
LUA_CFLAGS="-DLUA_USE_MACOSX"
needs_cpp_precomp=yes
;;
esac
]
)
AC_SUBST(LUA_CFLAGS)
@ -471,16 +471,16 @@ test "${with_libpcap+set}" != "set" && with_libpcap=yes
AC_ARG_WITH(libpcap,
AS_HELP_STRING([--with-libpcap=DIR], [Look for pcap in DIR/include and DIR/libs.])
AS_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap]),
[ case "$with_libpcap" in
yes)
[ AS_CASE(["$with_libpcap"],
[yes], [
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes ])])
;;
included)
],
[included], [
have_libpcap=no
;;
*)
],
[*], [
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -495,8 +495,8 @@ AS_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
LDFLAGS=$_ldflags
CPPFLAGS=$_cppflags
;;
esac]
]
)]
)
if test $needs_cpp_precomp = yes; then
@ -626,16 +626,16 @@ AC_ARG_WITH(libz,
AS_HELP_STRING([--with-libz=DIR], [Use specific copy of libz])
AS_HELP_STRING([--with-libz=included], [Always use version included with Nmap]),
[
case "$with_libz" in
yes)
;;
no)
AS_CASE(["$with_libz"],
[yes], [
],
[no], [
# Do nothing
;;
included)
],
[included], [
requested_included_libz="yes"
;;
*)
],
[*], [
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -652,8 +652,8 @@ AS_HELP_STRING([--with-libz=included], [Always use version included with Nmap]),
LDFLAGS=$_ldflags
CPPFLAGS=$_cppflags
;;
esac
]
)
]
)
@ -711,16 +711,16 @@ AC_ARG_WITH(libssh2,
AS_HELP_STRING([--with-libssh2=DIR], [Use specific copy of libssh2])
AS_HELP_STRING([--with-libssh2=included], [Always use version included with Nmap])
AS_HELP_STRING([--without-libssh2], [Compile without libssh2]),
[ case "$with_libssh2" in
yes)
;;
no)
[ AS_CASE(["$with_libssh2"],
[yes], [
],
[no], [
use_libssh2="no"
;;
included)
],
[included], [
requested_included_libssh2="yes"
;;
*)
],
[*], [
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -736,8 +736,8 @@ AS_HELP_STRING([--without-libssh2], [Compile without libssh2]),
CPPFLAGS=$_cppflags],[-lm])
])
;;
esac]
]
)]
)
@ -843,10 +843,10 @@ AC_ARG_WITH(liblua,
AS_HELP_STRING([--with-liblua=DIR], [Use an existing (compiled) lua lib from DIR/include and DIR/lib.])
AS_HELP_STRING([--with-liblua=included], [Use the liblua version included with Nmap])
AS_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all of NSE from compilation)]),
[ case "$with_liblua" in
yes)
;;
included)
[ AS_CASE(["$with_liblua"],
[yes], [
],
[included], [
CPPFLAGS="-I\$(top_srcdir)/$LIBLUADIR $CPPFLAGS"
LIBLUA_LIBS="\$(top_srcdir)/$LIBLUADIR/liblua.a"
LUA_BUILD="build-lua"
@ -854,15 +854,15 @@ AS_HELP_STRING([--without-liblua], [Compile without lua (this will exclude all o
LUA_DIST_CLEAN="distclean-lua"
have_lua="yes"
AC_DEFINE(LUA_INCLUDED, 1, [Using included liblua])
;;
no)
],
[no], [
no_lua="yes"
;;
*)
],
[*], [
CPPFLAGS="-I$with_liblua/include $CPPFLAGS"
LDFLAGS="-L$with_liblua/lib $LDFLAGS"
;;
esac]
]
)]
)
# They don't want lua

22
nping/configure vendored
View file

@ -6039,8 +6039,9 @@ test "${with_libpcap+set}" != "set" && with_libpcap=yes
# Check whether --with-libpcap was given.
if test ${with_libpcap+y}
then :
withval=$with_libpcap; case "$with_libpcap" in
yes)
withval=$with_libpcap; case "$with_libpcap" in #(
yes) :
ac_fn_c_check_header_compile "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes
then :
@ -6087,11 +6088,13 @@ fi
fi
;;
included)
;; #(
included) :
have_libpcap=no
;;
*)
;; #(
*) :
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -6149,8 +6152,11 @@ fi
LDFLAGS=$_ldflags
CPPFLAGS=$_cppflags
;;
esac
;; #(
*) :
;;
esac
fi

View file

@ -227,16 +227,16 @@ test "${with_libpcap+set}" != "set" && with_libpcap=yes
AC_ARG_WITH(libpcap,
AS_HELP_STRING([--with-libpcap=DIR], [Look for pcap in DIR/include and DIR/libs.])
AS_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap]),
[ case "$with_libpcap" in
yes)
[ AS_CASE(["$with_libpcap"],
[yes], [
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes ])])
;;
included)
],
[included], [
have_libpcap=no
;;
*)
],
[*], [
_cppflags=$CPPFLAGS
_ldflags=$LDFLAGS
@ -251,8 +251,8 @@ AS_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
LDFLAGS=$_ldflags
CPPFLAGS=$_cppflags
;;
esac]
]
)]
)
if test $needs_cpp_precomp = yes; then