Turn on largefileness always if available and

continue 64-bit fixes.

p4raw-id: //depot/cfgperl@4552

1 files changed, 26 insertions, 16 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index 5fd75471d8..d905be1d17 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -180,6 +180,32 @@ EOM
 esac
 EOCBU
 
+# Turn on largefileness, if available.
+	lfcflags="`getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
+	lfldflags="`getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
+	# _Somehow_ in AIX 4.3.1.0 the above getconf call manages to
+	# insert(?) *something* to $ldflags so that later (in Configure) evaluating
+	# $ldflags causes a newline after the '-b64' (the result of the getconf).
+	# (nothing strange shows up in $ldflags even in hexdump;
+	#  so it may be something in the shell, instead?)
+	# Try it out: just uncomment the below line and rerun Configure:
+# echo >&4 "AIX 4.3.1.0 $lfldflags mystery" ; exit 1
+	# Just don't ask me how AIX does it, I spent hours wondering.
+	# Therefore the line re-evaluating lfldflags: it seems to fix
+	# the whatever it was that AIX managed to break. --jhi
+	lfldflags="`echo $lfldflags`"
+	lflibs="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+case "$lfcflags$lfldflags$lflibs" in
+'');;
+*) ccflags="$ccflags $lfcflags"
+   ldflags="$ldflags $ldldflags"
+   libswanted="$libswanted $lflibs"
+   ;;
+esac
+	lfcflags=''
+	lfldflags=''
+	lflibs=''
+
 # This script UU/use64bits.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use 64 bits.
 cat > UU/use64bits.cbu <<'EOCBU'
@@ -198,22 +224,6 @@ EOM
 	    *-DUSE_LONG_LONG*) ;;
 	    *) ccflags="$ccflags -DUSE_LONG_LONG" ;;
 	    esac
-	    ccflags="$ccflags `getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
-
-	    ldflags="$ldflags `getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
-	    # _Somehow_ in AIX 4.3.1.0 the above getconf call manages to
-	    # insert(?) *something* to $ldflags so that later (in Configure) evaluating
-	    # $ldflags causes a newline after the '-b64' (the result of the getconf).
-	    # (nothing strange shows up in $ldflags even in hexdump;
-	    #  so it may be something in the shell, instead?)
-	    # Try it out: just uncomment the below line and rerun Configure:
-#	    echo >&4 "AIX 4.3.1.0 $ldflags mystery" ; exit 1
-	    # Just don't ask me how AIX does it.
-	    # Therefore the line re-evaluating ldflags: it seems to bypass
-	    # the whatever it was that AIX managed to break. --jhi
-	    ldflags="`echo $ldflags`"
-
-	    libswanted="$libswanted `getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`"
 	    # When a 64-bit cc becomes available $archname64
 	    # may need setting so that $archname gets it attached.
 	    ;;