X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=configure;h=d8546799da2e7c8f18928dd398e062721dcbd831;hp=ecd1b0d8ebf3a5fc40f80229e51b648d939545cf;hb=750475927f15964be39a8bdda8ea2f57c764f846;hpb=b2c36e6c0e1655aea9b1b0a03a8160f42a26c884

diff --git a/configure b/configure
index ecd1b0d..d854679 100755
--- a/configure
+++ b/configure
@@ -4,26 +4,30 @@
 # Where to install stuff by default
 DESTDIR=/usr/local
 SYSCONF=/etc
+LIBDIR='${PREFIX}'/lib
+INCDIR='${PREFIX}'/include
 
-#  if [ -d /NextApps ]; then
-#    system="NeXTStep"
-#  else
-  system=`uname -s`
-  release=`uname -r`
-  arch=`uname -m`
-#  fi
+VERSION=$(awk -F '"' '/VERSION/ { print $2; }' pppd/patchlevel.h)
+
+# Compile defaults
+CROSS_COMPILE=
+CC=cc
+CFLAGS=
+
+system=`uname -s`
+release=`uname -r`
+arch=`uname -m`
 state="unknown"
 
 case $system in
   Linux)
     makext="linux";
     ksrc="linux";
-    state="known";;
+    state="known";
+    CFLAGS="-O2 -g -pipe";;
   SunOS)
     karch=`/usr/bin/isainfo -k`
     case $release in
-#      [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 "$karch" in
 		amd64)		archvariant='-64x';;
@@ -72,57 +76,6 @@ case $system in
     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
@@ -131,22 +84,6 @@ 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,"
-    echo "but you may be able to port it.  Good luck!"
-    exit;;
-  early)
-    echo "This is an old release of a supported OS ($system)."
-    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 is supported by"
-    echo "this software.  It may or may not work.";;
   unknown)
     echo "This software has not been ported to $system.  Sorry.";;
   notincluded)
@@ -166,7 +103,7 @@ while [ $# -gt 0 ]; do
 	    val=`expr "x$arg" : 'x[^=]*=\(.*\)'`
 	    arg=`expr "x$arg" : 'x\([^=]*\)=.*'`
 	    ;;
-	--prefix|--sysconf)
+	--prefix|--sysconf|--libdir|--includedir)
 	    if [ $# -eq 0 ]; then
 		echo "error: the $arg argument requires a value" 1>&2
 		exit 1
@@ -176,8 +113,13 @@ while [ $# -gt 0 ]; do
 	    ;;
     esac
     case $arg in
-	--prefix)	DESTDIR=$val ;;
-	--sysconfdir)	SYSCONF=$val ;;
+	--prefix)	 DESTDIR=$val ;;
+	--sysconfdir)	 SYSCONF=$val ;;
+	--libdir)        LIBDIR=$val ; HAVE_LIBDIR_PARAM=1 ;;
+	--includedir)    INCDIR=$val ; HAVE_INCDIR_PARAM=1 ;;
+	--cross_compile) CROSS_COMPILE=$val ;;
+	--cc)            CC=$val ;;
+	--cflags)        CFLAGS=$val ;;
     esac
 done
 
@@ -185,7 +127,14 @@ mkmkf() {
     rm -f $2
     if [ -f $1 ]; then
 	echo "  $2 <= $1"
-	sed -e "s,@DESTDIR@,$DESTDIR,g" -e "s,@SYSCONF@,$SYSCONF,g" $1 >$2
+	sed -e "s,@DESTDIR@,$DESTDIR,g" \
+	    -e "s,@SYSCONF@,$SYSCONF,g" \
+	    -e "s,@LIBDIR@,$LIBDIR,g" \
+	    -e "s,@INCDIR@,$INCDIR,g" \
+	    -e "s,@CROSS_COMPILE@,$CROSS_COMPILE,g" \
+	    -e "s,@CC@,$CC,g" \
+	    -e "s|@CFLAGS@|$CFLAGS|g" \
+	    -e "s,@VERSION@,$VERSION,g" $1 >$2
     fi
 }
 
@@ -201,6 +150,16 @@ if [ -d "$ksrc" ]; then
     if [ -f $ksrc/Makefile.$makext$archvariant ]; then
 	mkmkf $ksrc/Makefile.$makext$archvariant $ksrc/Makefile
     fi
+    if [ -f "$ksrc/pppd.pc.in" ] ; then
+	echo "Creating pkg-config file"
+	if [ ${HAVE_LIBDIR_PARAM:-0} -ne 1 ] ; then
+	    LIBDIR='${prefix}'/lib
+	fi
+	if [ ${HAVE_INCDIR_PARAM:-0} -ne 1 ] ; then
+	    INCDIR='${prefix}'/include
+	fi
+	mkmkf $ksrc/pppd.pc.in pppd/pppd.pc
+    fi
 else
   echo "Unable to locate kernel source $ksrc"
   exit 1