fielding 01/07/09 19:18:55
Modified: . configure.in
Log:
Use the autoconf variable "host" consistently for OS checks instead of
creating a copy called "OS" or using "host_alias".
Submitted by: Roy Fielding, Mo DeJong
Revision Changes Path
1.335 +13 -14 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- configure.in 2001/07/09 23:30:17 1.334
+++ configure.in 2001/07/10 02:18:52 1.335
@@ -31,8 +31,7 @@
AC_CANONICAL_SYSTEM
echo "Configuring APR library"
-OS=$host
-echo "Platform: $OS"
+echo "Platform: $host"
dnl # Some initial steps for configuration. We setup the default directory
dnl # and which files are to be configured.
@@ -92,7 +91,7 @@
dnl
echo "performing libtool configuration..."
-case "$host_alias" in
+case $host in
*os2*)
# Use a custom-made libtool replacement
echo "using aplibtool"
@@ -161,7 +160,7 @@
dnl # this is the place to put specific options for platform/compiler
dnl # combinations
-case "$OS:$CC" in
+case "$host:$CC" in
*-hp-hpux*:cc )
APR_ADDTO(CFLAGS,[-Ae +DAportable +Z])
;;
@@ -175,7 +174,7 @@
;;
esac
LOCAL_MM_LIB="../shmem/unix/mm/libmm.la"
-case "$OS" in
+case $host in
i386-ibm-aix* | *-ibm-aix[1-2].* | *-ibm-aix3.* | *-ibm-aix4.1 |
*-ibm-aix4.1.* | *-ibm-aix4.2 | *-ibm-aix4.2.*)
OSDIR="aix"
config_subdirs="shmem/unix/mm"
@@ -224,7 +223,7 @@
dnl For some platforms we need a version string which allows easy numeric
dnl comparisons.
-case "$OS" in
+case $host in
*freebsd*)
# 3.4-RELEASE: 340 4.1.1-RELEASE: 411
os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/' |
sed -e 's/\(.\)\.\(.\)\-.*/\1\20/'`
@@ -327,7 +326,7 @@
AC_CHECK_FUNCS(sigwait, [ have_sigwait="1" ], [ have_sigwait="0" ])
dnl AC_CHECK_FUNCS doesn't work for this on Tru64 since the function
dnl is renamed in signal.h. Todo: Autodetect
-case "$OS" in
+case $host in
*alpha*-dec-osf* )
have_sigwait="1"
;;
@@ -460,7 +459,7 @@
sendfile="0"
fi ], [
orig_sendfile=$sendfile
- case "$OS" in
+ case $host in
*freebsd*)
if test $os_version -le "410"; then
if test "$threads" = "1"; then
@@ -776,7 +775,7 @@
# for APR types which vary between platforms, but we don't always get
# it right. If you find that we don't get it right for your platform,
# you can override our decision below.
-case "$OS" in
+case $host in
*linux*)
off_t_fmt='#define APR_OFF_T_FMT "ld"'
;;
@@ -858,7 +857,7 @@
tempdso="no")
fi
if test "$tempdso" = "no"; then
- case $OS in
+ case $host in
*os390|*-os2*)
tempdso="yes"
;;
@@ -1031,7 +1030,7 @@
lockcreatenp="1"
fi
-case "$OS" in
+case $host in
*-os2*)
# The above tests detect a working flock on OS/2
# but we don't want to use it when we have native locks
@@ -1080,7 +1079,7 @@
else
AC_MSG_RESULT(not found);
- case "$OS" in
+ case $host in
# we have built in support for OS/2
*-os2*)
rand="1"
@@ -1148,7 +1147,7 @@
apr_tcp_nopush_flag="TCP_CORK"
have_corkable_tcp="1"
else
- case $OS in
+ case $host in
*linux*)
AC_EGREP_CPP(yes,[
#include <linux/socket.h>
@@ -1256,7 +1255,7 @@
dnl
dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
dnl
-case "$host_alias" in
+case $host in
*bsdi*)
# Check whether they've installed GNU make
if make --version > /dev/null 2>&1; then
