1*4882a593SmuzhiyunFrom 7c54428db5b639f05093459b1ba3b77456c5a548 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: "Issam E. Maghni" <issam.e.maghni@mailbox.org> 3*4882a593SmuzhiyunDate: Wed, 16 Dec 2020 18:48:28 -0500 4*4882a593SmuzhiyunSubject: [PATCH] configure: test -a|o is not POSIX 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFixes `test: too many arguments` when building Linux-PAM using sbase. 7*4882a593SmuzhiyunThis is due to a non-POSIX syntax test ... -a ... and test ... -o .... 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun> The XSI extensions specifying the -a and -o binary primaries and the 10*4882a593Smuzhiyun> '(' and ')' operators have been marked obsolescent. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSee https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun[Retrieved from: 15*4882a593Smuzhiyunhttps://github.com/linux-pam/linux-pam/commit/7c54428db5b639f05093459b1ba3b77456c5a548] 16*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun configure.ac | 12 ++++++------ 19*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 6 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 22*4882a593Smuzhiyunindex 5eade7cd3..e325bdd3c 100644 23*4882a593Smuzhiyun--- a/configure.ac 24*4882a593Smuzhiyun+++ b/configure.ac 25*4882a593Smuzhiyun@@ -346,7 +346,7 @@ if test x"$WITH_LIBAUDIT" != xno ; then 26*4882a593Smuzhiyun [HAVE_AUDIT_TTY_STATUS=""], 27*4882a593Smuzhiyun [#include <libaudit.h>])] 28*4882a593Smuzhiyun ) 29*4882a593Smuzhiyun- if test -n "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then 30*4882a593Smuzhiyun+ if test -n "$LIBAUDIT" && test "$ac_cv_header_libaudit_h" != "no" ; then 31*4882a593Smuzhiyun AC_DEFINE([HAVE_LIBAUDIT], 1, [Define to 1 if audit support should be compiled in.]) 32*4882a593Smuzhiyun fi 33*4882a593Smuzhiyun if test -n "$HAVE_AUDIT_TTY_STATUS" ; then 34*4882a593Smuzhiyun@@ -373,12 +373,12 @@ esac 35*4882a593Smuzhiyun AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) 36*4882a593Smuzhiyun LIBS=$BACKUP_LIBS 37*4882a593Smuzhiyun AC_SUBST(LIBCRYPT) 38*4882a593Smuzhiyun-if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then 39*4882a593Smuzhiyun+if test "$LIBCRYPT" = "-lxcrypt" && test "$ac_cv_header_xcrypt_h" = "yes" ; then 40*4882a593Smuzhiyun AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.]) 41*4882a593Smuzhiyun fi 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(<path>|yes|no)],[use specified random device instead of /dev/urandom or 'no' to disable]), opt_randomdev=$withval) 44*4882a593Smuzhiyun-if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then 45*4882a593Smuzhiyun+if test "$opt_randomdev" = yes || test -z "$opt_randomdev"; then 46*4882a593Smuzhiyun opt_randomdev="/dev/urandom" 47*4882a593Smuzhiyun elif test "$opt_randomdev" = no; then 48*4882a593Smuzhiyun opt_randomdev= 49*4882a593Smuzhiyun@@ -395,7 +395,7 @@ AC_ARG_ENABLE([db], 50*4882a593Smuzhiyun AC_ARG_WITH([db-uniquename], 51*4882a593Smuzhiyun AS_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.])) 52*4882a593Smuzhiyun if test x"$WITH_DB" != xno ; then 53*4882a593Smuzhiyun- if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then 54*4882a593Smuzhiyun+ if test x"$WITH_DB" = xyes || test x"$WITH_DB" = xdb ; then 55*4882a593Smuzhiyun old_libs=$LIBS 56*4882a593Smuzhiyun LIBS="$LIBS -ldb$with_db_uniquename" 57*4882a593Smuzhiyun AC_CHECK_FUNCS([db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store], 58*4882a593Smuzhiyun@@ -572,7 +572,7 @@ fi 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun AC_PATH_PROG([FO2PDF], [fop]) 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun-AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno -a x$enable_doc != xno) 63*4882a593Smuzhiyun+AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno && test x$enable_doc != xno) 64*4882a593Smuzhiyun AM_CONDITIONAL(ENABLE_GENERATE_PDF, test -n "$FO2PDF") 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun 67*4882a593Smuzhiyun@@ -625,7 +625,7 @@ esac 68*4882a593Smuzhiyun AM_CONDITIONAL([COND_BUILD_PAM_KEYINIT], [test "$have_key_syscalls" = 1]) 69*4882a593Smuzhiyun AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes]) 70*4882a593Smuzhiyun AM_CONDITIONAL([COND_BUILD_PAM_NAMESPACE], [test "$ac_cv_func_unshare" = yes]) 71*4882a593Smuzhiyun-AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) 72*4882a593Smuzhiyun+AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes || test "$ac_cv_func_ruserok" = yes]) 73*4882a593Smuzhiyun AM_CONDITIONAL([COND_BUILD_PAM_SELINUX], [test -n "$LIBSELINUX"]) 74*4882a593Smuzhiyun AM_CONDITIONAL([COND_BUILD_PAM_SEPERMIT], [test -n "$LIBSELINUX"]) 75*4882a593Smuzhiyun AM_CONDITIONAL([COND_BUILD_PAM_SETQUOTA], [test "$ac_cv_func_quotactl" = yes]) 76