Get buildconf working in the new repository. Nothing builds, but we can

at least configure everything.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87176 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/MakeEtags b/build/MakeEtags
index 1b030a3fc03dd0e38bb3fa472b062a2bafa636d8..86a6db24ce6b0841b1c223ed6f3dd851da00ea59 100755 (executable)
--- a/build/MakeEtags
+++ b/build/MakeEtags
@@ -2,7 +2,7 @@
 
 # This file illustrates how to generate a useful TAGS file via etags
 # for emacs.  This should be invoked from the src directory i.e.:
-#   > helpers/MakeEtags
+#   > build/MakeEtags
 # and will create a TAGS file in the src directory.
 
 # This script falls under the Apache License.

diff --git a/build/build.mk b/build/build.mk
index c6e3332e53ae93e518b14217c5ea47d8c049e89d..bff40b17a0b2482e6a7381118ea4ff880130ad1c 100644 (file)
--- a/build/build.mk
+++ b/build/build.mk
@@ -61,7 +61,7 @@
 STAMP = buildmk.stamp
 
 all: $(STAMP) generated_lists
-       @if [ ! -d lib/apr ]; then \
+       @if [ ! -d srclib/apr ]; then \
            echo "APR not found."; \
            echo "Please check-out a working version of APR, the anonymous"; \
            echo "CVS root is :pserver:anoncvs@www.apache.org:/home/cvspublic"; \
@@ -70,13 +70,13 @@ all: $(STAMP) generated_lists
        @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
 
 generated_lists:
-       @libpath=`helpers/PrintPath libtoolize`; \
+       @libpath=`build/PrintPath libtoolize`; \
        if [ "x$$libpath" = "x" ]; then \
                echo "libtoolize not found in path"; \
                exit 1; \
        fi; 
        @echo config_m4_files = `find . -name config.m4` > $@
-       @n=`helpers/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@
+       @n=`build/PrintPath libtoolize`; echo libtool_prefix = `dirname $$n`/.. >> $@
 
 $(STAMP): build/buildcheck.sh
        @build/buildcheck.sh && touch $(STAMP)

diff --git a/build/build2.mk b/build/build2.mk
index b13dd67fcac14e7dea825b1a61b85f148fb27d01..76186f91648e9b2783fa8ce337813e5ea4fda2a8 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -61,10 +61,10 @@ TOUCH_FILES = mkinstalldirs install-sh missing
 LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
 
 config_h_in = include/ap_config_auto.h.in
-apr_private.h_in = lib/apr/include/apr_private.h.in
-apr_configure = lib/apr/configure
-mm_configure = lib/apr/shmem/unix/mm/configure
-pcre_configure = lib/pcre/configure
+apr_private.h_in = srclib/apr/include/apr_private.h.in
+apr_configure = srclib/apr/configure
+mm_configure = srclib/apr/shmem/unix/mm/configure
+pcre_configure = srclib/pcre/configure
 
 APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
 
@@ -83,12 +83,12 @@ all: $(targets)
 
 libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4
 
-aclocal.m4: acinclude.m4 lib/apr/apr_common.m4 lib/apr/hints.m4 $(libtool_m4)
+aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)
        @echo rebuilding $@
        @cat acinclude.m4 $(libtool_m4) > $@
 
 export_lists:
-       @build/buildexports.sh main/exports.c lib/apr/apr.exports
+       @build/buildexports.sh server/exports.c srclib/apr/apr.exports
 
 $(LT_TARGETS):
        libtoolize $(AMFLAGS) --force
@@ -112,19 +112,19 @@ configure: aclocal.m4 configure.in $(config_m4_files)
        ### to preserve autoconf's exit across the grep?
        -autoconf 2>&1 | grep -v $(cross_compile_warning)
 
-$(apr_private.h_in): $(apr_configure) lib/apr/acconfig.h
+$(apr_private.h_in): $(apr_configure) srclib/apr/acconfig.h
        @echo rebuilding $@
        @rm -f $@
-       (cd lib/apr && autoheader)
+       (cd srclib/apr && autoheader)
 
-$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/apr_common.m4 lib/apr/hints.m4
+$(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4
        @echo rebuilding $@
-       (cd lib/apr && ./buildconf)
+       (cd srclib/apr && ./buildconf)
 
-$(pcre_configure): lib/pcre/configure.in
+$(pcre_configure): srclib/pcre/configure.in
        @echo rebuilding $@
-       (cd lib/pcre && autoconf)
+       (cd srclib/pcre && autoconf)
 
 $(mm_configure): $(mm_configure).in
        @echo rebuilding $@
-       (cd lib/apr/shmem/unix/mm && autoconf)
+       (cd srclib/apr/shmem/unix/mm && autoconf)

diff --git a/build/buildexports.sh b/build/buildexports.sh
index 1a04a5f948a28b1f3df6100d79c3a158e91d8058..487f60653dbee910f755f5c0743e692e70d707e0 100755 (executable)
--- a/build/buildexports.sh
+++ b/build/buildexports.sh
@@ -9,7 +9,7 @@ echo " * the base server uses them."
 echo " */"
 echo ""
  
-cd lib/apr/include 
+cd srclib/apr/include 
 for file in *.h
 do
     echo "#include \"$file\""

diff --git a/build/fastgen.sh b/build/fastgen.sh
index eb9d83e6f74dfb1acaa605d1e5fea7c3408d2a52..347fb14250b17fa83f2486cfc9b74576a868a297 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -70,7 +70,7 @@ top_builddir=`pwd`
 if test "$mkdir_p" = "yes"; then
   mkdir_p="mkdir -p"
 else
-  mkdir_p="$top_srcdir/helpers/mkdir.sh"
+  mkdir_p="$top_srcdir/build/mkdir.sh"
 fi
 
 if test "$bsd_makefile" = "yes"; then

diff --git a/build/rules.mk b/build/rules.mk
index 2e4a41bd4377ce7586202ef011ca6b84f7c0073d..5cfaee85aa452ef8b82f57d41c913166f95dd5b6 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -78,8 +78,8 @@ SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
 # Helper programs
 
 SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
-MKINSTALLDIRS = $(abs_srcdir)/helpers/mkdir.sh
-INSTALL = $(abs_srcdir)/helpers/install.sh -c
+MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
+INSTALL = $(abs_srcdir)/build/install.sh -c
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_PROGRAM = $(INSTALL) -m 755
 

diff --git a/configure.in b/configure.in
index acc36fb88de9ed7f266178b1071df57aa63188c1..9d530f4fbbc02f1e1def25334b665cb767ead46e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -134,7 +134,7 @@ if test -n "$USE_VPATH"; then
 fi
 
 dnl reading config stubs
-esyscmd(./helpers/config-stubs .)
+esyscmd(./build/config-stubs .)
 
 INCLUDES="$INCLUDES -I\$(top_srcdir)/os/\$(OS_DIR)"
 EXTRA_LIBS="$EXTRA_LIBS $LIBS"