mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
clean up some damage from today's commit
convert codecs Makefile to new style git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
36
configure
vendored
36
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 35812 .
|
||||
# From configure.ac Revision: 35832 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59e.
|
||||
#
|
||||
@@ -701,7 +701,7 @@ gsm_LIB
|
||||
gsm_INCLUDE
|
||||
PBX_LIBgsm
|
||||
KDE_INCLUDE
|
||||
KDE_LIBS
|
||||
KDE_LIB
|
||||
PBX_KDE
|
||||
KDEINIT
|
||||
KDEDIR
|
||||
@@ -784,16 +784,16 @@ ZLIB_INCLUDE
|
||||
PBX_LIBZLIB
|
||||
ZAPTEL_INCLUDE
|
||||
PBX_ZAPTEL
|
||||
EDITLINE_LIBS
|
||||
EDITLINE_LIB
|
||||
PBX_H323
|
||||
PBX_IXJUSER
|
||||
GTKCONFIG
|
||||
PBX_GTK
|
||||
GTK_INCLUDE
|
||||
GTK_LIBS
|
||||
GTK_LIB
|
||||
CURL
|
||||
PBX_CURL
|
||||
CURLLIBS
|
||||
CURLLIB
|
||||
ALLOCA
|
||||
LIBOBJS
|
||||
POW_LIB
|
||||
@@ -7185,9 +7185,9 @@ echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "${ac_cv_lib_kde_crash}" = "yes"; then
|
||||
KDE_LIBS="-lkdecore -lkdeui"
|
||||
KDE_LIB="-lkdecore -lkdeui"
|
||||
if test "${KDE_DIR}" != ""; then
|
||||
KDE_LIBS="-L${KDE_DIR}/lib ${KDE_LIBS}"
|
||||
KDE_LIB="-L${KDE_DIR}/lib ${KDE_LIB}"
|
||||
KDE_INCLUDE="-I${KDE_DIR}/include"
|
||||
|
||||
fi
|
||||
@@ -18979,15 +18979,15 @@ fi
|
||||
|
||||
|
||||
|
||||
EDITLINE_LIBS=""
|
||||
EDITLINE_LIB=""
|
||||
if test "x$TERMCAP_LIB" != "x" ; then
|
||||
EDITLINE_LIBS="$TERMCAP_LIB"
|
||||
EDITLINE_LIB="$TERMCAP_LIB"
|
||||
elif test "x$TINFO_LIB" != "x" ; then
|
||||
EDITLINE_LIBS="$TINFO_LIB"
|
||||
EDITLINE_LIB="$TINFO_LIB"
|
||||
elif test "x$CURSES_LIB" != "x" ; then
|
||||
EDITLINE_LIBS="$CURSES_LIB"
|
||||
EDITLINE_LIB="$CURSES_LIB"
|
||||
elif test "x$NCURSES_LIB" != "x" ; then
|
||||
EDITLINE_LIBS="$NCURSES_LIB"
|
||||
EDITLINE_LIB="$NCURSES_LIB"
|
||||
else
|
||||
echo "*** termcap support not found"
|
||||
exit 1
|
||||
@@ -19326,7 +19326,7 @@ fi
|
||||
|
||||
if test ! "x${GTKCONFIG}" = xNo; then
|
||||
GTK_INCLUDE=$(${GTKCONFIG} --cflags gthread)
|
||||
GTK_LIBS=$(${GTKCONFIG} --libs gthread)
|
||||
GTK_LIB=$(${GTKCONFIG} --libs gthread)
|
||||
PBX_GTK=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -19443,7 +19443,7 @@ fi
|
||||
|
||||
if test ! x"${CURL}" = xNo; then
|
||||
# check for version
|
||||
CURLLIBS=$(${CURL} --libs)
|
||||
CURLLIB=$(${CURL} --libs)
|
||||
PBX_CURL=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -27649,7 +27649,7 @@ for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
PBX_LIBgsm!$PBX_LIBgsm$ac_delim
|
||||
KDE_INCLUDE!$KDE_INCLUDE$ac_delim
|
||||
KDE_LIBS!$KDE_LIBS$ac_delim
|
||||
KDE_LIB!$KDE_LIB$ac_delim
|
||||
PBX_KDE!$PBX_KDE$ac_delim
|
||||
KDEINIT!$KDEINIT$ac_delim
|
||||
KDEDIR!$KDEDIR$ac_delim
|
||||
@@ -27732,16 +27732,16 @@ ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
|
||||
PBX_LIBZLIB!$PBX_LIBZLIB$ac_delim
|
||||
ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
|
||||
PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
|
||||
EDITLINE_LIBS!$EDITLINE_LIBS$ac_delim
|
||||
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
|
||||
PBX_H323!$PBX_H323$ac_delim
|
||||
PBX_IXJUSER!$PBX_IXJUSER$ac_delim
|
||||
GTKCONFIG!$GTKCONFIG$ac_delim
|
||||
PBX_GTK!$PBX_GTK$ac_delim
|
||||
GTK_INCLUDE!$GTK_INCLUDE$ac_delim
|
||||
GTK_LIBS!$GTK_LIBS$ac_delim
|
||||
GTK_LIB!$GTK_LIB$ac_delim
|
||||
CURL!$CURL$ac_delim
|
||||
PBX_CURL!$PBX_CURL$ac_delim
|
||||
CURLLIBS!$CURLLIBS$ac_delim
|
||||
CURLLIB!$CURLLIB$ac_delim
|
||||
ALLOCA!$ALLOCA$ac_delim
|
||||
LIBOBJS!$LIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
Reference in New Issue
Block a user