diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2000-05-24 23:32:15 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2000-05-24 23:32:15 +0000 |
| commit | 6ddb64777d39b3c4760ab3ba5291ef07daad9eae (patch) | |
| tree | e105992b789bea00e783e24c5d2fac0c17f23fe3 | |
| parent | 881d620e7fa39d12bdafb004905aea72e9beaffa (diff) | |
Fix apache configure assumption that helper scripts are executable.
(thanks binkertn@umich.edu). - Closes PR 1175
| -rw-r--r-- | usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c | 6 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/libssl.module | 18 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/modules/standard/mod_auth_db.module | 12 |
3 files changed, 18 insertions, 18 deletions
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..d22cde9d8f4 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" @@ -95,9 +95,9 @@ RULE_DEV_RANDOM="/dev/urandom" else RULE_DEV_RANDOM="truerand" - if helpers/TestCompile func randbyte; then + if sh helpers/TestCompile func randbyte; then : - elif helpers/TestCompile lib rand randbyte; then + elif sh helpers/TestCompile lib rand randbyte; then : else echo " (mod_auth_digest) truerand library missing!" diff --git a/usr.sbin/httpd/src/modules/ssl/libssl.module b/usr.sbin/httpd/src/modules/ssl/libssl.module index dbb0248c20c..0205d699bd5 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..d633c4b6e2c 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 |