[asterisk-commits] branch oej/cdr_radius r28435 - in
/team/oej/cdr_radius: ./ build_tools/ cdr/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu May 18 18:09:07 MST 2006
Author: russell
Date: Thu May 18 20:09:06 2006
New Revision: 28435
URL: http://svn.digium.com/view/asterisk?rev=28435&view=rev
Log:
fix up autoconf support for cdr_radius, which required some changes to
the AST_EXT_LIB macro
Modified:
team/oej/cdr_radius/acinclude.m4
team/oej/cdr_radius/build_tools/menuselect-deps.in
team/oej/cdr_radius/cdr/Makefile
team/oej/cdr_radius/cdr/cdr_radius.c
team/oej/cdr_radius/configure
team/oej/cdr_radius/configure.ac
team/oej/cdr_radius/include/autoconfig.h.in
team/oej/cdr_radius/makeopts.in
Modified: team/oej/cdr_radius/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/acinclude.m4?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- team/oej/cdr_radius/acinclude.m4 (original)
+++ team/oej/cdr_radius/acinclude.m4 Thu May 18 20:09:06 2006
@@ -5,35 +5,35 @@
AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $5 files in PATH]),[
case ${withval} in
n|no)
- USE_$1=no
+ USE_$4=no
;;
y|ye|yes)
- $1_MANDATORY="yes"
+ $4_MANDATORY="yes"
;;
*)
- $1_DIR="${withval}"
- $1_MANDATORY="yes"
+ $4_DIR="${withval}"
+ $4_MANDATORY="yes"
;;
esac
])
-PBX_LIB$1=0
+PBX_LIB$4=0
-if test "${USE_$1}" != "no"; then
+if test "${USE_$4}" != "no"; then
libdir=""
- if test "x${$1_DIR}" != "x"; then
- libdir="-L${$1_DIR}/lib"
+ if test "x${$4_DIR}" != "x"; then
+ libdir="-L${$4_DIR}/lib"
fi
- AC_CHECK_LIB([$1], [$2], [:], [], ${libdir} $6)
+ AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${libdir} $6)
- if test "${ac_cv_lib_$1_$2}" = "yes"; then
- $1_LIB="-l$1 $6"
+ if test "${AST_$4_FOUND}" = "yes"; then
+ $4_LIB="-l$1 $6"
$4_HEADER_FOUND="1"
- if test "x${$1_DIR}" != "x"; then
- $1_LIB="${libdir} ${$1_LIB}"
- $1_INCLUDE="-I${$1_DIR}/include"
+ if test "x${$4_DIR}" != "x"; then
+ $4_LIB="${libdir} ${$4_LIB}"
+ $4_INCLUDE="-I${$4_DIR}/include"
if test "x$3" != "x" ; then
- AC_CHECK_HEADER([${$1_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
+ AC_CHECK_HEADER([${$4_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] )
fi
else
if test "x$3" != "x" ; then
@@ -41,7 +41,7 @@
fi
fi
if test "x${$4_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${$1_MANDATORY}" ;
+ if test ! -z "${$4_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the $1 development package installed."
@@ -49,14 +49,14 @@
echo " *** without explicitly specifying --with-$1"
exit 1
fi
- $1_LIB=""
- $1_INCLUDE=""
- PBX_LIB$1=0
+ $4_LIB=""
+ $4_INCLUDE=""
+ PBX_LIB$4=0
else
- PBX_LIB$1=1
+ PBX_LIB$4=1
AC_DEFINE_UNQUOTED([HAVE_$4], 1, [Define to indicate the $5 library])
fi
- elif test ! -z "${$1_MANDATORY}";
+ elif test ! -z "${$4_MANDATORY}";
then
echo "***"
echo "*** The $5 installation on this system appears to be broken."
@@ -65,9 +65,9 @@
exit 1
fi
fi
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([PBX_LIB$1])
+AC_SUBST([$4_LIB])
+AC_SUBST([$4_INCLUDE])
+AC_SUBST([PBX_LIB$4])
])
Modified: team/oej/cdr_radius/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/build_tools/menuselect-deps.in?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- team/oej/cdr_radius/build_tools/menuselect-deps.in (original)
+++ team/oej/cdr_radius/build_tools/menuselect-deps.in Thu May 18 20:09:06 2006
@@ -1,26 +1,27 @@
-ASOUND=@PBX_LIBasound@
+ASOUND=@PBX_LIBALSA@
CURL=@PBX_CURL@
-FREETDS=@PBX_LIBtds@
+FREETDS=@PBX_LIBFREETDS@
GTK=@PBX_GTK@
H323=@PBX_H323@
KDE=@PBX_KDE@
-LIBNEWT=@PBX_LIBnewt@
-LIBOSPTK=@PBX_LIBosptk@
-LIBPOPT=@PBX_LIBpopt@
-LIBPRI=@PBX_LIBpri@
-LIBSPEEX=@PBX_LIBspeex@
-LIBVORBIS=@PBX_LIBvorbis@
-NBS=@PBX_LIBnbs@
-OGG=@PBX_LIBogg@
-OSSAUDIO=@PBX_LIBossaudio@
+LIBNEWT=@PBX_LIBNEWT@
+LIBOSPTK=@PBX_LIBOSPTK@
+LIBPOPT=@PBX_LIBPOPT@
+LIBPRI=@PBX_LIBLIBPRI@
+LIBSPEEX=@PBX_LIBSPEEX@
+LIBVORBIS=@PBX_LIBVORBIS@
+NBS=@PBX_LIBNBS@
+OGG=@PBX_LIBOGG@
+OSSAUDIO=@PBX_LIBOSS@
PGSQL=@PBX_LIBpq@
QT=@PBX_QT@
-SQLITE=@PBX_LIBsqlite@
-SSL=@PBX_LIBssl@
-UNIXODBC=@PBX_LIBodbc@
+RADIUSCLIENT=@PBX_LIBRADIUSCLIENT@
+SQLITE=@PBX_LIBSQLITE@
+SSL=@PBX_LIBOPENSSL@
+UNIXODBC=@PBX_LIBUNIXODBC@
VPBAPI=@PBX_LIBvpb@
WIN32=@OSISWIN32@
-ZLIB=@PBX_LIBz@
-ZAPTEL=@PBX_LIBtonezone@
+ZLIB=@PBX_LIBZLIB@
+ZAPTEL=@PBX_LIBZAPTEL@
LIBGSM=@PBX_LIBgsm@
IXJUSER=@PBX_IXJUSER@
Modified: team/oej/cdr_radius/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/cdr/Makefile?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- team/oej/cdr_radius/cdr/Makefile (original)
+++ team/oej/cdr_radius/cdr/Makefile Thu May 18 20:09:06 2006
@@ -36,12 +36,6 @@
endif
endif
-#THIS NEEDS TO BE MOVED TO AUTOCONF
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/radiusclient-ng.h $(CROSS_COMPILE_TARGET)/usr/local/include/radiusclient-ng.h),)
- MODS:=$(filter-out cdr_radius.so,$(MODS))
-endif
-
-
all: depend $(MODS)
install: all
@@ -79,11 +73,15 @@
cdr_sqlite.so: cdr_sqlite.o
$(CC) $(SOLINK) -o $@ $< $(SQLITE_LIB)
-cdr_radius.so: cdr_radius.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lradiusclient-ng $(MLFLAGS)
-
cdr_sqlite.o: cdr_sqlite.c
$(CC) -c -o $@ $(CFLAGS) $(SQLITE_INCLUDE) $<
+
+cdr_radius.so: cdr_radius.o
+ $(CC) $(SOLINK) -o $@ $< $(RADIUSCLIENT_LIB)
+
+cdr_radius.o: cdr_radius.c
+ $(CC) -c -o $@ $(CFLAGS) $(RADIUSCLIENT_INCLUDE) $<
+
ifneq ($(wildcard .depend),)
include .depend
Modified: team/oej/cdr_radius/cdr/cdr_radius.c
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/cdr/cdr_radius.c?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- team/oej/cdr_radius/cdr/cdr_radius.c (original)
+++ team/oej/cdr_radius/cdr/cdr_radius.c Thu May 18 20:09:06 2006
@@ -26,6 +26,10 @@
* \arg See also \ref AstCDR
* \ingroup cdr_drivers
*/
+
+/*** MODULEINFO
+ <depend>radiusclient</depend>
+ ***/
#include <stdlib.h>
#include <stdio.h>
Modified: team/oej/cdr_radius/configure
URL: http://svn.digium.com/view/asterisk/team/oej/cdr_radius/configure?rev=28435&r1=28434&r2=28435&view=diff
==============================================================================
--- team/oej/cdr_radius/configure (original)
+++ team/oej/cdr_radius/configure Thu May 18 20:09:06 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 26020 .
+# From configure.ac Revision: 26823 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -314,7 +314,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PBX_PLATFORM PBX_CPU PBX_VENDOR PBX_OS UNAME ac_pt_UNAME PBX_OSREV OSISWIN32 PBX_OSTYPE CC ac_ct_CC CXX ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR NM ac_ct_NM WINDRES ac_ct_WINDRES DLLWRAP ac_ct_DLLWRAP CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT CXXFLAGS CPP CXXCPP AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S GNU_MAKE GREP FIND COMPRESS BASENAME DIRNAME LN DOT AST_DEVMODE EGREP asound_LIB asound_INCLUDE PBX_LIBasound curses_LIB curses_INCLUDE PBX_LIBcurses nbs_LIB nbs_INCLUDE PBX_LIBnbs ncurses_LIB ncurses_INCLUDE PBX_LIBncurses newt_LIB newt_INCLUDE PBX_LIBnewt odbc_LIB odbc_INCLUDE PBX_LIBodbc ogg_LIB ogg_INCLUDE PBX_LIBogg osptk_LIB osptk_INCLUDE PBX_LIBosptk popt_LIB popt_INCLUDE PBX_LIBpopt pri_LIB pri_INCLUDE PBX_LIBpri speex_LIB speex_INCLUDE PBX_LIBspeex sqlite_LIB sqlite_INCLUDE PBX_LIBsqlite ssl_LIB ssl_INCLUDE PBX_LIBssl tds_LIB tds_INCLUDE PBX_LIBtds termcap_LIB termcap_INCLUDE PBX_LIBtermcap tinfo_LIB tinfo_INCLUDE PBX_LIBtinfo vorbis_LIB vorbis_INCLUDE PBX_LIBvorbis z_LIB z_INCLUDE PBX_LIBz EDITLINE_LIBS ossaudio_LIB ossaudio_INCLUDE PBX_LIBossaudio tonezone_LIB tonezone_INCLUDE PBX_LIBtonezone gsm_LIB gsm_INCLUDE PBX_LIBgsm PG_CONFIG ac_pt_PG_CONFIG pq_INCLUDE pq_LIB PBX_LIBpq PBX_H323 PBX_IXJUSER VPB_INCLUDE VPB_LIB PBX_LIBvpb QT_INCLUDE QT_LIB QTMOC ac_pt_QTMOC PBX_QT KDE_INCLUDE KDE_LIBS PBX_KDE KDEINIT ac_pt_KDEINIT KDEDIR GTKCONFIG ac_ct_GTKCONFIG PBX_GTK GTK_INCLUDE GTK_LIBS PWLIB_INCLUDE PWLIB_LIB PBX_LIBPWLIB CURL ac_pt_CURL PBX_CURL CURLLIBS ALLOCA LIBOBJS POW_LIB LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PBX_PLATFORM PBX_CPU PBX_VENDOR PBX_OS UNAME ac_pt_UNAME PBX_OSREV OSISWIN32 PBX_OSTYPE CC ac_ct_CC CXX ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR NM ac_ct_NM WINDRES ac_ct_WINDRES DLLWRAP ac_ct_DLLWRAP CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT CXXFLAGS CPP CXXCPP AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S GNU_MAKE GREP FIND COMPRESS BASENAME DIRNAME LN DOT AST_DEVMODE EGREP ALSA_LIB ALSA_INCLUDE PBX_LIBALSA CURSES_LIB CURSES_INCLUDE PBX_LIBCURSES NBS_LIB NBS_INCLUDE PBX_LIBNBS NCURSES_LIB NCURSES_INCLUDE PBX_LIBNCURSES NEWT_LIB NEWT_INCLUDE PBX_LIBNEWT UNIXODBC_LIB UNIXODBC_INCLUDE PBX_LIBUNIXODBC OGG_LIB OGG_INCLUDE PBX_LIBOGG OSPTK_LIB OSPTK_INCLUDE PBX_LIBOSPTK POPT_LIB POPT_INCLUDE PBX_LIBPOPT LIBPRI_LIB LIBPRI_INCLUDE PBX_LIBLIBPRI RADIUSCLIENT_LIB RADIUSCLIENT_INCLUDE PBX_LIBRADIUSCLIENT SPEEX_LIB SPEEX_INCLUDE PBX_LIBSPEEX SQLITE_LIB SQLITE_INCLUDE PBX_LIBSQLITE OPENSSL_LIB OPENSSL_INCLUDE PBX_LIBOPENSSL FREETDS_LIB FREETDS_INCLUDE PBX_LIBFREETDS TERMCAP_LIB TERMCAP_INCLUDE PBX_LIBTERMCAP TINFO_LIB TINFO_INCLUDE PBX_LIBTINFO VORBIS_LIB VORBIS_INCLUDE PBX_LIBVORBIS ZLIB_LIB ZLIB_INCLUDE PBX_LIBZLIB EDITLINE_LIBS OSS_LIB OSS_INCLUDE PBX_LIBOSS ZAPTEL_LIB ZAPTEL_INCLUDE PBX_LIBZAPTEL gsm_LIB gsm_INCLUDE PBX_LIBgsm PG_CONFIG ac_pt_PG_CONFIG pq_INCLUDE pq_LIB PBX_LIBpq PBX_H323 PBX_IXJUSER VPB_INCLUDE VPB_LIB PBX_LIBvpb QT_INCLUDE QT_LIB QTMOC ac_pt_QTMOC PBX_QT KDE_INCLUDE KDE_LIBS PBX_KDE KDEINIT ac_pt_KDEINIT KDEDIR GTKCONFIG ac_ct_GTKCONFIG PBX_GTK GTK_INCLUDE GTK_LIBS PWLIB_INCLUDE PWLIB_LIB PBX_LIBPWLIB CURL ac_pt_CURL PBX_CURL CURLLIBS ALLOCA LIBOBJS POW_LIB LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -878,6 +878,8 @@
--with-osptk=PATH use OSP Toolkit files in PATH
--with-popt=PATH use popt files in PATH
--with-pri=PATH use ISDN PRI files in PATH
+ --with-radiusclient-ng=PATH
+ use Radius Client files in PATH
--with-speex=PATH use Speex files in PATH
--with-sqlite=PATH use SQLite files in PATH
--with-ssl=PATH use OpenSSL files in PATH
@@ -4872,25 +4874,25 @@
case ${withval} in
n|no)
- USE_asound=no
+ USE_ALSA=no
;;
y|ye|yes)
- asound_MANDATORY="yes"
+ ALSA_MANDATORY="yes"
;;
*)
- asound_DIR="${withval}"
- asound_MANDATORY="yes"
+ ALSA_DIR="${withval}"
+ ALSA_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBasound=0
-
-if test "${USE_asound}" != "no"; then
+PBX_LIBALSA=0
+
+if test "${USE_ALSA}" != "no"; then
libdir=""
- if test "x${asound_DIR}" != "x"; then
- libdir="-L${asound_DIR}/lib"
+ if test "x${ALSA_DIR}" != "x"; then
+ libdir="-L${ALSA_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for snd_spcm_init in -lasound" >&5
echo $ECHO_N "checking for snd_spcm_init in -lasound... $ECHO_C" >&6
@@ -4956,21 +4958,23 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_spcm_init" >&5
echo "${ECHO_T}$ac_cv_lib_asound_snd_spcm_init" >&6
if test $ac_cv_lib_asound_snd_spcm_init = yes; then
- :
-fi
-
-
- if test "${ac_cv_lib_asound_snd_spcm_init}" = "yes"; then
- asound_LIB="-lasound -lm -ldl"
+ AST_ALSA_FOUND=yes
+else
+ AST_ALSA_FOUND=no
+fi
+
+
+ if test "${AST_ALSA_FOUND}" = "yes"; then
+ ALSA_LIB="-lasound -lm -ldl"
ALSA_HEADER_FOUND="1"
- if test "x${asound_DIR}" != "x"; then
- asound_LIB="${libdir} ${asound_LIB}"
- asound_INCLUDE="-I${asound_DIR}/include"
+ if test "x${ALSA_DIR}" != "x"; then
+ ALSA_LIB="${libdir} ${ALSA_LIB}"
+ ALSA_INCLUDE="-I${ALSA_DIR}/include"
if test "xalsa/asoundlib.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${asound_DIR}/include/alsa/asoundlib.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${ALSA_DIR}/include/alsa/asoundlib.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${asound_DIR}/include/alsa/asoundlib.h" >&5
-echo $ECHO_N "checking for ${asound_DIR}/include/alsa/asoundlib.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${ALSA_DIR}/include/alsa/asoundlib.h" >&5
+echo $ECHO_N "checking for ${ALSA_DIR}/include/alsa/asoundlib.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -4978,8 +4982,8 @@
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${asound_DIR}/include/alsa/asoundlib.h usability" >&5
-echo $ECHO_N "checking ${asound_DIR}/include/alsa/asoundlib.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ALSA_DIR}/include/alsa/asoundlib.h usability" >&5
+echo $ECHO_N "checking ${ALSA_DIR}/include/alsa/asoundlib.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4987,7 +4991,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${asound_DIR}/include/alsa/asoundlib.h>
+#include <${ALSA_DIR}/include/alsa/asoundlib.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5022,15 +5026,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
-echo "$as_me:$LINENO: checking ${asound_DIR}/include/alsa/asoundlib.h presence" >&5
-echo $ECHO_N "checking ${asound_DIR}/include/alsa/asoundlib.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ALSA_DIR}/include/alsa/asoundlib.h presence" >&5
+echo $ECHO_N "checking ${ALSA_DIR}/include/alsa/asoundlib.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 <${asound_DIR}/include/alsa/asoundlib.h>
+#include <${ALSA_DIR}/include/alsa/asoundlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5064,25 +5068,25 @@
# 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: ${asound_DIR}/include/alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${asound_DIR}/include/alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${ALSA_DIR}/include/alsa/asoundlib.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -5093,8 +5097,8 @@
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${asound_DIR}/include/alsa/asoundlib.h" >&5
-echo $ECHO_N "checking for ${asound_DIR}/include/alsa/asoundlib.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${ALSA_DIR}/include/alsa/asoundlib.h" >&5
+echo $ECHO_N "checking for ${ALSA_DIR}/include/alsa/asoundlib.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5260,7 +5264,7 @@
fi
fi
if test "x${ALSA_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${asound_MANDATORY}" ;
+ if test ! -z "${ALSA_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the asound development package installed."
@@ -5268,18 +5272,18 @@
echo " *** without explicitly specifying --with-asound"
exit 1
fi
- asound_LIB=""
- asound_INCLUDE=""
- PBX_LIBasound=0
+ ALSA_LIB=""
+ ALSA_INCLUDE=""
+ PBX_LIBALSA=0
else
- PBX_LIBasound=1
+ PBX_LIBALSA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ALSA 1
_ACEOF
fi
- elif test ! -z "${asound_MANDATORY}";
+ elif test ! -z "${ALSA_MANDATORY}";
then
echo "***"
echo "*** The Advanced Linux Sound Architecture installation on this system appears to be broken."
@@ -5300,25 +5304,25 @@
case ${withval} in
n|no)
- USE_curses=no
+ USE_CURSES=no
;;
y|ye|yes)
- curses_MANDATORY="yes"
+ CURSES_MANDATORY="yes"
;;
*)
- curses_DIR="${withval}"
- curses_MANDATORY="yes"
+ CURSES_DIR="${withval}"
+ CURSES_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBcurses=0
-
-if test "${USE_curses}" != "no"; then
+PBX_LIBCURSES=0
+
+if test "${USE_CURSES}" != "no"; then
libdir=""
- if test "x${curses_DIR}" != "x"; then
- libdir="-L${curses_DIR}/lib"
+ if test "x${CURSES_DIR}" != "x"; then
+ libdir="-L${CURSES_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
@@ -5384,21 +5388,23 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
if test $ac_cv_lib_curses_initscr = yes; then
- :
-fi
-
-
- if test "${ac_cv_lib_curses_initscr}" = "yes"; then
- curses_LIB="-lcurses "
+ AST_CURSES_FOUND=yes
+else
+ AST_CURSES_FOUND=no
+fi
+
+
+ if test "${AST_CURSES_FOUND}" = "yes"; then
+ CURSES_LIB="-lcurses "
CURSES_HEADER_FOUND="1"
- if test "x${curses_DIR}" != "x"; then
- curses_LIB="${libdir} ${curses_LIB}"
- curses_INCLUDE="-I${curses_DIR}/include"
+ if test "x${CURSES_DIR}" != "x"; then
+ CURSES_LIB="${libdir} ${CURSES_LIB}"
+ CURSES_INCLUDE="-I${CURSES_DIR}/include"
if test "xcurses.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${curses_DIR}/include/curses.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${CURSES_DIR}/include/curses.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${curses_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${curses_DIR}/include/curses.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${CURSES_DIR}/include/curses.h" >&5
+echo $ECHO_N "checking for ${CURSES_DIR}/include/curses.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -5406,8 +5412,8 @@
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${curses_DIR}/include/curses.h usability" >&5
-echo $ECHO_N "checking ${curses_DIR}/include/curses.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${CURSES_DIR}/include/curses.h usability" >&5
+echo $ECHO_N "checking ${CURSES_DIR}/include/curses.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5415,7 +5421,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${curses_DIR}/include/curses.h>
+#include <${CURSES_DIR}/include/curses.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5450,15 +5456,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
-echo "$as_me:$LINENO: checking ${curses_DIR}/include/curses.h presence" >&5
-echo $ECHO_N "checking ${curses_DIR}/include/curses.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${CURSES_DIR}/include/curses.h presence" >&5
+echo $ECHO_N "checking ${CURSES_DIR}/include/curses.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 <${curses_DIR}/include/curses.h>
+#include <${CURSES_DIR}/include/curses.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5492,25 +5498,25 @@
# 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: ${curses_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${curses_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${curses_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -5521,8 +5527,8 @@
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${curses_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${curses_DIR}/include/curses.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${CURSES_DIR}/include/curses.h" >&5
+echo $ECHO_N "checking for ${CURSES_DIR}/include/curses.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5688,7 +5694,7 @@
fi
fi
if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${curses_MANDATORY}" ;
+ if test ! -z "${CURSES_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the curses development package installed."
@@ -5696,18 +5702,18 @@
echo " *** without explicitly specifying --with-curses"
exit 1
fi
- curses_LIB=""
- curses_INCLUDE=""
- PBX_LIBcurses=0
+ CURSES_LIB=""
+ CURSES_INCLUDE=""
+ PBX_LIBCURSES=0
else
- PBX_LIBcurses=1
+ PBX_LIBCURSES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_CURSES 1
_ACEOF
fi
- elif test ! -z "${curses_MANDATORY}";
+ elif test ! -z "${CURSES_MANDATORY}";
then
echo "***"
echo "*** The curses installation on this system appears to be broken."
@@ -5728,25 +5734,25 @@
case ${withval} in
n|no)
- USE_nbs=no
+ USE_NBS=no
;;
y|ye|yes)
- nbs_MANDATORY="yes"
+ NBS_MANDATORY="yes"
;;
*)
- nbs_DIR="${withval}"
- nbs_MANDATORY="yes"
+ NBS_DIR="${withval}"
+ NBS_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBnbs=0
-
-if test "${USE_nbs}" != "no"; then
+PBX_LIBNBS=0
+
+if test "${USE_NBS}" != "no"; then
libdir=""
- if test "x${nbs_DIR}" != "x"; then
- libdir="-L${nbs_DIR}/lib"
+ if test "x${NBS_DIR}" != "x"; then
+ libdir="-L${NBS_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for nbs_connect in -lnbs" >&5
echo $ECHO_N "checking for nbs_connect in -lnbs... $ECHO_C" >&6
@@ -5812,21 +5818,23 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_nbs_nbs_connect" >&5
echo "${ECHO_T}$ac_cv_lib_nbs_nbs_connect" >&6
if test $ac_cv_lib_nbs_nbs_connect = yes; then
- :
-fi
-
-
- if test "${ac_cv_lib_nbs_nbs_connect}" = "yes"; then
- nbs_LIB="-lnbs "
+ AST_NBS_FOUND=yes
+else
+ AST_NBS_FOUND=no
+fi
+
+
+ if test "${AST_NBS_FOUND}" = "yes"; then
+ NBS_LIB="-lnbs "
NBS_HEADER_FOUND="1"
- if test "x${nbs_DIR}" != "x"; then
- nbs_LIB="${libdir} ${nbs_LIB}"
- nbs_INCLUDE="-I${nbs_DIR}/include"
+ if test "x${NBS_DIR}" != "x"; then
+ NBS_LIB="${libdir} ${NBS_LIB}"
+ NBS_INCLUDE="-I${NBS_DIR}/include"
if test "xnbs.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${nbs_DIR}/include/nbs.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${NBS_DIR}/include/nbs.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${nbs_DIR}/include/nbs.h" >&5
-echo $ECHO_N "checking for ${nbs_DIR}/include/nbs.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${NBS_DIR}/include/nbs.h" >&5
+echo $ECHO_N "checking for ${NBS_DIR}/include/nbs.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -5834,8 +5842,8 @@
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${nbs_DIR}/include/nbs.h usability" >&5
-echo $ECHO_N "checking ${nbs_DIR}/include/nbs.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${NBS_DIR}/include/nbs.h usability" >&5
+echo $ECHO_N "checking ${NBS_DIR}/include/nbs.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5843,7 +5851,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${nbs_DIR}/include/nbs.h>
+#include <${NBS_DIR}/include/nbs.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5878,15 +5886,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
-echo "$as_me:$LINENO: checking ${nbs_DIR}/include/nbs.h presence" >&5
-echo $ECHO_N "checking ${nbs_DIR}/include/nbs.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${NBS_DIR}/include/nbs.h presence" >&5
+echo $ECHO_N "checking ${NBS_DIR}/include/nbs.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 <${nbs_DIR}/include/nbs.h>
+#include <${NBS_DIR}/include/nbs.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5920,25 +5928,25 @@
# 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: ${nbs_DIR}/include/nbs.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${nbs_DIR}/include/nbs.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${nbs_DIR}/include/nbs.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NBS_DIR}/include/nbs.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${NBS_DIR}/include/nbs.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -5949,8 +5957,8 @@
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${nbs_DIR}/include/nbs.h" >&5
-echo $ECHO_N "checking for ${nbs_DIR}/include/nbs.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${NBS_DIR}/include/nbs.h" >&5
+echo $ECHO_N "checking for ${NBS_DIR}/include/nbs.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6116,7 +6124,7 @@
fi
fi
if test "x${NBS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${nbs_MANDATORY}" ;
+ if test ! -z "${NBS_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the nbs development package installed."
@@ -6124,18 +6132,18 @@
echo " *** without explicitly specifying --with-nbs"
exit 1
fi
- nbs_LIB=""
- nbs_INCLUDE=""
- PBX_LIBnbs=0
+ NBS_LIB=""
+ NBS_INCLUDE=""
+ PBX_LIBNBS=0
else
- PBX_LIBnbs=1
+ PBX_LIBNBS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NBS 1
_ACEOF
fi
- elif test ! -z "${nbs_MANDATORY}";
+ elif test ! -z "${NBS_MANDATORY}";
then
echo "***"
echo "*** The Network Broadcast Sound installation on this system appears to be broken."
@@ -6156,25 +6164,25 @@
case ${withval} in
n|no)
- USE_ncurses=no
+ USE_NCURSES=no
;;
y|ye|yes)
- ncurses_MANDATORY="yes"
+ NCURSES_MANDATORY="yes"
;;
*)
- ncurses_DIR="${withval}"
- ncurses_MANDATORY="yes"
+ NCURSES_DIR="${withval}"
+ NCURSES_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBncurses=0
-
-if test "${USE_ncurses}" != "no"; then
+PBX_LIBNCURSES=0
+
+if test "${USE_NCURSES}" != "no"; then
libdir=""
- if test "x${ncurses_DIR}" != "x"; then
- libdir="-L${ncurses_DIR}/lib"
+ if test "x${NCURSES_DIR}" != "x"; then
+ libdir="-L${NCURSES_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6
@@ -6240,21 +6248,23 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6
if test $ac_cv_lib_ncurses_initscr = yes; then
- :
-fi
-
-
- if test "${ac_cv_lib_ncurses_initscr}" = "yes"; then
- ncurses_LIB="-lncurses "
+ AST_NCURSES_FOUND=yes
+else
+ AST_NCURSES_FOUND=no
+fi
+
+
+ if test "${AST_NCURSES_FOUND}" = "yes"; then
+ NCURSES_LIB="-lncurses "
NCURSES_HEADER_FOUND="1"
- if test "x${ncurses_DIR}" != "x"; then
- ncurses_LIB="${libdir} ${ncurses_LIB}"
- ncurses_INCLUDE="-I${ncurses_DIR}/include"
+ if test "x${NCURSES_DIR}" != "x"; then
+ NCURSES_LIB="${libdir} ${NCURSES_LIB}"
+ NCURSES_INCLUDE="-I${NCURSES_DIR}/include"
if test "xcurses.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${ncurses_DIR}/include/curses.h" | $as_tr_sh`
[... 4293 lines stripped ...]
More information about the asterisk-commits
mailing list