Change Apache config tools to not assume certain files are executable,

and thus allow us to build from cvs trees checked out read only. - basically
ensure we call shell scripts by using ${SHELL} instead of ./.
from leonard@csee.uq.edu.au

Building diffs of this (And some other stuff in Makefile.tmpl) to send
to slemko to see if apache will buy it back.

9 files changed, 75 insertions, 73 deletions

diff --git a/usr.sbin/httpd/src/Configure b/usr.sbin/httpd/src/Configure
index fb82691fd49..f397c14aa0f 100644
--- a/usr.sbin/httpd/src/Configure
+++ b/usr.sbin/httpd/src/Configure
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $OpenBSD: Configure,v 1.10 2000/01/28 18:39:57 beck Exp $
 ## ====================================================================
 ## Copyright (c) 1995-1999 The Apache Group.  All rights reserved.
 ##
@@ -79,6 +80,7 @@ awkfile=$tmpfile.4
 tmpconfig=$tmpfile.5
 SUBDIRS="ap main"
 APLIBDIRS=""
+SHELL=/bin/sh
 
 ####################################################################
 ## Now handle any arguments, which, for now, is -file
@@ -202,7 +204,7 @@ fi
 ## then fold in the modules that were included in Configuration
 ##
 echo "Creating Makefile"
-./helpers/mfhead . $file > Makefile
+${SHELL} helpers/mfhead . $file > Makefile
 
 ####################################################################
 ## Now we create a stub file, called Makefile.config, which
@@ -222,16 +224,16 @@ awk >Makefile.config <$tmpfile '
 ####################################################################
 ## Extract the rules.
 ##
-RULE_WANTHSREGEX=`./helpers/CutRule WANTHSREGEX $file`
-RULE_STATUS=`./helpers/CutRule STATUS $file`
-RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
-RULE_SOCKS5=`./helpers/CutRule SOCKS5 $file`
-RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
-RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file`
-RULE_PARANOID=`./helpers/CutRule PARANOID $file`
-RULE_EXPAT=`./helpers/CutRule EXPAT $file`
-RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file`
-RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file`
+RULE_WANTHSREGEX=`${SHELL} helpers/CutRule WANTHSREGEX $file`
+RULE_STATUS=`${SHELL} helpers/CutRule STATUS $file`
+RULE_SOCKS4=`${SHELL} helpers/CutRule SOCKS4 $file`
+RULE_SOCKS5=`${SHELL} helpers/CutRule SOCKS5 $file`
+RULE_IRIXNIS=`${SHELL} helpers/CutRule IRIXNIS $file`
+RULE_IRIXN32=`${SHELL} helpers/CutRule IRIXN32 $file`
+RULE_PARANOID=`${SHELL} helpers/CutRule PARANOID $file`
+RULE_EXPAT=`${SHELL} helpers/CutRule EXPAT $file`
+RULE_SHARED_CORE=`${SHELL} helpers/CutRule SHARED_CORE $file`
+RULE_SHARED_CHAIN=`${SHELL} helpers/CutRule SHARED_CHAIN $file`
 
 ####################################################################
 ## Rule SHARED_CORE implies required DSO support
@@ -266,8 +268,8 @@ CAT="cat"
 ## As more PLATFORMs are added to Configuration.tmpl, be sure to
 ## add the required lines below.
 ##
-PLAT=`./helpers/GuessOS`
 SHELL="/bin/sh"
+PLAT=`${SHELL} helpers/GuessOS`
 OSDIR="os/unix"
 
 case "$PLAT" in
@@ -874,7 +876,7 @@ if [ "x$TCC" = "x" ]; then
 	for compilers in "gcc" "cc" "acc" "c89"
 	do
 	    lookedfor="$lookedfor $compilers"
-	    if ./helpers/PrintPath -s $compilers; then
+	    if ${SHELL} helpers/PrintPath -s $compilers; then
 		COMPILER="$compilers"
 		break
 	    fi
@@ -908,9 +910,9 @@ fi
 ##
 TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
 if [ "x$TCPP" != "x" ]; then
-    CPP=`CPP="$TCPP"; export CPP CC; ./helpers/findcpp.sh`
+    CPP=`CPP="$TCPP"; export CPP CC; ${SHELL} ./helpers/findcpp.sh`
 else
-    CPP=`export CC; ./helpers/findcpp.sh`
+    CPP=`export CC; ${SHELL} ./helpers/findcpp.sh`
 fi
 if [ "x$TCPP" = "x" ]; then
     echo "CPP=$CPP" >> Makefile.config
@@ -938,7 +940,7 @@ for header in $CHECK_FOR_HEADERS; do
     echo "" >>$AP_CONFIG_AUTO_H
     echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H
     name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]' '[A-Z]'`"
-    ./helpers/checkheader.sh $header
+    ${SHELL} ./helpers/checkheader.sh $header
     if [ $? -eq 0 ]; then
 	echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H
 	echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H
@@ -956,7 +958,7 @@ done
 # to decide whether the Processor Binding can be used or not
 case "$PLAT" in
     *-ibm-aix*)
-	CPP=$CPP ./helpers/checkheader.sh sys/processor.h
+	CPP=$CPP ${SHELL} helpers/checkheader.sh sys/processor.h
 	if [ $? -eq 0 ]; then
 	    CFLAGS="$CFLAGS -DAIX_BIND_PROCESSOR"
 	fi
@@ -1453,7 +1455,7 @@ if [ "x$RANLIB" = "x" ]; then
     if [ "x$TRANLIB" != "x" ]; then
 	RANLIB=$TRANLIB
     else
-	if ./helpers/PrintPath -s ranlib; then
+	if ${SHELL} helpers/PrintPath -s ranlib; then
 	    RANLIB="ranlib"
 	else
 	    RANLIB="true"
@@ -1469,7 +1471,7 @@ fi
 case "$PLAT" in
     *-linux*)
 	# newer systems using glibc 2.x need -lcrypt
-	if ./helpers/TestCompile lib crypt; then
+	if ${SHELL} helpers/TestCompile lib crypt; then
 	    LIBS="$LIBS -lcrypt"
 	fi
 	;;
@@ -1477,11 +1479,11 @@ case "$PLAT" in
     *-dg-dgux*)
 	# R4.11MU02 requires -lsocket -lnsl ... no idea if it's earlier or
 	# later than what we already knew about.  PR#732
-	if ./helpers/TestCompile lib nsl; then
+	if ${SHELL} helpers/TestCompile lib nsl; then
 	    LIBS="$LIBS -lnsl"
 	    TLIB='-lnsl'
 	fi
-	if TLIB=$TLIB ./helpers/TestCompile lib socket; then
+	if TLIB=$TLIB ${SHELL} helpers/TestCompile lib socket; then
 	    LIBS="-lsocket $LIBS"
 	fi
 	;;
@@ -1499,14 +1501,14 @@ case "$PLAT" in
 	# -lnsl may be available (or may be not).
 	# In standard SVR4 systems, -lsocket relies on some symbols
 	# from -lnsl, so the test for -lnsl must appear first.
-	if ./helpers/TestCompile lib nsl; then
+	if ${SHELL} helpers/TestCompile lib nsl; then
 	    LIBS="$LIBS -lnsl"
 	    TLIB='-lnsl'
 	fi
-	if TLIB=$TLIB ./helpers/TestCompile lib socket; then
+	if TLIB=$TLIB ${SHELL} helpers/TestCompile lib socket; then
 	    LIBS="-lsocket $LIBS"
 	fi
-	if ./helpers/TestCompile func initgroups; then
+	if ${SHELL} helpers/TestCompile func initgroups; then
 	    :
 	else
 	    CFLAGS="$CFLAGS -DNEED_INITGROUPS"
@@ -1723,7 +1725,7 @@ fi
 ## Extended API (EAPI) support:
 ##
 if [ "x$RULE_EAPI" = "x" ]; then
-    RULE_EAPI=`./helpers/CutRule EAPI $file`
+    RULE_EAPI=`${SHELL} helpers/CutRule EAPI $file`
 fi
 if [ "x$RULE_EAPI" = "xyes" ]; then
     echo " + enabling Extended API (EAPI)"
@@ -1819,7 +1821,7 @@ if [ "x$using_shlib" = "x1" ] ; then
 	#   to our DSO files, i.e. PIC libraries and shared libraries
 	extra_ldflags="`grep EXTRA_LDFLAGS= Makefile.config`"
 	extra_libs="`grep EXTRA_LIBS= Makefile.config`"
-	eval "`./helpers/slo.sh $LDFLAGS $LIBS $extra_ldflags $extra_libs`"
+	eval "`${SHELL} helpers/slo.sh $LDFLAGS $LIBS $extra_ldflags $extra_libs`"
 	LIBS_SHLIB="$SLO_DIRS_PIC $SLO_LIBS_PIC $SLO_DIRS_DSO $SLO_LIBS_DSO"
     fi
 fi
@@ -2087,19 +2089,19 @@ if [ "x$using_shlib" = "x1" ] ; then
 	    esac
 	    ;;
 	*-hp-hpux*)
-	    if ./helpers/TestCompile func shl_load; then
+	    if ${SHELL} helpers/TestCompile func shl_load; then
 		:
 	    else
-		if ./helpers/TestCompile lib dld; then
+		if ${SHELL} helpers/TestCompile lib dld; then
 		    DL_LIB="-ldld"
 		fi
 	    fi
 	    ;;
 	* )
-	    if ./helpers/TestCompile func dlopen; then
+	    if ${SHELL} helpers/TestCompile func dlopen; then
 		:
 	    else
-		if ./helpers/TestCompile lib dl; then
+		if ${SHELL} helpers/TestCompile lib dl; then
 		    DL_LIB="-ldl"
 		fi
 	    fi
@@ -2117,7 +2119,7 @@ fi
 ## We check the sizeof various data types
 ##
 echo " + checking sizeof various data types"
-AP_TYPE_QUAD=`./helpers/TestCompile -r sizeof 'long long'`
+AP_TYPE_QUAD=`${SHELL} helpers/TestCompile -r sizeof 'long long'`
 if [ "x$AP_TYPE_QUAD" = "x" ]; then
     AP_TYPE_QUAD="unknown_quad"
     AP_LONGEST_LONG="long"
@@ -2136,7 +2138,7 @@ echo "#endif" >>$AP_CONFIG_AUTO_H
 ##
 ## We check for the endianess of the machine
 ##
-AP_BYTE_ORDER=`./helpers/TestCompile -r byteorder`
+AP_BYTE_ORDER=`${SHELL} helpers/TestCompile -r byteorder`
 if [ "x$AP_BYTE_ORDER" = "x21" ]; then
     AP_BYTE_ORDER="21" # big endian
 else
@@ -2152,12 +2154,12 @@ echo "#endif" >>$AP_CONFIG_AUTO_H
 ##
 ## Now compare the sizes of off_t to long
 ##
-AP_TYPE_OFF_T=`./helpers/TestCompile -r sizeof off_t`
+AP_TYPE_OFF_T=`${SHELL} helpers/TestCompile -r sizeof off_t`
 if [ "x$AP_TYPE_OFF_T" = "x" ]; then
     AP_TYPE_OFF_T="unknown_off_t"
 fi
 
-AP_TYPE_LONG=`./helpers/TestCompile -r sizeof long`
+AP_TYPE_LONG=`${SHELL} helpers/TestCompile -r sizeof long`
 if [ "x$AP_TYPE_LONG" = "x" ]; then
     AP_TYPE_LONG="unknown_long"
 fi
@@ -2179,7 +2181,7 @@ fi
 ##
 ## Now see of void * is as big as a quad (long long)
 ##
-AP_TYPE_VOID_P=`./helpers/TestCompile -r sizeof 'void *'`
+AP_TYPE_VOID_P=`${SHELL} helpers/TestCompile -r sizeof 'void *'`
 if [ "x$AP_TYPE_VOID_P" = "x" ]; then
     AP_TYPE_VOID_P="unknown_void_p"
 fi
@@ -2253,7 +2255,7 @@ if [ "x$OS" = "xTPF" ] ; then
     :
 else
    echo " + doing sanity check on compiler and options"
-   if ./helpers/TestCompile $vflag sanity; then
+   if ${SHELL} ./helpers/TestCompile $vflag sanity; then
       :
    else
       if [ "x$vflag" = "x-v" ] ; then
@@ -2288,15 +2290,15 @@ sed -e "s#@@Configuration@@#$file#" "Makefile.tmpl" >>Makefile
 MAKEDIRS="support $SUBDIRS"
 for dir in $MAKEDIRS ; do
 	echo Creating Makefile in $dir
-	./helpers/mfhead $dir $file > $dir/Makefile
+	${SHELL} helpers/mfhead $dir $file > $dir/Makefile
 	$CAT Makefile.config $dir/Makefile.tmpl |\
-	sed -e "s:^SRCDIR=.*:SRCDIR=`./helpers/fp2rp $dir`:" >> $dir/Makefile
+	sed -e "s:^SRCDIR=.*:SRCDIR=`${SHELL} helpers/fp2rp $dir`:" >> $dir/Makefile
 done
 
 ####################################################################
 ## Now create the lib/Makefile
 ##
-./helpers/mfhead modules $file > lib/Makefile
+${SHELL} helpers/mfhead modules $file > lib/Makefile
 $CAT Makefile.config | sed -e 's:^SRCDIR=.*:SRCDIR=..:' >> lib/Makefile
 
 $CAT << EOF >> lib/Makefile
@@ -2322,15 +2324,15 @@ EOF
 
 for dir in $APLIBDIRS ; do
 	echo Creating Makefile in lib/$dir
-	./helpers/mfhead lib/$dir $file > lib/$dir/Makefile
+	${SHELL} helpers/mfhead lib/$dir $file > lib/$dir/Makefile
 	$CAT Makefile.config lib/$dir/Makefile.tmpl |\
-	sed -e "s:^SRCDIR=.*:SRCDIR=`./helpers/fp2rp lib/$dir`:" >> lib/$dir/Makefile
+	sed -e "s:^SRCDIR=.*:SRCDIR=`${SHELL} helpers/fp2rp lib/$dir`:" >> lib/$dir/Makefile
 done
 
 ####################################################################
 ## Now create the modules/Makefile
 ##
-./helpers/mfhead modules $file > modules/Makefile
+${SHELL} helpers/mfhead modules $file > modules/Makefile
 $CAT Makefile.config | sed -e 's:^SRCDIR=.*:SRCDIR=..:' >> modules/Makefile
 
 $CAT << EOF >> modules/Makefile
@@ -2359,9 +2361,9 @@ EOF
 for moddir in $AUTODIRS ; do
 	echo "Creating Makefile in $moddir"
 
-    ./helpers/mfhead $moddir $file > $moddir/Makefile
+    ${SHELL} helpers/mfhead $moddir $file > $moddir/Makefile
 	$CAT Makefile.config |\
-	sed -e "s:^SRCDIR=.*:SRCDIR=`./helpers/fp2rp $moddir`:" >> $moddir/Makefile
+	sed -e "s:^SRCDIR=.*:SRCDIR=`${SHELL} helpers/fp2rp $moddir`:" >> $moddir/Makefile
 	$CAT << 'EOF' >> $moddir/Makefile
 ##
 ##  Default Makefile options from Configure script
diff --git a/usr.sbin/httpd/src/helpers/TestCompile b/usr.sbin/httpd/src/helpers/TestCompile
index 034c613ae51..2ec57ffac95 100644
--- a/usr.sbin/httpd/src/helpers/TestCompile
+++ b/usr.sbin/httpd/src/helpers/TestCompile
@@ -216,7 +216,7 @@ eval "${MAKE-make} ${TARGET} $ERRDIR >&2"
 # Use our PrintPath helper script using the "-p" option to
 # have PrintPath just search this directory.
 
-if ./PrintPath -s -p`pwd` $TARGET ; then
+if sh PrintPath -s -p`pwd` $TARGET ; then
     if [ "x$OS" = "xMPE/iX" ]; then
 	# clever hack to check for unresolved externals without actually
 	# executing the test program 
diff --git a/usr.sbin/httpd/src/helpers/find-dbm-lib b/usr.sbin/httpd/src/helpers/find-dbm-lib
index 3792d9301eb..e8f4d132152 100644
--- a/usr.sbin/httpd/src/helpers/find-dbm-lib
+++ b/usr.sbin/httpd/src/helpers/find-dbm-lib
@@ -5,7 +5,7 @@
 # two -ldbm -ldbm into the LIBS variable.
 
 if [ "x$found_dbm" = "x" ]; then
-    if ./helpers/TestCompile func dbm_open; then
+    if sh helpers/TestCompile func dbm_open; then
 	found_dbm=1
     else
 	found_dbm=0
@@ -13,9 +13,9 @@ if [ "x$found_dbm" = "x" ]; then
 	    *-linux*)
 		# many systems don't have -ldbm
 		DBM_LIB=""
-		if ./helpers/TestCompile lib dbm dbm_open; then
+		if sh helpers/TestCompile lib dbm dbm_open; then
 		    DBM_LIB="-ldbm"
-		elif ./helpers/TestCompile lib ndbm dbm_open; then
+		elif sh helpers/TestCompile lib ndbm dbm_open; then
 		    DBM_LIB="-lndbm"
 		fi
 		if [ "x$DBM_LIB" != "x" ]; then
@@ -27,7 +27,7 @@ if [ "x$found_dbm" = "x" ]; then
 		if [ "x$DBM_LIB" != "x" ]; then
 		    oldLIBS="$LIBS"
 		    LIBS="$LIBS $DBM_LIB"
-		    if ./helpers/TestCompile func dbm_open; then
+		    if sh helpers/TestCompile func dbm_open; then
 			found_dbm=1
 		    else
 			found_dbm=0
@@ -37,7 +37,7 @@ if [ "x$found_dbm" = "x" ]; then
 		    for dblib in dbm ndbm db
 		    do
 			DBM_LIB=""
-			if ./helpers/TestCompile lib $dblib dbm_open; then
+			if sh helpers/TestCompile lib $dblib dbm_open; then
 			    DBM_LIB="-l${dblib}"
 			    LIBS="$LIBS $DBM_LIB"
 			    found_dbm=1
diff --git a/usr.sbin/httpd/src/helpers/findcpp.sh b/usr.sbin/httpd/src/helpers/findcpp.sh
index a870f7371ae..0fb55849226 100644
--- a/usr.sbin/httpd/src/helpers/findcpp.sh
+++ b/usr.sbin/httpd/src/helpers/findcpp.sh
@@ -45,9 +45,9 @@ else
         my_error=`grep -v '^ *+' conftest.out`
         if [ "x$my_error" != "x" ]; then
             #   3. try a standalone cpp command in $PATH and lib dirs
-            CPP="`./helpers/PrintPath cpp`"
+            CPP="`sh helpers/PrintPath cpp`"
             if [ "x$CPP" = "x" ]; then
-                CPP="`./helpers/PrintPath -p/lib:/usr/lib:/usr/local/lib cpp`"
+                CPP="`sh helpers/PrintPath -p/lib:/usr/lib:/usr/local/lib cpp`"
             fi
             if [ "x$CPP" != "x" ]; then
                 (eval "$CPP conftest.c >/dev/null") 2>conftest.out
diff --git a/usr.sbin/httpd/src/helpers/getuid.sh b/usr.sbin/httpd/src/helpers/getuid.sh
index 42cdf0d6e5d..9b5b3498f5f 100644
--- a/usr.sbin/httpd/src/helpers/getuid.sh
+++ b/usr.sbin/httpd/src/helpers/getuid.sh
@@ -8,8 +8,8 @@
 # See http://www.apache.org/docs/LICENSE
 
 # First we try 'id'
-if `./src/helpers/PrintPath -s id` ; then
-    AP_IDPATH=`./src/helpers/PrintPath id`
+if `sh src/helpers/PrintPath -s id` ; then
+    AP_IDPATH=`sh src/helpers/PrintPath id`
     # See if it's a POSIX 'id'
     if `$AP_IDPATH -u >/dev/null 2>&1` ; then
 	AP_RETVAL=`$AP_IDPATH -u` 
@@ -31,8 +31,8 @@ fi
 # Try 'whoami' first, then 'who am i' (making sure to strip away
 # the who crud) and finally just copy $LOGNAME
 #
-if `./src/helpers/PrintPath -s whoami` ; then
-    AP_WAIPATH=`./src/helpers/PrintPath whoami`
+if `sh src/helpers/PrintPath -s whoami` ; then
+    AP_WAIPATH=`sh src/helpers/PrintPath whoami`
     AP_LOGNAME=`$AP_WAIPATH`
 else
     AP_LOGNAME=`who am i | tail -1 | sed -e 's/[ 	][ 	]*.*$//'`
diff --git a/usr.sbin/httpd/src/helpers/mfhead b/usr.sbin/httpd/src/helpers/mfhead
index 277c3962462..f33d82492d1 100644
--- a/usr.sbin/httpd/src/helpers/mfhead
+++ b/usr.sbin/httpd/src/helpers/mfhead
@@ -2,7 +2,7 @@
 echo "##"
 echo "##  Apache Makefile, automatically generated by Configure script."
 echo "##  Hand-edited changes will be lost if the Configure script is re-run."
-echo "##  Sources: - `./helpers/fp2rp $1`/Makefile.config (via $2)"
+echo "##  Sources: - `sh helpers/fp2rp $1`/Makefile.config (via $2)"
 echo "##           - ./Makefile.tmpl"
 echo "##"
 echo ""
diff --git a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
index 18312aea94e..2f0fa8366a0 100644
--- a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
+++ b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c
@@ -87,7 +87,7 @@
  * Name: digest_auth_module
  * ConfigStart
 
-    RULE_DEV_RANDOM=`./helpers/CutRule DEV_RANDOM $file`
+    RULE_DEV_RANDOM=`sh helpers/CutRule DEV_RANDOM $file`
     if [ "$RULE_DEV_RANDOM" = "default" ]; then
 	if [ -r "/dev/random" ]; then
 	    RULE_DEV_RANDOM="/dev/random"
diff --git a/usr.sbin/httpd/src/modules/ssl/libssl.module b/usr.sbin/httpd/src/modules/ssl/libssl.module
index 45248ddd4f9..d30b2d3302d 100644
--- a/usr.sbin/httpd/src/modules/ssl/libssl.module
+++ b/usr.sbin/httpd/src/modules/ssl/libssl.module
@@ -142,11 +142,11 @@ ConfigStart
         my_rule_SSL_CONSERVATIVE=$SSL_CONSERVATIVE
         my_rule_SSL_VENDOR=$SSL_VENDOR
     else
-        my_rule_SSL_COMPAT=`./helpers/CutRule SSL_COMPAT $file`
-        my_rule_SSL_SDBM=`./helpers/CutRule SSL_SDBM $file`
-        my_rule_SSL_EXPERIMENTAL=`./helpers/CutRule SSL_EXPERIMENTAL $file`
-        my_rule_SSL_CONSERVATIVE=`./helpers/CutRule SSL_CONSERVATIVE $file`
-        my_rule_SSL_VENDOR=`./helpers/CutRule SSL_VENDOR $file`
+        my_rule_SSL_COMPAT=`sh helpers/CutRule SSL_COMPAT $file`
+        my_rule_SSL_SDBM=`sh helpers/CutRule SSL_SDBM $file`
+        my_rule_SSL_EXPERIMENTAL=`sh helpers/CutRule SSL_EXPERIMENTAL $file`
+        my_rule_SSL_CONSERVATIVE=`sh helpers/CutRule SSL_CONSERVATIVE $file`
+        my_rule_SSL_VENDOR=`sh helpers/CutRule SSL_VENDOR $file`
     fi
 
     #
@@ -208,7 +208,7 @@ ConfigStart
         if [ ".$DBM_LIB" != . ]; then
             LIBS_ORIG="$LIBS"
             LIBS="$LIBS $DBM_LIB"
-            if ./helpers/TestCompile func dbm_open; then
+            if sh helpers/TestCompile func dbm_open; then
                 SSL_DBM_NAME="Configured DBM ($DBM_LIB)"
                 SSL_DBM_FLAG="$DBM_LIB"
             fi
@@ -216,13 +216,13 @@ ConfigStart
         fi
         #   2. check for various vendor DBM libs
         if [ ".$SSL_DBM_NAME" = . ]; then
-            if ./helpers/TestCompile func dbm_open; then
+            if sh helpers/TestCompile func dbm_open; then
                 SSL_DBM_NAME='Vendor DBM (libc)'
                 SSL_DBM_FLAG=''
-            elif ./helpers/TestCompile lib dbm dbm_open; then
+            elif sh helpers/TestCompile lib dbm dbm_open; then
                 SSL_DBM_NAME='Vendor DBM (libdbm)'
                 SSL_DBM_FLAG='-ldbm'
-            elif ./helpers/TestCompile lib ndbm dbm_open; then
+            elif sh helpers/TestCompile lib ndbm dbm_open; then
                 SSL_DBM_NAME='Vendor DBM (libndbm)'
                 SSL_DBM_FLAG='-lndbm'
             fi
diff --git a/usr.sbin/httpd/src/modules/standard/mod_auth_db.module b/usr.sbin/httpd/src/modules/standard/mod_auth_db.module
index 4636763b2a7..dba647d9a29 100644
--- a/usr.sbin/httpd/src/modules/standard/mod_auth_db.module
+++ b/usr.sbin/httpd/src/modules/standard/mod_auth_db.module
@@ -2,19 +2,19 @@ Name: db_auth_module
 ConfigStart
     DB_VERSION=''
     DB_LIB=''
-    if ./helpers/TestCompile func db_create; then
+    if sh helpers/TestCompile func db_create; then
         DB_VERSION='Berkeley-DB/3.x'
-    elif ./helpers/TestCompile lib db db_create; then
+    elif sh helpers/TestCompile lib db db_create; then
         DB_VERSION='Berkeley-DB/3.x'
         DB_LIB='-ldb'
-    elif ./helpers/TestCompile func db_open; then
+    elif sh helpers/TestCompile func db_open; then
         DB_VERSION='Berkeley-DB/2.x'
-    elif ./helpers/TestCompile lib db db_open; then
+    elif sh helpers/TestCompile lib db db_open; then
         DB_VERSION='Berkeley-DB/2.x'
         DB_LIB='-ldb'
-    elif ./helpers/TestCompile func dbopen; then
+    elif sh helpers/TestCompile func dbopen; then
         DB_VERSION='Berkeley-DB/1.x'
-    elif ./helpers/TestCompile lib db dbopen; then
+    elif sh helpers/TestCompile lib db dbopen; then
         DB_VERSION='Berkeley-DB/1.x'
         DB_LIB='-ldb'
     fi