You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/10/05 06:41:47 UTC
cvs commit: apache-2.0/src/os config.m4
rbb 00/10/04 21:41:47
Modified: src CHANGES acinclude.m4 configure.in
src/lib/apr configure.in hints.m4
src/lib/apr/shmem/unix/mm aclocal.m4 configure.in
src/modules/standard config.m4
src/os config.m4
Log:
Prepare our autoconf setup for autoconf 2.14a and for cross-compiling
PR: 6379
Submitted by: "R�diger" Kuhlmann <Ta...@gmx.de>
Reviewed by: Ryan Bloom
Revision Changes Path
1.247 +4 -0 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- CHANGES 2000/10/05 03:55:07 1.246
+++ CHANGES 2000/10/05 04:41:45 1.247
@@ -1,5 +1,9 @@
Changes with Apache 2.0a7
+ *) Prepare our autoconf setup for autoconf 2.14a and for cross-
+ compiling.
+ ["R�diger" Kuhlmann <Ta...@gmx.de>]
+
*) Fix a bug where a client which only sends \n to delimit header
lines (netcat) gets a strange looking HTTP_NOT_IMPLEMENTED
message. Start working on ebcdic co-existance with input
1.47 +2 -2 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- acinclude.m4 2000/09/26 11:26:45 1.46
+++ acinclude.m4 2000/10/05 04:41:45 1.47
@@ -318,7 +318,7 @@
fi
shared="";;
esac
- ifelse($6,,:,$6)
+ ifelse([$6],,:,[$6])
APACHE_MODPATH_ADD($1, $shared, $3)
fi
])dnl
@@ -339,7 +339,7 @@
-e "s/[ ]*$/'/g" \
$1 > $pldconf
changequote([,])
- layout_name=$name
+ layout_name=$2
. $pldconf
rm $pldconf
for var in prefix exec_prefix bindir sbindir libexecdir mandir \
1.79 +2 -0 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- configure.in 2000/09/26 11:26:45 1.78
+++ configure.in 2000/10/05 04:41:45 1.79
@@ -30,6 +30,8 @@
USE_VPATH=1
fi
+AC_CANONICAL_SYSTEM
+
dnl
dnl ## Preload our OS configuration
APR_PRELOAD
1.154 +4 -4 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.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- configure.in 2000/09/29 19:32:20 1.153
+++ configure.in 2000/10/05 04:41:46 1.154
@@ -7,10 +7,10 @@
AC_CONFIG_HEADER(include/apr_private.h)
AC_CONFIG_AUX_DIR(helpers)
+AC_CANONICAL_SYSTEM
echo "Configuring APR library"
-OS=`$ac_config_guess`
-OS=`$ac_config_sub $OS`
-echo "Platform: ${OS}"
+OS=$host
+echo "Platform: $OS"
dnl # Some initial steps for configuration. We setup the default directory
dnl # and which files are to be configured.
@@ -45,7 +45,7 @@
AC_PROG_RANLIB_NC
AC_PROG_MAKE_SET
AC_CHECK_PROG(RM, rm, rm)
-AC_CHECK_PROG(AR, ar, ar)
+AC_CHECK_TOOL(AR, ar, ar)
# This macro needs to be here in case we are on an AIX box.
AC_AIX
1.19 +2 -4 apache-2.0/src/lib/apr/hints.m4
Index: hints.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/hints.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hints.m4 2000/09/16 09:45:06 1.18
+++ hints.m4 2000/10/05 04:41:46 1.19
@@ -66,11 +66,9 @@
dnl based on outside knowledge
dnl
AC_DEFUN(APR_PRELOAD, [
-PLAT=`$ac_config_guess`
-PLAT=`$ac_config_sub $PLAT`
-echo "Applying hints file rules for $PLAT"
+echo "Applying hints file rules for $host"
-case "$PLAT" in
+case "$host" in
*mint)
APR_SETIFNULL(CFLAGS, [-DMINT])
APR_SETIFNULL(LIBS, [-lportlib -lsocket])
1.7 +18 -17 apache-2.0/src/lib/apr/shmem/unix/mm/aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aclocal.m4 2000/05/18 19:30:05 1.6
+++ aclocal.m4 2000/10/05 04:41:46 1.7
@@ -43,13 +43,14 @@
[ --enable-static build static libraries (default=yes)],
enable_static="$enableval",
enable_static=yes
-)dnl
+)
AC_ARG_ENABLE(shared,dnl
[ --enable-shared build shared libraries (default=yes)],
enable_shared="$enableval",
enable_shared=yes
-)dnl
+)
libtool_flags=''
+echo "Calling ltconfig with PLATFORM=$PLATFORM"
test ".$silent" = .yes && libtool_flags="$libtool_flags --silent"
test ".$enable_static" = .no && libtool_flags="$libtool_flags --disable-static"
test ".$enable_shared" = .no && libtool_flags="$libtool_flags --disable-shared"
@@ -61,7 +62,7 @@
AC_MSG_ERROR([libtool configuration failed])
LIBTOOL="\$(TOP)/libtool"
AC_SUBST(LIBTOOL)
-])dnl
+])
define(AC_CHECK_DEBUGGING,[dnl
AC_MSG_CHECKING(for compilation debug mode)
@@ -94,7 +95,7 @@
sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;;
esac
msg=disabled
-])dnl
+])
AC_MSG_RESULT([$msg])
])
@@ -242,12 +243,13 @@
define(AC_CHECK_MAXSEGSIZE,[dnl
AC_MSG_CHECKING(for shared memory maximum segment size)
+AC_CACHE_VAL(ac_cv_maxsegsize,
+[
OCFLAGS="$CFLAGS"
case "$1" in
MM_SHMT_MM* ) CFLAGS="-DTEST_MMAP $CFLAGS" ;;
MM_SHMT_IPCSHM ) CFLAGS="-DTEST_SHMGET $CFLAGS" ;;
esac
-cross_compile=no
AC_TRY_RUN(
changequote(<<, >>)dnl
<<
@@ -371,9 +373,15 @@
}
>>
changequote([, ])dnl
-,[
-MM_SHM_MAXSEGSIZE="`cat conftestval`"
-msg="$MM_SHM_MAXSEGSIZE"
+,[ac_cv_maxsegsize="`cat conftestval`"
+],
+ac_cv_maxsegsize=0
+,
+ac_cv_maxsegsize=0
+)
+CFLAGS="$OCFLAGS"
+])
+msg="$ac_cv_maxsegsize"
if test $msg -eq 67108864; then
msg="64MB (soft limit)"
elif test $msg -gt 1048576; then
@@ -384,17 +392,10 @@
msg="`expr $msg / 1024`"
msg="${msg}KB"
else
- MM_SHM_MAXSEGSIZE=0
+ ac_cv_maxsegsize=0
msg=unknown
fi
-],
-MM_SHM_MAXSEGSIZE=0
-msg=unknown
-,
-MM_SHM_MAXSEGSIZE=0
-msg=unknown
-)dnl
-CFLAGS="$OCFLAGS"
+MM_SHM_SEGSIZE=$ac_cv_maxsegsize
test ".$msg" = .unknown && AC_MSG_ERROR([Unable to determine maximum shared memory segment size])
AC_MSG_RESULT([$msg])
AC_DEFINE_UNQUOTED(MM_SHM_MAXSEGSIZE, $MM_SHM_MAXSEGSIZE)
1.5 +15 -11 apache-2.0/src/lib/apr/shmem/unix/mm/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.in 2000/05/03 17:15:48 1.4
+++ configure.in 2000/10/05 04:41:46 1.5
@@ -9,14 +9,23 @@
AC_PREREQ(2.12)dnl
AC_REVISION($1.0$)dnl
+dnl # autoconf initialization
+AC_INIT(README)
+AC_CONFIG_HEADER(mm_conf.h)
+AC_PREFIX_DEFAULT(/usr/local)
+
dnl # shtool bootstrap
SHTOOL="\$(TOP)/shtool"
AC_SUBST(SHTOOL)
ac_shtool="./shtool"
T_MD=`$ac_shtool echo -n -e %B`
T_ME=`$ac_shtool echo -n -e %b`
-PLATFORM=`${CONFIG_SHELL-/bin/sh} ./config.guess`
-PLATFORM=`${CONFIG_SHELL-/bin/sh} ./config.sub $PLATFORM`
+
+AC_CANONICAL_SYSTEM
+
+PLATFORM=$host
+echo "Platform = $host"
+
MM_VERSION_STR="`$ac_shtool version -l c -d long mm_vers.c`"
AC_SUBST(MM_VERSION_STR)
@@ -25,11 +34,6 @@
echo "Copyright (c) 1999-2000 Ralf S. Engelschall, All Rights Reserved."
echo "Platform: ${T_MD}${PLATFORM}${T_ME}"
-dnl # autoconf initialization
-AC_INIT(README)
-AC_CONFIG_HEADER(mm_conf.h)
-AC_PREFIX_DEFAULT(/usr/local)
-
dnl # determine build mode
AC_ARG_ENABLE(batch,dnl
[ --enable-batch build in batch mode (default=no)],
@@ -37,7 +41,7 @@
if test ".$enable_batch" = .; then
enable_batch=no
fi
-)dnl
+)
dnl #
dnl # determine build tools and parameters
@@ -145,7 +149,7 @@
AC_ARG_WITH(shm,dnl
[ --with-shm=TYPE force shared memory type: MMFILE MMZERO MMPOSX MMANON IPCSHM BEOS],
AC_DECISION_FORCE(MM_SHMT_$withval)
-)dnl
+)
AC_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
@@ -193,7 +197,7 @@
AC_ARG_WITH(sem,dnl
[ --with-sem=TYPE force semaphore type: FLOCK FCNTL IPCSEM BEOS],
AC_DECISION_FORCE(MM_SEMT_$withval)
-)dnl
+)
AC_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
@@ -208,7 +212,7 @@
mm-config dnl
,dnl
chmod a+x mm-config
-)dnl
+)
if test ".$enable_batch" != .yes; then
echo ""
1.27 +1 -1 apache-2.0/src/modules/standard/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- config.m4 2000/08/04 02:25:08 1.26
+++ config.m4 2000/10/05 04:41:46 1.27
@@ -4,7 +4,7 @@
dnl XXX - Need to allow --enable-module to fail if optional config fails
AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
- APACHE_MODULE($1,$2,,$3,$4,$5)
+ APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
])
APACHE_MODPATH_INIT(standard)
1.9 +1 -1 apache-2.0/src/os/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config.m4 2000/04/30 18:27:18 1.8
+++ config.m4 2000/10/05 04:41:47 1.9
@@ -1,7 +1,7 @@
AC_MSG_CHECKING(for target platform)
#PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
-PLATFORM=`$ac_config_guess`
+PLATFORM=$host
LIBPRE=lib
case "$PLATFORM" in