diff --git a/CREDITS b/CREDITS
index 4a24a7af8d58a70721e602afe08c8e3d944a6899..a63285e90ee824f68b3d4a96aa779657502a271c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -92,8 +92,9 @@ Brian M. Clapper - poll.c emulation
Music provided by www.freeplaymusic.com
=== OTHER SOURCE CODE IN ASTERISK ===
-Asterisk uses libedit, the lightweight readline replacement from
-NetBSD. It is BSD-licensed and requires the following statement:
+Asterisk uses libedit, the lightweight readline replacement from NetBSD.
+The cdr_radius module uses libradiusclient-ng, which is also from NetBSD.
+They are BSD-licensed and require the following statement:
This product includes software developed by the NetBSD
Foundation, Inc. and its contributors.
diff --git a/acinclude.m4 b/acinclude.m4
index 7ab203300266abc61ff4beb6edebb3dd470506d5..3fa9528f09e7affcc3acebefeb66ce8a5cb3a3f5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,35 +5,35 @@ AC_DEFUN([AST_EXT_LIB],
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
pbxlibdir=""
- if test "x${$1_DIR}" != "x"; then
+ if test "x${$4_DIR}" != "x"; then
pbxlibdir="-L${$1_DIR}/lib"
fi
- AC_CHECK_LIB([$1], [$2], [:], [], ${pbxlibdir} $6)
+ AC_CHECK_LIB([$1], [$2], [AST_$4_FOUND=yes], [AST_$4_FOUND=no], ${pbxlibdir} $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="${pbxlibdir} ${$1_LIB}"
- $1_INCLUDE="-I${$1_DIR}/include"
+ if test "x${$4_DIR}" != "x"; then
+ $4_LIB="${pbxlibdir} ${$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 @@ if test "${USE_$1}" != "no"; then
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 @@ if test "${USE_$1}" != "no"; then
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 @@ if test "${USE_$1}" != "no"; then
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])
])
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index d2a6729b647190af291ef8492a92b039fb467233..6a64f493b8f3509e4b2cabdcc42ebfd959350648 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -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@
diff --git a/cdr/Makefile b/cdr/Makefile
index ccce4d4844c01b64768e67ec161e982383342fa1..d6ec161d2153223178fb0e78c41a0dcf5de6c7c9 100644
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -75,6 +75,13 @@ cdr_sqlite.so: cdr_sqlite.o
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
endif
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
new file mode 100644
index 0000000000000000000000000000000000000000..721edca2d013957ff87e88605887487a0946626b
--- /dev/null
+++ b/cdr/cdr_radius.c
@@ -0,0 +1,318 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief RADIUS CDR Support
+ * \author Philippe Sultan
+ *
+ * \arg See also \ref AstCDR
+ * \ingroup cdr_drivers
+ */
+
+/*** MODULEINFO
+ <depend>radiusclient</depend>
+ ***/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <radiusclient-ng.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
+
+#include "asterisk/channel.h"
+#include "asterisk/cdr.h"
+#include "asterisk/module.h"
+#include "asterisk/logger.h"
+#include "asterisk/utils.h"
+
+/*! ISO 8601 standard format */
+#define DATE_FORMAT "%Y-%m-%d %T %z"
+
+#define VENDOR_CODE 22736
+
+enum {
+ PW_AST_ACCT_CODE = 101,
+ PW_AST_SRC = 102,
+ PW_AST_DST = 103,
+ PW_AST_DST_CTX = 104,
+ PW_AST_CLID = 105,
+ PW_AST_CHAN = 106,
+ PW_AST_DST_CHAN = 107,
+ PW_AST_LAST_APP = 108,
+ PW_AST_LAST_DATA = 109,
+ PW_AST_START_TIME = 110,
+ PW_AST_ANSWER_TIME = 111,
+ PW_AST_END_TIME = 112,
+ PW_AST_DURATION = 113,
+ PW_AST_BILL_SEC = 114,
+ PW_AST_DISPOSITION = 115,
+ PW_AST_AMA_FLAGS = 116,
+ PW_AST_UNIQUE_ID = 117,
+ PW_AST_USER_FIELD = 118
+};
+
+enum {
+ /*! Log dates and times in UTC */
+ RADIUS_FLAG_USEGMTIME = (1 << 0),
+ /*! Log Unique ID */
+ RADIUS_FLAG_LOGUNIQUEID = (1 << 1),
+ /*! Log User Field */
+ RADIUS_FLAG_LOGUSERFIELD = (1 << 2)
+};
+
+static char *desc = "RADIUS CDR Backend";
+static char *name = "radius";
+static char *cdr_config = "cdr.conf";
+
+static char radiuscfg[AST_CONFIG_MAX_PATH] = "/etc/radiusclient-ng/radiusclient.conf";
+
+static struct ast_flags global_flags = { RADIUS_FLAG_USEGMTIME | RADIUS_FLAG_LOGUNIQUEID | RADIUS_FLAG_LOGUSERFIELD };
+
+static rc_handle *rh = NULL;
+
+static int build_radius_record(VALUE_PAIR **send, struct ast_cdr *cdr)
+{
+ int recordtype = PW_STATUS_STOP;
+ struct tm tm;
+ char timestr[128];
+ char *tmp;
+
+ if (!rc_avpair_add(rh, send, PW_ACCT_STATUS_TYPE, &recordtype, 0, 0)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Account code */
+ if (!rc_avpair_add(rh, send, PW_AST_ACCT_CODE, &cdr->accountcode, strlen(cdr->accountcode), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Source */
+ if (!rc_avpair_add(rh, send, PW_AST_SRC, &cdr->src, strlen(cdr->src), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Destination */
+ if (!rc_avpair_add(rh, send, PW_AST_DST, &cdr->dst, strlen(cdr->dst), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Destination context */
+ if (!rc_avpair_add(rh, send, PW_AST_DST_CTX, &cdr->dcontext, strlen(cdr->dcontext), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Caller ID */
+ if (!rc_avpair_add(rh, send, PW_AST_CLID, &cdr->clid, strlen(cdr->clid), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Channel */
+ if (!rc_avpair_add(rh, send, PW_AST_CHAN, &cdr->channel, strlen(cdr->channel), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Destination Channel */
+ if (!rc_avpair_add(rh, send, PW_AST_DST_CHAN, &cdr->dstchannel, strlen(cdr->dstchannel), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Last Application */
+ if (!rc_avpair_add(rh, send, PW_AST_LAST_APP, &cdr->lastapp, strlen(cdr->lastapp), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Last Data */
+ if (!rc_avpair_add(rh, send, PW_AST_LAST_DATA, &cdr->lastdata, strlen(cdr->lastdata), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+
+ /* Start Time */
+ if (ast_test_flag(&global_flags, RADIUS_FLAG_USEGMTIME))
+ gmtime_r(&(cdr->start.tv_sec), &tm);
+ else
+ localtime_r(&(cdr->start.tv_sec), &tm);
+ strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm);
+ if (!rc_avpair_add(rh, send, PW_AST_START_TIME, timestr, strlen(timestr), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Answer Time */
+ if (ast_test_flag(&global_flags, RADIUS_FLAG_USEGMTIME))
+ gmtime_r(&(cdr->answer.tv_sec), &tm);
+ else
+ localtime_r(&(cdr->answer.tv_sec), &tm);
+ strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm);
+ if (!rc_avpair_add(rh, send, PW_AST_ANSWER_TIME, timestr, strlen(timestr), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* End Time */
+ if (ast_test_flag(&global_flags, RADIUS_FLAG_USEGMTIME))
+ gmtime_r(&(cdr->end.tv_sec), &tm);
+ else
+ localtime_r(&(cdr->end.tv_sec), &tm);
+ strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm);
+ if (!rc_avpair_add(rh, send, PW_AST_END_TIME, timestr, strlen(timestr), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Duration */
+ if (!rc_avpair_add(rh, send, PW_AST_DURATION, &cdr->duration, 0, VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Billable seconds */
+ if (!rc_avpair_add(rh, send, PW_AST_BILL_SEC, &cdr->billsec, 0, VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* Disposition */
+ tmp = ast_cdr_disp2str(cdr->disposition);
+ if (!rc_avpair_add(rh, send, PW_AST_DISPOSITION, tmp, strlen(tmp), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ /* AMA Flags */
+ tmp = ast_cdr_flags2str(cdr->amaflags);
+ if (!rc_avpair_add(rh, send, PW_AST_AMA_FLAGS, tmp, strlen(tmp), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+
+ if (ast_test_flag(&global_flags, RADIUS_FLAG_LOGUNIQUEID)) {
+ /* Unique ID */
+ if (!rc_avpair_add(rh, send, PW_AST_UNIQUE_ID, &cdr->uniqueid, strlen(cdr->uniqueid), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+ }
+
+ if (ast_test_flag(&global_flags, RADIUS_FLAG_LOGUSERFIELD)) {
+ /* append the user field */
+ if (!rc_avpair_add(rh, send, PW_AST_USER_FIELD, &cdr->userfield, strlen(cdr->userfield), VENDOR_CODE)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+ }
+
+ /* Setting Acct-Session-Id & User-Name attributes for proper generation
+ of Acct-Unique-Session-Id on server side */
+ /* Channel */
+ if (!rc_avpair_add(rh, send, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+ /* Unique ID */
+ if (!rc_avpair_add(rh, send, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) {
+ ast_log(LOG_WARNING, "Failed to add VALUE PAIR. RADIUS CDR not recorded!\n");
+ return -1;
+ }
+ return 0;
+}
+
+static int radius_log(struct ast_cdr *cdr)
+{
+ int result = ERROR_RC;
+ VALUE_PAIR *send = NULL;
+
+ if (build_radius_record(&send, cdr)) {
+ ast_log(LOG_WARNING, "Unable to create RADIUS record. CDR not recorded!\n");
+ return result;
+ }
+
+ result = rc_acct(rh, 0, send);
+ if (result != OK_RC)
+ ast_log(LOG_ERROR, "Failed to record Radius CDR record!\n");
+
+ return result;
+}
+
+static const char *description(void)
+{
+ return desc;
+}
+
+static int unload_module(void *mod)
+{
+ ast_cdr_unregister(name);
+ return 0;
+}
+
+static int load_module(void *mod)
+{
+ struct ast_config *cfg;
+ char *tmp;
+
+ if ((cfg = ast_config_load(cdr_config))) {
+ ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "radius", "usegmtime")), RADIUS_FLAG_USEGMTIME);
+ ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "radius", "loguniqueid")), RADIUS_FLAG_LOGUNIQUEID);
+ ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "radius", "loguserfield")), RADIUS_FLAG_LOGUSERFIELD);
+ if ((tmp = ast_variable_retrieve(cfg, "radius", "radiuscfg")))
+ ast_copy_string(radiuscfg, tmp, sizeof(radiuscfg));
+ ast_config_destroy(cfg);
+ }
+
+ /* start logging */
+ rc_openlog("asterisk");
+
+ /* read radiusclient-ng config file */
+ if (!(rh = rc_read_config(radiuscfg))) {
+ ast_log(LOG_NOTICE, "Cannot load radiusclient-ng configuration file %s.\n", radiuscfg);
+ return -1;
+ }
+
+ /* read radiusclient-ng dictionaries */
+ if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary"))) {
+ ast_log(LOG_NOTICE, "Cannot load radiusclient-ng dictionary file.\n");
+ return -1;
+ }
+
+ return ast_cdr_register(name, desc, radius_log);
+}
+
+static const char *key(void)
+{
+ return ASTERISK_GPL_KEY;
+}
+
+STD_MOD(MOD_0, NULL, NULL, NULL);
diff --git a/configs/cdr.conf.sample b/configs/cdr.conf.sample
index e8b3a6886c1c59fa9882f1d2e3dd738d0685c822..eb3ababcd3240cba401788c0ffb0a742f5c82adf 100644
--- a/configs/cdr.conf.sample
+++ b/configs/cdr.conf.sample
@@ -61,3 +61,11 @@
;loguniqueid=yes ;log uniqueid
;loguserfield=yes ;log user field
+;[radius]
+;usegmtime=yes ;log date/time in GMT
+;loguniqueid=yes ;log uniqueid
+;loguserfield=yes ;log user field
+; Set this to the location of the radiusclient-ng configuration file
+; The default is /etc/radiusclient-ng/radiusclient.conf
+;radiuscfg => /usr/local/etc/radiusclient-ng/radiusclient.conf
+
diff --git a/configure b/configure
index 6ebb7e33fa19eb5a54a075e9409ca7ce7f258c2c..aadcf9f1f6f3d3da9fbd15dc747612531cd31e09 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 26808 .
+# From configure.ac Revision: 28435 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -313,7 +313,7 @@ ac_includes_default="\
# 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.
@@ -877,6 +877,8 @@ Optional Packages:
--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
@@ -4890,24 +4892,24 @@ if test "${with_asound+set}" = set; then
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
+PBX_LIBALSA=0
-if test "${USE_asound}" != "no"; then
+if test "${USE_ALSA}" != "no"; then
pbxlibdir=""
- if test "x${asound_DIR}" != "x"; then
+ if test "x${ALSA_DIR}" != "x"; then
pbxlibdir="-L${asound_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for snd_spcm_init in -lasound" >&5
@@ -4974,21 +4976,23 @@ fi
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
- :
+ AST_ALSA_FOUND=yes
+else
+ AST_ALSA_FOUND=no
fi
- if test "${ac_cv_lib_asound_snd_spcm_init}" = "yes"; then
- asound_LIB="-lasound -lm -ldl"
+ 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="${pbxlibdir} ${asound_LIB}"
- asound_INCLUDE="-I${asound_DIR}/include"
+ if test "x${ALSA_DIR}" != "x"; then
+ ALSA_LIB="${pbxlibdir} ${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
@@ -4996,8 +5000,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
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
@@ -5005,7 +5009,7 @@ cat confdefs.h >>conftest.$ac_ext
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
@@ -5040,15 +5044,15 @@ 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 ${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
@@ -5082,25 +5086,25 @@ 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: ${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
## ------------------------------------------ ##
@@ -5111,8 +5115,8 @@ _ASBOX
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
@@ -5278,7 +5282,7 @@ fi
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."
@@ -5286,18 +5290,18 @@ fi
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."
@@ -5318,24 +5322,24 @@ if test "${with_curses+set}" = set; then
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
+PBX_LIBCURSES=0
-if test "${USE_curses}" != "no"; then
+if test "${USE_CURSES}" != "no"; then
pbxlibdir=""
- if test "x${curses_DIR}" != "x"; then
+ if test "x${CURSES_DIR}" != "x"; then
pbxlibdir="-L${curses_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
@@ -5402,21 +5406,23 @@ fi
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
- :
+ AST_CURSES_FOUND=yes
+else
+ AST_CURSES_FOUND=no
fi
- if test "${ac_cv_lib_curses_initscr}" = "yes"; then
- curses_LIB="-lcurses "
+ if test "${AST_CURSES_FOUND}" = "yes"; then
+ CURSES_LIB="-lcurses "
CURSES_HEADER_FOUND="1"
- if test "x${curses_DIR}" != "x"; then
- curses_LIB="${pbxlibdir} ${curses_LIB}"
- curses_INCLUDE="-I${curses_DIR}/include"
+ if test "x${CURSES_DIR}" != "x"; then
+ CURSES_LIB="${pbxlibdir} ${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
@@ -5424,8 +5430,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
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
@@ -5433,7 +5439,7 @@ cat confdefs.h >>conftest.$ac_ext
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
@@ -5468,15 +5474,15 @@ 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 ${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
@@ -5510,25 +5516,25 @@ 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: ${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
## ------------------------------------------ ##
@@ -5539,8 +5545,8 @@ _ASBOX
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
@@ -5706,7 +5712,7 @@ fi
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."
@@ -5714,18 +5720,18 @@ fi
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."
@@ -5746,24 +5752,24 @@ if test "${with_nbs+set}" = set; then
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
+PBX_LIBNBS=0
-if test "${USE_nbs}" != "no"; then
+if test "${USE_NBS}" != "no"; then
pbxlibdir=""
- if test "x${nbs_DIR}" != "x"; then
+ if test "x${NBS_DIR}" != "x"; then
pbxlibdir="-L${nbs_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for nbs_connect in -lnbs" >&5
@@ -5830,21 +5836,23 @@ fi
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
- :
+ AST_NBS_FOUND=yes
+else
+ AST_NBS_FOUND=no
fi
- if test "${ac_cv_lib_nbs_nbs_connect}" = "yes"; then
- nbs_LIB="-lnbs "
+ if test "${AST_NBS_FOUND}" = "yes"; then
+ NBS_LIB="-lnbs "
NBS_HEADER_FOUND="1"
- if test "x${nbs_DIR}" != "x"; then
- nbs_LIB="${pbxlibdir} ${nbs_LIB}"
- nbs_INCLUDE="-I${nbs_DIR}/include"
+ if test "x${NBS_DIR}" != "x"; then
+ NBS_LIB="${pbxlibdir} ${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
@@ -5852,8 +5860,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
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
@@ -5861,7 +5869,7 @@ cat confdefs.h >>conftest.$ac_ext
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
@@ -5896,15 +5904,15 @@ 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 ${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
@@ -5938,25 +5946,25 @@ 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: ${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
## ------------------------------------------ ##
@@ -5967,8 +5975,8 @@ _ASBOX
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
@@ -6134,7 +6142,7 @@ fi
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."
@@ -6142,18 +6150,18 @@ fi
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."
@@ -6174,24 +6182,24 @@ if test "${with_ncurses+set}" = set; then
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
+PBX_LIBNCURSES=0
-if test "${USE_ncurses}" != "no"; then
+if test "${USE_NCURSES}" != "no"; then
pbxlibdir=""
- if test "x${ncurses_DIR}" != "x"; then
+ if test "x${NCURSES_DIR}" != "x"; then
pbxlibdir="-L${ncurses_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
@@ -6258,21 +6266,23 @@ fi
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
- :
+ AST_NCURSES_FOUND=yes
+else
+ AST_NCURSES_FOUND=no
fi
- if test "${ac_cv_lib_ncurses_initscr}" = "yes"; then
- ncurses_LIB="-lncurses "
+ if test "${AST_NCURSES_FOUND}" = "yes"; then
+ NCURSES_LIB="-lncurses "
NCURSES_HEADER_FOUND="1"
- if test "x${ncurses_DIR}" != "x"; then
- ncurses_LIB="${pbxlibdir} ${ncurses_LIB}"
- ncurses_INCLUDE="-I${ncurses_DIR}/include"
+ if test "x${NCURSES_DIR}" != "x"; then
+ NCURSES_LIB="${pbxlibdir} ${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`
+ as_ac_Header=`echo "ac_cv_header_${NCURSES_DIR}/include/curses.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${ncurses_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${ncurses_DIR}/include/curses.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${NCURSES_DIR}/include/curses.h" >&5
+echo $ECHO_N "checking for ${NCURSES_DIR}/include/curses.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -6280,8 +6290,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${ncurses_DIR}/include/curses.h usability" >&5
-echo $ECHO_N "checking ${ncurses_DIR}/include/curses.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${NCURSES_DIR}/include/curses.h usability" >&5
+echo $ECHO_N "checking ${NCURSES_DIR}/include/curses.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6289,7 +6299,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${ncurses_DIR}/include/curses.h>
+#include <${NCURSES_DIR}/include/curses.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -6324,15 +6334,15 @@ 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 ${ncurses_DIR}/include/curses.h presence" >&5
-echo $ECHO_N "checking ${ncurses_DIR}/include/curses.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${NCURSES_DIR}/include/curses.h presence" >&5
+echo $ECHO_N "checking ${NCURSES_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 <${ncurses_DIR}/include/curses.h>
+#include <${NCURSES_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
@@ -6366,25 +6376,25 @@ 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: ${ncurses_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ncurses_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ncurses_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -6395,8 +6405,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${ncurses_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${ncurses_DIR}/include/curses.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${NCURSES_DIR}/include/curses.h" >&5
+echo $ECHO_N "checking for ${NCURSES_DIR}/include/curses.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6562,7 +6572,7 @@ fi
fi
fi
if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ncurses_MANDATORY}" ;
+ if test ! -z "${NCURSES_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the ncurses development package installed."
@@ -6570,18 +6580,18 @@ fi
echo " *** without explicitly specifying --with-ncurses"
exit 1
fi
- ncurses_LIB=""
- ncurses_INCLUDE=""
- PBX_LIBncurses=0
+ NCURSES_LIB=""
+ NCURSES_INCLUDE=""
+ PBX_LIBNCURSES=0
else
- PBX_LIBncurses=1
+ PBX_LIBNCURSES=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NCURSES 1
_ACEOF
fi
- elif test ! -z "${ncurses_MANDATORY}";
+ elif test ! -z "${NCURSES_MANDATORY}";
then
echo "***"
echo "*** The ncurses installation on this system appears to be broken."
@@ -6602,24 +6612,24 @@ if test "${with_newt+set}" = set; then
case ${withval} in
n|no)
- USE_newt=no
+ USE_NEWT=no
;;
y|ye|yes)
- newt_MANDATORY="yes"
+ NEWT_MANDATORY="yes"
;;
*)
- newt_DIR="${withval}"
- newt_MANDATORY="yes"
+ NEWT_DIR="${withval}"
+ NEWT_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBnewt=0
+PBX_LIBNEWT=0
-if test "${USE_newt}" != "no"; then
+if test "${USE_NEWT}" != "no"; then
pbxlibdir=""
- if test "x${newt_DIR}" != "x"; then
+ if test "x${NEWT_DIR}" != "x"; then
pbxlibdir="-L${newt_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for newtBell in -lnewt" >&5
@@ -6686,21 +6696,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_newt_newtBell" >&5
echo "${ECHO_T}$ac_cv_lib_newt_newtBell" >&6
if test $ac_cv_lib_newt_newtBell = yes; then
- :
+ AST_NEWT_FOUND=yes
+else
+ AST_NEWT_FOUND=no
fi
- if test "${ac_cv_lib_newt_newtBell}" = "yes"; then
- newt_LIB="-lnewt "
+ if test "${AST_NEWT_FOUND}" = "yes"; then
+ NEWT_LIB="-lnewt "
NEWT_HEADER_FOUND="1"
- if test "x${newt_DIR}" != "x"; then
- newt_LIB="${pbxlibdir} ${newt_LIB}"
- newt_INCLUDE="-I${newt_DIR}/include"
+ if test "x${NEWT_DIR}" != "x"; then
+ NEWT_LIB="${pbxlibdir} ${NEWT_LIB}"
+ NEWT_INCLUDE="-I${NEWT_DIR}/include"
if test "xnewt.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${newt_DIR}/include/newt.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${NEWT_DIR}/include/newt.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${newt_DIR}/include/newt.h" >&5
-echo $ECHO_N "checking for ${newt_DIR}/include/newt.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${NEWT_DIR}/include/newt.h" >&5
+echo $ECHO_N "checking for ${NEWT_DIR}/include/newt.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -6708,8 +6720,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${newt_DIR}/include/newt.h usability" >&5
-echo $ECHO_N "checking ${newt_DIR}/include/newt.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt.h usability" >&5
+echo $ECHO_N "checking ${NEWT_DIR}/include/newt.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6717,7 +6729,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${newt_DIR}/include/newt.h>
+#include <${NEWT_DIR}/include/newt.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -6752,15 +6764,15 @@ 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 ${newt_DIR}/include/newt.h presence" >&5
-echo $ECHO_N "checking ${newt_DIR}/include/newt.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt.h presence" >&5
+echo $ECHO_N "checking ${NEWT_DIR}/include/newt.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 <${newt_DIR}/include/newt.h>
+#include <${NEWT_DIR}/include/newt.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -6794,25 +6806,25 @@ 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: ${newt_DIR}/include/newt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${newt_DIR}/include/newt.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${newt_DIR}/include/newt.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -6823,8 +6835,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${newt_DIR}/include/newt.h" >&5
-echo $ECHO_N "checking for ${newt_DIR}/include/newt.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${NEWT_DIR}/include/newt.h" >&5
+echo $ECHO_N "checking for ${NEWT_DIR}/include/newt.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -6990,7 +7002,7 @@ fi
fi
fi
if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${newt_MANDATORY}" ;
+ if test ! -z "${NEWT_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the newt development package installed."
@@ -6998,18 +7010,18 @@ fi
echo " *** without explicitly specifying --with-newt"
exit 1
fi
- newt_LIB=""
- newt_INCLUDE=""
- PBX_LIBnewt=0
+ NEWT_LIB=""
+ NEWT_INCLUDE=""
+ PBX_LIBNEWT=0
else
- PBX_LIBnewt=1
+ PBX_LIBNEWT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_NEWT 1
_ACEOF
fi
- elif test ! -z "${newt_MANDATORY}";
+ elif test ! -z "${NEWT_MANDATORY}";
then
echo "***"
echo "*** The newt installation on this system appears to be broken."
@@ -7030,24 +7042,24 @@ if test "${with_odbc+set}" = set; then
case ${withval} in
n|no)
- USE_odbc=no
+ USE_UNIXODBC=no
;;
y|ye|yes)
- odbc_MANDATORY="yes"
+ UNIXODBC_MANDATORY="yes"
;;
*)
- odbc_DIR="${withval}"
- odbc_MANDATORY="yes"
+ UNIXODBC_DIR="${withval}"
+ UNIXODBC_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBodbc=0
+PBX_LIBUNIXODBC=0
-if test "${USE_odbc}" != "no"; then
+if test "${USE_UNIXODBC}" != "no"; then
pbxlibdir=""
- if test "x${odbc_DIR}" != "x"; then
+ if test "x${UNIXODBC_DIR}" != "x"; then
pbxlibdir="-L${odbc_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for SQLConnect in -lodbc" >&5
@@ -7114,21 +7126,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLConnect" >&5
echo "${ECHO_T}$ac_cv_lib_odbc_SQLConnect" >&6
if test $ac_cv_lib_odbc_SQLConnect = yes; then
- :
+ AST_UNIXODBC_FOUND=yes
+else
+ AST_UNIXODBC_FOUND=no
fi
- if test "${ac_cv_lib_odbc_SQLConnect}" = "yes"; then
- odbc_LIB="-lodbc "
+ if test "${AST_UNIXODBC_FOUND}" = "yes"; then
+ UNIXODBC_LIB="-lodbc "
UNIXODBC_HEADER_FOUND="1"
- if test "x${odbc_DIR}" != "x"; then
- odbc_LIB="${pbxlibdir} ${odbc_LIB}"
- odbc_INCLUDE="-I${odbc_DIR}/include"
+ if test "x${UNIXODBC_DIR}" != "x"; then
+ UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
+ UNIXODBC_INCLUDE="-I${UNIXODBC_DIR}/include"
if test "xsql.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${odbc_DIR}/include/sql.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${UNIXODBC_DIR}/include/sql.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${odbc_DIR}/include/sql.h" >&5
-echo $ECHO_N "checking for ${odbc_DIR}/include/sql.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${UNIXODBC_DIR}/include/sql.h" >&5
+echo $ECHO_N "checking for ${UNIXODBC_DIR}/include/sql.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -7136,8 +7150,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${odbc_DIR}/include/sql.h usability" >&5
-echo $ECHO_N "checking ${odbc_DIR}/include/sql.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${UNIXODBC_DIR}/include/sql.h usability" >&5
+echo $ECHO_N "checking ${UNIXODBC_DIR}/include/sql.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7145,7 +7159,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${odbc_DIR}/include/sql.h>
+#include <${UNIXODBC_DIR}/include/sql.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7180,15 +7194,15 @@ 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 ${odbc_DIR}/include/sql.h presence" >&5
-echo $ECHO_N "checking ${odbc_DIR}/include/sql.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${UNIXODBC_DIR}/include/sql.h presence" >&5
+echo $ECHO_N "checking ${UNIXODBC_DIR}/include/sql.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 <${odbc_DIR}/include/sql.h>
+#include <${UNIXODBC_DIR}/include/sql.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -7222,25 +7236,25 @@ 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: ${odbc_DIR}/include/sql.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${odbc_DIR}/include/sql.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${odbc_DIR}/include/sql.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${UNIXODBC_DIR}/include/sql.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${UNIXODBC_DIR}/include/sql.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -7251,8 +7265,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${odbc_DIR}/include/sql.h" >&5
-echo $ECHO_N "checking for ${odbc_DIR}/include/sql.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${UNIXODBC_DIR}/include/sql.h" >&5
+echo $ECHO_N "checking for ${UNIXODBC_DIR}/include/sql.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7418,7 +7432,7 @@ fi
fi
fi
if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${odbc_MANDATORY}" ;
+ if test ! -z "${UNIXODBC_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the odbc development package installed."
@@ -7426,18 +7440,18 @@ fi
echo " *** without explicitly specifying --with-odbc"
exit 1
fi
- odbc_LIB=""
- odbc_INCLUDE=""
- PBX_LIBodbc=0
+ UNIXODBC_LIB=""
+ UNIXODBC_INCLUDE=""
+ PBX_LIBUNIXODBC=0
else
- PBX_LIBodbc=1
+ PBX_LIBUNIXODBC=1
cat >>confdefs.h <<_ACEOF
#define HAVE_UNIXODBC 1
_ACEOF
fi
- elif test ! -z "${odbc_MANDATORY}";
+ elif test ! -z "${UNIXODBC_MANDATORY}";
then
echo "***"
echo "*** The unixODBC installation on this system appears to be broken."
@@ -7458,24 +7472,24 @@ if test "${with_ogg+set}" = set; then
case ${withval} in
n|no)
- USE_ogg=no
+ USE_OGG=no
;;
y|ye|yes)
- ogg_MANDATORY="yes"
+ OGG_MANDATORY="yes"
;;
*)
- ogg_DIR="${withval}"
- ogg_MANDATORY="yes"
+ OGG_DIR="${withval}"
+ OGG_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBogg=0
+PBX_LIBOGG=0
-if test "${USE_ogg}" != "no"; then
+if test "${USE_OGG}" != "no"; then
pbxlibdir=""
- if test "x${ogg_DIR}" != "x"; then
+ if test "x${OGG_DIR}" != "x"; then
pbxlibdir="-L${ogg_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for ogg_sync_init in -logg" >&5
@@ -7542,21 +7556,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_ogg_sync_init" >&5
echo "${ECHO_T}$ac_cv_lib_ogg_ogg_sync_init" >&6
if test $ac_cv_lib_ogg_ogg_sync_init = yes; then
- :
+ AST_OGG_FOUND=yes
+else
+ AST_OGG_FOUND=no
fi
- if test "${ac_cv_lib_ogg_ogg_sync_init}" = "yes"; then
- ogg_LIB="-logg "
+ if test "${AST_OGG_FOUND}" = "yes"; then
+ OGG_LIB="-logg "
OGG_HEADER_FOUND="1"
- if test "x${ogg_DIR}" != "x"; then
- ogg_LIB="${pbxlibdir} ${ogg_LIB}"
- ogg_INCLUDE="-I${ogg_DIR}/include"
+ if test "x${OGG_DIR}" != "x"; then
+ OGG_LIB="${pbxlibdir} ${OGG_LIB}"
+ OGG_INCLUDE="-I${OGG_DIR}/include"
if test "x" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${ogg_DIR}/include/" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${OGG_DIR}/include/" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${ogg_DIR}/include/" >&5
-echo $ECHO_N "checking for ${ogg_DIR}/include/... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${OGG_DIR}/include/" >&5
+echo $ECHO_N "checking for ${OGG_DIR}/include/... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -7564,8 +7580,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${ogg_DIR}/include/ usability" >&5
-echo $ECHO_N "checking ${ogg_DIR}/include/ usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OGG_DIR}/include/ usability" >&5
+echo $ECHO_N "checking ${OGG_DIR}/include/ usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7573,7 +7589,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${ogg_DIR}/include/>
+#include <${OGG_DIR}/include/>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7608,15 +7624,15 @@ 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 ${ogg_DIR}/include/ presence" >&5
-echo $ECHO_N "checking ${ogg_DIR}/include/ presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OGG_DIR}/include/ presence" >&5
+echo $ECHO_N "checking ${OGG_DIR}/include/ 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 <${ogg_DIR}/include/>
+#include <${OGG_DIR}/include/>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -7650,25 +7666,25 @@ 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: ${ogg_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ogg_DIR}/include/: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ogg_DIR}/include/: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OGG_DIR}/include/: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${OGG_DIR}/include/: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -7679,8 +7695,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${ogg_DIR}/include/" >&5
-echo $ECHO_N "checking for ${ogg_DIR}/include/... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${OGG_DIR}/include/" >&5
+echo $ECHO_N "checking for ${OGG_DIR}/include/... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -7846,7 +7862,7 @@ fi
fi
fi
if test "x${OGG_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ogg_MANDATORY}" ;
+ if test ! -z "${OGG_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the ogg development package installed."
@@ -7854,18 +7870,18 @@ fi
echo " *** without explicitly specifying --with-ogg"
exit 1
fi
- ogg_LIB=""
- ogg_INCLUDE=""
- PBX_LIBogg=0
+ OGG_LIB=""
+ OGG_INCLUDE=""
+ PBX_LIBOGG=0
else
- PBX_LIBogg=1
+ PBX_LIBOGG=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OGG 1
_ACEOF
fi
- elif test ! -z "${ogg_MANDATORY}";
+ elif test ! -z "${OGG_MANDATORY}";
then
echo "***"
echo "*** The OGG installation on this system appears to be broken."
@@ -7886,24 +7902,24 @@ if test "${with_osptk+set}" = set; then
case ${withval} in
n|no)
- USE_osptk=no
+ USE_OSPTK=no
;;
y|ye|yes)
- osptk_MANDATORY="yes"
+ OSPTK_MANDATORY="yes"
;;
*)
- osptk_DIR="${withval}"
- osptk_MANDATORY="yes"
+ OSPTK_DIR="${withval}"
+ OSPTK_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBosptk=0
+PBX_LIBOSPTK=0
-if test "${USE_osptk}" != "no"; then
+if test "${USE_OSPTK}" != "no"; then
pbxlibdir=""
- if test "x${osptk_DIR}" != "x"; then
+ if test "x${OSPTK_DIR}" != "x"; then
pbxlibdir="-L${osptk_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for OSPPCryptoDecrypt in -losptk" >&5
@@ -7970,21 +7986,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_osptk_OSPPCryptoDecrypt" >&5
echo "${ECHO_T}$ac_cv_lib_osptk_OSPPCryptoDecrypt" >&6
if test $ac_cv_lib_osptk_OSPPCryptoDecrypt = yes; then
- :
+ AST_OSPTK_FOUND=yes
+else
+ AST_OSPTK_FOUND=no
fi
- if test "${ac_cv_lib_osptk_OSPPCryptoDecrypt}" = "yes"; then
- osptk_LIB="-losptk -lcrypto -lssl"
+ if test "${AST_OSPTK_FOUND}" = "yes"; then
+ OSPTK_LIB="-losptk -lcrypto -lssl"
OSPTK_HEADER_FOUND="1"
- if test "x${osptk_DIR}" != "x"; then
- osptk_LIB="${pbxlibdir} ${osptk_LIB}"
- osptk_INCLUDE="-I${osptk_DIR}/include"
+ if test "x${OSPTK_DIR}" != "x"; then
+ OSPTK_LIB="${pbxlibdir} ${OSPTK_LIB}"
+ OSPTK_INCLUDE="-I${OSPTK_DIR}/include"
if test "xosp/osp.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${osptk_DIR}/include/osp/osp.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${OSPTK_DIR}/include/osp/osp.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${osptk_DIR}/include/osp/osp.h" >&5
-echo $ECHO_N "checking for ${osptk_DIR}/include/osp/osp.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${OSPTK_DIR}/include/osp/osp.h" >&5
+echo $ECHO_N "checking for ${OSPTK_DIR}/include/osp/osp.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -7992,8 +8010,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${osptk_DIR}/include/osp/osp.h usability" >&5
-echo $ECHO_N "checking ${osptk_DIR}/include/osp/osp.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OSPTK_DIR}/include/osp/osp.h usability" >&5
+echo $ECHO_N "checking ${OSPTK_DIR}/include/osp/osp.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8001,7 +8019,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${osptk_DIR}/include/osp/osp.h>
+#include <${OSPTK_DIR}/include/osp/osp.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8036,15 +8054,15 @@ 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 ${osptk_DIR}/include/osp/osp.h presence" >&5
-echo $ECHO_N "checking ${osptk_DIR}/include/osp/osp.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OSPTK_DIR}/include/osp/osp.h presence" >&5
+echo $ECHO_N "checking ${OSPTK_DIR}/include/osp/osp.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 <${osptk_DIR}/include/osp/osp.h>
+#include <${OSPTK_DIR}/include/osp/osp.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -8078,25 +8096,25 @@ 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: ${osptk_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${osptk_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${osptk_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSPTK_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${OSPTK_DIR}/include/osp/osp.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -8107,8 +8125,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${osptk_DIR}/include/osp/osp.h" >&5
-echo $ECHO_N "checking for ${osptk_DIR}/include/osp/osp.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${OSPTK_DIR}/include/osp/osp.h" >&5
+echo $ECHO_N "checking for ${OSPTK_DIR}/include/osp/osp.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8274,7 +8292,7 @@ fi
fi
fi
if test "x${OSPTK_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${osptk_MANDATORY}" ;
+ if test ! -z "${OSPTK_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the osptk development package installed."
@@ -8282,18 +8300,18 @@ fi
echo " *** without explicitly specifying --with-osptk"
exit 1
fi
- osptk_LIB=""
- osptk_INCLUDE=""
- PBX_LIBosptk=0
+ OSPTK_LIB=""
+ OSPTK_INCLUDE=""
+ PBX_LIBOSPTK=0
else
- PBX_LIBosptk=1
+ PBX_LIBOSPTK=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OSPTK 1
_ACEOF
fi
- elif test ! -z "${osptk_MANDATORY}";
+ elif test ! -z "${OSPTK_MANDATORY}";
then
echo "***"
echo "*** The OSP Toolkit installation on this system appears to be broken."
@@ -8314,24 +8332,24 @@ if test "${with_popt+set}" = set; then
case ${withval} in
n|no)
- USE_popt=no
+ USE_POPT=no
;;
y|ye|yes)
- popt_MANDATORY="yes"
+ POPT_MANDATORY="yes"
;;
*)
- popt_DIR="${withval}"
- popt_MANDATORY="yes"
+ POPT_DIR="${withval}"
+ POPT_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBpopt=0
+PBX_LIBPOPT=0
-if test "${USE_popt}" != "no"; then
+if test "${USE_POPT}" != "no"; then
pbxlibdir=""
- if test "x${popt_DIR}" != "x"; then
+ if test "x${POPT_DIR}" != "x"; then
pbxlibdir="-L${popt_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for poptStrerror in -lpopt" >&5
@@ -8398,21 +8416,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrerror" >&5
echo "${ECHO_T}$ac_cv_lib_popt_poptStrerror" >&6
if test $ac_cv_lib_popt_poptStrerror = yes; then
- :
+ AST_POPT_FOUND=yes
+else
+ AST_POPT_FOUND=no
fi
- if test "${ac_cv_lib_popt_poptStrerror}" = "yes"; then
- popt_LIB="-lpopt "
+ if test "${AST_POPT_FOUND}" = "yes"; then
+ POPT_LIB="-lpopt "
POPT_HEADER_FOUND="1"
- if test "x${popt_DIR}" != "x"; then
- popt_LIB="${pbxlibdir} ${popt_LIB}"
- popt_INCLUDE="-I${popt_DIR}/include"
+ if test "x${POPT_DIR}" != "x"; then
+ POPT_LIB="${pbxlibdir} ${POPT_LIB}"
+ POPT_INCLUDE="-I${POPT_DIR}/include"
if test "xpopt.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${popt_DIR}/include/popt.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${POPT_DIR}/include/popt.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${popt_DIR}/include/popt.h" >&5
-echo $ECHO_N "checking for ${popt_DIR}/include/popt.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${POPT_DIR}/include/popt.h" >&5
+echo $ECHO_N "checking for ${POPT_DIR}/include/popt.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -8420,8 +8440,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${popt_DIR}/include/popt.h usability" >&5
-echo $ECHO_N "checking ${popt_DIR}/include/popt.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${POPT_DIR}/include/popt.h usability" >&5
+echo $ECHO_N "checking ${POPT_DIR}/include/popt.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8429,7 +8449,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${popt_DIR}/include/popt.h>
+#include <${POPT_DIR}/include/popt.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8464,15 +8484,15 @@ 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 ${popt_DIR}/include/popt.h presence" >&5
-echo $ECHO_N "checking ${popt_DIR}/include/popt.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${POPT_DIR}/include/popt.h presence" >&5
+echo $ECHO_N "checking ${POPT_DIR}/include/popt.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 <${popt_DIR}/include/popt.h>
+#include <${POPT_DIR}/include/popt.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -8506,25 +8526,25 @@ 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: ${popt_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${popt_DIR}/include/popt.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${popt_DIR}/include/popt.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${POPT_DIR}/include/popt.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${POPT_DIR}/include/popt.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -8535,8 +8555,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${popt_DIR}/include/popt.h" >&5
-echo $ECHO_N "checking for ${popt_DIR}/include/popt.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${POPT_DIR}/include/popt.h" >&5
+echo $ECHO_N "checking for ${POPT_DIR}/include/popt.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -8702,7 +8722,7 @@ fi
fi
fi
if test "x${POPT_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${popt_MANDATORY}" ;
+ if test ! -z "${POPT_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the popt development package installed."
@@ -8710,18 +8730,18 @@ fi
echo " *** without explicitly specifying --with-popt"
exit 1
fi
- popt_LIB=""
- popt_INCLUDE=""
- PBX_LIBpopt=0
+ POPT_LIB=""
+ POPT_INCLUDE=""
+ PBX_LIBPOPT=0
else
- PBX_LIBpopt=1
+ PBX_LIBPOPT=1
cat >>confdefs.h <<_ACEOF
#define HAVE_POPT 1
_ACEOF
fi
- elif test ! -z "${popt_MANDATORY}";
+ elif test ! -z "${POPT_MANDATORY}";
then
echo "***"
echo "*** The popt installation on this system appears to be broken."
@@ -8742,24 +8762,24 @@ if test "${with_pri+set}" = set; then
case ${withval} in
n|no)
- USE_pri=no
+ USE_LIBPRI=no
;;
y|ye|yes)
- pri_MANDATORY="yes"
+ LIBPRI_MANDATORY="yes"
;;
*)
- pri_DIR="${withval}"
- pri_MANDATORY="yes"
+ LIBPRI_DIR="${withval}"
+ LIBPRI_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBpri=0
+PBX_LIBLIBPRI=0
-if test "${USE_pri}" != "no"; then
+if test "${USE_LIBPRI}" != "no"; then
pbxlibdir=""
- if test "x${pri_DIR}" != "x"; then
+ if test "x${LIBPRI_DIR}" != "x"; then
pbxlibdir="-L${pri_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for pri_call in -lpri" >&5
@@ -8826,21 +8846,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pri_pri_call" >&5
echo "${ECHO_T}$ac_cv_lib_pri_pri_call" >&6
if test $ac_cv_lib_pri_pri_call = yes; then
- :
+ AST_LIBPRI_FOUND=yes
+else
+ AST_LIBPRI_FOUND=no
fi
- if test "${ac_cv_lib_pri_pri_call}" = "yes"; then
- pri_LIB="-lpri "
+ if test "${AST_LIBPRI_FOUND}" = "yes"; then
+ LIBPRI_LIB="-lpri "
LIBPRI_HEADER_FOUND="1"
- if test "x${pri_DIR}" != "x"; then
- pri_LIB="${pbxlibdir} ${pri_LIB}"
- pri_INCLUDE="-I${pri_DIR}/include"
+ if test "x${LIBPRI_DIR}" != "x"; then
+ LIBPRI_LIB="${pbxlibdir} ${LIBPRI_LIB}"
+ LIBPRI_INCLUDE="-I${LIBPRI_DIR}/include"
if test "xlibpri.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${pri_DIR}/include/libpri.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${LIBPRI_DIR}/include/libpri.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${pri_DIR}/include/libpri.h" >&5
-echo $ECHO_N "checking for ${pri_DIR}/include/libpri.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${LIBPRI_DIR}/include/libpri.h" >&5
+echo $ECHO_N "checking for ${LIBPRI_DIR}/include/libpri.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -8848,8 +8870,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${pri_DIR}/include/libpri.h usability" >&5
-echo $ECHO_N "checking ${pri_DIR}/include/libpri.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${LIBPRI_DIR}/include/libpri.h usability" >&5
+echo $ECHO_N "checking ${LIBPRI_DIR}/include/libpri.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -8857,7 +8879,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${pri_DIR}/include/libpri.h>
+#include <${LIBPRI_DIR}/include/libpri.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8892,15 +8914,15 @@ 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 ${pri_DIR}/include/libpri.h presence" >&5
-echo $ECHO_N "checking ${pri_DIR}/include/libpri.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${LIBPRI_DIR}/include/libpri.h presence" >&5
+echo $ECHO_N "checking ${LIBPRI_DIR}/include/libpri.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 <${pri_DIR}/include/libpri.h>
+#include <${LIBPRI_DIR}/include/libpri.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -8934,25 +8956,25 @@ 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: ${pri_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${pri_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${pri_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${LIBPRI_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${LIBPRI_DIR}/include/libpri.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -8963,8 +8985,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${pri_DIR}/include/libpri.h" >&5
-echo $ECHO_N "checking for ${pri_DIR}/include/libpri.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${LIBPRI_DIR}/include/libpri.h" >&5
+echo $ECHO_N "checking for ${LIBPRI_DIR}/include/libpri.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9130,7 +9152,7 @@ fi
fi
fi
if test "x${LIBPRI_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${pri_MANDATORY}" ;
+ if test ! -z "${LIBPRI_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the pri development package installed."
@@ -9138,18 +9160,18 @@ fi
echo " *** without explicitly specifying --with-pri"
exit 1
fi
- pri_LIB=""
- pri_INCLUDE=""
- PBX_LIBpri=0
+ LIBPRI_LIB=""
+ LIBPRI_INCLUDE=""
+ PBX_LIBLIBPRI=0
else
- PBX_LIBpri=1
+ PBX_LIBLIBPRI=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPRI 1
_ACEOF
fi
- elif test ! -z "${pri_MANDATORY}";
+ elif test ! -z "${LIBPRI_MANDATORY}";
then
echo "***"
echo "*** The ISDN PRI installation on this system appears to be broken."
@@ -9164,30 +9186,460 @@ fi
+# Check whether --with-radiusclient-ng or --without-radiusclient-ng was given.
+if test "${with_radiusclient_ng+set}" = set; then
+ withval="$with_radiusclient_ng"
+
+case ${withval} in
+ n|no)
+ USE_RADIUSCLIENT=no
+ ;;
+ y|ye|yes)
+ RADIUSCLIENT_MANDATORY="yes"
+ ;;
+ *)
+ RADIUSCLIENT_DIR="${withval}"
+ RADIUSCLIENT_MANDATORY="yes"
+ ;;
+esac
+
+fi;
+
+PBX_LIBRADIUSCLIENT=0
+
+if test "${USE_RADIUSCLIENT}" != "no"; then
+ pbxlibdir=""
+ if test "x${RADIUSCLIENT_DIR}" != "x"; then
+ pbxlibdir="-L${radiusclient-ng_DIR}/lib"
+ fi
+ echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5
+echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6
+if test "${ac_cv_lib_radiusclient_ng_rc_read_config+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lradiusclient-ng ${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 gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char rc_read_config ();
+int
+main ()
+{
+rc_read_config ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_radiusclient_ng_rc_read_config=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_radiusclient_ng_rc_read_config=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5
+echo "${ECHO_T}$ac_cv_lib_radiusclient_ng_rc_read_config" >&6
+if test $ac_cv_lib_radiusclient_ng_rc_read_config = yes; then
+ AST_RADIUSCLIENT_FOUND=yes
+else
+ AST_RADIUSCLIENT_FOUND=no
+fi
+
+
+ if test "${AST_RADIUSCLIENT_FOUND}" = "yes"; then
+ RADIUSCLIENT_LIB="-lradiusclient-ng "
+ RADIUSCLIENT_HEADER_FOUND="1"
+ if test "x${RADIUSCLIENT_DIR}" != "x"; then
+ RADIUSCLIENT_LIB="${pbxlibdir} ${RADIUSCLIENT_LIB}"
+ RADIUSCLIENT_INCLUDE="-I${RADIUSCLIENT_DIR}/include"
+ if test "xradiusclient-ng.h" != "x" ; then
+ as_ac_Header=`echo "ac_cv_header_${RADIUSCLIENT_DIR}/include/radiusclient-ng.h" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h" >&5
+echo $ECHO_N "checking for ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h usability" >&5
+echo $ECHO_N "checking ${RADIUSCLIENT_DIR}/include/radiusclient-ng.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 <${RADIUSCLIENT_DIR}/include/radiusclient-ng.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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 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 ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h presence" >&5
+echo $ECHO_N "checking ${RADIUSCLIENT_DIR}/include/radiusclient-ng.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 <${RADIUSCLIENT_DIR}/include/radiusclient-ng.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h" >&5
+echo $ECHO_N "checking for ${RADIUSCLIENT_DIR}/include/radiusclient-ng.h... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ RADIUSCLIENT_HEADER_FOUND=1
+else
+ RADIUSCLIENT_HEADER_FOUND=0
+fi
+
+
+ fi
+ else
+ if test "xradiusclient-ng.h" != "x" ; then
+ if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5
+echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6
+if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5
+echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking radiusclient-ng.h usability" >&5
+echo $ECHO_N "checking radiusclient-ng.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 <radiusclient-ng.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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 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 radiusclient-ng.h presence" >&5
+echo $ECHO_N "checking radiusclient-ng.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 <radiusclient-ng.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: radiusclient-ng.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for radiusclient-ng.h" >&5
+echo $ECHO_N "checking for radiusclient-ng.h... $ECHO_C" >&6
+if test "${ac_cv_header_radiusclient_ng_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_radiusclient_ng_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_radiusclient_ng_h" >&5
+echo "${ECHO_T}$ac_cv_header_radiusclient_ng_h" >&6
+
+fi
+if test $ac_cv_header_radiusclient_ng_h = yes; then
+ RADIUSCLIENT_HEADER_FOUND=1
+else
+ RADIUSCLIENT_HEADER_FOUND=0
+fi
+
+
+ fi
+ fi
+ if test "x${RADIUSCLIENT_HEADER_FOUND}" = "x0" ; then
+ if test ! -z "${RADIUSCLIENT_MANDATORY}" ;
+ then
+ echo " ***"
+ echo " *** It appears that you do not have the radiusclient-ng development package installed."
+ echo " *** Please install it to include Radius Client support, or re-run configure"
+ echo " *** without explicitly specifying --with-radiusclient-ng"
+ exit 1
+ fi
+ RADIUSCLIENT_LIB=""
+ RADIUSCLIENT_INCLUDE=""
+ PBX_LIBRADIUSCLIENT=0
+ else
+ PBX_LIBRADIUSCLIENT=1
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_RADIUSCLIENT 1
+_ACEOF
+
+ fi
+ elif test ! -z "${RADIUSCLIENT_MANDATORY}";
+ then
+ echo "***"
+ echo "*** The Radius Client installation on this system appears to be broken."
+ echo "*** Either correct the installation, or run configure"
+ echo "*** without explicity specifying --with-radiusclient-ng"
+ exit 1
+ fi
+fi
+
+
+
+
+
+
# Check whether --with-speex or --without-speex was given.
if test "${with_speex+set}" = set; then
withval="$with_speex"
case ${withval} in
n|no)
- USE_speex=no
+ USE_SPEEX=no
;;
y|ye|yes)
- speex_MANDATORY="yes"
+ SPEEX_MANDATORY="yes"
;;
*)
- speex_DIR="${withval}"
- speex_MANDATORY="yes"
+ SPEEX_DIR="${withval}"
+ SPEEX_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBspeex=0
+PBX_LIBSPEEX=0
-if test "${USE_speex}" != "no"; then
+if test "${USE_SPEEX}" != "no"; then
pbxlibdir=""
- if test "x${speex_DIR}" != "x"; then
+ if test "x${SPEEX_DIR}" != "x"; then
pbxlibdir="-L${speex_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for speex_encode in -lspeex" >&5
@@ -9254,21 +9706,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encode" >&5
echo "${ECHO_T}$ac_cv_lib_speex_speex_encode" >&6
if test $ac_cv_lib_speex_speex_encode = yes; then
- :
+ AST_SPEEX_FOUND=yes
+else
+ AST_SPEEX_FOUND=no
fi
- if test "${ac_cv_lib_speex_speex_encode}" = "yes"; then
- speex_LIB="-lspeex -lm"
+ if test "${AST_SPEEX_FOUND}" = "yes"; then
+ SPEEX_LIB="-lspeex -lm"
SPEEX_HEADER_FOUND="1"
- if test "x${speex_DIR}" != "x"; then
- speex_LIB="${pbxlibdir} ${speex_LIB}"
- speex_INCLUDE="-I${speex_DIR}/include"
+ if test "x${SPEEX_DIR}" != "x"; then
+ SPEEX_LIB="${pbxlibdir} ${SPEEX_LIB}"
+ SPEEX_INCLUDE="-I${SPEEX_DIR}/include"
if test "xspeex/speex.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${speex_DIR}/include/speex/speex.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${SPEEX_DIR}/include/speex/speex.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${speex_DIR}/include/speex/speex.h" >&5
-echo $ECHO_N "checking for ${speex_DIR}/include/speex/speex.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${SPEEX_DIR}/include/speex/speex.h" >&5
+echo $ECHO_N "checking for ${SPEEX_DIR}/include/speex/speex.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -9276,8 +9730,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${speex_DIR}/include/speex/speex.h usability" >&5
-echo $ECHO_N "checking ${speex_DIR}/include/speex/speex.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${SPEEX_DIR}/include/speex/speex.h usability" >&5
+echo $ECHO_N "checking ${SPEEX_DIR}/include/speex/speex.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9285,7 +9739,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${speex_DIR}/include/speex/speex.h>
+#include <${SPEEX_DIR}/include/speex/speex.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -9320,15 +9774,15 @@ 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 ${speex_DIR}/include/speex/speex.h presence" >&5
-echo $ECHO_N "checking ${speex_DIR}/include/speex/speex.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${SPEEX_DIR}/include/speex/speex.h presence" >&5
+echo $ECHO_N "checking ${SPEEX_DIR}/include/speex/speex.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 <${speex_DIR}/include/speex/speex.h>
+#include <${SPEEX_DIR}/include/speex/speex.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9362,25 +9816,25 @@ 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: ${speex_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${speex_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${speex_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SPEEX_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${SPEEX_DIR}/include/speex/speex.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -9391,8 +9845,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${speex_DIR}/include/speex/speex.h" >&5
-echo $ECHO_N "checking for ${speex_DIR}/include/speex/speex.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${SPEEX_DIR}/include/speex/speex.h" >&5
+echo $ECHO_N "checking for ${SPEEX_DIR}/include/speex/speex.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9558,7 +10012,7 @@ fi
fi
fi
if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${speex_MANDATORY}" ;
+ if test ! -z "${SPEEX_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the speex development package installed."
@@ -9566,18 +10020,18 @@ fi
echo " *** without explicitly specifying --with-speex"
exit 1
fi
- speex_LIB=""
- speex_INCLUDE=""
- PBX_LIBspeex=0
+ SPEEX_LIB=""
+ SPEEX_INCLUDE=""
+ PBX_LIBSPEEX=0
else
- PBX_LIBspeex=1
+ PBX_LIBSPEEX=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SPEEX 1
_ACEOF
fi
- elif test ! -z "${speex_MANDATORY}";
+ elif test ! -z "${SPEEX_MANDATORY}";
then
echo "***"
echo "*** The Speex installation on this system appears to be broken."
@@ -9598,24 +10052,24 @@ if test "${with_sqlite+set}" = set; then
case ${withval} in
n|no)
- USE_sqlite=no
+ USE_SQLITE=no
;;
y|ye|yes)
- sqlite_MANDATORY="yes"
+ SQLITE_MANDATORY="yes"
;;
*)
- sqlite_DIR="${withval}"
- sqlite_MANDATORY="yes"
+ SQLITE_DIR="${withval}"
+ SQLITE_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBsqlite=0
+PBX_LIBSQLITE=0
-if test "${USE_sqlite}" != "no"; then
+if test "${USE_SQLITE}" != "no"; then
pbxlibdir=""
- if test "x${sqlite_DIR}" != "x"; then
+ if test "x${SQLITE_DIR}" != "x"; then
pbxlibdir="-L${sqlite_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for sqlite_exec in -lsqlite" >&5
@@ -9682,21 +10136,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_exec" >&5
echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_exec" >&6
if test $ac_cv_lib_sqlite_sqlite_exec = yes; then
- :
+ AST_SQLITE_FOUND=yes
+else
+ AST_SQLITE_FOUND=no
fi
- if test "${ac_cv_lib_sqlite_sqlite_exec}" = "yes"; then
- sqlite_LIB="-lsqlite "
+ if test "${AST_SQLITE_FOUND}" = "yes"; then
+ SQLITE_LIB="-lsqlite "
SQLITE_HEADER_FOUND="1"
- if test "x${sqlite_DIR}" != "x"; then
- sqlite_LIB="${pbxlibdir} ${sqlite_LIB}"
- sqlite_INCLUDE="-I${sqlite_DIR}/include"
+ if test "x${SQLITE_DIR}" != "x"; then
+ SQLITE_LIB="${pbxlibdir} ${SQLITE_LIB}"
+ SQLITE_INCLUDE="-I${SQLITE_DIR}/include"
if test "xsqlite.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${sqlite_DIR}/include/sqlite.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${SQLITE_DIR}/include/sqlite.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${sqlite_DIR}/include/sqlite.h" >&5
-echo $ECHO_N "checking for ${sqlite_DIR}/include/sqlite.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${SQLITE_DIR}/include/sqlite.h" >&5
+echo $ECHO_N "checking for ${SQLITE_DIR}/include/sqlite.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -9704,8 +10160,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${sqlite_DIR}/include/sqlite.h usability" >&5
-echo $ECHO_N "checking ${sqlite_DIR}/include/sqlite.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${SQLITE_DIR}/include/sqlite.h usability" >&5
+echo $ECHO_N "checking ${SQLITE_DIR}/include/sqlite.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9713,7 +10169,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${sqlite_DIR}/include/sqlite.h>
+#include <${SQLITE_DIR}/include/sqlite.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -9748,15 +10204,15 @@ 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 ${sqlite_DIR}/include/sqlite.h presence" >&5
-echo $ECHO_N "checking ${sqlite_DIR}/include/sqlite.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${SQLITE_DIR}/include/sqlite.h presence" >&5
+echo $ECHO_N "checking ${SQLITE_DIR}/include/sqlite.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 <${sqlite_DIR}/include/sqlite.h>
+#include <${SQLITE_DIR}/include/sqlite.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9790,25 +10246,25 @@ 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: ${sqlite_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${sqlite_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${sqlite_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${SQLITE_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${SQLITE_DIR}/include/sqlite.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -9819,8 +10275,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${sqlite_DIR}/include/sqlite.h" >&5
-echo $ECHO_N "checking for ${sqlite_DIR}/include/sqlite.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${SQLITE_DIR}/include/sqlite.h" >&5
+echo $ECHO_N "checking for ${SQLITE_DIR}/include/sqlite.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -9986,7 +10442,7 @@ fi
fi
fi
if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${sqlite_MANDATORY}" ;
+ if test ! -z "${SQLITE_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the sqlite development package installed."
@@ -9994,18 +10450,18 @@ fi
echo " *** without explicitly specifying --with-sqlite"
exit 1
fi
- sqlite_LIB=""
- sqlite_INCLUDE=""
- PBX_LIBsqlite=0
+ SQLITE_LIB=""
+ SQLITE_INCLUDE=""
+ PBX_LIBSQLITE=0
else
- PBX_LIBsqlite=1
+ PBX_LIBSQLITE=1
cat >>confdefs.h <<_ACEOF
#define HAVE_SQLITE 1
_ACEOF
fi
- elif test ! -z "${sqlite_MANDATORY}";
+ elif test ! -z "${SQLITE_MANDATORY}";
then
echo "***"
echo "*** The SQLite installation on this system appears to be broken."
@@ -10026,24 +10482,24 @@ if test "${with_ssl+set}" = set; then
case ${withval} in
n|no)
- USE_ssl=no
+ USE_OPENSSL=no
;;
y|ye|yes)
- ssl_MANDATORY="yes"
+ OPENSSL_MANDATORY="yes"
;;
*)
- ssl_DIR="${withval}"
- ssl_MANDATORY="yes"
+ OPENSSL_DIR="${withval}"
+ OPENSSL_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBssl=0
+PBX_LIBOPENSSL=0
-if test "${USE_ssl}" != "no"; then
+if test "${USE_OPENSSL}" != "no"; then
pbxlibdir=""
- if test "x${ssl_DIR}" != "x"; then
+ if test "x${OPENSSL_DIR}" != "x"; then
pbxlibdir="-L${ssl_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for ssl2_connect in -lssl" >&5
@@ -10110,21 +10566,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_ssl2_connect" >&5
echo "${ECHO_T}$ac_cv_lib_ssl_ssl2_connect" >&6
if test $ac_cv_lib_ssl_ssl2_connect = yes; then
- :
+ AST_OPENSSL_FOUND=yes
+else
+ AST_OPENSSL_FOUND=no
fi
- if test "${ac_cv_lib_ssl_ssl2_connect}" = "yes"; then
- ssl_LIB="-lssl -lcrypto"
+ if test "${AST_OPENSSL_FOUND}" = "yes"; then
+ OPENSSL_LIB="-lssl -lcrypto"
OPENSSL_HEADER_FOUND="1"
- if test "x${ssl_DIR}" != "x"; then
- ssl_LIB="${pbxlibdir} ${ssl_LIB}"
- ssl_INCLUDE="-I${ssl_DIR}/include"
+ if test "x${OPENSSL_DIR}" != "x"; then
+ OPENSSL_LIB="${pbxlibdir} ${OPENSSL_LIB}"
+ OPENSSL_INCLUDE="-I${OPENSSL_DIR}/include"
if test "xopenssl/ssl.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${ssl_DIR}/include/openssl/ssl.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${OPENSSL_DIR}/include/openssl/ssl.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${ssl_DIR}/include/openssl/ssl.h" >&5
-echo $ECHO_N "checking for ${ssl_DIR}/include/openssl/ssl.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${OPENSSL_DIR}/include/openssl/ssl.h" >&5
+echo $ECHO_N "checking for ${OPENSSL_DIR}/include/openssl/ssl.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -10132,8 +10590,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${ssl_DIR}/include/openssl/ssl.h usability" >&5
-echo $ECHO_N "checking ${ssl_DIR}/include/openssl/ssl.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OPENSSL_DIR}/include/openssl/ssl.h usability" >&5
+echo $ECHO_N "checking ${OPENSSL_DIR}/include/openssl/ssl.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10141,7 +10599,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${ssl_DIR}/include/openssl/ssl.h>
+#include <${OPENSSL_DIR}/include/openssl/ssl.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -10176,15 +10634,15 @@ 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 ${ssl_DIR}/include/openssl/ssl.h presence" >&5
-echo $ECHO_N "checking ${ssl_DIR}/include/openssl/ssl.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OPENSSL_DIR}/include/openssl/ssl.h presence" >&5
+echo $ECHO_N "checking ${OPENSSL_DIR}/include/openssl/ssl.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 <${ssl_DIR}/include/openssl/ssl.h>
+#include <${OPENSSL_DIR}/include/openssl/ssl.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -10218,25 +10676,25 @@ 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: ${ssl_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ssl_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ssl_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${OPENSSL_DIR}/include/openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -10247,8 +10705,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${ssl_DIR}/include/openssl/ssl.h" >&5
-echo $ECHO_N "checking for ${ssl_DIR}/include/openssl/ssl.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${OPENSSL_DIR}/include/openssl/ssl.h" >&5
+echo $ECHO_N "checking for ${OPENSSL_DIR}/include/openssl/ssl.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10414,7 +10872,7 @@ fi
fi
fi
if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ssl_MANDATORY}" ;
+ if test ! -z "${OPENSSL_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the ssl development package installed."
@@ -10422,18 +10880,18 @@ fi
echo " *** without explicitly specifying --with-ssl"
exit 1
fi
- ssl_LIB=""
- ssl_INCLUDE=""
- PBX_LIBssl=0
+ OPENSSL_LIB=""
+ OPENSSL_INCLUDE=""
+ PBX_LIBOPENSSL=0
else
- PBX_LIBssl=1
+ PBX_LIBOPENSSL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENSSL 1
_ACEOF
fi
- elif test ! -z "${ssl_MANDATORY}";
+ elif test ! -z "${OPENSSL_MANDATORY}";
then
echo "***"
echo "*** The OpenSSL installation on this system appears to be broken."
@@ -10454,24 +10912,24 @@ if test "${with_tds+set}" = set; then
case ${withval} in
n|no)
- USE_tds=no
+ USE_FREETDS=no
;;
y|ye|yes)
- tds_MANDATORY="yes"
+ FREETDS_MANDATORY="yes"
;;
*)
- tds_DIR="${withval}"
- tds_MANDATORY="yes"
+ FREETDS_DIR="${withval}"
+ FREETDS_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBtds=0
+PBX_LIBFREETDS=0
-if test "${USE_tds}" != "no"; then
+if test "${USE_FREETDS}" != "no"; then
pbxlibdir=""
- if test "x${tds_DIR}" != "x"; then
+ if test "x${FREETDS_DIR}" != "x"; then
pbxlibdir="-L${tds_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tds_version in -ltds" >&5
@@ -10538,21 +10996,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tds_tds_version" >&5
echo "${ECHO_T}$ac_cv_lib_tds_tds_version" >&6
if test $ac_cv_lib_tds_tds_version = yes; then
- :
+ AST_FREETDS_FOUND=yes
+else
+ AST_FREETDS_FOUND=no
fi
- if test "${ac_cv_lib_tds_tds_version}" = "yes"; then
- tds_LIB="-ltds "
+ if test "${AST_FREETDS_FOUND}" = "yes"; then
+ FREETDS_LIB="-ltds "
FREETDS_HEADER_FOUND="1"
- if test "x${tds_DIR}" != "x"; then
- tds_LIB="${pbxlibdir} ${tds_LIB}"
- tds_INCLUDE="-I${tds_DIR}/include"
+ if test "x${FREETDS_DIR}" != "x"; then
+ FREETDS_LIB="${pbxlibdir} ${FREETDS_LIB}"
+ FREETDS_INCLUDE="-I${FREETDS_DIR}/include"
if test "xtds.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${tds_DIR}/include/tds.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${FREETDS_DIR}/include/tds.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${tds_DIR}/include/tds.h" >&5
-echo $ECHO_N "checking for ${tds_DIR}/include/tds.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${FREETDS_DIR}/include/tds.h" >&5
+echo $ECHO_N "checking for ${FREETDS_DIR}/include/tds.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -10560,8 +11020,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${tds_DIR}/include/tds.h usability" >&5
-echo $ECHO_N "checking ${tds_DIR}/include/tds.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${FREETDS_DIR}/include/tds.h usability" >&5
+echo $ECHO_N "checking ${FREETDS_DIR}/include/tds.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10569,7 +11029,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${tds_DIR}/include/tds.h>
+#include <${FREETDS_DIR}/include/tds.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -10604,15 +11064,15 @@ 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 ${tds_DIR}/include/tds.h presence" >&5
-echo $ECHO_N "checking ${tds_DIR}/include/tds.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${FREETDS_DIR}/include/tds.h presence" >&5
+echo $ECHO_N "checking ${FREETDS_DIR}/include/tds.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 <${tds_DIR}/include/tds.h>
+#include <${FREETDS_DIR}/include/tds.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -10646,25 +11106,25 @@ 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: ${tds_DIR}/include/tds.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tds_DIR}/include/tds.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${tds_DIR}/include/tds.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${FREETDS_DIR}/include/tds.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${FREETDS_DIR}/include/tds.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -10675,8 +11135,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${tds_DIR}/include/tds.h" >&5
-echo $ECHO_N "checking for ${tds_DIR}/include/tds.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${FREETDS_DIR}/include/tds.h" >&5
+echo $ECHO_N "checking for ${FREETDS_DIR}/include/tds.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -10842,7 +11302,7 @@ fi
fi
fi
if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${tds_MANDATORY}" ;
+ if test ! -z "${FREETDS_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the tds development package installed."
@@ -10850,18 +11310,18 @@ fi
echo " *** without explicitly specifying --with-tds"
exit 1
fi
- tds_LIB=""
- tds_INCLUDE=""
- PBX_LIBtds=0
+ FREETDS_LIB=""
+ FREETDS_INCLUDE=""
+ PBX_LIBFREETDS=0
else
- PBX_LIBtds=1
+ PBX_LIBFREETDS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_FREETDS 1
_ACEOF
fi
- elif test ! -z "${tds_MANDATORY}";
+ elif test ! -z "${FREETDS_MANDATORY}";
then
echo "***"
echo "*** The FreeTDS installation on this system appears to be broken."
@@ -10882,24 +11342,24 @@ if test "${with_termcap+set}" = set; then
case ${withval} in
n|no)
- USE_termcap=no
+ USE_TERMCAP=no
;;
y|ye|yes)
- termcap_MANDATORY="yes"
+ TERMCAP_MANDATORY="yes"
;;
*)
- termcap_DIR="${withval}"
- termcap_MANDATORY="yes"
+ TERMCAP_DIR="${withval}"
+ TERMCAP_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBtermcap=0
+PBX_LIBTERMCAP=0
-if test "${USE_termcap}" != "no"; then
+if test "${USE_TERMCAP}" != "no"; then
pbxlibdir=""
- if test "x${termcap_DIR}" != "x"; then
+ if test "x${TERMCAP_DIR}" != "x"; then
pbxlibdir="-L${termcap_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
@@ -10966,21 +11426,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
if test $ac_cv_lib_termcap_tgetent = yes; then
- :
+ AST_TERMCAP_FOUND=yes
+else
+ AST_TERMCAP_FOUND=no
fi
- if test "${ac_cv_lib_termcap_tgetent}" = "yes"; then
- termcap_LIB="-ltermcap "
+ if test "${AST_TERMCAP_FOUND}" = "yes"; then
+ TERMCAP_LIB="-ltermcap "
TERMCAP_HEADER_FOUND="1"
- if test "x${termcap_DIR}" != "x"; then
- termcap_LIB="${pbxlibdir} ${termcap_LIB}"
- termcap_INCLUDE="-I${termcap_DIR}/include"
+ if test "x${TERMCAP_DIR}" != "x"; then
+ TERMCAP_LIB="${pbxlibdir} ${TERMCAP_LIB}"
+ TERMCAP_INCLUDE="-I${TERMCAP_DIR}/include"
if test "x" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${termcap_DIR}/include/" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${TERMCAP_DIR}/include/" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${termcap_DIR}/include/" >&5
-echo $ECHO_N "checking for ${termcap_DIR}/include/... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${TERMCAP_DIR}/include/" >&5
+echo $ECHO_N "checking for ${TERMCAP_DIR}/include/... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -10988,8 +11450,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${termcap_DIR}/include/ usability" >&5
-echo $ECHO_N "checking ${termcap_DIR}/include/ usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${TERMCAP_DIR}/include/ usability" >&5
+echo $ECHO_N "checking ${TERMCAP_DIR}/include/ usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10997,7 +11459,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${termcap_DIR}/include/>
+#include <${TERMCAP_DIR}/include/>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -11032,15 +11494,15 @@ 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 ${termcap_DIR}/include/ presence" >&5
-echo $ECHO_N "checking ${termcap_DIR}/include/ presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${TERMCAP_DIR}/include/ presence" >&5
+echo $ECHO_N "checking ${TERMCAP_DIR}/include/ 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 <${termcap_DIR}/include/>
+#include <${TERMCAP_DIR}/include/>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -11074,25 +11536,25 @@ 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: ${termcap_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${termcap_DIR}/include/: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${termcap_DIR}/include/: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TERMCAP_DIR}/include/: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${TERMCAP_DIR}/include/: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -11103,8 +11565,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${termcap_DIR}/include/" >&5
-echo $ECHO_N "checking for ${termcap_DIR}/include/... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${TERMCAP_DIR}/include/" >&5
+echo $ECHO_N "checking for ${TERMCAP_DIR}/include/... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11270,7 +11732,7 @@ fi
fi
fi
if test "x${TERMCAP_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${termcap_MANDATORY}" ;
+ if test ! -z "${TERMCAP_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the termcap development package installed."
@@ -11278,18 +11740,18 @@ fi
echo " *** without explicitly specifying --with-termcap"
exit 1
fi
- termcap_LIB=""
- termcap_INCLUDE=""
- PBX_LIBtermcap=0
+ TERMCAP_LIB=""
+ TERMCAP_INCLUDE=""
+ PBX_LIBTERMCAP=0
else
- PBX_LIBtermcap=1
+ PBX_LIBTERMCAP=1
cat >>confdefs.h <<_ACEOF
#define HAVE_TERMCAP 1
_ACEOF
fi
- elif test ! -z "${termcap_MANDATORY}";
+ elif test ! -z "${TERMCAP_MANDATORY}";
then
echo "***"
echo "*** The Termcap installation on this system appears to be broken."
@@ -11310,24 +11772,24 @@ if test "${with_tinfo+set}" = set; then
case ${withval} in
n|no)
- USE_tinfo=no
+ USE_TINFO=no
;;
y|ye|yes)
- tinfo_MANDATORY="yes"
+ TINFO_MANDATORY="yes"
;;
*)
- tinfo_DIR="${withval}"
- tinfo_MANDATORY="yes"
+ TINFO_DIR="${withval}"
+ TINFO_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBtinfo=0
+PBX_LIBTINFO=0
-if test "${USE_tinfo}" != "no"; then
+if test "${USE_TINFO}" != "no"; then
pbxlibdir=""
- if test "x${tinfo_DIR}" != "x"; then
+ if test "x${TINFO_DIR}" != "x"; then
pbxlibdir="-L${tinfo_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tgetent in -ltinfo" >&5
@@ -11394,21 +11856,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgetent" >&5
echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6
if test $ac_cv_lib_tinfo_tgetent = yes; then
- :
+ AST_TINFO_FOUND=yes
+else
+ AST_TINFO_FOUND=no
fi
- if test "${ac_cv_lib_tinfo_tgetent}" = "yes"; then
- tinfo_LIB="-ltinfo "
+ if test "${AST_TINFO_FOUND}" = "yes"; then
+ TINFO_LIB="-ltinfo "
TINFO_HEADER_FOUND="1"
- if test "x${tinfo_DIR}" != "x"; then
- tinfo_LIB="${pbxlibdir} ${tinfo_LIB}"
- tinfo_INCLUDE="-I${tinfo_DIR}/include"
+ if test "x${TINFO_DIR}" != "x"; then
+ TINFO_LIB="${pbxlibdir} ${TINFO_LIB}"
+ TINFO_INCLUDE="-I${TINFO_DIR}/include"
if test "x" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${tinfo_DIR}/include/" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${TINFO_DIR}/include/" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${tinfo_DIR}/include/" >&5
-echo $ECHO_N "checking for ${tinfo_DIR}/include/... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${TINFO_DIR}/include/" >&5
+echo $ECHO_N "checking for ${TINFO_DIR}/include/... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -11416,8 +11880,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${tinfo_DIR}/include/ usability" >&5
-echo $ECHO_N "checking ${tinfo_DIR}/include/ usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${TINFO_DIR}/include/ usability" >&5
+echo $ECHO_N "checking ${TINFO_DIR}/include/ usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11425,7 +11889,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${tinfo_DIR}/include/>
+#include <${TINFO_DIR}/include/>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -11460,15 +11924,15 @@ 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 ${tinfo_DIR}/include/ presence" >&5
-echo $ECHO_N "checking ${tinfo_DIR}/include/ presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${TINFO_DIR}/include/ presence" >&5
+echo $ECHO_N "checking ${TINFO_DIR}/include/ 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 <${tinfo_DIR}/include/>
+#include <${TINFO_DIR}/include/>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -11502,25 +11966,25 @@ 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: ${tinfo_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tinfo_DIR}/include/: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${tinfo_DIR}/include/: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${TINFO_DIR}/include/: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${TINFO_DIR}/include/: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -11531,8 +11995,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${tinfo_DIR}/include/" >&5
-echo $ECHO_N "checking for ${tinfo_DIR}/include/... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${TINFO_DIR}/include/" >&5
+echo $ECHO_N "checking for ${TINFO_DIR}/include/... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -11698,7 +12162,7 @@ fi
fi
fi
if test "x${TINFO_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${tinfo_MANDATORY}" ;
+ if test ! -z "${TINFO_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the tinfo development package installed."
@@ -11706,18 +12170,18 @@ fi
echo " *** without explicitly specifying --with-tinfo"
exit 1
fi
- tinfo_LIB=""
- tinfo_INCLUDE=""
- PBX_LIBtinfo=0
+ TINFO_LIB=""
+ TINFO_INCLUDE=""
+ PBX_LIBTINFO=0
else
- PBX_LIBtinfo=1
+ PBX_LIBTINFO=1
cat >>confdefs.h <<_ACEOF
#define HAVE_TINFO 1
_ACEOF
fi
- elif test ! -z "${tinfo_MANDATORY}";
+ elif test ! -z "${TINFO_MANDATORY}";
then
echo "***"
echo "*** The Term Info installation on this system appears to be broken."
@@ -11738,24 +12202,24 @@ if test "${with_vorbis+set}" = set; then
case ${withval} in
n|no)
- USE_vorbis=no
+ USE_VORBIS=no
;;
y|ye|yes)
- vorbis_MANDATORY="yes"
+ VORBIS_MANDATORY="yes"
;;
*)
- vorbis_DIR="${withval}"
- vorbis_MANDATORY="yes"
+ VORBIS_DIR="${withval}"
+ VORBIS_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBvorbis=0
+PBX_LIBVORBIS=0
-if test "${USE_vorbis}" != "no"; then
+if test "${USE_VORBIS}" != "no"; then
pbxlibdir=""
- if test "x${vorbis_DIR}" != "x"; then
+ if test "x${VORBIS_DIR}" != "x"; then
pbxlibdir="-L${vorbis_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for vorbis_info_init in -lvorbis" >&5
@@ -11822,21 +12286,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_info_init" >&6
if test $ac_cv_lib_vorbis_vorbis_info_init = yes; then
- :
+ AST_VORBIS_FOUND=yes
+else
+ AST_VORBIS_FOUND=no
fi
- if test "${ac_cv_lib_vorbis_vorbis_info_init}" = "yes"; then
- vorbis_LIB="-lvorbis -lm -lvorbisenc"
+ if test "${AST_VORBIS_FOUND}" = "yes"; then
+ VORBIS_LIB="-lvorbis -lm -lvorbisenc"
VORBIS_HEADER_FOUND="1"
- if test "x${vorbis_DIR}" != "x"; then
- vorbis_LIB="${pbxlibdir} ${vorbis_LIB}"
- vorbis_INCLUDE="-I${vorbis_DIR}/include"
+ if test "x${VORBIS_DIR}" != "x"; then
+ VORBIS_LIB="${pbxlibdir} ${VORBIS_LIB}"
+ VORBIS_INCLUDE="-I${VORBIS_DIR}/include"
if test "xvorbis/codec.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${vorbis_DIR}/include/vorbis/codec.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${VORBIS_DIR}/include/vorbis/codec.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${vorbis_DIR}/include/vorbis/codec.h" >&5
-echo $ECHO_N "checking for ${vorbis_DIR}/include/vorbis/codec.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${VORBIS_DIR}/include/vorbis/codec.h" >&5
+echo $ECHO_N "checking for ${VORBIS_DIR}/include/vorbis/codec.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -11844,8 +12310,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${vorbis_DIR}/include/vorbis/codec.h usability" >&5
-echo $ECHO_N "checking ${vorbis_DIR}/include/vorbis/codec.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${VORBIS_DIR}/include/vorbis/codec.h usability" >&5
+echo $ECHO_N "checking ${VORBIS_DIR}/include/vorbis/codec.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11853,7 +12319,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${vorbis_DIR}/include/vorbis/codec.h>
+#include <${VORBIS_DIR}/include/vorbis/codec.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -11888,15 +12354,15 @@ 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 ${vorbis_DIR}/include/vorbis/codec.h presence" >&5
-echo $ECHO_N "checking ${vorbis_DIR}/include/vorbis/codec.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${VORBIS_DIR}/include/vorbis/codec.h presence" >&5
+echo $ECHO_N "checking ${VORBIS_DIR}/include/vorbis/codec.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 <${vorbis_DIR}/include/vorbis/codec.h>
+#include <${VORBIS_DIR}/include/vorbis/codec.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -11930,25 +12396,25 @@ 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: ${vorbis_DIR}/include/vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${vorbis_DIR}/include/vorbis/codec.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${VORBIS_DIR}/include/vorbis/codec.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -11959,8 +12425,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${vorbis_DIR}/include/vorbis/codec.h" >&5
-echo $ECHO_N "checking for ${vorbis_DIR}/include/vorbis/codec.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${VORBIS_DIR}/include/vorbis/codec.h" >&5
+echo $ECHO_N "checking for ${VORBIS_DIR}/include/vorbis/codec.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12126,7 +12592,7 @@ fi
fi
fi
if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${vorbis_MANDATORY}" ;
+ if test ! -z "${VORBIS_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the vorbis development package installed."
@@ -12134,18 +12600,18 @@ fi
echo " *** without explicitly specifying --with-vorbis"
exit 1
fi
- vorbis_LIB=""
- vorbis_INCLUDE=""
- PBX_LIBvorbis=0
+ VORBIS_LIB=""
+ VORBIS_INCLUDE=""
+ PBX_LIBVORBIS=0
else
- PBX_LIBvorbis=1
+ PBX_LIBVORBIS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_VORBIS 1
_ACEOF
fi
- elif test ! -z "${vorbis_MANDATORY}";
+ elif test ! -z "${VORBIS_MANDATORY}";
then
echo "***"
echo "*** The Vorbis installation on this system appears to be broken."
@@ -12166,24 +12632,24 @@ if test "${with_z+set}" = set; then
case ${withval} in
n|no)
- USE_z=no
+ USE_ZLIB=no
;;
y|ye|yes)
- z_MANDATORY="yes"
+ ZLIB_MANDATORY="yes"
;;
*)
- z_DIR="${withval}"
- z_MANDATORY="yes"
+ ZLIB_DIR="${withval}"
+ ZLIB_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBz=0
+PBX_LIBZLIB=0
-if test "${USE_z}" != "no"; then
+if test "${USE_ZLIB}" != "no"; then
pbxlibdir=""
- if test "x${z_DIR}" != "x"; then
+ if test "x${ZLIB_DIR}" != "x"; then
pbxlibdir="-L${z_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for compress in -lz" >&5
@@ -12250,21 +12716,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
if test $ac_cv_lib_z_compress = yes; then
- :
+ AST_ZLIB_FOUND=yes
+else
+ AST_ZLIB_FOUND=no
fi
- if test "${ac_cv_lib_z_compress}" = "yes"; then
- z_LIB="-lz "
+ if test "${AST_ZLIB_FOUND}" = "yes"; then
+ ZLIB_LIB="-lz "
ZLIB_HEADER_FOUND="1"
- if test "x${z_DIR}" != "x"; then
- z_LIB="${pbxlibdir} ${z_LIB}"
- z_INCLUDE="-I${z_DIR}/include"
+ if test "x${ZLIB_DIR}" != "x"; then
+ ZLIB_LIB="${pbxlibdir} ${ZLIB_LIB}"
+ ZLIB_INCLUDE="-I${ZLIB_DIR}/include"
if test "xzlib.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${z_DIR}/include/zlib.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${ZLIB_DIR}/include/zlib.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${z_DIR}/include/zlib.h" >&5
-echo $ECHO_N "checking for ${z_DIR}/include/zlib.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${ZLIB_DIR}/include/zlib.h" >&5
+echo $ECHO_N "checking for ${ZLIB_DIR}/include/zlib.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -12272,8 +12740,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${z_DIR}/include/zlib.h usability" >&5
-echo $ECHO_N "checking ${z_DIR}/include/zlib.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ZLIB_DIR}/include/zlib.h usability" >&5
+echo $ECHO_N "checking ${ZLIB_DIR}/include/zlib.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -12281,7 +12749,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${z_DIR}/include/zlib.h>
+#include <${ZLIB_DIR}/include/zlib.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -12316,15 +12784,15 @@ 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 ${z_DIR}/include/zlib.h presence" >&5
-echo $ECHO_N "checking ${z_DIR}/include/zlib.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ZLIB_DIR}/include/zlib.h presence" >&5
+echo $ECHO_N "checking ${ZLIB_DIR}/include/zlib.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 <${z_DIR}/include/zlib.h>
+#include <${ZLIB_DIR}/include/zlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -12358,25 +12826,25 @@ 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: ${z_DIR}/include/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${z_DIR}/include/zlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${z_DIR}/include/zlib.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZLIB_DIR}/include/zlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${ZLIB_DIR}/include/zlib.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -12387,8 +12855,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${z_DIR}/include/zlib.h" >&5
-echo $ECHO_N "checking for ${z_DIR}/include/zlib.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${ZLIB_DIR}/include/zlib.h" >&5
+echo $ECHO_N "checking for ${ZLIB_DIR}/include/zlib.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -12554,7 +13022,7 @@ fi
fi
fi
if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${z_MANDATORY}" ;
+ if test ! -z "${ZLIB_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the z development package installed."
@@ -12562,18 +13030,18 @@ fi
echo " *** without explicitly specifying --with-z"
exit 1
fi
- z_LIB=""
- z_INCLUDE=""
- PBX_LIBz=0
+ ZLIB_LIB=""
+ ZLIB_INCLUDE=""
+ PBX_LIBZLIB=0
else
- PBX_LIBz=1
+ PBX_LIBZLIB=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB 1
_ACEOF
fi
- elif test ! -z "${z_MANDATORY}";
+ elif test ! -z "${ZLIB_MANDATORY}";
then
echo "***"
echo "*** The zlib installation on this system appears to be broken."
@@ -12588,21 +13056,21 @@ fi
EDITLINE_LIBS=""
-if test "x$termcap_LIB" != "x" ; then
- EDITLINE_LIBS="$termcap_LIB"
-elif test "x$tinfo_LIB" != "x" ; then
- EDITLINE_LIBS="$tinfo_LIB"
-elif test "x$curses_LIB" != "x" ; then
- EDITLINE_LIBS="$curses_LIB"
-elif test "x$ncurses_LIB" != "x" ; then
- EDITLINE_LIBS="$ncurses_LIB"
+if test "x$TERMCAP_LIB" != "x" ; then
+ EDITLINE_LIBS="$TERMCAP_LIB"
+elif test "x$TINFO_LIB" != "x" ; then
+ EDITLINE_LIBS="$TINFO_LIB"
+elif test "x$CURSES_LIB" != "x" ; then
+ EDITLINE_LIBS="$CURSES_LIB"
+elif test "x$NCURSES_LIB" != "x" ; then
+ EDITLINE_LIBS="$NCURSES_LIB"
else
echo "*** termcap support not found"
exit 1
fi
-PBX_LIBossaudio=0
+PBX_LIBOSS=0
if test "${ac_cv_header_linux_soundcard_h+set}" = set; then
echo "$as_me:$LINENO: checking for linux/soundcard.h" >&5
echo $ECHO_N "checking for linux/soundcard.h... $ECHO_C" >&6
@@ -12741,7 +13209,7 @@ echo "${ECHO_T}$ac_cv_header_linux_soundcard_h" >&6
fi
if test $ac_cv_header_linux_soundcard_h = yes; then
- PBX_LIBossaudio=1
+ PBX_LIBOSS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OSS 1
@@ -12751,7 +13219,7 @@ _ACEOF
fi
-if test "$PBX_LIBossaudio" = "0"; then
+if test "$PBX_LIBOSS" = "0"; then
if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
echo $ECHO_N "checking for sys/soundcard.h... $ECHO_C" >&6
@@ -12901,7 +13369,7 @@ fi
fi
-if test "$PBX_LIBossaudio" = "0"; then
+if test "$PBX_LIBOSS" = "0"; then
# Check whether --with-ossaudio or --without-ossaudio was given.
@@ -12910,24 +13378,24 @@ if test "${with_ossaudio+set}" = set; then
case ${withval} in
n|no)
- USE_ossaudio=no
+ USE_OSS=no
;;
y|ye|yes)
- ossaudio_MANDATORY="yes"
+ OSS_MANDATORY="yes"
;;
*)
- ossaudio_DIR="${withval}"
- ossaudio_MANDATORY="yes"
+ OSS_DIR="${withval}"
+ OSS_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBossaudio=0
+PBX_LIBOSS=0
-if test "${USE_ossaudio}" != "no"; then
+if test "${USE_OSS}" != "no"; then
pbxlibdir=""
- if test "x${ossaudio_DIR}" != "x"; then
+ if test "x${OSS_DIR}" != "x"; then
pbxlibdir="-L${ossaudio_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for oss_ioctl_mixer in -lossaudio" >&5
@@ -12994,21 +13462,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5
echo "${ECHO_T}$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6
if test $ac_cv_lib_ossaudio_oss_ioctl_mixer = yes; then
- :
+ AST_OSS_FOUND=yes
+else
+ AST_OSS_FOUND=no
fi
- if test "${ac_cv_lib_ossaudio_oss_ioctl_mixer}" = "yes"; then
- ossaudio_LIB="-lossaudio "
+ if test "${AST_OSS_FOUND}" = "yes"; then
+ OSS_LIB="-lossaudio "
OSS_HEADER_FOUND="1"
- if test "x${ossaudio_DIR}" != "x"; then
- ossaudio_LIB="${pbxlibdir} ${ossaudio_LIB}"
- ossaudio_INCLUDE="-I${ossaudio_DIR}/include"
+ if test "x${OSS_DIR}" != "x"; then
+ OSS_LIB="${pbxlibdir} ${OSS_LIB}"
+ OSS_INCLUDE="-I${OSS_DIR}/include"
if test "xsoundcard.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${ossaudio_DIR}/include/soundcard.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${OSS_DIR}/include/soundcard.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${ossaudio_DIR}/include/soundcard.h" >&5
-echo $ECHO_N "checking for ${ossaudio_DIR}/include/soundcard.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${OSS_DIR}/include/soundcard.h" >&5
+echo $ECHO_N "checking for ${OSS_DIR}/include/soundcard.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -13016,8 +13486,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${ossaudio_DIR}/include/soundcard.h usability" >&5
-echo $ECHO_N "checking ${ossaudio_DIR}/include/soundcard.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OSS_DIR}/include/soundcard.h usability" >&5
+echo $ECHO_N "checking ${OSS_DIR}/include/soundcard.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13025,7 +13495,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${ossaudio_DIR}/include/soundcard.h>
+#include <${OSS_DIR}/include/soundcard.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -13060,15 +13530,15 @@ 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 ${ossaudio_DIR}/include/soundcard.h presence" >&5
-echo $ECHO_N "checking ${ossaudio_DIR}/include/soundcard.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${OSS_DIR}/include/soundcard.h presence" >&5
+echo $ECHO_N "checking ${OSS_DIR}/include/soundcard.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 <${ossaudio_DIR}/include/soundcard.h>
+#include <${OSS_DIR}/include/soundcard.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -13102,25 +13572,25 @@ 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: ${ossaudio_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${ossaudio_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${ossaudio_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${OSS_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${OSS_DIR}/include/soundcard.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -13131,8 +13601,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${ossaudio_DIR}/include/soundcard.h" >&5
-echo $ECHO_N "checking for ${ossaudio_DIR}/include/soundcard.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${OSS_DIR}/include/soundcard.h" >&5
+echo $ECHO_N "checking for ${OSS_DIR}/include/soundcard.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13298,7 +13768,7 @@ fi
fi
fi
if test "x${OSS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ossaudio_MANDATORY}" ;
+ if test ! -z "${OSS_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the ossaudio development package installed."
@@ -13306,18 +13776,18 @@ fi
echo " *** without explicitly specifying --with-ossaudio"
exit 1
fi
- ossaudio_LIB=""
- ossaudio_INCLUDE=""
- PBX_LIBossaudio=0
+ OSS_LIB=""
+ OSS_INCLUDE=""
+ PBX_LIBOSS=0
else
- PBX_LIBossaudio=1
+ PBX_LIBOSS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_OSS 1
_ACEOF
fi
- elif test ! -z "${ossaudio_MANDATORY}";
+ elif test ! -z "${OSS_MANDATORY}";
then
echo "***"
echo "*** The Open Sound System installation on this system appears to be broken."
@@ -13343,24 +13813,24 @@ if test "${with_tonezone+set}" = set; then
case ${withval} in
n|no)
- USE_tonezone=no
+ USE_ZAPTEL=no
;;
y|ye|yes)
- tonezone_MANDATORY="yes"
+ ZAPTEL_MANDATORY="yes"
;;
*)
- tonezone_DIR="${withval}"
- tonezone_MANDATORY="yes"
+ ZAPTEL_DIR="${withval}"
+ ZAPTEL_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBtonezone=0
+PBX_LIBZAPTEL=0
-if test "${USE_tonezone}" != "no"; then
+if test "${USE_ZAPTEL}" != "no"; then
pbxlibdir=""
- if test "x${tonezone_DIR}" != "x"; then
+ if test "x${ZAPTEL_DIR}" != "x"; then
pbxlibdir="-L${tonezone_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tone_zone_find in -ltonezone" >&5
@@ -13427,21 +13897,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
echo "${ECHO_T}$ac_cv_lib_tonezone_tone_zone_find" >&6
if test $ac_cv_lib_tonezone_tone_zone_find = yes; then
- :
+ AST_ZAPTEL_FOUND=yes
+else
+ AST_ZAPTEL_FOUND=no
fi
- if test "${ac_cv_lib_tonezone_tone_zone_find}" = "yes"; then
- tonezone_LIB="-ltonezone "
+ if test "${AST_ZAPTEL_FOUND}" = "yes"; then
+ ZAPTEL_LIB="-ltonezone "
ZAPTEL_HEADER_FOUND="1"
- if test "x${tonezone_DIR}" != "x"; then
- tonezone_LIB="${pbxlibdir} ${tonezone_LIB}"
- tonezone_INCLUDE="-I${tonezone_DIR}/include"
+ if test "x${ZAPTEL_DIR}" != "x"; then
+ ZAPTEL_LIB="${pbxlibdir} ${ZAPTEL_LIB}"
+ ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
if test "xlinux/zaptel.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${tonezone_DIR}/include/linux/zaptel.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${ZAPTEL_DIR}/include/linux/zaptel.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${tonezone_DIR}/include/linux/zaptel.h" >&5
-echo $ECHO_N "checking for ${tonezone_DIR}/include/linux/zaptel.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/linux/zaptel.h" >&5
+echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/linux/zaptel.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -13449,8 +13921,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${tonezone_DIR}/include/linux/zaptel.h usability" >&5
-echo $ECHO_N "checking ${tonezone_DIR}/include/linux/zaptel.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/linux/zaptel.h usability" >&5
+echo $ECHO_N "checking ${ZAPTEL_DIR}/include/linux/zaptel.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13458,7 +13930,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${tonezone_DIR}/include/linux/zaptel.h>
+#include <${ZAPTEL_DIR}/include/linux/zaptel.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -13493,15 +13965,15 @@ 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 ${tonezone_DIR}/include/linux/zaptel.h presence" >&5
-echo $ECHO_N "checking ${tonezone_DIR}/include/linux/zaptel.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/linux/zaptel.h presence" >&5
+echo $ECHO_N "checking ${ZAPTEL_DIR}/include/linux/zaptel.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 <${tonezone_DIR}/include/linux/zaptel.h>
+#include <${ZAPTEL_DIR}/include/linux/zaptel.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -13535,25 +14007,25 @@ 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: ${tonezone_DIR}/include/linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/linux/zaptel.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/linux/zaptel.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -13564,8 +14036,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${tonezone_DIR}/include/linux/zaptel.h" >&5
-echo $ECHO_N "checking for ${tonezone_DIR}/include/linux/zaptel.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/linux/zaptel.h" >&5
+echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/linux/zaptel.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -13731,7 +14203,7 @@ fi
fi
fi
if test "x${ZAPTEL_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${tonezone_MANDATORY}" ;
+ if test ! -z "${ZAPTEL_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the tonezone development package installed."
@@ -13739,18 +14211,18 @@ fi
echo " *** without explicitly specifying --with-tonezone"
exit 1
fi
- tonezone_LIB=""
- tonezone_INCLUDE=""
- PBX_LIBtonezone=0
+ ZAPTEL_LIB=""
+ ZAPTEL_INCLUDE=""
+ PBX_LIBZAPTEL=0
else
- PBX_LIBtonezone=1
+ PBX_LIBZAPTEL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ZAPTEL 1
_ACEOF
fi
- elif test ! -z "${tonezone_MANDATORY}";
+ elif test ! -z "${ZAPTEL_MANDATORY}";
then
echo "***"
echo "*** The Zaptel installation on this system appears to be broken."
@@ -13772,24 +14244,24 @@ if test "${with_tonezone+set}" = set; then
case ${withval} in
n|no)
- USE_tonezone=no
+ USE_ZAPTEL=no
;;
y|ye|yes)
- tonezone_MANDATORY="yes"
+ ZAPTEL_MANDATORY="yes"
;;
*)
- tonezone_DIR="${withval}"
- tonezone_MANDATORY="yes"
+ ZAPTEL_DIR="${withval}"
+ ZAPTEL_MANDATORY="yes"
;;
esac
fi;
-PBX_LIBtonezone=0
+PBX_LIBZAPTEL=0
-if test "${USE_tonezone}" != "no"; then
+if test "${USE_ZAPTEL}" != "no"; then
pbxlibdir=""
- if test "x${tonezone_DIR}" != "x"; then
+ if test "x${ZAPTEL_DIR}" != "x"; then
pbxlibdir="-L${tonezone_DIR}/lib"
fi
echo "$as_me:$LINENO: checking for tone_zone_find in -ltonezone" >&5
@@ -13856,21 +14328,23 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
echo "${ECHO_T}$ac_cv_lib_tonezone_tone_zone_find" >&6
if test $ac_cv_lib_tonezone_tone_zone_find = yes; then
- :
+ AST_ZAPTEL_FOUND=yes
+else
+ AST_ZAPTEL_FOUND=no
fi
- if test "${ac_cv_lib_tonezone_tone_zone_find}" = "yes"; then
- tonezone_LIB="-ltonezone -lm"
+ if test "${AST_ZAPTEL_FOUND}" = "yes"; then
+ ZAPTEL_LIB="-ltonezone -lm"
ZAPTEL_HEADER_FOUND="1"
- if test "x${tonezone_DIR}" != "x"; then
- tonezone_LIB="${pbxlibdir} ${tonezone_LIB}"
- tonezone_INCLUDE="-I${tonezone_DIR}/include"
+ if test "x${ZAPTEL_DIR}" != "x"; then
+ ZAPTEL_LIB="${pbxlibdir} ${ZAPTEL_LIB}"
+ ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
if test "xzaptel.h" != "x" ; then
- as_ac_Header=`echo "ac_cv_header_${tonezone_DIR}/include/zaptel.h" | $as_tr_sh`
+ as_ac_Header=`echo "ac_cv_header_${ZAPTEL_DIR}/include/zaptel.h" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for ${tonezone_DIR}/include/zaptel.h" >&5
-echo $ECHO_N "checking for ${tonezone_DIR}/include/zaptel.h... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/zaptel.h" >&5
+echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/zaptel.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@ -13878,8 +14352,8 @@ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking ${tonezone_DIR}/include/zaptel.h usability" >&5
-echo $ECHO_N "checking ${tonezone_DIR}/include/zaptel.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/zaptel.h usability" >&5
+echo $ECHO_N "checking ${ZAPTEL_DIR}/include/zaptel.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13887,7 +14361,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <${tonezone_DIR}/include/zaptel.h>
+#include <${ZAPTEL_DIR}/include/zaptel.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -13922,15 +14396,15 @@ 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 ${tonezone_DIR}/include/zaptel.h presence" >&5
-echo $ECHO_N "checking ${tonezone_DIR}/include/zaptel.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking ${ZAPTEL_DIR}/include/zaptel.h presence" >&5
+echo $ECHO_N "checking ${ZAPTEL_DIR}/include/zaptel.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 <${tonezone_DIR}/include/zaptel.h>
+#include <${ZAPTEL_DIR}/include/zaptel.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -13964,25 +14438,25 @@ 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: ${tonezone_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ${tonezone_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${tonezone_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ${ZAPTEL_DIR}/include/zaptel.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------ ##
@@ -13993,8 +14467,8 @@ _ASBOX
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for ${tonezone_DIR}/include/zaptel.h" >&5
-echo $ECHO_N "checking for ${tonezone_DIR}/include/zaptel.h... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for ${ZAPTEL_DIR}/include/zaptel.h" >&5
+echo $ECHO_N "checking for ${ZAPTEL_DIR}/include/zaptel.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -14160,7 +14634,7 @@ fi
fi
fi
if test "x${ZAPTEL_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${tonezone_MANDATORY}" ;
+ if test ! -z "${ZAPTEL_MANDATORY}" ;
then
echo " ***"
echo " *** It appears that you do not have the tonezone development package installed."
@@ -14168,18 +14642,18 @@ fi
echo " *** without explicitly specifying --with-tonezone"
exit 1
fi
- tonezone_LIB=""
- tonezone_INCLUDE=""
- PBX_LIBtonezone=0
+ ZAPTEL_LIB=""
+ ZAPTEL_INCLUDE=""
+ PBX_LIBZAPTEL=0
else
- PBX_LIBtonezone=1
+ PBX_LIBZAPTEL=1
cat >>confdefs.h <<_ACEOF
#define HAVE_ZAPTEL 1
_ACEOF
fi
- elif test ! -z "${tonezone_MANDATORY}";
+ elif test ! -z "${ZAPTEL_MANDATORY}";
then
echo "***"
echo "*** The Zaptel installation on this system appears to be broken."
@@ -22920,67 +23394,70 @@ s,@LN@,$LN,;t t
s,@DOT@,$DOT,;t t
s,@AST_DEVMODE@,$AST_DEVMODE,;t t
s,@EGREP@,$EGREP,;t t
-s,@asound_LIB@,$asound_LIB,;t t
-s,@asound_INCLUDE@,$asound_INCLUDE,;t t
-s,@PBX_LIBasound@,$PBX_LIBasound,;t t
-s,@curses_LIB@,$curses_LIB,;t t
-s,@curses_INCLUDE@,$curses_INCLUDE,;t t
-s,@PBX_LIBcurses@,$PBX_LIBcurses,;t t
-s,@nbs_LIB@,$nbs_LIB,;t t
-s,@nbs_INCLUDE@,$nbs_INCLUDE,;t t
-s,@PBX_LIBnbs@,$PBX_LIBnbs,;t t
-s,@ncurses_LIB@,$ncurses_LIB,;t t
-s,@ncurses_INCLUDE@,$ncurses_INCLUDE,;t t
-s,@PBX_LIBncurses@,$PBX_LIBncurses,;t t
-s,@newt_LIB@,$newt_LIB,;t t
-s,@newt_INCLUDE@,$newt_INCLUDE,;t t
-s,@PBX_LIBnewt@,$PBX_LIBnewt,;t t
-s,@odbc_LIB@,$odbc_LIB,;t t
-s,@odbc_INCLUDE@,$odbc_INCLUDE,;t t
-s,@PBX_LIBodbc@,$PBX_LIBodbc,;t t
-s,@ogg_LIB@,$ogg_LIB,;t t
-s,@ogg_INCLUDE@,$ogg_INCLUDE,;t t
-s,@PBX_LIBogg@,$PBX_LIBogg,;t t
-s,@osptk_LIB@,$osptk_LIB,;t t
-s,@osptk_INCLUDE@,$osptk_INCLUDE,;t t
-s,@PBX_LIBosptk@,$PBX_LIBosptk,;t t
-s,@popt_LIB@,$popt_LIB,;t t
-s,@popt_INCLUDE@,$popt_INCLUDE,;t t
-s,@PBX_LIBpopt@,$PBX_LIBpopt,;t t
-s,@pri_LIB@,$pri_LIB,;t t
-s,@pri_INCLUDE@,$pri_INCLUDE,;t t
-s,@PBX_LIBpri@,$PBX_LIBpri,;t t
-s,@speex_LIB@,$speex_LIB,;t t
-s,@speex_INCLUDE@,$speex_INCLUDE,;t t
-s,@PBX_LIBspeex@,$PBX_LIBspeex,;t t
-s,@sqlite_LIB@,$sqlite_LIB,;t t
-s,@sqlite_INCLUDE@,$sqlite_INCLUDE,;t t
-s,@PBX_LIBsqlite@,$PBX_LIBsqlite,;t t
-s,@ssl_LIB@,$ssl_LIB,;t t
-s,@ssl_INCLUDE@,$ssl_INCLUDE,;t t
-s,@PBX_LIBssl@,$PBX_LIBssl,;t t
-s,@tds_LIB@,$tds_LIB,;t t
-s,@tds_INCLUDE@,$tds_INCLUDE,;t t
-s,@PBX_LIBtds@,$PBX_LIBtds,;t t
-s,@termcap_LIB@,$termcap_LIB,;t t
-s,@termcap_INCLUDE@,$termcap_INCLUDE,;t t
-s,@PBX_LIBtermcap@,$PBX_LIBtermcap,;t t
-s,@tinfo_LIB@,$tinfo_LIB,;t t
-s,@tinfo_INCLUDE@,$tinfo_INCLUDE,;t t
-s,@PBX_LIBtinfo@,$PBX_LIBtinfo,;t t
-s,@vorbis_LIB@,$vorbis_LIB,;t t
-s,@vorbis_INCLUDE@,$vorbis_INCLUDE,;t t
-s,@PBX_LIBvorbis@,$PBX_LIBvorbis,;t t
-s,@z_LIB@,$z_LIB,;t t
-s,@z_INCLUDE@,$z_INCLUDE,;t t
-s,@PBX_LIBz@,$PBX_LIBz,;t t
+s,@ALSA_LIB@,$ALSA_LIB,;t t
+s,@ALSA_INCLUDE@,$ALSA_INCLUDE,;t t
+s,@PBX_LIBALSA@,$PBX_LIBALSA,;t t
+s,@CURSES_LIB@,$CURSES_LIB,;t t
+s,@CURSES_INCLUDE@,$CURSES_INCLUDE,;t t
+s,@PBX_LIBCURSES@,$PBX_LIBCURSES,;t t
+s,@NBS_LIB@,$NBS_LIB,;t t
+s,@NBS_INCLUDE@,$NBS_INCLUDE,;t t
+s,@PBX_LIBNBS@,$PBX_LIBNBS,;t t
+s,@NCURSES_LIB@,$NCURSES_LIB,;t t
+s,@NCURSES_INCLUDE@,$NCURSES_INCLUDE,;t t
+s,@PBX_LIBNCURSES@,$PBX_LIBNCURSES,;t t
+s,@NEWT_LIB@,$NEWT_LIB,;t t
+s,@NEWT_INCLUDE@,$NEWT_INCLUDE,;t t
+s,@PBX_LIBNEWT@,$PBX_LIBNEWT,;t t
+s,@UNIXODBC_LIB@,$UNIXODBC_LIB,;t t
+s,@UNIXODBC_INCLUDE@,$UNIXODBC_INCLUDE,;t t
+s,@PBX_LIBUNIXODBC@,$PBX_LIBUNIXODBC,;t t
+s,@OGG_LIB@,$OGG_LIB,;t t
+s,@OGG_INCLUDE@,$OGG_INCLUDE,;t t
+s,@PBX_LIBOGG@,$PBX_LIBOGG,;t t
+s,@OSPTK_LIB@,$OSPTK_LIB,;t t
+s,@OSPTK_INCLUDE@,$OSPTK_INCLUDE,;t t
+s,@PBX_LIBOSPTK@,$PBX_LIBOSPTK,;t t
+s,@POPT_LIB@,$POPT_LIB,;t t
+s,@POPT_INCLUDE@,$POPT_INCLUDE,;t t
+s,@PBX_LIBPOPT@,$PBX_LIBPOPT,;t t
+s,@LIBPRI_LIB@,$LIBPRI_LIB,;t t
+s,@LIBPRI_INCLUDE@,$LIBPRI_INCLUDE,;t t
+s,@PBX_LIBLIBPRI@,$PBX_LIBLIBPRI,;t t
+s,@RADIUSCLIENT_LIB@,$RADIUSCLIENT_LIB,;t t
+s,@RADIUSCLIENT_INCLUDE@,$RADIUSCLIENT_INCLUDE,;t t
+s,@PBX_LIBRADIUSCLIENT@,$PBX_LIBRADIUSCLIENT,;t t
+s,@SPEEX_LIB@,$SPEEX_LIB,;t t
+s,@SPEEX_INCLUDE@,$SPEEX_INCLUDE,;t t
+s,@PBX_LIBSPEEX@,$PBX_LIBSPEEX,;t t
+s,@SQLITE_LIB@,$SQLITE_LIB,;t t
+s,@SQLITE_INCLUDE@,$SQLITE_INCLUDE,;t t
+s,@PBX_LIBSQLITE@,$PBX_LIBSQLITE,;t t
+s,@OPENSSL_LIB@,$OPENSSL_LIB,;t t
+s,@OPENSSL_INCLUDE@,$OPENSSL_INCLUDE,;t t
+s,@PBX_LIBOPENSSL@,$PBX_LIBOPENSSL,;t t
+s,@FREETDS_LIB@,$FREETDS_LIB,;t t
+s,@FREETDS_INCLUDE@,$FREETDS_INCLUDE,;t t
+s,@PBX_LIBFREETDS@,$PBX_LIBFREETDS,;t t
+s,@TERMCAP_LIB@,$TERMCAP_LIB,;t t
+s,@TERMCAP_INCLUDE@,$TERMCAP_INCLUDE,;t t
+s,@PBX_LIBTERMCAP@,$PBX_LIBTERMCAP,;t t
+s,@TINFO_LIB@,$TINFO_LIB,;t t
+s,@TINFO_INCLUDE@,$TINFO_INCLUDE,;t t
+s,@PBX_LIBTINFO@,$PBX_LIBTINFO,;t t
+s,@VORBIS_LIB@,$VORBIS_LIB,;t t
+s,@VORBIS_INCLUDE@,$VORBIS_INCLUDE,;t t
+s,@PBX_LIBVORBIS@,$PBX_LIBVORBIS,;t t
+s,@ZLIB_LIB@,$ZLIB_LIB,;t t
+s,@ZLIB_INCLUDE@,$ZLIB_INCLUDE,;t t
+s,@PBX_LIBZLIB@,$PBX_LIBZLIB,;t t
s,@EDITLINE_LIBS@,$EDITLINE_LIBS,;t t
-s,@ossaudio_LIB@,$ossaudio_LIB,;t t
-s,@ossaudio_INCLUDE@,$ossaudio_INCLUDE,;t t
-s,@PBX_LIBossaudio@,$PBX_LIBossaudio,;t t
-s,@tonezone_LIB@,$tonezone_LIB,;t t
-s,@tonezone_INCLUDE@,$tonezone_INCLUDE,;t t
-s,@PBX_LIBtonezone@,$PBX_LIBtonezone,;t t
+s,@OSS_LIB@,$OSS_LIB,;t t
+s,@OSS_INCLUDE@,$OSS_INCLUDE,;t t
+s,@PBX_LIBOSS@,$PBX_LIBOSS,;t t
+s,@ZAPTEL_LIB@,$ZAPTEL_LIB,;t t
+s,@ZAPTEL_INCLUDE@,$ZAPTEL_INCLUDE,;t t
+s,@PBX_LIBZAPTEL@,$PBX_LIBZAPTEL,;t t
s,@gsm_LIB@,$gsm_LIB,;t t
s,@gsm_INCLUDE@,$gsm_INCLUDE,;t t
s,@PBX_LIBgsm@,$PBX_LIBgsm,;t t
diff --git a/configure.ac b/configure.ac
index 832e7ec41d1a2ae5297be4a3f1082726a12186ec..1482aaa76f337bb5131e4fc9c6e7d33e165ea4c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,6 +198,7 @@ AST_EXT_LIB([ogg], [ogg_sync_init], [], [OGG], [OGG])
AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [osp/osp.h], [OSPTK], [OSP Toolkit], [-lcrypto -lssl])
AST_EXT_LIB([popt], [poptStrerror], [popt.h], [POPT], [popt])
AST_EXT_LIB([pri], [pri_call], [libpri.h], [LIBPRI], [ISDN PRI])
+AST_EXT_LIB([radiusclient-ng], [rc_read_config], [radiusclient-ng.h], [RADIUSCLIENT], [Radius Client])
AST_EXT_LIB([speex], [speex_encode], [speex/speex.h], [SPEEX], [Speex], [-lm])
AST_EXT_LIB([sqlite], [sqlite_exec], [sqlite.h], [SQLITE], [SQLite])
AST_EXT_LIB([ssl], [ssl2_connect], [openssl/ssl.h], [OPENSSL], [OpenSSL], [-lcrypto])
@@ -208,38 +209,38 @@ AST_EXT_LIB([vorbis], [vorbis_info_init], [vorbis/codec.h], [VORBIS], [Vorbis],
AST_EXT_LIB([z], [compress], [zlib.h], [ZLIB], [zlib])
EDITLINE_LIBS=""
-if test "x$termcap_LIB" != "x" ; then
- EDITLINE_LIBS="$termcap_LIB"
-elif test "x$tinfo_LIB" != "x" ; then
- EDITLINE_LIBS="$tinfo_LIB"
-elif test "x$curses_LIB" != "x" ; then
- EDITLINE_LIBS="$curses_LIB"
-elif test "x$ncurses_LIB" != "x" ; then
- EDITLINE_LIBS="$ncurses_LIB"
+if test "x$TERMCAP_LIB" != "x" ; then
+ EDITLINE_LIBS="$TERMCAP_LIB"
+elif test "x$TINFO_LIB" != "x" ; then
+ EDITLINE_LIBS="$TINFO_LIB"
+elif test "x$CURSES_LIB" != "x" ; then
+ EDITLINE_LIBS="$CURSES_LIB"
+elif test "x$NCURSES_LIB" != "x" ; then
+ EDITLINE_LIBS="$NCURSES_LIB"
else
echo "*** termcap support not found"
exit 1
fi
AC_SUBST(EDITLINE_LIBS)
-PBX_LIBossaudio=0
+PBX_LIBOSS=0
AC_CHECK_HEADER([linux/soundcard.h],
[
- PBX_LIBossaudio=1
+ PBX_LIBOSS=1
AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library])
])
-if test "$PBX_LIBossaudio" = "0"; then
+if test "$PBX_LIBOSS" = "0"; then
AC_CHECK_HEADER([sys/soundcard.h],
[
PBX_LIBossaudio=1
AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library])
])
fi
-if test "$PBX_LIBossaudio" = "0"; then
+if test "$PBX_LIBOSS" = "0"; then
AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System])
fi
-AC_SUBST([PBX_LIBossaudio])
+AC_SUBST([PBX_LIBOSS])
if test "${PBX_OSTYPE}" = "Linux" ; then
AST_EXT_LIB([tonezone], [tone_zone_find], [linux/zaptel.h], [ZAPTEL], [Zaptel])
diff --git a/contrib/dictionary.digium b/contrib/dictionary.digium
new file mode 100644
index 0000000000000000000000000000000000000000..694605f5489f08d6b0c310f0ba8f55d99e273ecd
--- /dev/null
+++ b/contrib/dictionary.digium
@@ -0,0 +1,31 @@
+#
+# Digium's Asterisk specific radius attributes
+# markster@digium.com
+#
+#
+
+VENDOR Digium 22736
+
+BEGIN-VENDOR Digium
+
+ATTRIBUTE Asterisk-Acc-Code 101 string Digium
+ATTRIBUTE Asterisk-Src 102 string Digium
+ATTRIBUTE Asterisk-Dst 103 string Digium
+ATTRIBUTE Asterisk-Dst-Ctx 104 string Digium
+ATTRIBUTE Asterisk-Clid 105 string Digium
+ATTRIBUTE Asterisk-Chan 106 string Digium
+ATTRIBUTE Asterisk-Dst-Chan 107 string Digium
+ATTRIBUTE Asterisk-Last-App 108 string Digium
+ATTRIBUTE Asterisk-Last-Data 109 string Digium
+ATTRIBUTE Asterisk-Start-Time 110 string Digium
+ATTRIBUTE Asterisk-Answer-Time 111 string Digium
+ATTRIBUTE Asterisk-End-Time 112 string Digium
+ATTRIBUTE Asterisk-Duration 113 integer Digium
+ATTRIBUTE Asterisk-Bill-Sec 114 integer Digium
+ATTRIBUTE Asterisk-Disposition 115 string Digium
+ATTRIBUTE Asterisk-AMA-Flags 116 string Digium
+ATTRIBUTE Asterisk-Unique-ID 117 string Digium
+ATTRIBUTE Asterisk-User-Field 118 string Digium
+
+END-VENDOR Digium
+
diff --git a/doc/cdrdriver.txt b/doc/cdrdriver.txt
index 4db7797f43d3ecd2962c49036f28eb9dea705e90..9bc6fa102c90be19092db27cbf422e268de49932 100644
--- a/doc/cdrdriver.txt
+++ b/doc/cdrdriver.txt
@@ -166,6 +166,4 @@ PGSQL:
SQLLITE:
--------------------------------------------------------------------------------
-
-08/02/2004 : Duane Cox <dcox@illicom.net> - added mssql information
+RADIUS: See doc/radius.txt for more information on cdr_radius
diff --git a/doc/radius.txt b/doc/radius.txt
new file mode 100644
index 0000000000000000000000000000000000000000..71b7530e66d857d4a3a7a09890290770974cdd41
--- /dev/null
+++ b/doc/radius.txt
@@ -0,0 +1,198 @@
+Call Detail Recording to RADIUS Server
+======================================
+
+
+Configuration of Asterisk to send CDRs to (Free)RADIUS servers.
+
+
+A. What is needed :
+ * FreeRADIUS server
+ * Radiusclient-ng library
+ * Asterisk PBX
+
+
+ +--------------------+
+ | Asterisk PBX |
+ | |
+ |********************|
+ | | +---------------+
+ | RADIUS client |------->| RADIUS server |
+ | |<-------| (FreeRADIUS) |
+ +--------------------+ +---------------+
+
+
+
+
+B. Steps to follow in order to have RADIUS support:
+
+ 1.Radiusclient library
+ 1.a Installation
+
+ Download the sources from:
+
+ http://developer.berlios.de/projects/radiusclient-ng/
+
+ Untar the source tarball.
+ root@localhost:/usr/local/src# tar xvfz radiusclient-ng-0.5.2.tar.gz
+
+ Compile and install the library.
+ root@localhost:/usr/local/src# cd radiusclient-ng-0.5.2
+ root@localhost:/usr/local/src/radiusclient-ng-0.5.2# ./configure
+ root@localhost:/usr/local/src/radiusclient-ng-0.5.2# make
+ root@localhost:/usr/local/src/radiusclient-ng-0.5.2# make install
+
+ 1.b Configuration
+
+ By default all the configuration files of the radiusclient library will
+ be in /usr/local/etc/radiusclient-ng directory.
+
+ File "radiusclient.conf"
+ Open the file and find lines containing the following:
+
+ authserver localhost
+
+ This is the hostname or IP address of the RADIUS server used for
+ authentication. You will have to change this unless the server is
+ running on the same host as your Asterisk PBX.
+
+ acctserver localhost
+
+ This is the hostname or IP address of the RADIUS server used for
+ accounting. You will have to change this unless the server is running
+ on the same host as your Asterisk PBX.
+
+ File "servers"
+
+ RADIUS protocol uses simple access control mechanism based on shared
+ secrets that allows RADIUS servers to limit access from RADIUS clients.
+
+ A RADIUS server is configured with a secret string and only RADIUS
+ clients that have the same secret will be accepted.
+
+ You need to configure a shared secret for each server you have
+ configured in radiusclient.conf file in the previous step. The shared
+ secrets are stored in /usr/local/etc/radiusclient-ng/servers file.
+
+ Each line contains hostname of a RADIUS server and shared secret
+ used in communication with that server. The two values are separated
+ by white spaces. Configure shared secrets for every RADIUS server you
+ are going to use.
+
+ File "dictionary"
+
+ Asterisk uses some attributes that are not included in the
+ dictionary of radiusclient library, therefore it is necesarry to add
+ them. A file called dictionary.asterisk was created to list all new
+ attributes used by Asterisk. Add into file
+ /usr/local/etc/radiusclient-ng/dictionary
+ the line:
+
+ $INCLUDE /path/to/dictionary.asterisk
+
+ 2.FreeRADIUS Server
+ 2.a Installation
+
+ Download sources tarball from:
+
+ http://freeradius.org/
+
+ Untar, configure, build, and install the server:
+
+ root@localhost:/usr/local/src# tar xvfz freeradius-1.1.1.tar.gz
+ root@localhost:/usr/local/src# cd freeradius-1.1.1
+ root@localhost"/usr/local/src/freeradius-1.1.1# ./configure
+ root@localhost"/usr/local/src/freeradius-1.1.1# make
+ root@localhost"/usr/local/src/freeradius-1.1.1# make install
+
+ All the configuration files of FreeRADIUS server will be in
+ /usr/local/etc/raddb directory.
+
+
+ 2.b Configuration
+
+ There are several file that have to be modified to configure the
+ RADIUS server. These are presented next.
+
+ File "clients.conf"
+
+ File /usr/local/etc/raddb/clients.conf contains description of
+ RADIUS clients that are allowed to use the server. For each of the
+ clients you need to specify its hostname or IP address and also a
+ shared secret. The shared secret must be the same string you configured
+ in radiusclient library.
+
+ Example:
+ client myhost {
+ secret = mysecret
+ shortname = foo
+ }
+
+ This fragment allows access from RADIUS clients on "myhost" if they use
+ "mysecret" as the shared secret.
+ The file already contains an entry for localhost (127.0.0.1), so if you
+ are running the RADIUS server on the same host as your Asterisk server,
+ then modify the existing entry instead, replacing the default password.
+
+ File "dictionary"
+
+ File /usr/local/etc/raddb/dictionary contains the dictionary of
+ FreeRADIUS server. You have to add the same dictionary file
+ (dictionary.asterisk), which you added to the dictionary of radiusclient-ng
+ library. You can include it into the main file, adding the following line at the
+ end of file '/usr/local/etc/raddb/dictionary':
+
+ $INCLUDE /path/to/dictionary.digium
+
+ That will include the same new attribute definitions that are used
+ in radiusclient-ng library so the client and server will understand each
+ other.
+
+
+ 3. Asterisk Accounting Configuration
+
+ Compilation and installation:
+ The module will be compiled as long as the radiusclient-ng
+ library has been detected on your system.
+
+ By default FreeRADIUS server will log all accounting requests into
+ /usr/local/var/log/radius/radacct directory in form of plain text files.
+ The server will create one file for each hostname in the directory. The
+ following example shows how the log files look like.
+
+ Asterisk now generates Call Detail Records. See /include/asterisk/cdr.h
+ for all the fields which are recorded. By default, records in comma
+ separated values will be created in /var/log/asterisk/cdr-csv.
+
+ The configuration file for cdr_radius.so module is :
+
+ /etc/asterisk/cdr.conf
+ This is where you can set CDR related parameters as well as the path to
+ the radiusclient-ng library configuration file.
+
+
+ 4. Logged Values
+
+ "Asterisk-Acc-Code", The account name of detail records
+ "Asterisk-Src",
+ "Asterisk-Dst",
+ "Asterisk-Dst-Ctx", The destination context
+ "Asterisk-Clid",
+ "Asterisk-Chan", The channel
+ "Asterisk-Dst-Chan", (if applicable)
+ "Asterisk-Last-App", Last application run on the channel
+ "Asterisk-Last-Data", Argument to the last channel
+ "Asterisk-Start-Time",
+ "Asterisk-Answer-Time",
+ "Asterisk-End-Time",
+ "Asterisk-Duration", Duration is the whole length that the entire
+ call lasted. ie. call rx'd to hangup
+ "end time" minus "start time"
+ "Asterisk-Bill-Sec", The duration that a call was up after other
+ end answered which will be <= to duration
+ "end time" minus "answer time"
+ "Asterisk-Disposition", ANSWERED, NO ANSWER, BUSY
+ "Asterisk-AMA-Flags", DOCUMENTATION, BILL, IGNORE etc, specified on
+ a per channel basis like accountcode.
+ "Asterisk-Unique-ID", Unique call identifier
+ "Asterisk-User-Field" User field set via SetCDRUserField
+
diff --git a/include/autoconfig.h.in b/include/autoconfig.h.in
index 082755c287df4f2e63c26750205e5ca76e250938..b8847cc74d7d78573d66b5dd4fd4837069562c55 100644
--- a/include/autoconfig.h.in
+++ b/include/autoconfig.h.in
@@ -221,6 +221,9 @@
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
+/* Define to indicate the Radius Client library */
+#undef HAVE_RADIUSCLIENT
+
/* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */
#undef HAVE_REALLOC
diff --git a/makeopts.in b/makeopts.in
index eaee75a7a30da9eab7b14fbcdd8c90f285b6bd14..19518693e099ace4301ccb92376d5b2f35e1225b 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -37,62 +37,62 @@ sysconfdir = @sysconfdir@
AST_DEVMODE=@AST_DEVMODE@
-OGG_LIB=@ogg_LIB@
-OGG_INCLUDE=@ogg_INCLUDE@
+OGG_LIB=@OGG_LIB@
+OGG_INCLUDE=@OGG_INCLUDE@
-VORBIS_LIB=@vorbis_LIB@
-VORBIS_INCLUDE=@vorbis_INCLUDE@
+VORBIS_LIB=@VORBIS_LIB@
+VORBIS_INCLUDE=@VORBIS_INCLUDE@
-ASOUND_LIB=@asound_LIB@
-ASOUND_INCLUDE=@asound_INCLUDE@
+ASOUND_LIB=@ALSA_LIB@
+ASOUND_INCLUDE=@ALSA_INCLUDE@
-NBS_LIB=@nbs_LIB@
-NBS_INCLUDE=@nbs_INCLUDE@
+NBS_LIB=@NBS_LIB@
+NBS_INCLUDE=@NBS_INCLUDE@
-OSSAUDIO_LIB=@ossaudio_LIB@
-OSSAUDIO_INCLUDE=@ossaudio_INCLUDE@
+OSSAUDIO_LIB=@OSS_LIB@
+OSSAUDIO_INCLUDE=@OSS_INCLUDE@
-SPEEX_LIB=@speex_LIB@
-SPEEX_INCLUDE=@speex_INCLUDE@
+SPEEX_LIB=@SPEEX_LIB@
+SPEEX_INCLUDE=@SPEEX_INCLUDE@
-ZAPTEL_LIB=@tonezone_LIB@
-ZAPTEL_INCLUDE=@tonezone_INCLUDE@
+ZAPTEL_LIB=@ZAPTEL_LIB@
+ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@
VPB_LIB=@VPB_LIB@
VPB_INCLUDE=@VPB_INCLUDE@
-PRI_LIB=@pri_LIB@
-PRI_INCLUDE=@pri_INCLUDE@
+PRI_LIB=@LIBPRI_LIB@
+PRI_INCLUDE=@LIBPRI_INCLUDE@
-OSPTK_LIB=@osptk_LIB@
-OSPTK_INCLUDE=@osptk_INCLUDE@
+OSPTK_LIB=@OSPTK_LIB@
+OSPTK_INCLUDE=@OSPTK_INCLUDE@
-ODBC_LIB=@odbc_LIB@
-ODBC_INCLUDE=@odbc_INCLUDE@
+ODBC_LIB=@UNIXODBC_LIB@
+ODBC_INCLUDE=@UNIXODBC_INCLUDE@
PGSQL_LIB=@pq_LIB@
PGSQL_INCLUDE=@pq_INCLUDE@
-SQLITE_LIB=@sqlite_LIB@
-SQLITE_INCLUDE=@sqlite_INCLUDE@
+SQLITE_LIB=@SQLITE_LIB@
+SQLITE_INCLUDE=@SQLITE_INCLUDE@
-TDS_LIB=@tds_LIB@
-TDS_INCLUDE=@tds_INCLUDE@
+TDS_LIB=@FREETDS_LIB@
+TDS_INCLUDE=@FREETDS_INCLUDE@
-POPT_LIB=@popt_LIB@
-POPT_INCLUDE=@popt_INCLUDE@
+POPT_LIB=@POPT_LIB@
+POPT_INCLUDE=@POPT_INCLUDE@
-NEWT_LIB=@newt_LIB@
-NEWT_INCLUDE=@newt_INCLUDE@
+NEWT_LIB=@NEWT_LIB@
+NEWT_INCLUDE=@NEWT_INCLUDE@
PWLIB_LIB=@PWLIB_LIB@
PWLIB_INCLUDE=@PWLIB_INCLUDE@
-SSL_LIB=@ssl_LIB@
-SSL_INCLUDE=@ssl_INCLUDE@
+SSL_LIB=@OPENSSL_LIB@
+SSL_INCLUDE=@OPENSSL_INCLUDE@
-Z_LIB=@z_LIB@
-Z_INCLUDE=@z_INCLUDE@
+Z_LIB=@ZLIB_LIB@
+Z_INCLUDE=@ZLIB_INCLUDE@
QT_LIB=@QT_LIB@
QT_INCLUDE=@QT_INCLUDE@
@@ -109,11 +109,13 @@ CURL_LIB=@CURLLIBS@
GSM_LIB=@gsm_LIB@
GSM_INCLUDE=@gsm_INCLUDE@
-CURSES_LIB=@curses_LIB@
-CURSES_INCLUDE=@curses_INCLUDE@
+CURSES_LIB=@CURSES_LIB@
+CURSES_INCLUDE=@CURSES_INCLUDE@
-NCURSES_LIB=@ncurses_LIB@
-NCURSES_INCLUDE=@ncurses_INCLUDE@
+NCURSES_LIB=@NCURSES_LIB@
+NCURSES_INCLUDE=@NCURSES_INCLUDE@
EDITLINE_LIBS=@EDITLINE_LIBS@
+RADIUSCLIENT_LIB=@RADIUSCLIENT_LIB@
+RADIUSCLIENT_INCLUDE=@RADIUSCLIENT_INCLUDE@