X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=configure;h=511f55b00b89419ba5b87b24bfe243db11a5655b;hp=3b2bb809a62c63f58e034282b6a470e7034a6ec2;hb=baf120b604ced444e816f4b362ccca4b123b0fcf;hpb=21cdaec64fc3385795f4318fdf2358f503ec26ba

diff --git a/configure b/configure
index 3b2bb80..511f55b 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,13 @@
 #!/bin/sh
-# $Id: configure,v 1.12 1996/10/08 04:36:56 paulus Exp $
+# $Id: configure,v 1.23 1999/11/15 01:56:26 paulus Exp $
 
 if [ -d /NextApps ]; then
   system="NeXTStep"
 else
   system=`uname -s`
   release=`uname -r`
+  machine=`uname -p`
+  arch=`uname -m`
 fi
 state="unknown"
 
@@ -14,16 +16,22 @@ case $system in
     makext="bsd";
     case $release in
       0.*)	state="ancient";;
-      1.0*)	state="known"; ksrc="netbsd-1.0";;
+      1.0*)	state="ancient";;
       1.1*)	state="known"; ksrc="netbsd-1.1";;
-      1.[2-9]*|[2-9]*)
-		state="late"; ksrc="netbsd-1.1";;
+      1.2*)	state="known"; ksrc="netbsd-1.2"; makext="netbsd-1.2";;
+      1.[3-9]*|[2-9]*)
+		state="late"; ksrc="netbsd-1.2";;
     esac;;
   SunOS)
     case $release in
       [0-3]*)	state="ancient";;
       4*)	state="known"; ksrc="sunos4"; makext="sunos4";;
-      5*)	state="known"; ksrc="svr4"; makext="sol2";;
+      5.[1-6]*)	state="known"; ksrc="svr4"; makext="sol2";;
+      5.[789]*)	state="known"; ksrc="svr4"; makext="sol2";
+              case $arch in
+		sun4u)	lp64='y';;
+		*)	;;
+	      esac;;
     esac;;
   ULTRIX)
     makext="ultrix";
@@ -35,9 +43,10 @@ case $system in
   OSF1)
     makext="osf";
     case $release in
-      V1.*)   state="ancient"; ksrc="osf1";;
-      V[23].*)	state="known"; ksrc="osf1";;
-      V[4-9]*) state="late"; ksrc="osf1";;
+      V1.*)   state="neolithic"; ksrc="osf1";;
+      V[23].*)	state="neolithic"; ksrc="osf1";;
+      V4.*)	state="known"; ksrc="osf1";;
+      V[5-9]*) state="late"; ksrc="osf1";;
     esac;;
   Linux)
     makext="linux";
@@ -48,7 +57,9 @@ case $system in
     case $release in
       1.*)	state="known"; ksrc="freebsd-old";;
       2.[01]*)	state="known"; ksrc="freebsd-2.0";;
-      2.[2-9]*)	state="late"; ksrc="freebsd-2.0";;
+      2.2.[2-7]*) state="late"; ksrc="freebsd-2.0";;
+      2.2.8*)   state="known"; ksrc="freebsd-2.2.8";;
+      3.[0-1]*)	state="known"; ksrc="freebsd-3.0";;
     esac;;
   NeXTStep)
     makext="NeXT";
@@ -75,6 +86,10 @@ if [ -d "$ksrc" ]; then :; else
 fi
 
 case $state in
+  neolithic) 
+    echo "This is a newer release on an outdated OS ($system)."
+    echo " This software may or may not work on this OS."
+    echo " You may want to download an older version of PPP for this OS.";;
   ancient)
     echo "This is an old release of a supported OS ($system)."
     echo "This software cannot be used as-is on this system,"
@@ -85,8 +100,8 @@ case $state in
     echo "This software should install and run on this system,"
     echo "but it hasn't been tested.";;
   late)
-    echo "This is a newer release of $system than was available when"
-    echo "this software was released.  It may or may not work.";;
+    echo "This is a newer release of $system than is supported by"
+    echo "this software.  It may or may not work.";;
   unknown)
     echo "This software has not been ported to this system.  Sorry.";;
   notincluded)
@@ -94,19 +109,31 @@ case $state in
     echo "in this distribution.  Sorry.";;
 esac
 
+orig_makext=$makext
+
 if [ -d "$ksrc" ]; then
   echo "Creating links to Makefiles."
   rm -f Makefile
   ln -s $ksrc/Makefile.top Makefile
   echo "  Makefile -> $ksrc/Makefile.top"
-  if [ $ksrc = svr4 ]; then
+  if [ "$ksrc" = svr4 ]; then
+    # Point to 64-bit Makefile extension
+    if [ "$lp64" = y ]; then 
+      makext=$makext-64 
+    fi
     rm -f $ksrc/Makefile
     ln -s Makefile.$makext $ksrc/Makefile
     echo "  $ksrc/Makefile -> Makefile.$makext"
+    # Restore extension
+    if [ "$lp64" = y ]; then 
+      makext=$orig_makext 
+    fi
   fi
-  for dir in pppd pppstats chat; do
+  for dir in pppd pppstats chat pppdump; do
     rm -f $dir/Makefile
-    ln -s Makefile.$makext $dir/Makefile
-    echo "  $dir/Makefile -> Makefile.$makext"
+    if [ -f $dir/Makefile.$makext ]; then
+      ln -s Makefile.$makext $dir/Makefile
+      echo "  $dir/Makefile -> Makefile.$makext"
+    fi
   done
 fi