* Maintain the same meaning of DESTDIR and INSTALL_PREFIX as in main

  Makefile
* Document ppp support to the best of my knowledge.
* Err clearly if the VERSION was not found.
* Add some basic/broken detection of ppp in autoconf.

Merged revisions 2987 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2990 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 45 insertions, 2 deletions

diff --git a/configure b/configure
index 94a677c..b625069 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 2107 .
+# From configure.ac Revision: 2216 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -686,6 +686,7 @@ PBX_LIBNEWT
 USB_LIB
 USB_INCLUDE
 PBX_LIBUSB
+PPPD_VERSION
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1270,6 +1271,7 @@ Optional Packages:
   --with-ncurses=PATH     use ncurses files in PATH
   --with-newt=PATH        use newt files in PATH
   --with-usb=PATH         use libusb files in PATH
+  --with-ppp=PATH         Use ppp support from PATH
 
 Some influential environment variables:
   CC          C compiler command
@@ -5325,6 +5327,46 @@ fi
 
 
 
+
+# Check whether --with-ppp was given.
+if test "${with_ppp+set}" = set; then
+  withval=$with_ppp;
+else
+  with_ppp=check
+
+fi
+
+set -x
+# somebody will fix that
+default_ppp_path=/usr
+
+case "$with_ppp" in
+	yes|check) ppp_path="$default_ppp_path";;
+	no) ppp_path='' ;;
+	*) ppp_path="$with_ppp" ;;
+esac
+
+level_file="$ppp_path/include/pppd/patchlevel.h"
+PPP_VERSION=
+if test "$ppp_path" != '' && test -r "$level_file"; then
+	PPPD_VERSION=`awk -F '"' '/VERSION/ { print $$2; }' $level_file`
+fi
+
+case "$with_ppp" in
+	check|no) :;;
+	*)
+	# If we asked explicitly for ppp support
+	if test "$PPPD_VERSION" = ''; then
+		# but have not detected it
+		{ { echo "$as_me:$LINENO: error: failed to find pppd/patchlevel.h: no ppp support." >&5
+echo "$as_me: error: failed to find pppd/patchlevel.h: no ppp support." >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	;;
+esac
+set +x
+
+
 ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
 
 cat >confcache <<\_ACEOF
@@ -6026,11 +6068,12 @@ PBX_LIBNEWT!$PBX_LIBNEWT$ac_delim
 USB_LIB!$USB_LIB$ac_delim
 USB_INCLUDE!$USB_INCLUDE$ac_delim
 PBX_LIBUSB!$PBX_LIBUSB$ac_delim
+PPPD_VERSION!$PPPD_VERSION$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5