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 a939f2450f666d47b4e5e13d2668e4db66bacc49..313dc2be345f38b1e66ce1f50c34e75c76b9177f 100644 (file)
--- 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 c7488fc603451da3c309de8fc10db3714858f184..00403cae933d443cb7ff7a5a47798886b38f3fc9 100644 (file)
--- 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 618ee6a3d55d49d64fff509d97f063c4d64c7d7b..525075c3f17e9afcb048835ce156703d6517db47 100644 (file)
--- 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 f8fd400f679e3129ea1f55f8a182e4602aa1bf04..9ac71a741db726d06e5a9661444b4df8d4edd8bf 100644 (file)
--- 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 c0ab7cc4c320b7c12fdff58794b2a1b305b459a8..8e1e77656c942be283835c2254e016204b2f5f52 100644 (file)
--- 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 b3e89717dd696d01e5b8b9f739bdbb207f3195c4..bcbee0e851ff61013265e8d98f4d1148fc993e95 100644 (file)
--- 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 ..) > $@