s3 build: Eliminate the gmake-specific Makefile syntax

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a1873eb6d5cb8cbddeae9e7e2c8a79a94ed80334..1f28e49b9fc31dd6ddde86f8d771426b6b5c9666 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2930,21 +2930,11 @@ test_pam_modules:: pam_modules
 ## Targets for 'make test'
 ##
 
-ifdef smbtorture4_path
-smbtorture4_path_arg=-t ${smbtorture4_path}
-endif
-
-ifdef selftest_shrdir
-selftest_shrdir_arg=-s ${selftest_shrdir}
-endif
-
-ifdef selftest_custom_conf
-selftest_custom_conf_arg=-c ${selftest_custom_conf}
-endif
+TEST_EXTRA_ARGS = ${smbtorture4_path} ${selftest_shrdir} ${selftest_custom_conf}
 
 test:: all torture timelimit
        @echo Running Test suite
-       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${smbtorture4_path_arg} ${selftest_shrdir_arg} ${selftest_custom_conf_arg}
+       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
 
 valgrindtest:: all torture timelimit
        @echo Running Test suite with valgrind
@@ -2953,7 +2943,7 @@ valgrindtest:: all torture timelimit
         WINBINDD_VALGRIND="xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
         SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
         VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
-        PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${smbtorture4_path_arg} ${selftest_shrdir_arg} ${selftest_custom_conf_arg}
+        PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
 
 SELFTEST_FORMAT = plain
 selftestdir = ../selftest

diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index 962e2765a0300d527205901dc195a7693f4ae066..2a468d7002ae92b823d47eb41ba205cc6642d438 100644 (file)
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -337,7 +337,7 @@ AC_ARG_WITH(selftest-shrdir,
     AC_MSG_WARN([--with-selftest-shrdir called without argument - will use default])
   ;;
   * )
-    selftest_shrdir="$withval"
+    selftest_shrdir="-s $withval"
     ;;
   esac
 ])
@@ -357,6 +357,7 @@ AC_ARG_WITH(smbtorture4_path,
     if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then
        AC_MSG_ERROR(['$smbtorture_path' does not  exist!])
     fi
+    smbtorture4_path="-t $withval"
   ;;
  esac
 ])
@@ -376,6 +377,7 @@ AC_ARG_WITH(selftest_custom_conf,
     if test -z "$selftest_custom_conf" -a ! -f $selftest_custom_conf; then
        AC_MSG_ERROR(['$selftest_custom_conf' does not  exist!])
     fi
+    selftest_custom_conf="-c $withval"
   ;;
  esac
 ])

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 421ace0dbb1158ae76288c9a4919f4d441473179..fd0cc8305c02fb49970958c1eda237096ef96816 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -1,5 +1,5 @@
 AC_SUBST(BLDSHARED)
-smbtorture4_path=bin/smbtorture4
+smbtorture4_path="-t bin/smbtorture4"
 m4_include(build/m4/public.m4)
 
 m4_include(../m4/check_python.m4)