gregames 02/02/15 14:36:40
Modified: build apr_hints.m4
. configure.in
Log:
provide APR_CC_HINTS. This allows us to specify a default compiler
which the user can override externally (i.e., the compiler choice isn't
forced). Then AC_PROG_CC can verify that the compiler works, and
logic in APR_PRELOAD can make decisions based on the compiler choice.
This is most useful when AC_PROG_CC picks a compiler which exists
but which isn't appropriate for APR's needs. On os390, AC_PROG_CC chose c89
which doesn't support long long by default. This caused problems with
apr_int64_t in apr.h
Revision Changes Path
1.34 +16 -2 apr/build/apr_hints.m4
Index: apr_hints.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_hints.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- apr_hints.m4 23 Jan 2002 06:10:30 -0000 1.33
+++ apr_hints.m4 15 Feb 2002 22:36:40 -0000 1.34
@@ -365,7 +365,6 @@
APR_SETIFNULL(apr_process_lock_is_global, [yes])
APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
- APR_SETIFNULL(CC, [cc])
APR_ADDTO(CPPFLAGS, [-U_NO_PROTO
-DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO
-DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
;;
*-ibm-as400)
@@ -373,7 +372,6 @@
APR_SETIFNULL(apr_process_lock_is_global, [yes])
APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
- APR_SETIFNULL(CC, [icc])
;;
*cygwin*)
APR_ADDTO(CPPFLAGS, [-DCYGWIN])
@@ -382,4 +380,20 @@
esac
fi
+])
+
+dnl
+dnl APR_CC_HINTS
+dnl
+dnl Allows us to provide a default choice of compiler which
+dnl the user can override.
+AC_DEFUN(APR_CC_HINTS, [
+case "$host" in
+ *-ibm-os390)
+ APR_SETIFNULL(CC, [cc])
+ ;;
+ *-ibm-as400)
+ APR_SETIFNULL(CC, [icc])
+ ;;
+esac
])
1.408 +5 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- configure.in 15 Feb 2002 08:43:46 -0000 1.407
+++ configure.in 15 Feb 2002 22:36:40 -0000 1.408
@@ -36,6 +36,11 @@
dnl # Some initial steps for configuration. We setup the default directory
dnl # and which files are to be configured.
+dnl Set optional CC hints here in case autoconf make an inappropriate choice.
+dnl This allows us to suggest what the compiler should be, but still
+dnl allows the user to override CC externally.
+APR_CC_HINTS
+
dnl Do the various CC checks *before* preloading values. The preload code
dnl may need to use compiler characteristics to make decisions. This macro
dnl can only be used once within a configure script, so this prevents a
