[asterisk-commits] russell: branch 1.4 r97734 - in /branches/1.4: ./ build_tools/ include/asteri...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jan 10 10:10:10 CST 2008
Author: russell
Date: Thu Jan 10 10:10:09 2008
New Revision: 97734
URL: http://svn.digium.com/view/asterisk?view=rev&rev=97734
Log:
Remove pbx_kdeconsole from the tree. It hasn't worked in ages, and nobody has
complained.
(closes issue #11706, reported by caio1982)
Removed:
branches/1.4/pbx/pbx_kdeconsole.cc
Modified:
branches/1.4/build_tools/menuselect-deps.in
branches/1.4/configure
branches/1.4/configure.ac
branches/1.4/include/asterisk/autoconfig.h.in
branches/1.4/makeopts.in
Modified: branches/1.4/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/menuselect-deps.in?view=diff&rev=97734&r1=97733&r2=97734
==============================================================================
--- branches/1.4/build_tools/menuselect-deps.in (original)
+++ branches/1.4/build_tools/menuselect-deps.in Thu Jan 10 10:10:09 2008
@@ -20,7 +20,6 @@
PGSQL=@PBX_PGSQL@
POPT=@PBX_POPT@
PRI=@PBX_PRI@
-QT=@PBX_QT@
RADIUS=@PBX_RADIUS@
SPEEX=@PBX_SPEEX@
SQLITE=@PBX_SQLITE@
Modified: branches/1.4/configure
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure?view=diff&rev=97734&r1=97733&r2=97734
==============================================================================
--- branches/1.4/configure (original)
+++ branches/1.4/configure Thu Jan 10 10:10:09 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 93180 .
+# From configure.ac Revision: 94077 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@@ -814,10 +814,6 @@
OPENH323_INCLUDE
OPENH323_DIR
PBX_OPENH323
-QT_LIB
-QT_INCLUDE
-QT_DIR
-PBX_QT
RADIUS_LIB
RADIUS_INCLUDE
RADIUS_DIR
@@ -895,7 +891,6 @@
OPENH323_LIBDIR
OPENH323_SUFFIX
OPENH323_BUILD
-QTMOC
PBX_ZAPTEL_VLDTMF
PBX_ZAPTEL_TRANSCODE
EDITLINE_LIB
@@ -1531,7 +1526,6 @@
--with-pri=PATH use ISDN PRI files in PATH
--with-pwlib=PATH use PWlib files in PATH
--with-h323=PATH use OpenH323 files in PATH
- --with-qt=PATH use Qt files in PATH
--with-radius=PATH use Radius Client files in PATH
--with-speex=PATH use Speex files in PATH
--with-sqlite=PATH use SQLite files in PATH
@@ -8408,34 +8402,6 @@
fi
PBX_OPENH323=0
-
-
-
-
-
-
-QT_DESCRIP="Qt"
-QT_OPTION="qt"
-
-# Check whether --with-qt was given.
-if test "${with_qt+set}" = set; then
- withval=$with_qt;
-case ${withval} in
- n|no)
- USE_QT=no
- ;;
- y|ye|yes)
- QT_MANDATORY="yes"
- ;;
- *)
- QT_DIR="${withval}"
- QT_MANDATORY="yes"
- ;;
-esac
-
-fi
-
-PBX_QT=0
@@ -27292,274 +27258,6 @@
echo "$as_me: *** including --without-h323" >&6;}
exit 1
fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-if test "${USE_QT}" != "no"; then
- { echo "$as_me:$LINENO: checking for QDate in -lqt" >&5
-echo $ECHO_N "checking for QDate in -lqt... $ECHO_C" >&6; }
- saved_libs="${LIBS}"
- saved_cppflags="${CPPFLAGS}"
- if test "x${QT_DIR}" != "x"; then
- LIBS="${LIBS} -L${QT_DIR}/lib"
- CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include"
- fi
- LIBS="${LIBS} -lqt"
- qtlib="qt"
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <qt3/qdatetime.h>
-int
-main ()
-{
-QDate date();
- ;
- 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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_qt_qt_date="yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_qt_qt_date="no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="${saved_libs}"
- CPPFLAGS="${saved_cppflags}"
-
- if test "${ac_cv_lib_qt_qt_date}" = "no"; then
- saved_libs="${LIBS}"
- saved_cppflags="${CPPFLAGS}"
- if test "x${QT_DIR}" != "x"; then
- LIBS="${LIBS} -L${QT_DIR}/lib"
- CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include"
- fi
- LIBS="${LIBS} -lqt-mt"
- qtlib="qt-mt"
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <qt3/qdatetime.h>
-int
-main ()
-{
-QDate date();
- ;
- 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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_qt_qt_date="yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_qt_qt_date="no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="${saved_libs}"
- CPPFLAGS="${saved_cppflags}"
- fi
-
- if test "${ac_cv_lib_qt_qt_date}" = "yes"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
-
- if test "${ac_cv_lib_qt_qt_date}" = "yes"; then
- QT_LIB="-l${qtlib}"
- if test "${QT_DIR}" != ""; then
- QT_LIB="-L${QT_DIR}/lib ${QT_LIB}"
- QT_INCLUDE="-I${QT_DIR}/include"
- fi
- PBX_QT=1
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_QT 1
-_ACEOF
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}moc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}moc; 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_path_QTMOC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $QTMOC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_QTMOC="$QTMOC" # Let the user override the test with a path.
- ;;
- *)
- 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_path_QTMOC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-QTMOC=$ac_cv_path_QTMOC
-if test -n "$QTMOC"; then
- { echo "$as_me:$LINENO: result: $QTMOC" >&5
-echo "${ECHO_T}$QTMOC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_QTMOC"; then
- ac_pt_QTMOC=$QTMOC
- # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; 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_path_ac_pt_QTMOC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $ac_pt_QTMOC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_QTMOC="$ac_pt_QTMOC" # Let the user override the test with a path.
- ;;
- *)
- 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_path_ac_pt_QTMOC="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_QTMOC=$ac_cv_path_ac_pt_QTMOC
-if test -n "$ac_pt_QTMOC"; then
- { echo "$as_me:$LINENO: result: $ac_pt_QTMOC" >&5
-echo "${ECHO_T}$ac_pt_QTMOC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_pt_QTMOC" = x; then
- QTMOC="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
- QTMOC=$ac_pt_QTMOC
- fi
-else
- QTMOC="$ac_cv_path_QTMOC"
-fi
-
- elif test -n "${QT_MANDATORY}";
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The Qt installation on this system appears to be broken." >&5
-echo "$as_me: *** The Qt installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
-echo "$as_me: *** Either correct the installation, or run configure" >&6;}
- { echo "$as_me:$LINENO: *** including --without-qt." >&5
-echo "$as_me: *** including --without-qt." >&6;}
- exit 1
- fi
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
if test "${USE_RADIUS}" != "no"; then
@@ -34455,10 +34153,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-QT_LIB!$QT_LIB$ac_delim
-QT_INCLUDE!$QT_INCLUDE$ac_delim
-QT_DIR!$QT_DIR$ac_delim
-PBX_QT!$PBX_QT$ac_delim
RADIUS_LIB!$RADIUS_LIB$ac_delim
RADIUS_INCLUDE!$RADIUS_INCLUDE$ac_delim
RADIUS_DIR!$RADIUS_DIR$ac_delim
@@ -34536,7 +34230,6 @@
OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim
OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
OPENH323_BUILD!$OPENH323_BUILD$ac_delim
-QTMOC!$QTMOC$ac_delim
PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim
PBX_ZAPTEL_TRANSCODE!$PBX_ZAPTEL_TRANSCODE$ac_delim
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
@@ -34554,7 +34247,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -34573,7 +34266,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -34586,6 +34279,8 @@
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
@@ -34833,7 +34528,7 @@
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=97734&r1=97733&r2=97734
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Thu Jan 10 10:10:09 2008
@@ -196,7 +196,6 @@
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
-AST_EXT_LIB_SETUP([QT], [Qt], [qt])
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
@@ -871,78 +870,6 @@
exit 1
fi
-
-AC_LANG_PUSH(C++)
-
-if test "${USE_QT}" != "no"; then
- AC_MSG_CHECKING(for QDate in -lqt)
- saved_libs="${LIBS}"
- saved_cppflags="${CPPFLAGS}"
- if test "x${QT_DIR}" != "x"; then
- LIBS="${LIBS} -L${QT_DIR}/lib"
- CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include"
- fi
- LIBS="${LIBS} -lqt"
- qtlib="qt"
- AC_LINK_IFELSE(
- [
- AC_LANG_PROGRAM(
- [#include <qt3/qdatetime.h>],
- [QDate date();])
- ],
- [ac_cv_lib_qt_qt_date="yes"],
- [ac_cv_lib_qt_qt_date="no"])
- LIBS="${saved_libs}"
- CPPFLAGS="${saved_cppflags}"
-
- if test "${ac_cv_lib_qt_qt_date}" = "no"; then
- saved_libs="${LIBS}"
- saved_cppflags="${CPPFLAGS}"
- if test "x${QT_DIR}" != "x"; then
- LIBS="${LIBS} -L${QT_DIR}/lib"
- CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include"
- fi
- LIBS="${LIBS} -lqt-mt"
- qtlib="qt-mt"
- AC_LINK_IFELSE(
- [
- AC_LANG_PROGRAM(
- [#include <qt3/qdatetime.h>],
- [QDate date();])
- ],
- [ac_cv_lib_qt_qt_date="yes"],
- [ac_cv_lib_qt_qt_date="no"])
- LIBS="${saved_libs}"
- CPPFLAGS="${saved_cppflags}"
- fi
-
- if test "${ac_cv_lib_qt_qt_date}" = "yes"; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- if test "${ac_cv_lib_qt_qt_date}" = "yes"; then
- QT_LIB="-l${qtlib}"
- if test "${QT_DIR}" != ""; then
- QT_LIB="-L${QT_DIR}/lib ${QT_LIB}"
- QT_INCLUDE="-I${QT_DIR}/include"
- fi
- PBX_QT=1
- AC_DEFINE([HAVE_QT], 1, [Define if your system has the Qt library])
- AC_PATH_TOOL(QTMOC, moc, No)
- elif test -n "${QT_MANDATORY}";
- then
- AC_MSG_NOTICE([***])
- AC_MSG_NOTICE([*** The Qt installation on this system appears to be broken.])
- AC_MSG_NOTICE([*** Either correct the installation, or run configure])
- AC_MSG_NOTICE([*** including --without-qt.])
- exit 1
- fi
-fi
-
-AC_LANG_POP
-
AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
Modified: branches/1.4/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/autoconfig.h.in?view=diff&rev=97734&r1=97733&r2=97734
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Thu Jan 10 10:10:09 2008
@@ -288,9 +288,6 @@
/* Define if your system has the PWLib libraries. */
#undef HAVE_PWLIB
-
-/* Define if your system has the Qt library */
-#undef HAVE_QT
/* Define to indicate the ${RADIUS_DESCRIP} library */
#undef HAVE_RADIUS
Modified: branches/1.4/makeopts.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/makeopts.in?view=diff&rev=97734&r1=97733&r2=97734
==============================================================================
--- branches/1.4/makeopts.in (original)
+++ branches/1.4/makeopts.in Thu Jan 10 10:10:09 2008
@@ -17,7 +17,6 @@
ID=@ID@
SHELL=@SHELL@
LN=@LN@
-QTMOC=@QTMOC@
DOT=@DOT@
STRIP=@STRIP@
WGET=@WGET@
@@ -135,9 +134,6 @@
PWLIB_INCLUDE=@PWLIB_INCLUDE@
PWLIB_LIB=@PWLIB_LIB@
-QT_INCLUDE=@QT_INCLUDE@
-QT_LIB=@QT_LIB@
-
RADIUS_INCLUDE=@RADIUS_INCLUDE@
RADIUS_LIB=@RADIUS_LIB@
More information about the asterisk-commits
mailing list