jim 98/08/03 12:59:58
Modified: src CHANGES Configure
Log:
PR: 2736
Submitted by: Alain St-Denis <[EMAIL PROTECTED]> [Idea]
Reviewed by: Jim Jagielski
IRIXN32 rule was being ignored... Noted in the above PR although the suggested
Fix was more than what was required.
Revision Changes Path
1.1000 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.999
retrieving revision 1.1000
diff -u -r1.999 -r1.1000
--- CHANGES 1998/08/03 09:36:03 1.999
+++ CHANGES 1998/08/03 19:59:55 1.1000
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) The IRIXN32 Rule was being ignored. Configure now correctly adds
+ -n32 only if IRIXN32 says to. [Jim Jagielski, Alain St-Denis
+ <[EMAIL PROTECTED]>] PR#2736
+
*) Clean up a warning in mod_proxy. [Ralf S. Engelschall]
*) Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2
1.283 +34 -12 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- Configure 1998/08/03 09:14:44 1.282
+++ Configure 1998/08/03 19:59:56 1.283
@@ -888,6 +888,24 @@
fi
LDFLAGS_SHLIB_EXPORT=""
;;
+ *-sgi-irix64)
+ case $CC in
+ */gcc|gcc )
+ CFLAGS_SHLIB="-fpic"
+ N32FLAG=""
+ ;;
+ */cc|cc )
+ CFLAGS_SHLIB="-KPIC"
+ N32FLAG="-n32"
+ ;;
+ esac
+ if [ "$RULE_IRIXN32" = "yes" ]; then
+ LDFLAGS_SHLIB="$N32FLAG -shared"
+ else
+ LDFLAGS_SHLIB="-shared"
+ fi
+ LDFLAGS_SHLIB_EXPORT=""
+ ;;
*-sgi-irix)
case $CC in
*/gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
@@ -1095,20 +1113,24 @@
esac
;;
*IRIX-64*)
- case "$CC" in
- */cc|cc )
- CFLAGS="$CFLAGS -n32"
- LDFLAGS="$LDFLAGS -n32"
- ;;
- esac
+ if [ "$RULE_IRIXN32" = "yes" ]; then
+ case "$CC" in
+ */cc|cc )
+ CFLAGS="$CFLAGS -n32"
+ LDFLAGS="$LDFLAGS -n32"
+ ;;
+ esac
+ fi
;;
*IRIX-32*)
- case "$CC" in
- */cc|cc )
- CFLAGS="$CFLAGS -n32"
- LDFLAGS="$LDFLAGS -n32"
- ;;
- esac
+ if [ "$RULE_IRIXN32" = "yes" ]; then
+ case "$CC" in
+ */cc|cc )
+ CFLAGS="$CFLAGS -n32"
+ LDFLAGS="$LDFLAGS -n32"
+ ;;
+ esac
+ fi
;;
IBM?AIX?4.[123])
case $CC in
