cvs commit: apache-2.0/src/lib/apr configure.in
rbb 00/02/04 13:14:10
Modified:src/lib/apr configure.in
Log:
Re-structure APR's configure.in file. This should make adding functions to
APR easier. Basically, I just moved things around a bit to make them easier
to find, and I added some output.
Revision ChangesPath
1.52 +286 -272 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- configure.in 2000/02/04 01:06:46 1.51
+++ configure.in 2000/02/04 21:14:09 1.52
@@ -1,28 +1,30 @@
+dnl ##
+dnl ## Autoconf configuration file for APR
+dnl ##
+echo Configuring APR library
+echo Platform: ${OS}
+echo (Default will be ${DEFAULT_OSDIR})
+
AC_CONFIG_AUX_DIR(./helpers)
OS=`./config.guess`
-OS=`./config.sub $OS`
+OS=`./config.sub $OS`
+
+dnl # Some initial steps for configuration. We setup the default directory
+dnl # and which files are to be configured.
# These added to allow default directories to be used...
DEFAULT_OSDIR=unix
-MODULES=file_io network_io threadproc misc locks time mmap shmem
-
-echo Configuring APR library
-echo Platform: ${OS}
-echo (Default will be ${DEFAULT_OSDIR})
+MODULES=file_io network_io threadproc misc locks time mmap shmem
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-
AC_CONFIG_HEADER(include/apr_config.h)
-AC_ARG_WITH(optim,[ --with-optim=FLAGS compiler optimisation flags],
- [OPTIM=$withval])
-
# Most platforms use a prefix of 'lib' on their library files.
LIBPREFIX='lib'
-dnl Checks for programs.
+dnl # Checks for programs.
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_MAKE_SET
@@ -32,53 +34,21 @@
# This macro needs to be here in case we are on an AIX box.
AC_AIX
-REENTRANCY_FLAGS
-PTHREADS_CHECK
-
-AC_CACHE_CHECK([for threads], ac_cv_enable_threads,
- [ AC_ARG_ENABLE(threads,
-[ --enable-threads Enable threading support in APR.],
-[ ] ,
-[ AC_CHECK_HEADERS(pthread.h,
- [ ac_cv_enable_threads=pthread ] ,
- [ ac_cv_enable_threads=no ] ) ] ) ] )
-
-if test $ac_cv_enable_threads = no; then
-threads=0
-pthreadh=0
-else
-if test $ac_cv_enable_threads = pthread; then
-# We have specified pthreads for our threading library, just make sure
-# that we have everything we need
- AC_CHECK_HEADERS(pthread.h, [
- threads=1
- pthreadh=1
- AC_DEFINE(USE_THREADS) ], [
- threads=0
- pthreadh=0 ] )
-else
-# We basically specified that we wanted threads, but not how to implement
-# them. In this case, just look for pthreads. In the future, we can check
-# for other threading libraries as well.
- AC_CHECK_HEADERS(pthread.h, [
- threads=1
- pthreadh=1
- AC_DEFINE(USE_THREADS) ], [
- threads=0
- pthreadh=0 ] )
-fi
+# Use /bin/sh if it exists, otherwise go looking for sh in the path
+if test .$SH = . -a -f /bin/sh; then
+ SH=/bin/sh
fi
+AC_CHECK_PROG(SH, sh, sh)
-pthreadser=0
-if test $threads = 1; then
-AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
-AC_CHECK_FUNC(pthread_mutex_init, [
-AC_DEFINE(USE_PTHREAD_SERIALIZE)
-pthreadser=1 ])
-fi
+dnl #- Checks for compiler flags
+echo -e \nCheck for compiler flags.
+AC_ARG_WITH(optim,[ --with-optim=FLAGS compiler optimisation flags],
+[OPTIM=$withval])
-AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile
time warnings],
- [if test $GCC = yes; then CFLAGS=$CFLAGS -g -Wall; else
CFLAGS=$CFLAGS -g; fi])
+AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile
tim
+e warnings],
+[if test $GCC = yes; then CFLAGS=$CFLAGS -g -Wall; else
CFLAGS=$C
+FLAGS -g; fi])
dnl # this is the place to put specific options for platform/compiler
dnl # combinations
@@ -91,79 +61,6 @@
;;
esac
-dnl Checks for standard typedefs
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_CHECK_TYPE(ssize_t, int)
-AC_C_INLINE
-
-dnl Checks for integer size
-AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long double, 12)
-AC_CHECK_SIZEOF(long long, 8)
-
-if test $ac_cv_sizeof_short = 2; then
-short_value=short
-fi
-if test $ac_cv_sizeof_int = 4; then
-int_value=int
-fi
-if test $ac_cv_sizeof_long = 8; then
-long_value=long
-fi
-if test $ac_cv_sizeof_long_double = 8; then
-long_value=long double
cvs commit: apache-2.0/src/lib/apr configure.in
sascha 00/01/16 10:20:57 Modified:src/lib/apr configure.in Log: Inherit thread flags from Apache Revision ChangesPath 1.43 +8 -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.42 retrieving revision 1.43 diff -u -u -r1.42 -r1.43 --- configure.in 2000/01/11 12:59:34 1.42 +++ configure.in 2000/01/16 18:20:57 1.43 @@ -32,6 +32,13 @@ # This macro needs to be here in case we are on an AIX box. AC_AIX +dnl inherit REENTRANCY_FLAGS +test -n $ac_cv_pass_REENTRANCY_CFLAGS \ +CFLAGS=$CFLAGS $ac_cv_pass_REENTRANCY_CFLAGS + +test -n $ac_cv_pass_REENTRANCY_LDFLAGS \ +LDFLAGS=$LDFLAGS $ac_cv_pass_REENTRANCY_LDFLAGS + AC_CACHE_CHECK([for threads], ac_cv_enable_threads, [ AC_ARG_ENABLE(threads, [ --enable-threads Enable threading support in APR.], @@ -69,21 +76,14 @@ pthreadser=0 if test $threads = 1; then AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h) -AC_CHECK_LIB(pthread, pthread_mutex_init, [ +AC_CHECK_FUNC(pthread_mutex_init, [ AC_DEFINE(USE_PTHREAD_SERIALIZE) pthreadser=1 ]) -AC_CHECK_LIB(c_r, pthread_mutex_init, [ -AC_DEFINE(USE_PTHREAD_SERIALIZE) -pthreadser=1]) fi AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile time warnings], [if test $GCC = yes; then CFLAGS=$CFLAGS -g -Wall; else CFLAGS=$CFLAGS -g; fi]) -dnl inherit REENTRANCY_FLAGS -test -n $ac_cv_pass_REENTRANCY_FLAGS \ -CFLAGS=$CFLAGS $ac_cv_pass_REENTRANCY_FLAGS - dnl # this is the place to put specific options for platform/compiler dnl # combinations case $OS:$CC in @@ -221,8 +221,6 @@ esac AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB(pthread, pthread_mutex_init) -AC_CHECK_LIB(c_r, pthread_mutex_init) AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(crypt,crypt) AC_CHECK_LIB(ufc,crypt)
cvs commit: apache-2.0/src/lib/apr configure.in
sascha 00/01/11 04:59:35 Modified:src/lib/apr configure.in Log: Use REENTRANCY_FLAGS from config.cache (effectively only set by Apache) Revision ChangesPath 1.42 +4 -0 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.41 retrieving revision 1.42 diff -u -u -r1.41 -r1.42 --- configure.in 1999/12/29 23:54:27 1.41 +++ configure.in 2000/01/11 12:59:34 1.42 @@ -80,6 +80,10 @@ AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile time warnings], [if test $GCC = yes; then CFLAGS=$CFLAGS -g -Wall; else CFLAGS=$CFLAGS -g; fi]) +dnl inherit REENTRANCY_FLAGS +test -n $ac_cv_pass_REENTRANCY_FLAGS \ +CFLAGS=$CFLAGS $ac_cv_pass_REENTRANCY_FLAGS + dnl # this is the place to put specific options for platform/compiler dnl # combinations case $OS:$CC in
cvs commit: apache-2.0/src/lib/apr configure.in
rbb 99/11/30 10:45:52 Modified:src/lib/apr configure.in Log: First step in removing all needs to include apr_config.h in public apr header files. Plus some cleanup. Revision ChangesPath 1.28 +30 -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.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- configure.in 1999/11/17 18:09:55 1.27 +++ configure.in 1999/11/30 18:45:50 1.28 @@ -57,6 +57,28 @@ AC_CHECK_SIZEOF(long double, 12) AC_CHECK_SIZEOF(long long, 8) +if test $ac_cv_sizeof_short = 2; then +short_value=short +fi +if test $ac_cv_sizeof_int = 4; then +int_value=int +fi +if test $ac_cv_sizeof_long = 8; then +long_value=long +fi +if test $ac_cv_sizeof_long_double = 8; then +long_value=long double +fi +if test $ac_cv_sizeof_long_long = 8; then +long_value=long long +fi +if test $ac_cv_sizeof_longlong = 8; then +long_value=__int64 +fi +AC_SUBST(short_value) +AC_SUBST(int_value) +AC_SUBST(long_value) + AC_CHECK_SIZEOF_EXTENDED([#include sys/types.h], ssize_t, 8) # Use /bin/sh if it exists, otherwise go looking for sh in the path @@ -225,7 +247,9 @@ AC_MSG_RESULT(no) else if test $enableval = pthread; then - AC_CHECK_HEADERS(pthread.h, [ AC_DEFINE(APR_HAS_THREADS, 1) ], [ AC_DEFINE(APR_HAS_THREADS, 0) ] ) + AC_CHECK_HEADERS(pthread.h, [ + AC_DEFINE(APR_HAS_THREADS, 1) ], [ + AC_DEFINE(APR_HAS_THREADS, 0) ] ) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -233,8 +257,9 @@ fi ], [ - AC_CHECK_HEADERS(pthread.h, [ AC_DEFINE(APR_HAS_THREADS, 1) ], [ AC_DEFINE(APR_HAS_THREADS, 0) ] ) - + AC_CHECK_HEADERS(pthread.h, [ + AC_DEFINE(APR_HAS_THREADS, 1) ], [ + AC_DEFINE(APR_HAS_THREADS, 0) ] ) ]) @@ -261,7 +286,8 @@ SUBDIRS=$SUBDIRS $dir/$DEFAULT_OSDIR fi done + MAKEFILE3=test/Makefile AC_SUBST(SUBDIRS) AC_SUBST(MODULES) -AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3) +AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h)
cvs commit: apache-2.0/src/lib/apr configure.in aclocal.m4 acconfig.h
rbb 99/11/10 05:40:52
Modified:src/lib/apr configure.in aclocal.m4 acconfig.h
Log:
Fix a problem with the configure script. AC_CHECK_SIZEOF is only meant to
be used for built-in types. ssize_t is not a built-in type on all systems,
so SIZEOF_SSIZE_T was consistently getting defined to 0 on all of my
systems. This fixes that problem by re-writing AC_TRY_RUN (the default
AC_TRY_RUN has issues that don't allow for getting the return code from the
program) and using it to get the size of SSIZE_T.
Revision ChangesPath
1.24 +13 -1 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- configure.in 1999/11/09 09:01:10 1.23
+++ configure.in 1999/11/10 13:40:51 1.24
@@ -56,7 +56,19 @@
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(long double, 12)
AC_CHECK_SIZEOF(long long, 8)
-AC_CHECK_SIZEOF(ssize_t, 4)
+
+MY_TRY_RUN([
+#include sys/types.h
+#include stdlib.h
+#include stdio.h
+
+int main() {
+return(sizeof(ssize_t));
+}
+],
+AC_DEFINE(SIZEOF_SSIZE_T, 4),
+AC_DEFINE_UNQUOTED(SIZEOF_SSIZE_T, $?),
+AC_DEFINE(SIZEOF_SSIZE_T, 4))
# Use /bin/sh if it exists, otherwise go looking for sh in the path
if test .$SH = . -a -f /bin/sh; then
1.4 +42 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aclocal.m41999/10/21 16:41:07 1.3
+++ aclocal.m41999/11/10 13:40:52 1.4
@@ -95,4 +95,46 @@
fi
])dnl
+dnl ### AC_TRY_RUN had some problems actually using a programs return code,
+dnl ### so I am re-working it here to be used in APR's configure script.
+dnl MY_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE
+dnl[, ACTION-IF-CROSS-COMPILING]]])
+AC_DEFUN(MY_TRY_RUN,
+[if test $cross_compiling = yes; then
+ ifelse([$4], ,
+[errprint(__file__:__line__: warning: [AC_TRY_RUN] called without
default to allow cross compiling
+)dnl
+ AC_MSG_ERROR(can not run test program while cross compiling)],
+ [$4])
+else
+ MY_TRY_RUN_NATIVE([$1], [$2], [$3])
+fi
+])
+
+dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
+dnl MY_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
+AC_DEFUN(MY_TRY_RUN_NATIVE,
+[cat conftest.$ac_ext EOF
+[#]line __oline__ configure
+#include confdefs.h
+ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern C void exit(int);
+#endif
+])dnl
+[$1]
+EOF
+if AC_TRY_EVAL(ac_link) test -s conftest${ac_exeext} (./conftest;
exit) 2/dev/null
+then
+dnl Don't remove the temporary files here, so they can be examined.
+ ifelse([$2], , :, [$2])
+else
+ifelse([$3], , , [ $3
+ rm -fr conftest*
+])dnl
+ echo configure: failed program was: AC_FD_CC
+ cat conftest.$ac_ext AC_FD_CC
+fi
+rm -fr conftest*])
+
+
1.11 +1 -0 apache-2.0/src/lib/apr/acconfig.h
Index: acconfig.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- acconfig.h1999/10/20 15:09:54 1.10
+++ acconfig.h1999/11/10 13:40:52 1.11
@@ -42,6 +42,7 @@
#undef NEED_RLIM_T
#undef USEBCOPY
+#undef SIZEOF_SSIZE_T
#undef APR_HAS_THREADS
@BOTTOM@
cvs commit: apache-2.0/src/lib/apr configure.in
bjh 99/10/11 07:15:28 Modified:src/lib/apr configure.in Log: OS/2: Compile with multi-threaded switch so we get things like thread safe errno etc. Revision ChangesPath 1.18 +1 -1 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure.in 1999/10/10 17:25:29 1.17 +++ configure.in 1999/10/11 14:15:27 1.18 @@ -87,7 +87,7 @@ case $OS in *-os2*) - CFLAGS=$CFLAGS -DOS2 + CFLAGS=$CFLAGS -DOS2 -Zmt OSDIR=os2 LIBPREFIX= ;;
cvs commit: apache-2.0/src/lib/apr configure.in
rse 99/10/01 02:36:31 Modified:src/lib/apr configure.in Log: - remove bogus subshell usage and avoid test -z - remove FreeBSD hack: first SYS_SW is not set anywhere (same actually also for AIX) and second, -D__STR__ is useless on FreeBSD and -pthread should not be used always (think about Pth or other libs except FreeBSD uthread) Revision ChangesPath 1.12 +2 -6 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure.in 1999/09/12 12:12:00 1.11 +++ configure.in 1999/10/01 09:36:30 1.12 @@ -50,7 +50,7 @@ AC_C_INLINE # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z $SH -a -f /bin/sh); then +if test .$SH = . -a -f /bin/sh; then SH=/bin/sh fi AC_CHECK_PROG(SH, sh, sh) @@ -97,7 +97,7 @@ AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(ufc,crypt) -if (test $SYS_SW = AIX); then +if test .$SYS_SW = .AIX; then CFLAGS=$CFLAGS -U__STR__ case $SYS_KV in [12]*) @@ -110,10 +110,6 @@ AC_DEFINE(NEED_RLIM_T) ;; esac -fi - -if (test $SYS_SW = FreeBSD); then -CFLAGS=$CFLAGS -pthread -U__STR__ fi dnl Checks for header files.
cvs commit: apache-2.0/src/lib/apr configure.in
jim 99/09/11 04:49:32 Modified:src/lib/apr configure.in Log: -x isn't present on 7th edition shells, so move down to -f Revision ChangesPath 1.10 +1 -1 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.in 1999/09/10 16:52:42 1.9 +++ configure.in 1999/09/11 11:49:31 1.10 @@ -50,7 +50,7 @@ AC_C_INLINE # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z $SH -a -x /bin/sh); then +if (test -z $SH -a -f /bin/sh); then SH=/bin/sh fi AC_CHECK_PROG(SH, sh, sh)
cvs commit: apache-2.0/src/lib/apr configure.in
bjh 99/08/30 07:44:47 Modified:src/lib/apr configure.in Log: APR configure.in tweaks to allow test programs to build on OS/2. Revision ChangesPath 1.5 +4 -0 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure.in 1999/08/28 08:05:43 1.4 +++ configure.in 1999/08/30 14:44:46 1.5 @@ -79,7 +79,9 @@ case $OS in *-os2*) + CFLAGS=$CFLAGS -DOS2 OSDIR=os2 + LIBPREFIX= ;; *beos*) OSDIR=beos @@ -91,6 +93,8 @@ AC_CHECK_LIB(dl, dlopen) AC_CHECK_LIB(pthread, pthread_mutex_init) +AC_CHECK_LIB(socket,socket) +AC_CHECK_LIB(ufc,crypt) if (test $SYS_SW = AIX); then CFLAGS=$CFLAGS -U__STR__
