cvs commit: httpd-2.0 acinclude.m4 configure.in

[rb...@locus.apache.org]

rbb         00/12/04 12:10:43

  Modified:    .        acinclude.m4 configure.in
  Log:
  Start pointing the configuration scripts to the correct directories
  
  Revision  Changes    Path
  1.53      +3 -3      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- acinclude.m4	2000/11/28 21:31:50	1.52
  +++ acinclude.m4	2000/12/04 20:10:39	1.53
  @@ -173,8 +173,8 @@
     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 @@
     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
  
  
  
  1.95      +8 -8      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- configure.in	2000/12/04 18:56:08	1.94
  +++ configure.in	2000/12/04 20:10:39	1.95
  @@ -128,9 +128,9 @@
   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 @@
   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 ## 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 @@
   
   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.