Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove KDE configure script check that isn't used

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98604 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Russell Bryant 18 years ago
parent b7425090c8
commit bed72d73b0
5 changed files with 11 additions and 314 deletions
Show Stats Download Patch File Download Diff File

1
build_tools/menuselect-deps.in
Unescape View File

@ -10,7 +10,6 @@ ICONV=@PBX_ICONV@
IKSEMEL=@PBX_IKSEMEL@
IMAP_TK=@PBX_IMAP_TK@
IXJUSER=@PBX_IXJUSER@
KDE=@PBX_KDE@
LTDL=@PBX_LTDL@
LUA=@PBX_LUA@
NBS=@PBX_NBS@

267
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 97767 .
# From configure.ac Revision: 98454 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@ -773,10 +773,6 @@ ISDNNET_LIB
ISDNNET_INCLUDE
ISDNNET_DIR
PBX_ISDNNET
KDE_LIB
KDE_INCLUDE
KDE_DIR
PBX_KDE
LTDL_LIB
LTDL_INCLUDE
LTDL_DIR
@ -953,8 +949,6 @@ GC_CFLAGS
GC_LDFLAGS
AST_DECLARATION_AFTER_STATEMENT
GSM_INTERNAL
KDEINIT
KDEDIR
CONFIG_NETSNMP
PG_CONFIG
PTLIB_CONFIG
@ -1584,7 +1578,6 @@ Optional Packages:
--with-iksemel=PATH use Iksemel Jabber Library files in PATH
--with-imap=PATH use UW IMAP Toolkit files in PATH
--with-isdnnet=PATH use ISDN4Linux Library files in PATH
--with-kde=PATH use KDE 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
@ -8298,34 +8291,6 @@ fi
KDE_DESCRIP="KDE"
KDE_OPTION="kde"
# Check whether --with-kde was given.
if test "${with_kde+set}" = set; then
withval=$with_kde;
case ${withval} in
n|no)
USE_KDE=no
;;
y|ye|yes)
ac_mandatory_list="${ac_mandatory_list} KDE"
;;
*)
KDE_DIR="${withval}"
ac_mandatory_list="${ac_mandatory_list} KDE"
;;
esac
fi
PBX_KDE=0
LTDL_DESCRIP="libtool"
LTDL_OPTION="ltdl"
@ -32899,211 +32864,6 @@ _ACEOF
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_KDE}" != "no"; then
{ echo "$as_me:$LINENO: checking for crashHandler in -lkdecore" >&5
echo $ECHO_N "checking for crashHandler in -lkdecore... $ECHO_C" >&6; }
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} -I${KDE_DIR}/include"
if test -d ${KDE_DIR}/lib; then
kdelibdir="${KDE_DIR}/lib"
else
kdelibdir="${KDE_DIR}"
fi
LIBS="${LIBS} -L${kdelibdir} -lkdecore"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "kcrash.h"
int
main ()
{
KCrash::defaultCrashHandler(1);
;
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_kde_crash="yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_kde_crash="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_kde_crash}" = "yes"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
KDE_LIB="-lkdecore -lkdeui"
if test "${KDE_DIR}" != ""; then
KDE_LIB="-L${kdelibdir} ${KDE_LIB}"
KDE_INCLUDE="-I${KDE_DIR}/include"
fi
PBX_KDE=1
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBKDE 1
_ACEOF
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
fi
if test "${PBX_KDE}" = 1; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}kdeinit", so it can be a program name with args.
set dummy ${ac_tool_prefix}kdeinit; 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_KDEINIT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $KDEINIT in
[\\/]* | ?:[\\/]*)
ac_cv_path_KDEINIT="$KDEINIT" # 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_KDEINIT="$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
KDEINIT=$ac_cv_path_KDEINIT
if test -n "$KDEINIT"; then
{ echo "$as_me:$LINENO: result: $KDEINIT" >&5
echo "${ECHO_T}$KDEINIT" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
fi
if test -z "$ac_cv_path_KDEINIT"; then
ac_pt_KDEINIT=$KDEINIT
# Extract the first word of "kdeinit", so it can be a program name with args.
set dummy kdeinit; 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_KDEINIT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $ac_pt_KDEINIT in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_KDEINIT="$ac_pt_KDEINIT" # 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_KDEINIT="$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_KDEINIT=$ac_cv_path_ac_pt_KDEINIT
if test -n "$ac_pt_KDEINIT"; then
{ echo "$as_me:$LINENO: result: $ac_pt_KDEINIT" >&5
echo "${ECHO_T}$ac_pt_KDEINIT" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
if test "x$ac_pt_KDEINIT" = x; then
KDEINIT="No"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&5
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
ac_tool_warned=yes ;;
esac
KDEINIT=$ac_pt_KDEINIT
fi
else
KDEINIT="$ac_cv_path_KDEINIT"
fi
if test ! x"${KDEINIT}" = xNo; then
KDEDIR=$(${DIRNAME} ${KDEINIT})
KDEDIR=$(${DIRNAME} ${KDEDIR})
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 "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then
pbxlibdir=""
@ -38034,6 +37794,7 @@ if test "${USE_PWLIB}" != "no"; then
fi
PWLIB_INCDIR=
PWLIB_LIBDIR=
ac_ext=cpp
@ -48880,10 +48641,6 @@ ISDNNET_LIB!$ISDNNET_LIB$ac_delim
ISDNNET_INCLUDE!$ISDNNET_INCLUDE$ac_delim
ISDNNET_DIR!$ISDNNET_DIR$ac_delim
PBX_ISDNNET!$PBX_ISDNNET$ac_delim
KDE_LIB!$KDE_LIB$ac_delim
KDE_INCLUDE!$KDE_INCLUDE$ac_delim
KDE_DIR!$KDE_DIR$ac_delim
PBX_KDE!$PBX_KDE$ac_delim
LTDL_LIB!$LTDL_LIB$ac_delim
LTDL_INCLUDE!$LTDL_INCLUDE$ac_delim
LTDL_DIR!$LTDL_DIR$ac_delim
@ -48921,6 +48678,10 @@ OGG_INCLUDE!$OGG_INCLUDE$ac_delim
OGG_DIR!$OGG_DIR$ac_delim
PBX_OGG!$PBX_OGG$ac_delim
OSPTK_LIB!$OSPTK_LIB$ac_delim
OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim
OSPTK_DIR!$OSPTK_DIR$ac_delim
PBX_OSPTK!$PBX_OSPTK$ac_delim
OSS_LIB!$OSS_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -48962,10 +48723,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
OSPTK_INCLUDE!$OSPTK_INCLUDE$ac_delim
OSPTK_DIR!$OSPTK_DIR$ac_delim
PBX_OSPTK!$PBX_OSPTK$ac_delim
OSS_LIB!$OSS_LIB$ac_delim
OSS_INCLUDE!$OSS_INCLUDE$ac_delim
OSS_DIR!$OSS_DIR$ac_delim
PBX_OSS!$PBX_OSS$ac_delim
@ -49059,6 +48816,10 @@ ZLIB_DIR!$ZLIB_DIR$ac_delim
PBX_ZLIB!$PBX_ZLIB$ac_delim
ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim
ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
ZAPTEL_DIR!$ZAPTEL_DIR$ac_delim
PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
ZAPTEL_TRANSCODE_LIB!$ZAPTEL_TRANSCODE_LIB$ac_delim
ZAPTEL_TRANSCODE_INCLUDE!$ZAPTEL_TRANSCODE_INCLUDE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -49100,10 +48861,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
ZAPTEL_DIR!$ZAPTEL_DIR$ac_delim
PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
ZAPTEL_TRANSCODE_LIB!$ZAPTEL_TRANSCODE_LIB$ac_delim
ZAPTEL_TRANSCODE_INCLUDE!$ZAPTEL_TRANSCODE_INCLUDE$ac_delim
ZAPTEL_TRANSCODE_DIR!$ZAPTEL_TRANSCODE_DIR$ac_delim
PBX_ZAPTEL_TRANSCODE!$PBX_ZAPTEL_TRANSCODE$ac_delim
ZAPTEL_VLDTMF_LIB!$ZAPTEL_VLDTMF_LIB$ac_delim
@ -49142,8 +48899,6 @@ GC_CFLAGS!$GC_CFLAGS$ac_delim
GC_LDFLAGS!$GC_LDFLAGS$ac_delim
AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim
GSM_INTERNAL!$GSM_INTERNAL$ac_delim
KDEINIT!$KDEINIT$ac_delim
KDEDIR!$KDEDIR$ac_delim
CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim
PG_CONFIG!$PG_CONFIG$ac_delim
PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim
@ -49166,7 +48921,7 @@ 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` = 64; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

50
configure.ac
Unescape View File

@ -215,7 +215,6 @@ AST_EXT_LIB_SETUP([ICONV], [Iconv Library], [iconv])
AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
AST_EXT_LIB_SETUP([KDE], [KDE], [kde])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@ -811,55 +810,6 @@ fi
# Needed by unixodbc
AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])
AC_LANG_PUSH(C++)
if test "${USE_KDE}" != "no"; then
AC_MSG_CHECKING(for crashHandler in -lkdecore)
saved_libs="${LIBS}"
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} -I${KDE_DIR}/include"
if test -d ${KDE_DIR}/lib; then
kdelibdir="${KDE_DIR}/lib"
else
kdelibdir="${KDE_DIR}"
fi
LIBS="${LIBS} -L${kdelibdir} -lkdecore"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include "kcrash.h"],
[KCrash::defaultCrashHandler(1);])
],
[ac_cv_lib_kde_crash="yes"],
[ac_cv_lib_kde_crash="no"])
LIBS="${saved_libs}"
CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_lib_kde_crash}" = "yes"; then
AC_MSG_RESULT(yes)
KDE_LIB="-lkdecore -lkdeui"
if test "${KDE_DIR}" != ""; then
KDE_LIB="-L${kdelibdir} ${KDE_LIB}"
KDE_INCLUDE="-I${KDE_DIR}/include"
fi
PBX_KDE=1
AC_DEFINE([HAVE_LIBKDE], 1, [Define if your system has the KDE libraries.])
else
AC_MSG_RESULT(no)
fi
fi
if test "${PBX_KDE}" = 1; then
AC_PATH_TOOL(KDEINIT, kdeinit, No)
if test ! x"${KDEINIT}" = xNo; then
KDEDIR=$(${DIRNAME} ${KDEINIT})
KDEDIR=$(${DIRNAME} ${KDEDIR})
fi
AC_SUBST([KDEDIR])
fi
AC_LANG_POP
AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
if test "${PBX_MISDN}" = 1; then

3
include/asterisk/autoconfig.h.in
Unescape View File

@ -370,9 +370,6 @@
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define if your system has the KDE libraries. */
#undef HAVE_LIBKDE
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H

4
makeopts.in
Unescape View File

@ -100,10 +100,6 @@ IKSEMEL_LIB=@IKSEMEL_LIB@
IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
IMAP_TK_LIB=@IMAP_TK_LIB@
KDEDIR=@KDEDIR@
KDE_INCLUDE=@KDE_INCLUDE@
KDE_LIB=@KDE_LIB@
LUA_INCLUDE=@LUA_INCLUDE@
LUA_LIB=@LUA_LIB@

Write Preview
Loading…
Cancel
Save