From b308f69dd658b51c5535251b7296d5680d421e52 Mon Sep 17 00:00:00 2001

From: Jeffrey C. Ollie <jeff@ocjtech.us>

Date: Tue, 25 Mar 2008 00:51:35 -0500

Subject: [PATCH] Update autoconf.

---

 configure                        |  983 +++++++++++++++++++++++++++++++-------

 include/asterisk/autoconfig.h.in |   20 +-

 2 files changed, 820 insertions(+), 183 deletions(-)

diff --git a/configure b/configure

index 4199e72..011c661 100755

--- a/configure

+++ b/configure

@@ -1,5 +1,5 @@

 #! /bin/sh

-# From configure.ac Revision: 109282 .

+# From configure.ac Revision.

 # Guess values for system-dependent variables and create Makefiles.

 # Generated by GNU Autoconf 2.61 for asterisk 1.6.

 #

@@ -728,14 +728,18 @@ BKTR_LIB

 BKTR_INCLUDE

 BKTR_DIR

 PBX_BKTR

-CAP_LIB

-CAP_INCLUDE

-CAP_DIR

-PBX_CAP

+BLUETOOTH_LIB

+BLUETOOTH_INCLUDE

+BLUETOOTH_DIR

+PBX_BLUETOOTH

 CURL_LIB

 CURL_INCLUDE

 CURL_DIR

 PBX_CURL

+CAP_LIB

+CAP_INCLUDE

+CAP_DIR

+PBX_CAP

 CURSES_LIB

 CURSES_INCLUDE

 CURSES_DIR

@@ -788,6 +792,10 @@ LDAP_LIB

 LDAP_INCLUDE

 LDAP_DIR

 PBX_LDAP

+LIBEDIT_LIB

+LIBEDIT_INCLUDE

+LIBEDIT_DIR

+PBX_LIBEDIT

 LTDL_LIB

 LTDL_INCLUDE

 LTDL_DIR

@@ -872,6 +880,10 @@ SDL_IMAGE_LIB

 SDL_IMAGE_INCLUDE

 SDL_IMAGE_DIR

 PBX_SDL_IMAGE

+SPANDSP_LIB

+SPANDSP_INCLUDE

+SPANDSP_DIR

+PBX_SPANDSP

 SPEEX_LIB

 SPEEX_INCLUDE

 SPEEX_DIR

@@ -963,6 +975,7 @@ OPENH323_INCDIR

 OPENH323_LIBDIR

 OPENH323_SUFFIX

 OPENH323_BUILD

+PKGCONFIG

 CONFIG_GMIME

 PBX_ZAPTEL_VLDTMF

 PBX_ZAPTEL_ECHOCANPARAMS

@@ -974,7 +987,7 @@ PBX_H323

 PBX_IXJUSER

 CONFIG_SDL

 CONFIG_GTK

-PKGCONFIG

+LIBEDIT_OBJ

 CURL_CONFIG

 LTLIBOBJS'

 ac_subst_files=''

@@ -1574,8 +1587,9 @@ Optional Packages:

   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]

   --with-asound=PATH      use Advanced Linux Sound Architecture files in PATH

   --with-execinfo=PATH    use Stack Backtrace support files in PATH

-  --with-cap=PATH         use POSIX 1.e capabilities files in PATH

+  --with-bluetooth=PATH   use Bluetooth Support files in PATH

   --with-curl=PATH        use cURL files in PATH

+  --with-cap=PATH         use POSIX 1.e capabilities files in PATH

   --with-curses=PATH      use curses files in PATH

   --with-crypto=PATH      use OpenSSL Cryptography support files in PATH

   --with-avcodec=PATH     use Ffmpeg and avcodec library files in PATH

@@ -1590,6 +1604,7 @@ Optional Packages:

   --with-isdnnet=PATH     use ISDN4Linux Library files in PATH

   --with-jack=PATH        use Jack Audio Connection Kit files in PATH

   --with-ldap=PATH        use OpenLDAP files in PATH

+  --with-libedit=PATH     use NetBSD Editline library files in PATH

   --with-ltdl=PATH        use libtool files in PATH

   --with-lua=PATH         use Lua files in PATH

   --with-misdn=PATH       use mISDN User Library files in PATH

@@ -1611,6 +1626,7 @@ Optional Packages:

   --with-radius=PATH      use Radius Client files in PATH

   --with-sdl=PATH         use Sdl files in PATH

   --with-SDL_image=PATH   use Sdl Image library files in PATH

+  --with-spandsp=PATH     use spandsp Library files in PATH

   --with-speex=PATH       use Speex files in PATH

   --with-speexdsp=PATH    use Speexdsp files in PATH

   --with-sqlite=PATH      use SQLite files in PATH

@@ -7940,6 +7956,62 @@ fi

+    BLUETOOTH_DESCRIP="Bluetooth Support"

+    BLUETOOTH_OPTION="bluetooth"

+

+# Check whether --with-bluetooth was given.

+if test "${with_bluetooth+set}" = set; then

+  withval=$with_bluetooth;

+	case ${withval} in

+	n|no)

+	USE_BLUETOOTH=no

+	;;

+	y|ye|yes)

+	ac_mandatory_list="${ac_mandatory_list} BLUETOOTH"

+	;;

+	*)

+	BLUETOOTH_DIR="${withval}"

+	ac_mandatory_list="${ac_mandatory_list} BLUETOOTH"

+	;;

+	esac

+

+fi

+

+    PBX_BLUETOOTH=0

+

+

+

+

+

+

+    CURL_DESCRIP="cURL"

+    CURL_OPTION="curl"

+

+# Check whether --with-curl was given.

+if test "${with_curl+set}" = set; then

+  withval=$with_curl;

+	case ${withval} in

+	n|no)

+	USE_CURL=no

+	;;

+	y|ye|yes)

+	ac_mandatory_list="${ac_mandatory_list} CURL"

+	;;

+	*)

+	CURL_DIR="${withval}"

+	ac_mandatory_list="${ac_mandatory_list} CURL"

+	;;

+	esac

+

+fi

+

+    PBX_CURL=0

+

+

+

+

+

+

     CAP_DESCRIP="POSIX 1.e capabilities"

     CAP_OPTION="cap"

@@ -8360,6 +8432,34 @@ fi

+    LIBEDIT_DESCRIP="NetBSD Editline library"

+    LIBEDIT_OPTION="libedit"

+

+# Check whether --with-libedit was given.

+if test "${with_libedit+set}" = set; then

+  withval=$with_libedit;

+	case ${withval} in

+	n|no)

+	USE_LIBEDIT=no

+	;;

+	y|ye|yes)

+	ac_mandatory_list="${ac_mandatory_list} LIBEDIT"

+	;;

+	*)

+	LIBEDIT_DIR="${withval}"

+	ac_mandatory_list="${ac_mandatory_list} LIBEDIT"

+	;;

+	esac

+

+fi

+

+    PBX_LIBEDIT=0

+

+

+

+

+

+

     LTDL_DESCRIP="libtool"

     LTDL_OPTION="ltdl"

@@ -8948,6 +9048,34 @@ fi

+    SPANDSP_DESCRIP="spandsp Library"

+    SPANDSP_OPTION="spandsp"

+

+# Check whether --with-spandsp was given.

+if test "${with_spandsp+set}" = set; then

+  withval=$with_spandsp;

+	case ${withval} in

+	n|no)

+	USE_SPANDSP=no

+	;;

+	y|ye|yes)

+	ac_mandatory_list="${ac_mandatory_list} SPANDSP"

+	;;

+	*)

+	SPANDSP_DIR="${withval}"

+	ac_mandatory_list="${ac_mandatory_list} SPANDSP"

+	;;

+	esac

+

+fi

+

+    PBX_SPANDSP=0

+

+

+

+

+

+

     SPEEX_DESCRIP="Speex"

     SPEEX_OPTION="speex"

@@ -12769,13 +12897,11 @@ _ACEOF

 cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

-#include <sys/types.h> /* for off_t */

-     #include <stdio.h>

+#include <stdio.h>

 int

 main ()

 {

-int (*fp) (FILE *, off_t, int) = fseeko;

-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);

+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);

   ;

   return 0;

 }

@@ -12815,13 +12941,11 @@ cat confdefs.h >>conftest.$ac_ext

 cat >>conftest.$ac_ext <<_ACEOF

 /* end confdefs.h.  */

 #define _LARGEFILE_SOURCE 1

-#include <sys/types.h> /* for off_t */

-     #include <stdio.h>

+#include <stdio.h>

 int

 main ()

 {

-int (*fp) (FILE *, off_t, int) = fseeko;

-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);

+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);

   ;

   return 0;

 }

@@ -18120,6 +18244,268 @@ fi

+if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then

+   pbxlibdir=""

+   # if --with-BLUETOOTH=DIR has been specified, use it.

+   if test "x${BLUETOOTH_DIR}" != "x"; then

+      if test -d ${BLUETOOTH_DIR}/lib; then

+      	 pbxlibdir="-L${BLUETOOTH_DIR}/lib"

+      else

+      	 pbxlibdir="-L${BLUETOOTH_DIR}"

+      fi

+   fi

+   pbxfuncname="ba2str"

+   if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers

+      AST_BLUETOOTH_FOUND=yes

+   else

+      as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh`

+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5

+echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; }

+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lbluetooth ${pbxlibdir}  $LIBS"

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char ${pbxfuncname} ();

+int

+main ()

+{

+return ${pbxfuncname} ();

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (ac_try="$ac_link"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_link") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

+  eval "$as_ac_Lib=yes"

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	eval "$as_ac_Lib=no"

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

+      conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+ac_res=`eval echo '${'$as_ac_Lib'}'`

+	       { echo "$as_me:$LINENO: result: $ac_res" >&5

+echo "${ECHO_T}$ac_res" >&6; }

+if test `eval echo '${'$as_ac_Lib'}'` = yes; then

+  AST_BLUETOOTH_FOUND=yes

+else

+  AST_BLUETOOTH_FOUND=no

+fi

+

+   fi

+

+   # now check for the header.

+   if test "${AST_BLUETOOTH_FOUND}" = "yes"; then

+      BLUETOOTH_LIB="${pbxlibdir} -lbluetooth "

+      # if --with-BLUETOOTH=DIR has been specified, use it.

+      if test "x${BLUETOOTH_DIR}" != "x"; then

+	 BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include"

+      fi

+      BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} "

+      if test "xbluetooth/bluetooth.h" = "x" ; then	# no header, assume found

+         BLUETOOTH_HEADER_FOUND="1"

+      else				# check for the header

+         saved_cppflags="${CPPFLAGS}"

+         CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE} "

+	 if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then

+  { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5

+echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; }

+if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5

+echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; }

+else

+  # Is the header compilable?

+{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5

+echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; }

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+$ac_includes_default

+#include <bluetooth/bluetooth.h>

+_ACEOF

+rm -f conftest.$ac_objext

+if { (ac_try="$ac_compile"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_compile") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

+  ac_header_compiler=yes

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+	ac_header_compiler=no

+fi

+

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

+echo "${ECHO_T}$ac_header_compiler" >&6; }

+

+# Is the header present?

+{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5

+echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; }

+cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+#include <bluetooth/bluetooth.h>

+_ACEOF

+if { (ac_try="$ac_cpp conftest.$ac_ext"

+case "(($ac_try" in

+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

+  *) ac_try_echo=$ac_try;;

+esac

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

+  ac_status=$?

+  grep -v '^ *+' conftest.er1 >conftest.err

+  rm -f conftest.er1

+  cat conftest.err >&5

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } >/dev/null && {

+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       }; then

+  ac_header_preproc=yes

+else

+  echo "$as_me: failed program was:" >&5

+sed 's/^/| /' conftest.$ac_ext >&5

+

+  ac_header_preproc=no

+fi

+

+rm -f conftest.err conftest.$ac_ext

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

+echo "${ECHO_T}$ac_header_preproc" >&6; }

+

+# So?  What about this header?

+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

+  yes:no: )

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;}

+    ac_header_preproc=yes

+    ;;

+  no:yes:* )

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;}

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h:     check for missing prerequisite headers?" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h:     check for missing prerequisite headers?" >&2;}

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;}

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h:     section \"Present But Cannot Be Compiled\"" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h:     section \"Present But Cannot Be Compiled\"" >&2;}

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;}

+    { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5

+echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;}

+    ( cat <<\_ASBOX

+## ------------------------------- ##

+## Report this to www.asterisk.org ##

+## ------------------------------- ##

+_ASBOX

+     ) | sed "s/^/$as_me: WARNING:     /" >&2

+    ;;

+esac

+{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5

+echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; }

+if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5

+echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; }

+

+fi

+if test $ac_cv_header_bluetooth_bluetooth_h = yes; then

+  BLUETOOTH_HEADER_FOUND=1

+else

+  BLUETOOTH_HEADER_FOUND=0

+fi

+

+

+         CPPFLAGS="${saved_cppflags}"

+      fi

+      if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then

+         BLUETOOTH_LIB=""

+         BLUETOOTH_INCLUDE=""

+      else

+         if test "x${pbxfuncname}" = "x" ; then		# only checking headers -> no library

+	    BLUETOOTH_LIB=""

+	 fi

+         PBX_BLUETOOTH=1

+         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED

+

+cat >>confdefs.h <<_ACEOF

+#define HAVE_BLUETOOTH 1

+_ACEOF

+

+

+cat >>confdefs.h <<_ACEOF

+#define HAVE_BLUETOOTH_VERSION

+_ACEOF

+

+      fi

+   fi

+fi

+

+

+

 if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then

    pbxlibdir=""

    # if --with-CURSES=DIR has been specified, use it.

@@ -40874,31 +41260,137 @@ _ACEOF

 fi

-LUA_INCLUDE="-I/usr/include/lua5.1"

-LUA_LIB="-llua5.1"

+PBX_LUA=0

+if test -n "$ac_tool_prefix"; then

+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  if test -n "$PKGCONFIG"; then

+  ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.

+else

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  for ac_exec_ext in '' $ac_executable_extensions; do

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+    ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config"

+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+fi

+fi

+PKGCONFIG=$ac_cv_prog_PKGCONFIG

+if test -n "$PKGCONFIG"; then

+  { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5

+echo "${ECHO_T}$PKGCONFIG" >&6; }

+else

+  { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

+fi

+

+

+fi

+if test -z "$ac_cv_prog_PKGCONFIG"; then

+  ac_ct_PKGCONFIG=$PKGCONFIG

+  # Extract the first word of "pkg-config", so it can be a program name with args.

+set dummy pkg-config; ac_word=$2

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

+if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  if test -n "$ac_ct_PKGCONFIG"; then

+  ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test.

+else

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  for ac_exec_ext in '' $ac_executable_extensions; do

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+    ac_cv_prog_ac_ct_PKGCONFIG="pkg-config"

+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

+    break 2

+  fi

+done

+done

+IFS=$as_save_IFS

+

+fi

+fi

+ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG

+if test -n "$ac_ct_PKGCONFIG"; then

+  { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5

+echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; }

+else

+  { echo "$as_me:$LINENO: result: no" >&5

+echo "${ECHO_T}no" >&6; }

+fi

+

+  if test "x$ac_ct_PKGCONFIG" = x; then

+    PKGCONFIG="No"

+  else

+    case $cross_compiling:$ac_tool_warned in

+yes:)

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

+whose name does not start with the host triplet.  If you think this

+configuration is useful to you, please write to autoconf@gnu.org." >&5

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

+whose name does not start with the host triplet.  If you think this

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

+ac_tool_warned=yes ;;

+esac

+    PKGCONFIG=$ac_ct_PKGCONFIG

+  fi

+else

+  PKGCONFIG="$ac_cv_prog_PKGCONFIG"

+fi

+

+if test ! "x${PKGCONFIG}" = xNo; then

+   LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null)

+   LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null)

+   PBX_LUA=1

+

+cat >>confdefs.h <<\_ACEOF

+#define HAVE_LUA 1

+_ACEOF

+

+fi

+

-if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then

+if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then

    pbxlibdir=""

-   # if --with-LUA=DIR has been specified, use it.

-   if test "x${LUA_DIR}" != "x"; then

-      if test -d ${LUA_DIR}/lib; then

-      	 pbxlibdir="-L${LUA_DIR}/lib"

+   # if --with-RADIUS=DIR has been specified, use it.

+   if test "x${RADIUS_DIR}" != "x"; then

+      if test -d ${RADIUS_DIR}/lib; then

+      	 pbxlibdir="-L${RADIUS_DIR}/lib"

       else

-      	 pbxlibdir="-L${LUA_DIR}"

+      	 pbxlibdir="-L${RADIUS_DIR}"

       fi

    fi

-   pbxfuncname="luaL_newstate"

+   pbxfuncname="rc_read_config"

    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers

-      AST_LUA_FOUND=yes

+      AST_RADIUS_FOUND=yes

    else

-      as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5

-echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; }

+      as_ac_Lib=`echo "ac_cv_lib_radiusclient-ng_${pbxfuncname}" | $as_tr_sh`

+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lradiusclient-ng" >&5

+echo $ECHO_N "checking for ${pbxfuncname} in -lradiusclient-ng... $ECHO_C" >&6; }

 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then

   echo $ECHO_N "(cached) $ECHO_C" >&6

 else

   ac_check_lib_save_LIBS=$LIBS

-LIBS="-llua5.1 ${pbxlibdir}  $LIBS"

+LIBS="-lradiusclient-ng ${pbxlibdir}  $LIBS"

 cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

 _ACEOF

@@ -40955,38 +41447,38 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`

 	       { echo "$as_me:$LINENO: result: $ac_res" >&5

 echo "${ECHO_T}$ac_res" >&6; }

 if test `eval echo '${'$as_ac_Lib'}'` = yes; then

-  AST_LUA_FOUND=yes

+  AST_RADIUS_FOUND=yes

 else

-  AST_LUA_FOUND=no

+  AST_RADIUS_FOUND=no

 fi

    fi

    # now check for the header.

-   if test "${AST_LUA_FOUND}" = "yes"; then

-      LUA_LIB="${pbxlibdir} -llua5.1 "

-      # if --with-LUA=DIR has been specified, use it.

-      if test "x${LUA_DIR}" != "x"; then

-	 LUA_INCLUDE="-I${LUA_DIR}/include"

-      fi

-      LUA_INCLUDE="${LUA_INCLUDE} "

-      if test "xlua5.1/lua.h" = "x" ; then	# no header, assume found