X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=configure;h=04dd908bd2e6f47cfcce82f5db32b82b1369f844;hp=038ed60232bfb22ae4f6202663fdace04edf58c8;hb=d4777d66024a8c343ad420f1d45ed2cbaa7468bc;hpb=caa450d9a8f60236f954dd2763273896ea4867a9

diff --git a/configure b/configure
index 038ed60..04dd908 100755
--- a/configure
+++ b/configure
@@ -1,73 +1,105 @@
 #!/bin/sh
-# $Id: configure,v 1.15 1999/04/01 11:48:30 paulus Exp $
+# $Id: configure,v 1.30 2002/11/02 19:48:12 carlsonj Exp $
 
-if [ -d /NextApps ]; then
-  system="NeXTStep"
-else
+#  if [ -d /NextApps ]; then
+#    system="NeXTStep"
+#  else
   system=`uname -s`
   release=`uname -r`
-fi
+  machine=`uname -p`
+  arch=`uname -m`
+#  fi
 state="unknown"
 
 case $system in
-  NetBSD)
-    makext="bsd";
-    case $release in
-      0.*)	state="ancient";;
-      1.0*)	state="ancient";;
-      1.1*)	state="known"; 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";;
-    esac;;
-  ULTRIX)
-    makext="ultrix";
-    case $release in
-      [0-3]*)	state="ancient";;
-      4.[01]*)	state="early"; ksrc="ultrix";;
-      4.[234])	state="known"; ksrc="ultrix";;
-    esac;;
-  OSF1)
-    makext="osf";
-    case $release in
-      V1.*)   state="ancient"; ksrc="osf1";;
-      V[23].*)	state="known"; ksrc="osf1";;
-      V[4-9]*) state="late"; ksrc="osf1";;
-    esac;;
   Linux)
     makext="linux";
     ksrc="linux";
     state="known";;
-  FreeBSD)
-    makext="bsd";
-    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";;
-    esac;;
-  NeXTStep)
-    makext="NeXT";
-    ksrc="NeXT";
-    state="known";;
-  SINIX-?)
-    case $release in
-      5.4[01]) state=known; ksrc=svr4; makext=svr4;;
-      5.4[2-9]) state=late; ksrc=svr4; makext=svr4;;
-    esac;;
-  # Intel SVR4 systems come with a bug in the uname program.  Unless
-  # your provider fixed the bug, or you get a fix for it, uname -S will
-  # overwrite the system name with the node name!
-  UNIX_SV|UNIX_System_V|`uname -n`)
+  SunOS)
     case $release in
-      4.0) state=known; ksrc=svr4; makext=svr4;;
-      4.2) state=late; ksrc=svr4; makext=svr4;;
-    esac;;
+#      [0-3]*)	state="ancient";;
+#      4*)	state="known"; ksrc="sunos4"; makext="sunos4";;
+      5.[7-9]*|5.[1-9][0-9])	state="known"; ksrc="solaris"; makext="sol2";
+              case "`/usr/bin/isainfo -k`" in
+		sparcv9)	archvariant='-64';;
+		*)	;;
+	      esac;;
+      5.[1-6]*)	state="known"; ksrc="solaris"; makext="sol2";;
+    esac
+    if [ -x /opt/SUNWspro/bin/cc ] &&
+       /opt/SUNWspro/bin/cc -flags >/dev/null 2>&1; then
+      : # use Sun WorkShop compiler
+    elif gcc --version >/dev/null 2>&1; then
+      archvariant=gcc$archvariant
+      compiletype=.gcc
+      if [ "$archvariant" = "gcc-64" ]; then
+        ( cd /tmp; touch ppp$$.c
+	  gcc -c -m64 ppp$$.c >/dev/null 2>&1 || (
+	    echo "gcc is unable to make 64 bit modules, and your $arch system needs them."
+	    echo "consider upgrading gcc on this machine, or switching to Sun WorkShop."
+	    rm -f ppp$$.c
+	    exit 1
+	  ) || exit 1
+	  rm -f ppp$$.c ppp$$.o
+        ) || exit 1
+      fi
+    else
+      echo "C compiler not found; hoping for the best."
+    fi;;
+  NetBSD|FreeBSD|ULTRIX|OSF1|NeXTStep|SINIX-?|UNIX_SV|UNIX_System_V)
+    state="notincluded";;
+#    NetBSD)
+#      makext="bsd";
+#      case $release in
+#        0.*)	state="ancient";;
+#        1.0*)	state="ancient";;
+#        1.1*)	state="known"; 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;;
+#    ULTRIX)
+#      makext="ultrix";
+#      case $release in
+#        [0-3]*)	state="ancient";;
+#        4.[01]*)	state="early"; ksrc="ultrix";;
+#        4.[234])	state="known"; ksrc="ultrix";;
+#      esac;;
+#    OSF1)
+#      makext="osf";
+#      case $release in
+#        V1.*)   state="neolithic"; ksrc="osf1";;
+#        V[23].*)	state="neolithic"; ksrc="osf1";;
+#        V4.*)	state="known"; ksrc="osf1";;
+#        V[5-9]*) state="late"; ksrc="osf1";;
+#      esac;;
+#    FreeBSD)
+#      makext="bsd";
+#      case $release in
+#        1.*)	state="known"; ksrc="freebsd-old";;
+#        2.[01]*)	state="known"; 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";
+#      ksrc="NeXT";
+#      state="known";;
+#    SINIX-?)
+#      case $release in
+#        5.4[01]) state=known; ksrc=svr4; makext=svr4;;
+#        5.4[2-9]) state=late; ksrc=svr4; makext=svr4;;
+#      esac;;
+#    # Intel SVR4 systems come with a bug in the uname program.  Unless
+#    # your provider fixed the bug, or you get a fix for it, uname -S will
+#    # overwrite the system name with the node name!
+#    UNIX_SV|UNIX_System_V|`uname -n`)
+#      case $release in
+#        4.0) state=known; ksrc=svr4; makext=svr4;;
+#        4.2) state=late; ksrc=svr4; makext=svr4;;
+#      esac;;
 esac
 
 if [ -d "$ksrc" ]; then :; else
@@ -76,6 +108,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,"
@@ -89,10 +125,12 @@ case $state in
     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.";;
+    echo "This software has not been ported to $system.  Sorry.";;
   notincluded)
-    echo "Support for this system has not been included"
+    echo "Support for $system has not been included"
     echo "in this distribution.  Sorry.";;
+  known)
+    echo "Configuring for $system";;
 esac
 
 if [ -d "$ksrc" ]; then
@@ -100,16 +138,23 @@ if [ -d "$ksrc" ]; then
   rm -f Makefile
   ln -s $ksrc/Makefile.top Makefile
   echo "  Makefile -> $ksrc/Makefile.top"
-  if [ $ksrc = svr4 ]; then
-    rm -f $ksrc/Makefile
-    ln -s Makefile.$makext $ksrc/Makefile
-    echo "  $ksrc/Makefile -> Makefile.$makext"
-  fi
-  for dir in pppd pppstats chat pppdump; do
+  rm -f Makedefs.com
+  ln -s $ksrc/Makedefs$compiletype Makedefs.com
+  echo "  $ksrc/Makedefs$compiletype -> Makedefs.com"
+  for dir in pppd pppstats chat pppdump pppd/plugins pppd/plugins/rp-pppoe pppd/plugins/radius; do
     rm -f $dir/Makefile
     if [ -f $dir/Makefile.$makext ]; then
       ln -s Makefile.$makext $dir/Makefile
       echo "  $dir/Makefile -> Makefile.$makext"
     fi
   done
+  if [ "$archvariant" ]; then
+    makext=$makext$archvariant
+    rm -f $ksrc/Makefile
+    ln -s Makefile.$makext $ksrc/Makefile
+    echo "  $ksrc/Makefile -> Makefile.$makext"
+  fi
+else
+  echo "Unable to locate kernel source $ksrc"
+  exit 1
 fi