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/07/15 18:14:36 UTC
cvs commit: apache-2.0/src/lib/apr hints.m4
rbb 00/07/15 09:14:31
Modified: src/lib/apr hints.m4
Log:
Clean up the detection of various versions of AIX. This has one glaring
annoyance; xlC must be detected early on, and passed a certain flag to
quit on needed error conditions.
Submitted by: Victor J. Orlikowski <v....@gte.net>
Reviewed by: Ryan Bloom
Revision Changes Path
1.13 +44 -23 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hints.m4 2000/06/26 13:23:27 1.12
+++ hints.m4 2000/07/15 16:14:31 1.13
@@ -77,30 +77,51 @@
APR_SETIFNULL(LIBS, [-lposix -lbsd])
APR_SETIFNULL(LDFLAGS, [-s])
;;
- i386-ibm-aix*)
- APR_SETIFNULL(CFLAGS, [-DAIX=1 -U__STR__ -DUSEBCOPY])
- ;;
- *-ibm-aix[1-2].*)
- APR_SETIFNULL(CFLAGS, [-DAIX=1 -DNEED_RLIM_T -U__STR__])
- ;;
- *-ibm-aix3.*)
- APR_SETIFNULL(CFLAGS, [-DAIX=30 -DNEED_RLIM_T -U__STR__])
- ;;
- *-ibm-aix4.1)
- APR_SETIFNULL(CFLAGS, [-DAIX=41 -DNEED_RLIM_T -U__STR__])
- ;;
- *-ibm-aix4.2)
- APR_SETIFNULL(CFLAGS, [-DAIX=42 -U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
- ;;
- *-ibm-aix4.3)
- APR_SETIFNULL(CFLAGS, [-DAIX=43 -U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
- ;;
*-ibm-aix*)
- APR_SETIFNULL(CFLAGS, [-DAIX=1 -U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
- ;;
+ case $PLAT in
+ i386-ibm-aix*)
+ APR_SETIFNULL(CFLAGS, [-U__STR__ -DUSEBCOPY])
+ ;;
+ *-ibm-aix[1-2].*)
+ APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ ;;
+ *-ibm-aix3.*)
+ APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ ;;
+ *-ibm-aix4.1)
+ APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ ;;
+ *-ibm-aix4.1.*)
+ APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ ;;
+ *-ibm-aix4.2)
+ APR_SETIFNULL(CFLAGS, [-U__STR__])
+ APR_SETIFNULL(LDFLAGS, [-lm])
+ ;;
+ *-ibm-aix4.2.*)
+ APR_SETIFNULL(CFLAGS, [-U__STR__])
+ APR_SETIFNULL(LDFLAGS, [-lm])
+ ;;
+ *-ibm-aix4.3)
+ APR_SETIFNULL(CFLAGS, [-D_USE_IRS -U__STR__])
+ APR_SETIFNULL(LDFLAGS, [-lm])
+ ;;
+ *-ibm-aix4.3.*)
+ APR_SETIFNULL(CFLAGS, [-D_USE_IRS -U__STR__])
+ APR_SETIFNULL(LDFLAGS, [-lm])
+ ;;
+ *-ibm-aix*)
+ APR_SETIFNULL(CFLAGS, [-U__STR__])
+ APR_SETIFNULL(LDFLAGS, [-lm])
+ ;;
+ esac
+ dnl Must do a check for gcc or egcs here, to get the right options
+ dnl to the compiler.
+ AC_PROG_CC
+ if test "$GCC" != "yes"; then
+ APR_ADDTO(CFLAGS, [-qHALT=E])
+ fi
+ ;;
*-apollo-*)
APR_SETIFNULL(CFLAGS, [-DAPOLLO])
;;