Use autoconf variables in makefiles and tests

dex4er · Mar 19, 2019 · d6be489 · d6be489
1 parent 06c3987
commit d6be489
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/config.sh.in b/config.sh.in
@@ -1,8 +1,6 @@
 # config.sh  Generated from config.sh.in by configure.
 
-POD2MAN=@POD2MAN@
-PROVE=@PROVE@
-SEQ=@SEQ@
+AWK=@AWK@
 CHROOT=@CHROOT@
 DEBOOTSTRAP=@DEBOOTSTRAP@
 ECHO=@ECHO@
@@ -12,4 +10,8 @@ ISCHROOT=@ISCHROOT@
 LDCONFIG=@LDCONFIG@
 LDD=@LDD@
 PERL=@PERL@
+POD2MAN=@POD2MAN@
+PROVE=@PROVE@
+SED=@SED@
+SEQ=@SEQ@
 SHELL=@SHELL@
diff --git a/configure.ac b/configure.ac
@@ -41,9 +41,6 @@ AS_IF([test "x$with_libpath" = x],
 AC_SUBST(libpath, $with_libpath)
 
 # Checks for programs.
-AC_CHECK_PROGS([POD2MAN], [pod2man])
-AC_CHECK_PROGS([PROVE], [prove])
-AC_CHECK_PROGS([SEQ], [seq gseq])
 AC_PATH_PROG([CHROOT], [chroot], [/usr/sbin/chroot], [/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
 AC_PATH_PROG([DEBOOTSTRAP], [debootstrap], [/usr/sbin/debootstrap], [/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
 AC_PATH_PROG([DEVFS], [devfs], [/sbin/devfs], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
@@ -56,7 +53,10 @@ AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/chroot], [/sbin:/usr/sbin:/usr/bin:/
 AC_PATH_PROG([LDD], [ldd], [/usr/bin/ldd], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([LS], [ls], [/bin/ls], [/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([MKFIFO], [mkfifo], [/usr/bin/mkfifo], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
-AC_PATH_PROG([PERL], [perl], [/usr/bin/perl], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
+AC_PATH_PROG([PERL], [perl], [/usr/bin/perl], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/bin/core_perl:/usr/local/bin:/usr/local/sbin:$PATH])
+AC_PATH_PROG([POD2MAN], [pod2man], [], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/bin/core_perl:/usr/local/bin:/usr/local/sbin:$PATH])
+AC_PATH_PROG([PROVE], [prove], [], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/bin/core_perl:/usr/local/bin:/usr/local/sbin:$PATH])
+AC_PATH_PROG([SEQ], [seq gseq], [], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([SH], [sh], [/bin/sh], [/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([SHELL], [bash dash sh], [/bin/sh], [/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([SYSTEMCTL], [systemctl], [/sbin/systemctl], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])

diff --git a/man/Makefile.am b/man/Makefile.am
@@ -3,4 +3,4 @@ man_MANS = fakechroot.1
 EXTRA_DIST = $(man_MANS) fakechroot.pod
 
 fakechroot.1: fakechroot.pod
-	eval $(POD2MAN) `head -n1 $(srcdir)/fakechroot.pod | sed 's/^# pod2man //'` $(srcdir)/fakechroot.pod $@
+	eval $(POD2MAN) `head -n1 $(srcdir)/fakechroot.pod | $(SED) 's/^# pod2man //'` $(srcdir)/fakechroot.pod $@
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -11,7 +11,7 @@ sysconf_DATA = chroot.env debootstrap.env rinse.env
 EXTRA_DIST = $(src_wrappers) $(src_envs) $(example_scripts)
 CLEANFILES = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(sysconf_DATA)
 
-do_subst = sed -e 's,[@]bindir[@],$(bindir),g' \
+do_subst = $(SED) -e 's,[@]bindir[@],$(bindir),g' \
                -e 's,[@]libpath[@],$(libpath),g' \
                -e 's,[@]sbindir[@],$(sbindir),g' \
                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \

diff --git a/test/t/escape-nested-chroot.t b/test/t/escape-nested-chroot.t
@@ -3,6 +3,10 @@
 srcdir=${srcdir:-.}
 . $srcdir/common.inc.sh
 
+top_srcdir=${top_srcdir:-..}
+
+. $top_srcdir/config.sh
+
 prepare 8
 
 $srcdir/testtree.sh $testtree/$testtree
@@ -16,20 +20,20 @@ for chroot in chroot fakechroot; do
 
         for paths in '/ /' '/ .' '. /'; do
             t=`$srcdir/$chroot.sh $testtree /bin/test-chroot / /$testtree $paths 2>&1`
-            f1=`echo $t | awk '{print $1}'`
-            f2=`echo $t | awk '{print $2}'`
-            f3=`echo $t | awk '{print $3}'`
-            f4=`echo $t | awk '{print $4}'`
+            f1=`echo $t | $AWK '{print $1}'`
+            f2=`echo $t | $AWK '{print $2}'`
+            f3=`echo $t | $AWK '{print $3}'`
+            f4=`echo $t | $AWK '{print $4}'`
             test "$f2" = "/" -a "$f4" = "/" -a "$f1" = "$f3" || not
             ok "$chroot test-chroot $paths (not escaped):" $t
         done
 
         for paths in '. .'; do
             t=`$srcdir/$chroot.sh $testtree /bin/test-chroot / /$testtree $paths 2>&1`
-            f1=`echo $t | awk '{print $1}'`
-            f2=`echo $t | awk '{print $2}'`
-            f3=`echo $t | awk '{print $3}'`
-            f4=`echo $t | awk '{print $4}'`
+            f1=`echo $t | $AWK '{print $1}'`
+            f2=`echo $t | $AWK '{print $2}'`
+            f3=`echo $t | $AWK '{print $3}'`
+            f4=`echo $t | $AWK '{print $4}'`
             test "$f2" = "/" -a "$f4" = "/" -a "$f1" != "$f3" || not
             ok "$chroot test-chroot $paths (escaped):" $t
         done