You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sa...@locus.apache.org on 2000/06/11 13:42:06 UTC
cvs commit: apache-2.0/src/lib/apr aclocal.m4 configure.in
sascha 00/06/11 04:42:06
Modified: src/lib/apr aclocal.m4 configure.in
Log:
* RUN_SUBDIR_CONFIG_NOW needs to run the configure script found in srcdir.
* The mm directory is now made VPATH-ready again before mm's configure
script is run.
Revision Changes Path
1.16 +14 -10 apache-2.0/src/lib/apr/aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- aclocal.m4 2000/06/10 16:08:36 1.15
+++ aclocal.m4 2000/06/11 11:42:05 1.16
@@ -264,6 +264,7 @@
AC_DEFUN(RUN_SUBDIR_CONFIG_NOW, [
echo "configuring package in $1 now"
ac_popdir=`pwd`
+ ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
cd $1
# Make the cache file name correct relative to the subdirectory.
@@ -273,18 +274,9 @@
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
- case "$srcdir" in
- .) # No --srcdir option. We are building in place.
- ac_sub_srcdir=$srcdir ;;
- /*) # Absolute path.
- ac_sub_srcdir=$srcdir/$ac_config_dir ;;
- *) # Relative path.
- ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
- esac
-
# The eval makes quoting arguments work.
- if eval ./configure --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+ if eval $ac_abs_srcdir/configure --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir
then :
echo "$1 configured properly"
else
@@ -292,6 +284,18 @@
fi
cd $ac_popdir
+])
+
+AC_DEFUN(APR_PREPARE_MM_DIR,[
+dnl #----------------------------- Prepare mm directory for VPATH support
+if test -n "$USE_MM" && test -n "$USE_VPATH"; then
+ test -d $mm_dir || $MKDIR -p $mm_dir
+
+ for i in shtool config.guess config.sub fbtool ltconfig \
+ ltmain.sh mm_vers.c; do
+ test -r $mm_dir/$i || ln -s $abs_srcdir/$mm_dir/$i $mm_dir/$i
+ done
+fi
])
sinclude(threads.m4)
1.108 +1 -10 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -u -r1.107 -r1.108
--- configure.in 2000/06/10 18:20:35 1.107
+++ configure.in 2000/06/11 11:42:05 1.108
@@ -110,6 +110,7 @@
# run this on a more conditional basis.
USE_MM=yes
mm_dir=shmem/unix/mm
+APR_PREPARE_MM_DIR
RUN_SUBDIR_CONFIG_NOW($config_subdirs)
AC_MSG_CHECKING(Checking for Shared memory support)
@@ -629,16 +630,6 @@
AC_SUBST(file_as_socket)
APR_CHECK_GETHOSTBYNAME_NAS
-
-dnl #----------------------------- Prepare mm directory for VPATH support
-if test -n "$USE_MM" && test -n "$USE_VPATH"; then
- test -d $mm_dir || $MKDIR -p $mm_dir
-
- for i in shtool config.guess config.sub fbtool ltconfig \
- ltmain.sh mm_vers.c; do
- test -r $mm_dir/$i || ln -s $abs_srcdir/$mm_dir/$i $mm_dir/$i
- done
-fi
dnl #----------------------------- Construct the files
AC_SUBST(LDLIBS)