From: Roy T. Fielding Date: Sun, 18 Feb 2001 16:07:31 +0000 (+0000) Subject: Intermediate change of hardcoded "helpers" reference to "build" X-Git-Tag: 2.0.12~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b1b30525b085dc9fea5ab94dc946e5bd8a7e566;p=thirdparty%2Fapache%2Fhttpd.git Intermediate change of hardcoded "helpers" reference to "build" until I get a chance to revamp this to use APR's variables directly. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88230 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Makefile.in b/Makefile.in index a939f2450f6..313dc2be345 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,7 @@ htdocs-srcdir = docs/docroot docs:: mkdir -p ./docs/api - srclib/apr/helpers/scandoc -isrclib/apr/helpers/default.pl -p./docs/api/ ./include/*.h + srclib/apr/build/scandoc -isrclib/apr/build/default.pl -p./docs/api/ ./include/*.h install-htdocs: @echo Installing HTML documents diff --git a/configure.in b/configure.in index c7488fc6034..00403cae933 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ dnl Absolute source/build directory abs_srcdir=`(cd $srcdir && pwd)` abs_builddir=`pwd` -MKDIR=$abs_srcdir/srclib/apr/helpers/mkdir.sh +MKDIR=$abs_srcdir/srclib/apr/build/mkdir.sh APACHE_CONFIG_NICE(config.nice) diff --git a/modules/aaa/mod_auth_db.module b/modules/aaa/mod_auth_db.module index 618ee6a3d55..525075c3f17 100644 --- a/modules/aaa/mod_auth_db.module +++ b/modules/aaa/mod_auth_db.module @@ -3,17 +3,17 @@ ConfigStart # XXX: this needs updating for apache-2.0 configuration method DB_VERSION='' DB_LIB='' - if ./helpers/TestCompile func db_open; then + if ./build/TestCompile func db_open; then DB_VERSION='Berkeley-DB/2.x' else - if ./helpers/TestCompile lib db db_open; then + if ./build/TestCompile lib db db_open; then DB_VERSION='Berkeley-DB/2.x' DB_LIB='-ldb' else - if ./helpers/TestCompile func dbopen; then + if ./build/TestCompile func dbopen; then DB_VERSION='Berkeley-DB/1.x' else - if ./helpers/TestCompile lib db dbopen; then + if ./build/TestCompile lib db dbopen; then DB_VERSION='Berkeley-DB/1.x' DB_LIB='-ldb' fi diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c index f8fd400f679..9ac71a741db 100644 --- a/modules/aaa/mod_auth_dbm.c +++ b/modules/aaa/mod_auth_dbm.c @@ -106,7 +106,7 @@ * MODULE-DEFINITION-START * Name: auth_dbm_module * ConfigStart - . ./helpers/find-dbm-lib + . ./build/find-dbm-lib * ConfigEnd * MODULE-DEFINITION-END */ diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index c0ab7cc4c32..8e1e77656c9 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -164,7 +164,7 @@ * MODULE-DEFINITION-START * Name: rewrite_module * ConfigStart - . ./helpers/find-dbm-lib + . ./build/find-dbm-lib if [ "x$found_dbm" = "x1" ]; then echo " enabling DBM support for mod_rewrite" else diff --git a/server/Makefile.in b/server/Makefile.in index b3e89717dd6..bcbee0e851f 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -51,7 +51,7 @@ delete-exports: $(TARGET_EXPORTS): - $(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h > $@ + $(AWK) -f $(top_srcdir)/srclib/apr/build/make_export.awk $(top_srcdir)/include/*.h > $@ exports.c: $(EXPORT_FILES) (cat $(EXPORT_FILES) | ../build/buildexports.sh ..) > $@