You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Victor J. Orlikowski" <vj...@raleigh.ibm.com> on 2000/06/27 22:33:25 UTC
[PATCH] Fix to earlier xlc bit
O.K. So my previous patch needed $CC to be set. This does an AC_PROG_CC to set $CC for AIX really early, so decisions on CFLAGS can
be made.
This patch is open to change. It's a kludge, and if anyone can come up with a better idea, please step up.
Index: src/lib/apr/hints.m4
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/hints.m4,v
retrieving revision 1.12
diff -u -r1.12 hints.m4
--- hints.m4 2000/06/26 13:23:27 1.12
+++ hints.m4 2000/06/27 20:30:17
@@ -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
+ dnl if test "$GCC" != "yes"; then
+ dnl APR_ADDTO(CFLAGS, [-qHALT=E])
+ dnl fi
+ ;;
*-apollo-*)
APR_SETIFNULL(CFLAGS, [-DAPOLLO])
;;
[PATCH] Fix to earlier xlc bit #2
Posted by "Victor J. Orlikowski" <vj...@raleigh.ibm.com>.
[Repeated hollow banging sound as head is beaten against desk]
When making a change, do not leave part of it commented out.
All previous commentary about this patch still applies.
Index: src/lib/apr/hints.m4
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/hints.m4,v
retrieving revision 1.12
diff -u -r1.12 hints.m4
--- hints.m4 2000/06/26 13:23:27 1.12
+++ hints.m4 2000/06/27 21:01:12
@@ -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])
;;