martin 99/12/17 05:52:03
Modified: src/helpers GuessOS
Log:
Fix GuessOS to correctly return "TPF" instead of "OS390" when
compiling apache for TPF.
Submitted by: Joe Moenich, Ovies Brabson <[EMAIL PROTECTED]>
Revision Changes Path
1.66 +14 -7 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- GuessOS 1999/12/09 17:19:40 1.65
+++ GuessOS 1999/12/17 13:52:00 1.66
@@ -12,6 +12,20 @@
# Be as similar to the output of config.guess/config.sub
# as possible.
+# Handle TPF before handling other OSes. This
+# is being done because TPF is sometimes compiled
+# on OS/390. When that is the case, if we don't
+# handle TPF ahead of the other OSes, TPF will
+# fall into the OS/390 case and this script would
+# return an incorrect value for the platform.
+#
+# Apache is not compiled on the TPF platform
+# therefore an environment variable is used
+if [ "x$TPF" = "xYES" ]; then
+ echo "TPF"
+ exit 0
+fi
+
# First get uname entries that we use below
MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
@@ -295,13 +309,6 @@
if [ -d /usr/apollo ]; then
echo "whatever-apollo-whatever"
exit 0
-fi
-
-# Apache is not compiled on the TPF platform
-# therefore an environment variable is used
-if [ "x$TPF" = "xYES" ]; then
- echo "TPF"
- exit 0
fi
# Now NeXT
