httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Victor J. Orlikowski" <...@duke.edu>
Subject [PATCH] AIX gcc and xlC workaround, and AIX handling cleanup
Date Tue, 27 Jun 2000 16:46:19 GMT
xlC requires a setting to halt at a certain level of error. gcc does not appreciate said setting.
Bill needs this setting at the core server level, not just APR. Therefore, we patch and clean
up hints.m4

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 16:42:15
@@ -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.
+        if test -z "`$CC -v 2>&1 | grep gcc`" ||
+           test -z "`$CC -v 2>&1 | grep egcs`"; then
+          APR_ADDTO(CFLAGS, [-qHALT=E])
+        fi
+        ;;
     *-apollo-*)
  APR_SETIFNULL(CFLAGS, [-DAPOLLO])
  ;;



Mime
View raw message