Start pointing the configuration scripts to the correct directories

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

diff --git a/acinclude.m4 b/acinclude.m4
index 9fd9aedce986e6101868e6fe0f6ff83ad431def5..ae562da4cc49e65dd3c71dc52c8333c9f65f2ca1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -173,8 +173,8 @@ AC_DEFUN(APACHE_ONCE,[
   fi
 ])
 
-sinclude(lib/apr/apr_common.m4)
-sinclude(lib/apr/hints.m4)
+sinclude(srclib/apr/apr_common.m4)
+sinclude(srclib/apr/hints.m4)
 sinclude(hints.m4)
 
 AC_DEFUN(APACHE_CHECK_SIGWAIT_ONE_ARG,[
@@ -226,7 +226,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[
   modpath_current=modules/$1
   modpath_static=
   modpath_shared=
-  test -d $1 || $srcdir/helpers/mkdir.sh $modpath_current
+  test -d $1 || $srcdir/build/mkdir.sh $modpath_current
   > $modpath_current/modules.mk
 ])dnl
 dnl

diff --git a/configure.in b/configure.in
index 9d530f4fbbc02f1e1def25334b665cb767ead46e..724dedbd28de565a93d27be39c5e7f83787824a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -128,9 +128,9 @@ APACHE_ENABLE_LAYOUT
 APACHE_ENABLE_MODULES
 APACHE_ENABLE_SHARED
 
-INCLUDES="-I\$(top_srcdir)/include -I\$(top_srcdir)/lib/apr/include"
+INCLUDES="-I\$(top_srcdir)/include -I\$(top_srcdir)/srclib/apr/include"
 if test -n "$USE_VPATH"; then
-  INCLUDES="$INCLUDES -I\$(top_builddir)/include -I\$(top_builddir)/lib/apr/include"
+  INCLUDES="$INCLUDES -I\$(top_builddir)/include -I\$(top_builddir)/srclib/apr/include"
 fi
 
 dnl reading config stubs
@@ -190,7 +190,7 @@ if test "$apache_need_expat" = "yes"; then
 fi
 
 dnl APR should go after the other libs, so the right symbols can be picked up
-AP_LIBS="$AP_LIBS lib/apr/\$(LIBPRE)apr.a"
+AP_LIBS="$AP_LIBS srclib/apr/\$(LIBPRE)apr.a"
 APACHE_SUBST(AP_LIB_DIRS)
 APACHE_SUBST(AP_LIBS)
 
@@ -225,15 +225,15 @@ dnl ## or disable threads), while still allowing APR to run and generate
 dnl ## APRVARS before Apache generates it's Makefiles and the related files.
 dnl ## This allows APR to detect libraries like dl and tell Apache that it
 dnl ## needs to include or not include them.
-RUN_SUBDIR_CONFIG_NOW(lib/apr, $apache_apr_flags)
-RUN_SUBDIR_CONFIG_NOW(lib/pcre)
-. ./lib/apr/APRVARS
+RUN_SUBDIR_CONFIG_NOW(srclib/apr, $apache_apr_flags)
+RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
+. ./srclib/apr/APRVARS
 
 APACHE_GEN_CONFIG_VARS
 
 dnl ## Build modules.c
 rm -f modules.c
-echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > modules.c
+echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
 
 AC_OUTPUT_COMMANDS([
 echo '/* Generated by configure */' > ${path_h}.new
@@ -261,7 +261,7 @@ mpmdir=$MPM_DIR
 
 AC_TYPE_RLIM_T
 
-perlbin=`$srcdir/helpers/PrintPath perl`
+perlbin=`$srcdir/build/PrintPath perl`
 AC_SUBST(perlbin)
 
 dnl If we are running on BSD/OS, we need to use the BSD .include syntax.