rpms/asterisk/devel 0008-Update-autoconf.patch, NONE, 1.1 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.2, 1.3 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.2, 1.3 0003-Allow-alternate-extensions-to-be-specified-in-users.patch, 1.1, 1.2 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 1.1, 1.2 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.1, 1.2 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.1, 1.2 0007-Build-using-external-libedit.patch, 1.1, 1.2 asterisk-strip.sh, 1.3, 1.4 asterisk.spec, 1.33, 1.34 sources, 1.15, 1.16 0008-Update-cdr_tds-to-latest.patch, 1.1, NONE 0009-Merged-revisions-123952-via-svnmerge-from.patch, 1.1, NONE 0010-Merged-revisions-132778-via-svnmerge-from.patch, 1.1, NONE 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch, 1.1, NONE 0012-Update-autoconf.patch, 1.1, NONE
Jeffrey C. Ollie
jcollie at fedoraproject.org
Fri Oct 10 17:17:05 UTC 2008
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5253
Modified Files:
.cvsignore
0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
0003-Allow-alternate-extensions-to-be-specified-in-users.patch
0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
0005-Add-chan_mobile-from-asterisk-addons.patch
0006-Use-pkgconfig-to-check-for-Lua.patch
0007-Build-using-external-libedit.patch asterisk-strip.sh
asterisk.spec sources
Added Files:
0008-Update-autoconf.patch
0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
Removed Files:
0008-Update-cdr_tds-to-latest.patch
0009-Merged-revisions-123952-via-svnmerge-from.patch
0010-Merged-revisions-132778-via-svnmerge-from.patch
0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch
0012-Update-autoconf.patch
Log Message:
* Fri Oct 10 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-1
- Update to final release.
0008-Update-autoconf.patch:
--- NEW FILE 0008-Update-autoconf.patch ---
>From a76ad8b9310d30d27afafe63c0e1aae1779784b6 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Thu, 4 Sep 2008 11:52:21 -0500
Subject: [PATCH] Update autoconf
---
configure | 870 ++++++++++++++++++++++++++------------
include/asterisk/autoconfig.h.in | 14 +-
2 files changed, 609 insertions(+), 275 deletions(-)
diff --git a/configure b/configure
index 27dc084..7b95ed9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 134539 .
+# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -728,14 +728,18 @@ BKTR_LIB
BKTR_INCLUDE
BKTR_DIR
PBX_BKTR
-CAP_LIB
-CAP_INCLUDE
-CAP_DIR
-PBX_CAP
+BLUETOOTH_LIB
+BLUETOOTH_INCLUDE
+BLUETOOTH_DIR
+PBX_BLUETOOTH
CURL_LIB
CURL_INCLUDE
CURL_DIR
PBX_CURL
+CAP_LIB
+CAP_INCLUDE
+CAP_DIR
+PBX_CAP
CURSES_LIB
CURSES_INCLUDE
CURSES_DIR
@@ -792,6 +796,10 @@ LDAP_LIB
LDAP_INCLUDE
LDAP_DIR
PBX_LDAP
+LIBEDIT_LIB
+LIBEDIT_INCLUDE
+LIBEDIT_DIR
+PBX_LIBEDIT
LTDL_LIB
LTDL_INCLUDE
LTDL_DIR
@@ -971,6 +979,7 @@ OPENH323_INCDIR
OPENH323_LIBDIR
OPENH323_SUFFIX
OPENH323_BUILD
+PKGCONFIG
PBX_SPEEX_PREPROCESS
CONFIG_GMIME
EDITLINE_LIB
@@ -978,7 +987,7 @@ PBX_H323
PBX_IXJUSER
CONFIG_SDL
CONFIG_GTK
-PKGCONFIG
+LIBEDIT_OBJ
CURL_CONFIG
LTLIBOBJS'
ac_subst_files=''
@@ -1579,8 +1588,9 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-asound=PATH use Advanced Linux Sound Architecture files in PATH
--with-execinfo=PATH use Stack Backtrace support files in PATH
- --with-cap=PATH use POSIX 1.e capabilities files in PATH
+ --with-bluetooth=PATH use Bluetooth Support files in PATH
--with-curl=PATH use cURL files in PATH
+ --with-cap=PATH use POSIX 1.e capabilities files in PATH
--with-curses=PATH use curses files in PATH
--with-crypto=PATH use OpenSSL Cryptography support files in PATH
--with-dahdi=PATH use DAHDI files in PATH
@@ -1596,6 +1606,7 @@ Optional Packages:
--with-isdnnet=PATH use ISDN4Linux Library files in PATH
--with-jack=PATH use Jack Audio Connection Kit files in PATH
--with-ldap=PATH use OpenLDAP files in PATH
+ --with-libedit=PATH use NetBSD Editline library files in PATH
--with-ltdl=PATH use libtool files in PATH
--with-lua=PATH use Lua files in PATH
--with-misdn=PATH use mISDN User Library files in PATH
@@ -7949,6 +7960,62 @@ fi
+ BLUETOOTH_DESCRIP="Bluetooth Support"
+ BLUETOOTH_OPTION="bluetooth"
+
+# Check whether --with-bluetooth was given.
+if test "${with_bluetooth+set}" = set; then
+ withval=$with_bluetooth;
+ case ${withval} in
+ n|no)
+ USE_BLUETOOTH=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} BLUETOOTH"
+ ;;
+ *)
+ BLUETOOTH_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} BLUETOOTH"
+ ;;
+ esac
+
+fi
+
+ PBX_BLUETOOTH=0
+
+
+
+
+
+
+ CURL_DESCRIP="cURL"
+ CURL_OPTION="curl"
+
+# Check whether --with-curl was given.
+if test "${with_curl+set}" = set; then
+ withval=$with_curl;
+ case ${withval} in
+ n|no)
+ USE_CURL=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} CURL"
+ ;;
+ *)
+ CURL_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} CURL"
+ ;;
+ esac
+
+fi
+
+ PBX_CURL=0
+
+
+
+
+
+
CAP_DESCRIP="POSIX 1.e capabilities"
CAP_OPTION="cap"
@@ -8397,6 +8464,34 @@ fi
+ LIBEDIT_DESCRIP="NetBSD Editline library"
+ LIBEDIT_OPTION="libedit"
+
+# Check whether --with-libedit was given.
+if test "${with_libedit+set}" = set; then
+ withval=$with_libedit;
+ case ${withval} in
+ n|no)
+ USE_LIBEDIT=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} LIBEDIT"
+ ;;
+ *)
+ LIBEDIT_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} LIBEDIT"
+ ;;
+ esac
+
+fi
+
+ PBX_LIBEDIT=0
+
+
+
+
+
+
LTDL_DESCRIP="libtool"
LTDL_OPTION="ltdl"
@@ -12835,13 +12930,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h> /* for off_t */
- #include <stdio.h>
+#include <stdio.h>
int
main ()
{
-int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
@@ -12881,13 +12974,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
- #include <stdio.h>
+#include <stdio.h>
int
main ()
{
-int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
@@ -18410,6 +18501,268 @@ fi
+if test "x${PBX_BLUETOOTH}" != "x1" -a "${USE_BLUETOOTH}" != "no"; then
+ pbxlibdir=""
+ # if --with-BLUETOOTH=DIR has been specified, use it.
+ if test "x${BLUETOOTH_DIR}" != "x"; then
+ if test -d ${BLUETOOTH_DIR}/lib; then
+ pbxlibdir="-L${BLUETOOTH_DIR}/lib"
+ else
+ pbxlibdir="-L${BLUETOOTH_DIR}"
+ fi
+ fi
+ pbxfuncname="ba2str"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_BLUETOOTH_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_bluetooth_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lbluetooth" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lbluetooth... $ECHO_C" >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbluetooth ${pbxlibdir} $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ${pbxfuncname} ();
+int
+main ()
+{
+return ${pbxfuncname} ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_Lib=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ AST_BLUETOOTH_FOUND=yes
+else
+ AST_BLUETOOTH_FOUND=no
+fi
+
+ fi
+
+ # now check for the header.
+ if test "${AST_BLUETOOTH_FOUND}" = "yes"; then
+ BLUETOOTH_LIB="${pbxlibdir} -lbluetooth "
+ # if --with-BLUETOOTH=DIR has been specified, use it.
+ if test "x${BLUETOOTH_DIR}" != "x"; then
+ BLUETOOTH_INCLUDE="-I${BLUETOOTH_DIR}/include"
+ fi
+ BLUETOOTH_INCLUDE="${BLUETOOTH_INCLUDE} "
+ if test "xbluetooth/bluetooth.h" = "x" ; then # no header, assume found
+ BLUETOOTH_HEADER_FOUND="1"
+ else # check for the header
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE}"
+ if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5
+echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5
+echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h usability" >&5
+echo $ECHO_N "checking bluetooth/bluetooth.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <bluetooth/bluetooth.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking bluetooth/bluetooth.h presence" >&5
+echo $ECHO_N "checking bluetooth/bluetooth.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <bluetooth/bluetooth.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: bluetooth/bluetooth.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------- ##
+## Report this to www.asterisk.org ##
+## ------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for bluetooth/bluetooth.h" >&5
+echo $ECHO_N "checking for bluetooth/bluetooth.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_bluetooth_bluetooth_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_bluetooth_bluetooth_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_bluetooth_bluetooth_h" >&5
+echo "${ECHO_T}$ac_cv_header_bluetooth_bluetooth_h" >&6; }
+
+fi
+if test $ac_cv_header_bluetooth_bluetooth_h = yes; then
+ BLUETOOTH_HEADER_FOUND=1
+else
+ BLUETOOTH_HEADER_FOUND=0
+fi
+
+
+ CPPFLAGS="${saved_cppflags}"
+ fi
+ if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then
+ BLUETOOTH_LIB=""
+ BLUETOOTH_INCLUDE=""
+ else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ BLUETOOTH_LIB=""
+ fi
+ PBX_BLUETOOTH=1
+ # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_BLUETOOTH 1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_BLUETOOTH_VERSION
+_ACEOF
+
+ fi
+ fi
+fi
+
+
+
if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then
pbxlibdir=""
# if --with-CURSES=DIR has been specified, use it.
@@ -42125,269 +42478,115 @@ _ACEOF
fi
-
-if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
- pbxlibdir=""
- # if --with-LUA=DIR has been specified, use it.
- if test "x${LUA_DIR}" != "x"; then
- if test -d ${LUA_DIR}/lib; then
- pbxlibdir="-L${LUA_DIR}/lib"
- else
- pbxlibdir="-L${LUA_DIR}"
- fi
- fi
- pbxfuncname="luaL_newstate"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_LUA_FOUND=yes
- else
- as_ac_Lib=`echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llua5.1" >&5
-echo $ECHO_N "checking for ${pbxfuncname} in -llua5.1... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+PBX_LUA=0
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.1 ${pbxlibdir} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ${pbxfuncname} ();
-int
-main ()
-{
-return ${pbxfuncname} ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_Lib=yes"
+ if test -n "$PKGCONFIG"; then
+ ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- eval "$as_ac_Lib=no"
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- AST_LUA_FOUND=yes
+PKGCONFIG=$ac_cv_prog_PKGCONFIG
+if test -n "$PKGCONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
+echo "${ECHO_T}$PKGCONFIG" >&6; }
else
- AST_LUA_FOUND=no
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
- fi
- # now check for the header.
- if test "${AST_LUA_FOUND}" = "yes"; then
- LUA_LIB="${pbxlibdir} -llua5.1 "
- # if --with-LUA=DIR has been specified, use it.
- if test "x${LUA_DIR}" != "x"; then
- LUA_INCLUDE="-I${LUA_DIR}/include"
- fi
- LUA_INCLUDE="${LUA_INCLUDE} "
- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found
- LUA_HEADER_FOUND="1"
- else # check for the header
- saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
- if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5
-echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5
-echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; }
+if test -z "$ac_cv_prog_PKGCONFIG"; then
+ ac_ct_PKGCONFIG=$PKGCONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking lua5.1/lua.h usability" >&5
-echo $ECHO_N "checking lua5.1/lua.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 <lua5.1/lua.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ if test -n "$ac_ct_PKGCONFIG"; then
+ ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PKGCONFIG="pkg-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_header_compiler=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking lua5.1/lua.h presence" >&5
-echo $ECHO_N "checking lua5.1/lua.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 <lua5.1/lua.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: lua5.1/lua.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ------------------------------- ##
-## Report this to www.asterisk.org ##
-## ------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for lua5.1/lua.h" >&5
-echo $ECHO_N "checking for lua5.1/lua.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_lua5_1_lua_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG
+if test -n "$ac_ct_PKGCONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5
+echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; }
else
- ac_cv_header_lua5_1_lua_h=$ac_header_preproc
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_lua5_1_lua_h" >&5
-echo "${ECHO_T}$ac_cv_header_lua5_1_lua_h" >&6; }
-fi
-if test $ac_cv_header_lua5_1_lua_h = yes; then
- LUA_HEADER_FOUND=1
+ if test "x$ac_ct_PKGCONFIG" = x; then
+ PKGCONFIG="No"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKGCONFIG=$ac_ct_PKGCONFIG
+ fi
else
- LUA_HEADER_FOUND=0
+ PKGCONFIG="$ac_cv_prog_PKGCONFIG"
fi
+if test ! "x${PKGCONFIG}" = xNo; then
+ LUA_INCLUDE=$(${PKGCONFIG} lua --cflags 2>/dev/null)
+ LUA_LIB=$(${PKGCONFIG} lua --libs 2>/dev/null)
+ PBX_LUA=1
- CPPFLAGS="${saved_cppflags}"
- fi
- if test "x${LUA_HEADER_FOUND}" = "x0" ; then
- LUA_LIB=""
- LUA_INCLUDE=""
- else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- LUA_LIB=""
- fi
- PBX_LUA=1
- # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
-
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<\_ACEOF
#define HAVE_LUA 1
_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LUA_VERSION
-_ACEOF
-
- fi
- fi
fi
-
if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then
pbxlibdir=""
# if --with-RADIUS=DIR has been specified, use it.
@@ -48914,6 +49113,126 @@ fi
+PBX_LIBEDIT=0
+LIBEDIT_INCLUDE=-Ieditline/readline
+LIBEDIT_LIB=
+LIBEDIT_OBJ=editline/libedit.a
+if test "${USE_LIBEDIT}" != "no"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_PKGCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$PKGCONFIG"; then
+ ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+PKGCONFIG=$ac_cv_prog_PKGCONFIG
+if test -n "$PKGCONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
+echo "${ECHO_T}$PKGCONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKGCONFIG"; then
+ ac_ct_PKGCONFIG=$PKGCONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_PKGCONFIG"; then
+ ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PKGCONFIG="pkg-config"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG
+if test -n "$ac_ct_PKGCONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5
+echo "${ECHO_T}$ac_ct_PKGCONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_PKGCONFIG" = x; then
+ PKGCONFIG="no"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKGCONFIG=$ac_ct_PKGCONFIG
+ fi
+else
+ PKGCONFIG="$ac_cv_prog_PKGCONFIG"
+fi
+
+ if test "${PKGCONFIG}" != "no"; then
+ if ${PKGCONFIG} --exists libedit; then
+ LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
+ LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
+ LIBEDIT_OBJ=
+ PBX_LIBEDIT=1
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBEDIT 1
+_ACEOF
+
+ fi
+ fi
+fi
+
+
+
+
+
if test "${USE_CURL}" != "no"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}curl-config", so it can be a program name with args.
@@ -49888,14 +50207,18 @@ BKTR_LIB!$BKTR_LIB$ac_delim
BKTR_INCLUDE!$BKTR_INCLUDE$ac_delim
BKTR_DIR!$BKTR_DIR$ac_delim
PBX_BKTR!$PBX_BKTR$ac_delim
-CAP_LIB!$CAP_LIB$ac_delim
-CAP_INCLUDE!$CAP_INCLUDE$ac_delim
-CAP_DIR!$CAP_DIR$ac_delim
-PBX_CAP!$PBX_CAP$ac_delim
+BLUETOOTH_LIB!$BLUETOOTH_LIB$ac_delim
+BLUETOOTH_INCLUDE!$BLUETOOTH_INCLUDE$ac_delim
+BLUETOOTH_DIR!$BLUETOOTH_DIR$ac_delim
+PBX_BLUETOOTH!$PBX_BLUETOOTH$ac_delim
CURL_LIB!$CURL_LIB$ac_delim
CURL_INCLUDE!$CURL_INCLUDE$ac_delim
CURL_DIR!$CURL_DIR$ac_delim
PBX_CURL!$PBX_CURL$ac_delim
+CAP_LIB!$CAP_LIB$ac_delim
+CAP_INCLUDE!$CAP_INCLUDE$ac_delim
+CAP_DIR!$CAP_DIR$ac_delim
+PBX_CAP!$PBX_CAP$ac_delim
CURSES_LIB!$CURSES_LIB$ac_delim
CURSES_INCLUDE!$CURSES_INCLUDE$ac_delim
CURSES_DIR!$CURSES_DIR$ac_delim
@@ -49952,6 +50275,10 @@ LDAP_LIB!$LDAP_LIB$ac_delim
LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim
LDAP_DIR!$LDAP_DIR$ac_delim
PBX_LDAP!$PBX_LDAP$ac_delim
+LIBEDIT_LIB!$LIBEDIT_LIB$ac_delim
+LIBEDIT_INCLUDE!$LIBEDIT_INCLUDE$ac_delim
+LIBEDIT_DIR!$LIBEDIT_DIR$ac_delim
+PBX_LIBEDIT!$PBX_LIBEDIT$ac_delim
LTDL_LIB!$LTDL_LIB$ac_delim
LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim
LTDL_DIR!$LTDL_DIR$ac_delim
@@ -49965,14 +50292,6 @@ MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim
MISDN_DIR!$MISDN_DIR$ac_delim
PBX_MISDN!$PBX_MISDN$ac_delim
NBS_LIB!$NBS_LIB$ac_delim
-NBS_INCLUDE!$NBS_INCLUDE$ac_delim
-NBS_DIR!$NBS_DIR$ac_delim
-PBX_NBS!$PBX_NBS$ac_delim
-NCURSES_LIB!$NCURSES_LIB$ac_delim
-NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
-NCURSES_DIR!$NCURSES_DIR$ac_delim
-PBX_NCURSES!$PBX_NCURSES$ac_delim
-NETSNMP_LIB!$NETSNMP_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -50014,6 +50333,14 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+NBS_INCLUDE!$NBS_INCLUDE$ac_delim
+NBS_DIR!$NBS_DIR$ac_delim
+PBX_NBS!$PBX_NBS$ac_delim
+NCURSES_LIB!$NCURSES_LIB$ac_delim
+NCURSES_INCLUDE!$NCURSES_INCLUDE$ac_delim
+NCURSES_DIR!$NCURSES_DIR$ac_delim
+PBX_NCURSES!$PBX_NCURSES$ac_delim
+NETSNMP_LIB!$NETSNMP_LIB$ac_delim
NETSNMP_INCLUDE!$NETSNMP_INCLUDE$ac_delim
NETSNMP_DIR!$NETSNMP_DIR$ac_delim
PBX_NETSNMP!$PBX_NETSNMP$ac_delim
@@ -50103,14 +50430,6 @@ SQLITE3_DIR!$SQLITE3_DIR$ac_delim
PBX_SQLITE3!$PBX_SQLITE3$ac_delim
SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
-SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
-PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
-OPENSSL_LIB!$OPENSSL_LIB$ac_delim
-OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
-OPENSSL_DIR!$OPENSSL_DIR$ac_delim
-PBX_OPENSSL!$PBX_OPENSSL$ac_delim
-FREETDS_LIB!$FREETDS_LIB$ac_delim
-FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -50152,6 +50471,14 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
+PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
+OPENSSL_LIB!$OPENSSL_LIB$ac_delim
+OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
+OPENSSL_DIR!$OPENSSL_DIR$ac_delim
+PBX_OPENSSL!$PBX_OPENSSL$ac_delim
+FREETDS_LIB!$FREETDS_LIB$ac_delim
+FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
FREETDS_DIR!$FREETDS_DIR$ac_delim
PBX_FREETDS!$PBX_FREETDS$ac_delim
TERMCAP_LIB!$TERMCAP_LIB$ac_delim
@@ -50213,6 +50540,7 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim
OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
OPENH323_BUILD!$OPENH323_BUILD$ac_delim
+PKGCONFIG!$PKGCONFIG$ac_delim
PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim
CONFIG_GMIME!$CONFIG_GMIME$ac_delim
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
@@ -50220,12 +50548,12 @@ PBX_H323!$PBX_H323$ac_delim
PBX_IXJUSER!$PBX_IXJUSER$ac_delim
CONFIG_SDL!$CONFIG_SDL$ac_delim
CONFIG_GTK!$CONFIG_GTK$ac_delim
-PKGCONFIG!$PKGCONFIG$ac_delim
+LIBEDIT_OBJ!$LIBEDIT_OBJ$ac_delim
CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index a79f773..1bdb72a 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -116,6 +116,12 @@
/* Define to indicate the ${BKTR_DESCRIP} library version */
#undef HAVE_BKTR_VERSION
+/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+#undef HAVE_BLUETOOTH
+
+/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+#undef HAVE_BLUETOOTH_VERSION
+
/* Define to 1 if byteswap.h macros are available. */
#undef HAVE_BYTESWAP_H
@@ -391,6 +397,9 @@
/* Define to indicate the ${LDAP_DESCRIP} library version */
#undef HAVE_LDAP_VERSION
+/* Define if your system has the NetBSD Editline libraries. */
+#undef HAVE_LIBEDIT
+
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
@@ -448,12 +457,9 @@
/* Define to indicate the ${LTDL_DESCRIP} library version */
#undef HAVE_LTDL_VERSION
-/* Define this to indicate the ${LUA_DESCRIP} library */
+/* Define if your system has the LUA libraries. */
#undef HAVE_LUA
-/* Define to indicate the ${LUA_DESCRIP} library version */
-#undef HAVE_LUA_VERSION
-
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
--
1.5.5.2
0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:
--- NEW FILE 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch ---
>From f8b34fb970f0022d4d1a61d1384c2dce65280954 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
Subject: [PATCH] Revert changes to pbx_lua from rev 126363 that cause some problems.
---
pbx/pbx_lua.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 704d811..6302ac6 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -41,9 +41,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/term.h"
#include "asterisk/paths.h"
-#include <lua5.1/lua.h>
-#include <lua5.1/lauxlib.h>
-#include <lua5.1/lualib.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
static char *config = "extensions.lua";
--
1.5.5.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 19 May 2008 14:40:41 -0000 1.15
+++ .cvsignore 10 Oct 2008 17:16:34 -0000 1.16
@@ -1 +1 @@
-asterisk-1.6.0-beta9-stripped.tar.gz
+asterisk-1.6.0-stripped.tar.gz
0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 30 Jul 2008 15:04:08 -0000 1.2
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 10 Oct 2008 17:16:34 -0000 1.3
@@ -1,4 +1,4 @@
-From c916a79652be51092082c2c5a537a3093636aa71 Mon Sep 17 00:00:00 2001
+From 2611b4b4b116867408211ccfa7e2a668c8c92f83 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 18 Nov 2007 21:47:59 -0600
Subject: [PATCH] Modify init scripts for better Fedora compatibility.
@@ -10,7 +10,7 @@
create mode 100644 contrib/sysconfig/asterisk
diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index de821fe..ddb1d64 100755
+index d2a630e..51e3459 100755
--- a/contrib/init.d/rc.redhat.asterisk
+++ b/contrib/init.d/rc.redhat.asterisk
@@ -3,7 +3,7 @@
0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 30 Jul 2008 15:04:08 -0000 1.2
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 10 Oct 2008 17:16:34 -0000 1.3
@@ -1,4 +1,4 @@
-From fe8076de7d6ce46220751ecefe0e75823031325c Mon Sep 17 00:00:00 2001
+From c53abf5c0887bf5d821b8f829dc551b17edd956f Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
Date: Thu, 8 Nov 2007 15:52:36 -0600
Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded.
0003-Allow-alternate-extensions-to-be-specified-in-users.patch:
Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch 30 Jul 2008 15:04:08 -0000 1.1
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch 10 Oct 2008 17:16:34 -0000 1.2
@@ -1,4 +1,4 @@
-From 673d0920ab94971a9ca2f91de16ecd1f0e9d9b43 Mon Sep 17 00:00:00 2001
+From 1975154336588486242bc48acb1915c21f4b4b5d Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
Date: Thu, 8 Nov 2007 16:32:56 -0600
Subject: [PATCH] Allow alternate extensions to be specified in users.conf
@@ -8,25 +8,25 @@
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
-index 4a7a3d3..0e38d88 100644
+index b63fedd..3574d0d 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
-@@ -1532,11 +1532,14 @@ static void pbx_load_users(void)
+@@ -1562,11 +1562,14 @@ static void pbx_load_users(void)
{
struct ast_config *cfg;
char *cat, *chan;
+ char *ext;
- const char *zapchan;
+ const char *dahdichan;
const char *hasexten;
+ const char *altexts;
char tmp[256];
char iface[256];
- char zapcopy[256];
+ char dahdicopy[256];
+ char altcopy[256];
char *c;
int len;
int hasvoicemail;
-@@ -1617,6 +1620,17 @@ static void pbx_load_users(void)
+@@ -1647,6 +1650,17 @@ static void pbx_load_users(void)
} else {
ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
}
0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:
Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 30 Jul 2008 15:04:08 -0000 1.1
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 10 Oct 2008 17:16:34 -0000 1.2
@@ -1,4 +1,4 @@
-From 38df88e16ff71fd00dabc5e95e3692e4d37b5159 Mon Sep 17 00:00:00 2001
+From 0e62c215b2dbb4dde75801d1e78e7c8ed3357457 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
Date: Tue, 29 Jul 2008 23:00:45 +0000
Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer.
@@ -13,7 +13,7 @@
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 7c44b41..a9fd366 100644
+index a874a7c..f82602c 100644
--- a/Makefile
+++ b/Makefile
@@ -221,10 +221,16 @@ ifeq ($(OSARCH),linux-gnu)
0005-Add-chan_mobile-from-asterisk-addons.patch:
Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0005-Add-chan_mobile-from-asterisk-addons.patch 30 Jul 2008 15:04:08 -0000 1.1
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch 10 Oct 2008 17:16:34 -0000 1.2
@@ -1,4 +1,4 @@
-From cff5fa429540c33f5b0dc06ab8e52b21b54b1ce1 Mon Sep 17 00:00:00 2001
+From 1c9699ad108002862c21c918f2e91bdcb77e587a Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Mon, 25 Feb 2008 09:23:28 -0600
Subject: [PATCH] Add chan_mobile from asterisk-addons.
@@ -17,7 +17,7 @@
create mode 100644 doc/chan_mobile.txt
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index aa76d56..97822e6 100644
+index 1cd1870..45faa9e 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -1,5 +1,6 @@
@@ -25,8 +25,8 @@
CRYPTO=@PBX_CRYPTO@
+BLUETOOTH=@PBX_BLUETOOTH@
CURL=@PBX_CURL@
+ DAHDI=@PBX_DAHDI@
FREETDS=@PBX_FREETDS@
- GMIME=@PBX_GMIME@
diff --git a/channels/Makefile b/channels/Makefile
index 34bd8e0..d8e691a 100644
--- a/channels/Makefile
@@ -2228,10 +2228,10 @@
+type=headset
+adapter=dlink
diff --git a/configure.ac b/configure.ac
-index 63f0376..422981b 100644
+index 33b40a2..f86e8f5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -203,6 +203,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
+@@ -205,6 +205,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
# BKTR is used for backtrace support on platforms that do not
# have it natively.
AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
@@ -2240,7 +2240,7 @@
AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-@@ -542,6 +544,8 @@ AC_CHECK_SIZEOF(int)
+@@ -556,6 +558,8 @@ AC_CHECK_SIZEOF(int)
AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
@@ -2496,7 +2496,7 @@
+
+email me at david.bowerman at gmail.com or dseeb_ on #asterisk & #asterisk-dev irc.
diff --git a/makeopts.in b/makeopts.in
-index 3bf203e..9e99a6f 100644
+index b3e5c49..05de366 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
0006-Use-pkgconfig-to-check-for-Lua.patch:
Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006-Use-pkgconfig-to-check-for-Lua.patch 30 Jul 2008 15:04:08 -0000 1.1
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch 10 Oct 2008 17:16:34 -0000 1.2
@@ -1,22 +1,20 @@
-From e7c5d20c24e3d18954212c484cd015be14de2e1e Mon Sep 17 00:00:00 2001
+From 3c8269faf056a4db7ba3cca418d466b0a1473cc7 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Mon, 25 Feb 2008 13:14:23 -0600
Subject: [PATCH] Use pkgconfig to check for Lua.
---
- configure.ac | 11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
+ configure.ac | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 422981b..b8c093c 100644
+index f86e8f5..f4e445c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1331,9 +1331,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
+@@ -1364,7 +1364,14 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
[${PWLIB_INCLUDE}], [${PWLIB_LIB}])
fi
--LUA_INCLUDE="-I/usr/include/lua5.1"
--LUA_LIB="-llua5.1"
-AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h])
+PBX_LUA=0
+AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
0007-Build-using-external-libedit.patch:
Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0007-Build-using-external-libedit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0007-Build-using-external-libedit.patch 30 Jul 2008 15:04:08 -0000 1.1
+++ 0007-Build-using-external-libedit.patch 10 Oct 2008 17:16:34 -0000 1.2
@@ -1,4 +1,4 @@
-From 23c345241390d5aa577421abfb7e36aa6f3a343e Mon Sep 17 00:00:00 2001
+From 76f411669b771983c0bdbab8c0f294351d988861 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue, 25 Mar 2008 00:50:27 -0500
Subject: [PATCH] Build using external libedit.
@@ -12,10 +12,10 @@
5 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 97822e6..e51279b 100644
+index 45faa9e..90507ee 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
-@@ -16,6 +16,7 @@ ISDNNET=@PBX_ISDNNET@
+@@ -17,6 +17,7 @@ ISDNNET=@PBX_ISDNNET@
IXJUSER=@PBX_IXJUSER@
JACK=@PBX_JACK@
LDAP=@PBX_LDAP@
@@ -24,10 +24,10 @@
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
-index b8c093c..c72e9c2 100644
+index f4e445c..40f8d6e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -220,6 +220,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+@@ -223,6 +223,7 @@ AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -35,7 +35,7 @@
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1568,6 +1569,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1530,6 +1531,27 @@ AC_SUBST(PBX_GTK2)
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -64,18 +64,18 @@
AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
if test ! x"${CURL_CONFIG}" = xNo; then
diff --git a/main/Makefile b/main/Makefile
-index 976c37b..09c5eb6 100644
+index b3a53a3..996ddf6 100644
--- a/main/Makefile
+++ b/main/Makefile
-@@ -133,6 +133,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
- channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
- asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+@@ -132,6 +132,7 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+ channel.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
+ asterisk.o: ASTCFLAGS+=$(DAHDI_INCLUDE)
+cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
http.o: ASTCFLAGS+=$(GMIME_INCLUDE)
-@@ -166,13 +167,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -165,13 +166,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
GMIMELDFLAGS+=$(GMIME_LIB)
endif
@@ -93,7 +93,7 @@
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
diff --git a/main/cli.c b/main/cli.c
-index 11d6671..dce7950 100644
+index 70d26e1..90454d8 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -114,10 +114,10 @@
/*!
diff --git a/makeopts.in b/makeopts.in
-index 9e99a6f..b8a4ab6 100644
+index 05de366..72d5315 100644
--- a/makeopts.in
+++ b/makeopts.in
-@@ -235,3 +235,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -241,3 +241,7 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
Index: asterisk-strip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-strip.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- asterisk-strip.sh 2 Apr 2008 21:30:00 -0000 1.3
+++ asterisk-strip.sh 10 Oct 2008 17:16:34 -0000 1.4
@@ -11,11 +11,12 @@
tar czf asterisk-$version-stripped.tar.gz asterisk-$version
rm -rf asterisk-$version
-echo "MD5 Sums"
-echo "========"
-md5sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz
-echo
-echo "SHA1 Sums"
-echo "========="
-sha1sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz
+echo "# MD5 Sums"
+echo "# ========"
+md5sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /'
+echo "#"
+echo "# SHA1 Sums"
+echo "# ========="
+sha1sum asterisk-$version.tar.gz asterisk-$version-stripped.tar.gz | sed -e 's/^/# /'
+
Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- asterisk.spec 11 Sep 2008 14:30:09 -0000 1.33
+++ asterisk.spec 10 Oct 2008 17:16:34 -0000 1.34
@@ -1,10 +1,9 @@
%define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define beta 9
Summary: The Open Source PBX
Name: asterisk
Version: 1.6.0
-Release: 0.22.beta%{beta}%{?dist}
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -20,15 +19,15 @@
# MD5 Sums
# ========
-# 47998ad858e8ccadf5fa92311fc24b6e asterisk-1.6.0-beta9.tar.gz
-# 4bc3d81f90935caf0bf344e3ee817b17 asterisk-1.6.0-beta9-stripped.tar.gz
-#
+# 4031b05669be9d0556f52d88aa617803 asterisk-1.6.0.tar.gz
+# d7bdfb3605dfd6b02d85b679bc6dfa9f asterisk-1.6.0-stripped.tar.gz
+#
# SHA1 Sums
# =========
-# 3f04cd803fea058ecec170db15a1a3e1738f0fc9 asterisk-1.6.0-beta9.tar.gz
-# a5d3d6699bcd55afe35c2e57059f3b3b32ebf112 asterisk-1.6.0-beta9-stripped.tar.gz
+# c96717d8cbb70b538b7b9183a76fd69c39543acc asterisk-1.6.0.tar.gz
+# a8a68f260daaa66ac388c1f625ee859f6e9457d1 asterisk-1.6.0-stripped.tar.gz
-Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz
+Source0: asterisk-%{version}-stripped.tar.gz
Source1: asterisk-logrotate
Source2: menuselect.makedeps
Source3: menuselect.makeopts
@@ -41,11 +40,8 @@
Patch5: 0005-Add-chan_mobile-from-asterisk-addons.patch
Patch6: 0006-Use-pkgconfig-to-check-for-Lua.patch
Patch7: 0007-Build-using-external-libedit.patch
-Patch8: 0008-Update-cdr_tds-to-latest.patch
-Patch9: 0009-Merged-revisions-123952-via-svnmerge-from.patch
-Patch10: 0010-Merged-revisions-132778-via-svnmerge-from.patch
-Patch11: 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch
-Patch12: 0012-Update-autoconf.patch
+Patch8: 0008-Update-autoconf.patch
+Patch9: 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -135,6 +131,21 @@
%description curl
Modules for Asterisk that use cURL.
+%package dahdi
+Summary: Modules for Asterisk that use DAHDI
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires: dahdi-tools >= 2.0.0
+Requires(pre): %{_sbindir}/usermod
+BuildRequires: dahdi-tools-devel >= 2.0.0
+BuildRequires: libpri-devel >= 1.4.6
+BuildRequires: libss7-devel >= 1.0.1
+Obsoletes: asterisk-zaptel <= 1.6.0-0.22.beta9
+Provides: asterisk-zaptel = %{version}-%{release}
+
+%description dahdi
+Modules for Asterisk that use DAHDI.
+
%package devel
Summary: Development files for Asterisk
Group: Development/Libraries
@@ -195,6 +206,7 @@
Group: Applications/Internet
Requires: asterisk = %{version}-%{release}
BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libresample-devel
%description jack
JACK resources for Asterisk.
@@ -391,20 +403,8 @@
Voicemail implementation for Asterisk that stores voicemail on the
local filesystem.
-%package zaptel
-Summary: Modules for Asterisk that use Zaptel
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-Requires: zaptel >= 1.4.0
-Requires(pre): %{_sbindir}/usermod
-BuildRequires: zaptel-devel >= 1.4.11
-BuildRequires: libpri-devel >= 1.4.6
-
-%description zaptel
-Modules for Asterisk that use Zaptel.
-
%prep
-%setup0 -q -n asterisk-%{version}%{?beta:-beta%{beta}}
+%setup0 -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -414,9 +414,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -553,12 +550,12 @@
/sbin/chkconfig --del asterisk
fi
+%pre dahdi
+%{_sbindir}/usermod -a -G dahdi asterisk
+
%pre misdn
%{_sbindir}/usermod -a -G misdn asterisk
-%pre zaptel
-%{_sbindir}/usermod -a -G zaptel asterisk
-
%files
%defattr(-,root,root,-)
%doc README* *.txt ChangeLog BUGS CREDITS configs
@@ -849,6 +846,19 @@
%{_libdir}/asterisk/modules/func_curl.so
%{_libdir}/asterisk/modules/res_config_curl.so
+%files dahdi
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
+%config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
+%{_libdir}/asterisk/modules/app_flash.so
+%{_libdir}/asterisk/modules/app_meetme.so
+%{_libdir}/asterisk/modules/app_page.so
+%{_libdir}/asterisk/modules/app_dahdibarge.so
+%{_libdir}/asterisk/modules/app_dahdiras.so
+%{_libdir}/asterisk/modules/app_dahdiscan.so
+%{_libdir}/asterisk/modules/chan_dahdi.so
+%{_libdir}/asterisk/modules/codec_dahdi.so
+
%files devel
%defattr(-,root,root,-)
%doc doc/CODING-GUIDELINES
@@ -1012,20 +1022,10 @@
%{_libdir}/asterisk/modules/app_directory_plain.so
%{_libdir}/asterisk/modules/app_voicemail_plain.so
-%files zaptel
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/zapata.conf
-%{_libdir}/asterisk/modules/app_flash.so
-%{_libdir}/asterisk/modules/app_meetme.so
-%{_libdir}/asterisk/modules/app_page.so
-%{_libdir}/asterisk/modules/app_zapbarge.so
-%{_libdir}/asterisk/modules/app_zapras.so
-%{_libdir}/asterisk/modules/app_zapscan.so
-%{_libdir}/asterisk/modules/chan_zap.so
-%{_libdir}/asterisk/modules/codec_zap.so
-
%changelog
+* Fri Oct 10 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-1
+- Update to final release.
+
* Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.6.0-0.22.beta9
- Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 19 May 2008 14:40:41 -0000 1.15
+++ sources 10 Oct 2008 17:16:34 -0000 1.16
@@ -1 +1 @@
-4bc3d81f90935caf0bf344e3ee817b17 asterisk-1.6.0-beta9-stripped.tar.gz
+d7bdfb3605dfd6b02d85b679bc6dfa9f asterisk-1.6.0-stripped.tar.gz
--- 0008-Update-cdr_tds-to-latest.patch DELETED ---
--- 0009-Merged-revisions-123952-via-svnmerge-from.patch DELETED ---
--- 0010-Merged-revisions-132778-via-svnmerge-from.patch DELETED ---
--- 0011-Replace-app_rxfax-app_txfax-with-app_fax-pulled-from.patch DELETED ---
--- 0012-Update-autoconf.patch DELETED ---
More information about the scm-commits
mailing list