jim 97/07/21 10:51:31
Modified: src Configuration.tmpl Configure
Log:
Add the IRIXN32 RULE for Configure/Configuration.tmpl
Revision Changes Path
1.67 +6 -1 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.66
retrieving revision 1.67
diff -C3 -r1.66 -r1.67
*** Configuration.tmpl 1997/07/08 19:50:45 1.66
--- Configuration.tmpl 1997/07/21 17:51:29 1.67
***************
*** 57,63 ****
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
! # STATUS, and IRIXNIS.
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
--- 57,63 ----
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
! # STATUS, IRIXNIS and IRIXN32
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
***************
*** 80,89 ****
--- 80,94 ----
# SGI IRIX. If you are, and you are using NIS, you should set this
# to 'yes'
#
+ # IRIXN32:
+ # If you are running a version of IRIX and Configure detects
+ # n32 libraries, it will use those instead of the o32 ones.
+ #
Rule STATUS=yes
Rule SOCKS4=no
Rule IRIXNIS=no
+ Rule IRIXN32=yes
# The following rules should be set automatically by Configure. However, if
# they are not set by Configure (because we don't know the correct value for
1.117 +15 -6 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.116
retrieving revision 1.117
diff -C3 -r1.116 -r1.117
*** Configure 1997/07/21 12:27:16 1.116
--- Configure 1997/07/21 17:51:29 1.117
***************
*** 165,170 ****
--- 165,171 ----
RULE_STATUS=`./helpers/CutRule STATUS $file`
RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
+ RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file`
####################################################################
# Preset some "constants"; can be overridden on a per-platform basis below.
***************
*** 268,283 ****
fi
;;
*-sgi-irix32)
- CFLAGS="$CFLAGS -n32"
- LDFLAGS="$LDFLAGS -n32"
DEF_WANTHSREGEX=yes
DBM_LIB=""
! CFLAGS="$CFLAGS -DIRIX"
! if [ "$RULE_IRIXNIS" = "yes" ]; then
! OS='SGI IRIX-32 w/NIS'
else
! OS='SGI IRIX-32'
fi
;;
*-sgi-irix)
DEF_WANTHSREGEX=yes
--- 269,292 ----
fi
;;
*-sgi-irix32)
DEF_WANTHSREGEX=yes
DBM_LIB=""
! if [ "$RULE_IRIXN32" = "yes" ]; then
! CFLAGS="$CFLAGS -n32"
! LDFLAGS="$LDFLAGS -n32"
! if [ "$RULE_IRIXNIS" = "yes" ]; then
! OS='SGI IRIX-32 w/NIS'
! else
! OS='SGI IRIX-32'
! fi
else
! if [ "$RULE_IRIXNIS" = "yes" ]; then
! OS='SGI IRIX w/NIS'
! else
! OS='SGI IRIX'
! fi
fi
+ CFLAGS="$CFLAGS -DIRIX"
;;
*-sgi-irix)
DEF_WANTHSREGEX=yes
