This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=4af26951f2753c4a50a838342bfe881d8265e3f2 commit 4af26951f2753c4a50a838342bfe881d8265e3f2 Author: Guillem Jover <[email protected]> AuthorDate: Wed Dec 4 23:53:20 2024 +0100 build: Do not use an obsolete x prefix for shell test checks We are expecting a conformant POSIX shell to be available in the system, coping with broken system shells at configure only delays the point where breakage will be detected. In any case all currently supported ports have POSIX compliant shells, and that's the minimum to expect from new ones. --- configure.ac | 8 ++++---- doc/coding-style.txt | 4 ++-- m4/dpkg-arch.m4 | 6 +++--- m4/dpkg-build.m4 | 6 +++--- m4/dpkg-compiler.m4 | 24 ++++++++++++------------ m4/dpkg-coverage.m4 | 4 ++-- m4/dpkg-funcs.m4 | 18 +++++++++--------- m4/dpkg-libs.m4 | 44 ++++++++++++++++++++++---------------------- m4/dpkg-linker.m4 | 6 +++--- m4/dpkg-progs.m4 | 8 ++++---- m4/dpkg-types.m4 | 4 ++-- 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/configure.ac b/configure.ac index 987f9efd4..2681cc2b7 100644 --- a/configure.ac +++ b/configure.ac @@ -117,10 +117,10 @@ DPKG_LIB_BZ2 DPKG_LIB_LZMA DPKG_LIB_ZSTD DPKG_LIB_SELINUX -AS_IF([test "x$build_dselect" = "xyes"], [ +AS_IF([test "$build_dselect" = "yes"], [ DPKG_LIB_CURSES ]) -AS_IF([test "x$build_start_stop_daemon" = "xyes"], [ +AS_IF([test "$build_start_stop_daemon" = "yes"], [ DPKG_LIB_SOCKET DPKG_LIB_PS DPKG_LIB_KVM @@ -161,7 +161,7 @@ AC_CHECK_HEADERS([sys/proc.h], [], [], [ #endif ]) -AS_IF([test "x$build_dselect" = "xyes"], [ +AS_IF([test "$build_dselect" = "yes"], [ AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([cxxabi.h]) AC_LANG_POP([C++]) @@ -225,7 +225,7 @@ AC_CHECK_FUNCS([\ uselocale \ ]) -AS_IF([test "x$build_dselect" = "xyes"], [ +AS_IF([test "$build_dselect" = "yes"], [ AC_LANG_PUSH([C++]) AC_CHECK_FUNCS([__cxa_pure_virtual]) AC_LANG_POP([C++]) diff --git a/doc/coding-style.txt b/doc/coding-style.txt index d3976d24f..9e3b49fed 100644 --- a/doc/coding-style.txt +++ b/doc/coding-style.txt @@ -62,8 +62,8 @@ second argument quoted tightly surrounding the code, like this: [], [enable_feature="yes"]) AM_CONDITIONAL([HAVE_SOME_FEATURE], - [test "x$ac_cv_have_some_feature" = "xyes" && \ - test "x$ac_cv_have_some_feature" = "xyes"]) + [test "$ac_cv_have_some_feature" = "yes" && \ + test "$ac_cv_have_some_feature" = "yes"]) or the output will get messed up. diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 index 3d6652223..3e18b3b1d 100644 --- a/m4/dpkg-arch.m4 +++ b/m4/dpkg-arch.m4 @@ -19,7 +19,7 @@ AC_DEFUN([_DPKG_ARCHITECTURE], [ AC_DEFUN([DPKG_CPU_TYPE], [ AC_MSG_CHECKING([dpkg cpu type]) _DPKG_ARCHITECTURE([DEB_HOST_ARCH_CPU], [cpu_type]) - AS_IF([test "x$cpu_type" = "x"], [ + AS_IF([test -z "$cpu_type"], [ cpu_type=$host_cpu AC_MSG_RESULT([$cpu_type]) AC_MSG_WARN([$host_cpu not found in cputable]) @@ -37,7 +37,7 @@ AC_DEFUN([DPKG_CPU_TYPE], [ AC_DEFUN([DPKG_OS_TYPE], [ AC_MSG_CHECKING([dpkg operating system type]) _DPKG_ARCHITECTURE([DEB_HOST_ARCH_OS], [os_type]) - AS_IF([test "x$os_type" = "x"], [ + AS_IF([test -z "$os_type"], [ os_type=$host_os AC_MSG_RESULT([$os_type]) AC_MSG_WARN([$host_os not found in ostable]) @@ -57,7 +57,7 @@ AC_DEFUN([DPKG_ARCHITECTURE], [ DPKG_OS_TYPE AC_MSG_CHECKING([dpkg architecture name]) _DPKG_ARCHITECTURE([DEB_HOST_ARCH], [dpkg_arch]) - AS_IF([test "x$dpkg_arch" = "x"], [ + AS_IF([test -z "$dpkg_arch"], [ AC_MSG_ERROR([cannot determine host dpkg architecture]) ], [ AC_MSG_RESULT([$dpkg_arch]) diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index 74897f565..ca774869d 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -28,8 +28,8 @@ AC_DEFUN([DPKG_BUILD_PROG], [ [AS_TR_SH([build_$1])=$AS_TR_SH([enable_$1])], [AS_TR_SH([build_$1])=yes]) AM_CONDITIONAL(AS_TR_CPP([BUILD_$1]), - [test "x$AS_TR_SH([build_$1])" = "xyes"]) - AS_IF([test "x$AS_TR_SH([build_$1])" = "xyes"], [ + [test "$AS_TR_SH([build_$1])" = "yes"]) + AS_IF([test "$AS_TR_SH([build_$1])" = "yes"], [ AC_DEFINE(AS_TR_CPP([BUILD_$1]), [1], [Define to 1 if $1 is compiled.]) ], [ AC_DEFINE(AS_TR_CPP([BUILD_$1]), [0]) @@ -47,7 +47,7 @@ AC_DEFUN([DPKG_BUILD_DEVEL_DOCS], [ [build_devel_docs=$enable_devel_docs], [build_devel_docs=yes] ) - AS_IF([test "x$build_devel_docs" = "xyes"], [ + AS_IF([test "$build_devel_docs" = "yes"], [ AC_SUBST([BUILD_DEVEL_DOCS], [YES]) ], [ AC_SUBST([BUILD_DEVEL_DOCS], [NO]) diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 index 0694169b6..c9ccfadf1 100644 --- a/m4/dpkg-compiler.m4 +++ b/m4/dpkg-compiler.m4 @@ -150,7 +150,7 @@ AC_DEFUN([DPKG_COMPILER_WARNINGS], [ [Disable (detected) additional compiler warnings])], [], [enable_compiler_warnings=yes]) - AS_IF([test "x$enable_compiler_warnings" = "xyes"], [ + AS_IF([test "$enable_compiler_warnings" = "yes"], [ DPKG_CHECK_COMPILER_WARNINGS AC_LANG_PUSH([C++]) DPKG_CHECK_COMPILER_WARNINGS @@ -179,7 +179,7 @@ AC_DEFUN([DPKG_COMPILER_SANITIZER], [ [Enable compiler sanitizer support])], [], [enable_compiler_sanitizer=no]) - AS_IF([test "x$enable_compiler_sanitizer" = "xyes"], [ + AS_IF([test "$enable_compiler_sanitizer" = "yes"], [ DPKG_CHECK_COMPILER_SANITIZER AC_LANG_PUSH([C++]) DPKG_CHECK_COMPILER_SANITIZER @@ -203,7 +203,7 @@ AC_DEFUN([DPKG_COMPILER_ANALYZER], [ [Enable compiler analyzer support])], [], [enable_compiler_analyzer=no]) - AS_IF([test "x$enable_compiler_analyzer" = "xyes"], [ + AS_IF([test "$enable_compiler_analyzer" = "yes"], [ DPKG_CHECK_COMPILER_FLAG([-fanalyzer]) AC_LANG_PUSH([C++]) DPKG_CHECK_COMPILER_FLAG([-fanalyzer]) @@ -224,7 +224,7 @@ AC_DEFUN([DPKG_COMPILER_OPTIMIZATIONS], [ [Disable (detected) compiler optimizations])], [], [enable_compiler_optimizations=yes]) - AS_IF([test "x$enable_compiler_optimizations" = "xno"], [ + AS_IF([test "$enable_compiler_optimizations" = "no"], [ CFLAGS=$(echo "$CFLAGS" | $SED -e "s/ -O[[1-9]]*\b/ -O0/g") ]) ]) @@ -323,7 +323,7 @@ AC_DEFUN([DPKG_C_STD], [ AC_CACHE_CHECK([whether $CC supports C$1], [dpkg_cv_c_std], [ _DPKG_C_STD_TRY([$1], [dpkg_cv_c_std=yes], [dpkg_cv_c_std=no]) ]) - AS_IF([test "x$dpkg_cv_c_std" != "xyes"], [ + AS_IF([test "$dpkg_cv_c_std" != "yes"], [ AC_CACHE_CHECK([for $CC option to accept C$1], [dpkg_cv_c_std_opt], [ dpkg_cv_c_std_opt=none dpkg_save_CC="$CC" @@ -332,17 +332,17 @@ AC_DEFUN([DPKG_C_STD], [ _DPKG_C_STD_TRY([$1], [dpkg_opt_worked=yes], [dpkg_opt_worked=no]) CC="$dpkg_save_CC" - AS_IF([test "x$dpkg_opt_worked" = "xyes"], [ + AS_IF([test "$dpkg_opt_worked" = "yes"], [ dpkg_cv_c_std_opt="$opt"; break ]) done ]) - AS_IF([test "x$dpkg_cv_c_std_opt" != "xnone"], [ + AS_IF([test "$dpkg_cv_c_std_opt" != "none"], [ CC="$CC $dpkg_cv_c_std_opt" dpkg_cv_c_std=yes ]) ]) - AS_IF([test "x$dpkg_cv_c_std" = "xyes"], [ + AS_IF([test "$dpkg_cv_c_std" = "yes"], [ dpkg_c_std_version="_DPKG_C_C$1_VERSION" ], [ AC_MSG_ERROR([unsupported required C$1]) @@ -445,7 +445,7 @@ AC_DEFUN([DPKG_CXX_STD], [ AC_CACHE_CHECK([whether $CXX supports C++$1], [dpkg_cv_cxx_std], [ _DPKG_CXX_STD_TRY([$1], [dpkg_cv_cxx_std=yes], [dpkg_cv_cxx_std=no]) ]) - AS_IF([test "x$dpkg_cv_cxx_std" != "xyes"], [ + AS_IF([test "$dpkg_cv_cxx_std" != "yes"], [ AC_CACHE_CHECK([for $CXX option to accept C++$1], [dpkg_cv_cxx_std_opt], [ dpkg_cv_cxx_std_opt=none dpkg_save_CXX="$CXX" @@ -454,17 +454,17 @@ AC_DEFUN([DPKG_CXX_STD], [ _DPKG_CXX_STD_TRY([$1], [dpkg_opt_worked=yes], [dpkg_opt_worked=no]) CXX="$dpkg_save_CXX" - AS_IF([test "x$dpkg_opt_worked" = "xyes"], [ + AS_IF([test "$dpkg_opt_worked" = "yes"], [ dpkg_cv_cxx_std_opt="$opt"; break ]) done ]) - AS_IF([test "x$dpkg_cv_cxx_std_opt" != "xnone"], [ + AS_IF([test "$dpkg_cv_cxx_std_opt" != "none"], [ CXX="$CXX $dpkg_cv_cxx_std_opt" dpkg_cv_cxx_std=yes ]) ]) - AS_IF([test "x$dpkg_cv_cxx_std" = "xyes"], [ + AS_IF([test "$dpkg_cv_cxx_std" = "yes"], [ dpkg_cxx_std_version="_DPKG_CXX_CXX$1_VERSION" ], [ AC_MSG_ERROR([unsupported required C++$1]) diff --git a/m4/dpkg-coverage.m4 b/m4/dpkg-coverage.m4 index 70b67d152..c727459ab 100644 --- a/m4/dpkg-coverage.m4 +++ b/m4/dpkg-coverage.m4 @@ -10,8 +10,8 @@ AC_DEFUN([DPKG_CODE_COVERAGE], [ [], [enable_coverage=no]) AM_CONDITIONAL([COVERAGE_ENABLED], [test x$enable_coverage = xyes]) - AS_IF([test "x$enable_coverage" = "xyes"], [ - AS_IF([test "x$GCC" = "xno"], [ + AS_IF([test "$enable_coverage" = "yes"], [ + AS_IF([test "$GCC" = "no"], [ AC_MSG_ERROR([not compiling with gcc, which is required for C coverage support]) ]) diff --git a/m4/dpkg-funcs.m4 b/m4/dpkg-funcs.m4 index 22002b534..7e72d7a84 100644 --- a/m4/dpkg-funcs.m4 +++ b/m4/dpkg-funcs.m4 @@ -20,7 +20,7 @@ va_copy(v1, v2); dpkg_cv_va_copy=no ]) ]) - AS_IF([test "x$dpkg_cv_va_copy" = "xyes"], [ + AS_IF([test "$dpkg_cv_va_copy" = "yes"], [ AC_DEFINE([HAVE_VA_COPY], [1], [Define to 1 if the 'va_copy' macro exists]) ]) ])# DPKG_FUNC_VA_COPY @@ -56,7 +56,7 @@ AC_DEFUN([DPKG_FUNC_FSYNC_DIR], [ dpkg_cv_fsync_dir=maybe ]) - AS_IF([test "x$dpkg_cv_fsync_dir" = "xmaybe"], [ + AS_IF([test "$dpkg_cv_fsync_dir" = "maybe"], [ AS_CASE([$host_os], [aix*], [ # On AIX fsync(3) requires writable file descriptors, which @@ -70,7 +70,7 @@ AC_DEFUN([DPKG_FUNC_FSYNC_DIR], [ ) ]) ]) - AS_IF([test "x$dpkg_cv_fsync_dir" = "xyes"], [ + AS_IF([test "$dpkg_cv_fsync_dir" = "yes"], [ AC_DEFINE([HAVE_FSYNC_DIR], [1], [Define to 1 if the 'fsync' function works on directories]) ]) @@ -116,7 +116,7 @@ int test_vsnprintf(const char *fmt, ...) dpkg_cv_c99_snprintf=maybe ]) - AS_IF([test "x$dpkg_cv_c99_snprintf" = "xmaybe"], [ + AS_IF([test "$dpkg_cv_c99_snprintf" = "maybe"], [ AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[ #define _GNU_SOURCE 1 @@ -132,11 +132,11 @@ int test_vsnprintf(const char *fmt, ...) ]) ]) ]) - AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"], [ + AS_IF([test "$dpkg_cv_c99_snprintf" = "yes"], [ AC_DEFINE([HAVE_C99_SNPRINTF], [1], [Define to 1 if the 'snprintf' family is C99 conformant]) ]) - AM_CONDITIONAL([HAVE_C99_SNPRINTF], [test "x$dpkg_cv_c99_snprintf" = "xyes"]) + AM_CONDITIONAL([HAVE_C99_SNPRINTF], [test "$dpkg_cv_c99_snprintf" = "yes"]) ])# DPKG_FUNC_C99_SNPRINTF # DPKG_USE_MMAP @@ -148,7 +148,7 @@ AC_DEFUN([DPKG_USE_MMAP], [ [enable usage of unrealiable mmap if available])], [], [enable_mmap=no]) - AS_IF([test "x$enable_mmap" = "xyes"], [ + AS_IF([test "$enable_mmap" = "yes"], [ AC_CHECK_FUNCS([mmap]) AC_DEFINE([USE_MMAP], [1], [Use unreliable mmap support]) ]) @@ -164,7 +164,7 @@ AC_DEFUN([DPKG_USE_DISK_PREALLOCATE], [ [enable usage of disk size pre-allocation])], [], [enable_disk_preallocate=no]) - AS_IF([test "x$enable_disk_preallocate" = "xyes"], [ + AS_IF([test "$enable_disk_preallocate" = "yes"], [ AC_DEFINE([USE_DISK_PREALLOCATE], [1], [Use disk size pre-allocation]) ]) ]) @@ -211,6 +211,6 @@ AC_DEFUN([DPKG_CHECK_COMPAT_FUNCS], [ AC_CHECK_FUNCS([$1]) m4_foreach_w([ac_func], [$1], [ AM_CONDITIONAL([HAVE_]AS_TR_CPP(ac_func), - [test "x$ac_cv_func_[]AS_TR_SH(ac_func)" = "xyes"]) + [test "$ac_cv_func_[]AS_TR_SH(ac_func)" = "yes"]) ]) ]) # DPKG_CHECK_COMPAT_FUNCS diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4 index 21858a8eb..f8d546596 100644 --- a/m4/dpkg-libs.m4 +++ b/m4/dpkg-libs.m4 @@ -13,14 +13,14 @@ AC_DEFUN([DPKG_LIB_MD], [ dpkg_save_libmd_LIBS=$LIBS AC_SEARCH_LIBS([MD5Init], [md]) LIBS=$dpkg_save_libmd_LIBS - AS_IF([test "x$ac_cv_search_MD5Init" = "xnone required"], [ + AS_IF([test "$ac_cv_search_MD5Init" = "none required"], [ have_libmd="builtin" - ], [test "x$ac_cv_search_MD5Init" != "xno"], [ + ], [test "$ac_cv_search_MD5Init" != "no"], [ have_libmd="yes" MD_LIBS="$ac_cv_search_MD5Init" ]) ]) - AS_IF([test "x$have_libmd" = "xno"], [ + AS_IF([test "$have_libmd" = "no"], [ AC_MSG_FAILURE([md5 digest functions not found]) ]) ])# DPKG_LIB_MD @@ -35,25 +35,25 @@ AC_DEFUN([DPKG_WITH_COMPRESS_LIB], [ [use $1 library for compression and decompression])], [], [AS_TR_SH([with_lib$1])=check]) AS_TR_SH([have_lib$1])="no" - AS_IF([test "x$AS_TR_SH([with_lib$1])" != "xno"], [ + AS_IF([test "$AS_TR_SH([with_lib$1])" != "no"], [ AC_CHECK_LIB([$1], [$3], [ AC_CHECK_HEADER([$2], [ AS_TR_SH([have_lib$1])="yes" ]) ]) - AS_IF([test "x$AS_TR_SH([with_lib$1])" != "xno"], [ - AS_IF([test "x$AS_TR_SH([have_lib$1])" = "xyes"], [ + AS_IF([test "$AS_TR_SH([with_lib$1])" != "no"], [ + AS_IF([test "$AS_TR_SH([have_lib$1])" = "yes"], [ AC_DEFINE(AS_TR_CPP([WITH_LIB$1]), 1, [Define to 1 to use $1 library rather than console tool]) - AS_IF([test "x$AS_TR_SH([with_lib$1])" = "xstatic"], [ + AS_IF([test "$AS_TR_SH([with_lib$1])" = "static"], [ AS_TR_SH([dpkg_$1_libs])="-Wl,-Bstatic -l$1 -Wl,-Bdynamic" ], [ AS_TR_SH([dpkg_$1_libs])="-l$1" ]) AS_TR_CPP([$1_LIBS])="${AS_TR_CPP([$1_LIBS]):+$AS_TR_CPP([$1_LIBS]) }$AS_TR_SH([dpkg_$1_libs])" ], [ - AS_IF([test "x$AS_TR_SH([with_lib$1])" != "xcheck"], [ + AS_IF([test "$AS_TR_SH([with_lib$1])" != "check"], [ AC_MSG_FAILURE([lib$1 library or header not found]) ]) ]) @@ -76,13 +76,13 @@ AC_DEFUN([DPKG_LIB_Z], [ [Define zlib-ng as 2 for the zlib implementation enum]) # If we have been requested the stock zlib, override the auto-detection. - AS_IF([test "x$with_libz" != "xyes" && test "x$have_libz_ng" = "xyes"], [ + AS_IF([test "$with_libz" != "yes" && test "$have_libz_ng" = "yes"], [ AC_DEFINE([WITH_GZFILEOP], [yes], [Define to yes to use zlib-ng gzFile IO support]) Z_LIBS=$Z_NG_LIBS use_libz_impl="USE_LIBZ_IMPL_ZLIB_NG" have_libz_impl="yes (zlib-ng)" - ], [test "x$have_libz" = "xyes"], [ + ], [test "$have_libz" = "yes"], [ use_libz_impl="USE_LIBZ_IMPL_ZLIB" have_libz_impl="yes (zlib)" ], [ @@ -135,14 +135,14 @@ AC_DEFUN([DPKG_LIB_SELINUX], [ [], [with_libselinux=check]) SELINUX_MIN_VERSION=2.3 have_libselinux="no" - AS_IF([test "x$with_libselinux" != "xno"], [ + AS_IF([test "$with_libselinux" != "no"], [ PKG_CHECK_MODULES([SELINUX], [libselinux >= $SELINUX_MIN_VERSION], [ AC_CHECK_HEADER([selinux/selinux.h], [ AC_DEFINE([WITH_LIBSELINUX], [1], [Define to 1 to compile in SELinux support]) have_libselinux="yes" ], [ - AS_IF([test "x$with_libselinux" != "xcheck"], [ + AS_IF([test "$with_libselinux" != "check"], [ AC_MSG_FAILURE([libselinux header not found]) ]) ]) @@ -150,12 +150,12 @@ AC_DEFUN([DPKG_LIB_SELINUX], [ AC_MSG_FAILURE([libselinux does not support setexecfilecon()]) ]) ], [ - AS_IF([test "x$with_libselinux" != "xcheck"], [ + AS_IF([test "$with_libselinux" != "check"], [ AC_MSG_FAILURE([libselinux at least $SELINUX_MIN_VERSION not found]) ]) ]) ]) - AM_CONDITIONAL([WITH_LIBSELINUX], [test "x$have_libselinux" = "xyes"]) + AM_CONDITIONAL([WITH_LIBSELINUX], [test "$have_libselinux" = "yes"]) ])# DPKG_LIB_SELINUX # _DPKG_CHECK_LIB_CURSES_NARROW @@ -181,7 +181,7 @@ AC_DEFUN([DPKG_LIB_CURSES], [ AC_ARG_VAR([CURSES_LIBS], [linker flags for curses library])dnl AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h curses.h ncurses/term.h term.h], [have_curses_header=yes]) - AS_IF([test "x$USE_UNICODE" = "xyes"], [ + AS_IF([test "$USE_UNICODE" = "yes"], [ AC_CHECK_HEADERS([ncursesw/ncurses.h ncursesw/term.h], [have_curses_header=yes]) AC_CHECK_LIB([ncursesw], [initscr], [ @@ -198,11 +198,11 @@ AC_DEFUN([DPKG_LIB_CURSES], [ LIBS="$CURSES_LIBS" AC_SEARCH_LIBS([tigetstr], [tinfo]) LIBS=$dpkg_save_curses_LIBS - AS_IF([test "x$ac_cv_search_tigetstr" != "xnone required" && \ - test "x$ac_cv_search_tigetstr" != "xno"], [ + AS_IF([test "$ac_cv_search_tigetstr" != "none required" && \ + test "$ac_cv_search_tigetstr" != "no"], [ CURSES_LIBS="${CURSES_LIBS:+$CURSES_LIBS }$ac_cv_search_tigetstr" ]) - AS_IF([test "x$have_curses_header" != "xyes"], [ + AS_IF([test "$have_curses_header" != "yes"], [ AC_MSG_FAILURE([curses header not found]) ]) have_libcurses=yes @@ -217,9 +217,9 @@ AC_DEFUN([DPKG_LIB_RT], [ dpkg_save_librt_LIBS=$LIBS AC_SEARCH_LIBS([clock_gettime], [rt]) LIBS=$dpkg_save_librt_LIBS - AS_IF([test "x$ac_cv_search_clock_gettime" = "xnone required"], [ + AS_IF([test "$ac_cv_search_clock_gettime" = "none required"], [ have_librt="builtin" - ], [test "x$ac_cv_search_clock_gettime" != "xno"], [ + ], [test "$ac_cv_search_clock_gettime" != "no"], [ have_librt="yes" RT_LIBS="$ac_cv_search_clock_gettime" ]) @@ -234,9 +234,9 @@ AC_DEFUN([DPKG_LIB_SOCKET], [ dpkg_save_libsocket_LIBS=$LIBS AC_SEARCH_LIBS([bind], [socket]) LIBS=$dpkg_save_libsocket_LIBS - AS_IF([test "x$ac_cv_search_bind" = "xnone required"], [ + AS_IF([test "$ac_cv_search_bind" = "none required"], [ have_libsocket="builtin" - ], [test "x$ac_cv_search_bind" != "xno"], [ + ], [test "$ac_cv_search_bind" != "no"], [ have_libsocket="yes" SOCKET_LIBS="$ac_cv_search_bind" ]) diff --git a/m4/dpkg-linker.m4 b/m4/dpkg-linker.m4 index 8c62c21f4..68800d91c 100644 --- a/m4/dpkg-linker.m4 +++ b/m4/dpkg-linker.m4 @@ -11,7 +11,7 @@ AC_DEFUN([DPKG_LINKER_OPTIMIZATIONS], [ [Disable (detected) linker optimizations])], [], [enable_linker_optimizations=yes]) - AS_IF([test "x$enable_linker_optimizations" = "xno"], [ + AS_IF([test "$enable_linker_optimizations" = "no"], [ LDFLAGS=$(echo "$LDFLAGS" | $SED -e "s/ -Wl,-O[[0-9]]*\b//g") ], [ save_LDFLAGS=$LDFLAGS @@ -40,7 +40,7 @@ AC_DEFUN([DPKG_LINKER_AS_NEEDED], [ LDFLAGS="$save_LDFLAGS" ]) AM_CONDITIONAL([HAVE_LINKER_AS_NEEDED], - [test "x$dpkg_cv_linker_as_needed" = "xyes"]) + [test "$dpkg_cv_linker_as_needed" = "yes"]) ]) # DPKG_LINKER_VERSION_SCRIPT @@ -65,5 +65,5 @@ int symbol(void) { return 0; } rm -f conftest.map ]) AM_CONDITIONAL([HAVE_LINKER_VERSION_SCRIPT], - [test "x$dpkg_cv_version_script" = "xyes"]) + [test "$dpkg_cv_version_script" = "yes"]) ]) diff --git a/m4/dpkg-progs.m4 b/m4/dpkg-progs.m4 index b00f1aa09..fc933f3bc 100644 --- a/m4/dpkg-progs.m4 +++ b/m4/dpkg-progs.m4 @@ -13,7 +13,7 @@ AC_DEFUN([DPKG_PROG_SHELL], [ AC_PATH_PROGS_FEATURE_CHECK([DPKG_SHELL], [sh dash bsh ksh bash], [ shellcheck=$(test -x $ac_path_DPKG_SHELL && \ $ac_path_DPKG_SHELL -c -- "echo yes" 2>/dev/null) - AS_IF([test "x$shellcheck" = "xyes"], [ + AS_IF([test "$shellcheck" = "yes"], [ ac_cv_path_DPKG_SHELL="$(AS_BASENAME([$ac_path_DPKG_SHELL]))" ac_path_DPKG_SHELL_found=: ]) @@ -63,7 +63,7 @@ AC_DEFUN([DPKG_PROG_PERL], [ $ac_path_PERL -MConfig -Mversion -e \ 'my $r = qv("v$Config{version}") >= qv("_PERL_MIN_VERSION"); print "yes" if $r') - AS_IF([test "x$perlcheck" = "xyes"], [ + AS_IF([test "$perlcheck" = "yes"], [ ac_cv_path_PERL=$ac_path_PERL ac_path_PERL_found=: ]) ], [ @@ -96,7 +96,7 @@ AC_DEFUN([DPKG_PROG_PO4A], [ | $SED -ne 's/^po4a version \(.*\)\.$/\1/p') AS_VERSION_COMPARE([$po4aversion], [_PO4A_MIN_VERSION], [po4acheck=no], [po4acheck=yes], [po4acheck=yes]) - AS_IF([test "x$po4acheck" = "xyes"], [ + AS_IF([test "$po4acheck" = "yes"], [ ac_cv_path_PO4A=$ac_path_PO4A ac_path_PO4A_found=: ]) ], [ @@ -118,7 +118,7 @@ AC_DEFUN([DPKG_PROG_PO4A], [ AC_DEFUN([DPKG_PROG_POD2MAN], [ AC_ARG_VAR([POD2MAN], [pod2man program]) AC_CHECK_PROGS([POD2MAN], [pod2man]) - AM_CONDITIONAL([BUILD_POD_DOC], [test "x$POD2MAN" != "x"]) + AM_CONDITIONAL([BUILD_POD_DOC], [test -n "$POD2MAN"]) ])# DPKG_PROG_POD2MAN # DPKG_PROG_TAR diff --git a/m4/dpkg-types.m4 b/m4/dpkg-types.m4 index 1e47ad2dd..0acdf08f1 100644 --- a/m4/dpkg-types.m4 +++ b/m4/dpkg-types.m4 @@ -54,8 +54,8 @@ AC_DEFUN([DPKG_DECL_SYS_ERRLIST], [ #include <stdio.h> ]]) AM_CONDITIONAL([HAVE_SYS_ERRLIST], - [test "x$ac_cv_have_decl_sys_errlist" = "xyes" && \ - test "x$ac_cv_have_decl_sys_nerr" = "xyes"]) + [test "$ac_cv_have_decl_sys_errlist" = "yes" && \ + test "$ac_cv_have_decl_sys_nerr" = "yes"]) ])# DPKG_DECL_SYS_SIGLIST # DPKG_CHECK_DECL([DECL], [HEADER]) -- Dpkg.Org's dpkg
