[asterisk-commits] branch group/autoconf_and_menuselect r15064 -
/team/group/autoconf_and_menuse...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Mar 26 11:31:35 MST 2006
Author: dancho
Date: Sun Mar 26 12:31:32 2006
New Revision: 15064
URL: http://svn.digium.com/view/asterisk?rev=15064&view=rev
Log:
Changed external libraris checks..
Modified:
team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in
team/group/autoconf_and_menuselect/autoconf/makeopts.in
team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
Modified: team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in?rev=15064&r1=15063&r2=15064&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/autoconfig.h.in Sun Mar 26 12:31:32 2006
@@ -85,7 +85,7 @@
/* Define to 1 if you have the `isascii' function. */
#undef HAVE_ISASCII
-/* Define to 1 if you have the `asound' library (-lasound). */
+/* Define to indicate the ALSA sound libraries should be used */
#undef HAVE_LIBASOUND
/* Define to 1 if you have the `c' library (-lc). */
@@ -94,34 +94,43 @@
/* Define to 1 if you have the `crypto' library (-lcrypto). */
#undef HAVE_LIBCRYPTO
+/* Define to 1 if you have the `curses' library (-lcurses). */
+#undef HAVE_LIBCURSES
+
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
-/* Define to 1 if you have the `mfcr2' library (-lmfcr2). */
+/* Define to indicate the MFCR2 libraries should be used */
#undef HAVE_LIBMFCR2
-/* Define to 1 if you have the `nbs' library (-lnbs). */
+/* Define to indicate the NBS (Network Broadcast Sound) libraries should be
+ used for sound operations. */
#undef HAVE_LIBNBS
/* Define to 1 if you have the `ncurses' library (-lncurses). */
#undef HAVE_LIBNCURSES
-/* Define to 1 if you have the `newt' library (-lnewt). */
+/* Define to indicate the newt libraries should be used for GUI operations. */
#undef HAVE_LIBNEWT
-/* Define to 1 if you have the `osptk' library (-losptk). */
+/* Define to indicate the Ogg libraries */
+#undef HAVE_LIBOGG
+
+/* Define to indicate the OSPTK libraries should be used for audio operations.
+ */
#undef HAVE_LIBOSPTK
-/* Define to 1 if you have the `ossaudio' library (-lossaudio). */
+/* Define to indicate the OSS audio libraries should be used for sound
+ operations. */
#undef HAVE_LIBOSSAUDIO
-/* Define to 1 if you have the `popt' library (-lpopt). */
+/* Define to indicate the popt libraries should be used for GUI operations. */
#undef HAVE_LIBPOPT
-/* Define to 1 if you have the `pri' library (-lpri). */
+/* Define to indicate the PRI libraries should be used */
#undef HAVE_LIBPRI
/* Define to 1 if you have the `pthread' library (-lpthread). */
@@ -133,33 +142,29 @@
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
-/* Define to 1 if you have the `speex' library (-lspeex). */
+/* Define to indicate the SPEEX libraries should be used for audio operations.
+ */
#undef HAVE_LIBSPEEX
-/* Define to 1 if you have the `sqlite' library (-lsqlite). */
+/* Define to indicate the sqlite libraries should be used for database
+ operations. */
#undef HAVE_LIBSQLITE
/* Define to indicate the OpenSSL libraries should be used for cryptographic
operations. */
#undef HAVE_LIBSSL
-/* Define to 1 if you have the `tds' library (-ltds). */
+/* Define to indicate the FreeTDS libraries should be used */
#undef HAVE_LIBTDS
-/* Define to 1 if you have the `tonezone' library (-ltonezone). */
-#undef HAVE_LIBTONEZONE
-
-/* Define to 1 if you have the `vorbis' library (-lvorbis). */
+/* Define to indicate the vorbis libraries should be used. */
#undef HAVE_LIBVORBIS
-
-/* Define to 1 if you have the `vorbisenc' library (-lvorbisenc). */
-#undef HAVE_LIBVORBISENC
-
-/* Define to 1 if you have the `vpb' library (-lvpb). */
-#undef HAVE_LIBVPB
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
+
+/* Define to indicate the Zaptel libraries */
+#undef HAVE_LIBZAPTEL
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -381,6 +386,10 @@
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
+
+/* Define to indicate the Z libraries should be used for compression
+ operations. */
+#undef HAVE_Z
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
Modified: team/group/autoconf_and_menuselect/autoconf/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/makeopts.in?rev=15064&r1=15063&r2=15064&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/makeopts.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/makeopts.in Sun Mar 26 12:31:32 2006
@@ -23,21 +23,68 @@
INSTALL_PREFIX=@prefix@
-CFLAGS = @z_CFLAGS@ @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CXXDEPMODE = @CXXDEPMODE@
+PBX_DEBUG=@PBX_DEBUG@
-DEFS = @DEFS@
+OGG_LIB=@OGG_LIB@
+OGG_INCLUDE=@OGG_INCLUDE@
-LIBS = @LIBS@
-LDFLAGS = @z_LDFLAGS@ @LDFLAGS@
+VORBIS_LIB=@VORBIS_LIB@
+VORBIS_INCLUDE=@VORBIS_INCLUDE@
-CFLAGS_SHLIB = @z_CFLAGS_SHLIB@
-LDFLAGS_SHLIB = @z_LDFLAGS_SHLIB@
+ASOUND_LIB=@ASOUND_LIB@
+ASOUND_INCLUDE=@ASOUND_INCLUDE@
+NBS_LIB=@NBS_LIB@
+NBS_INCLUDE=@NBS_INCLUDE@
-CURLLIBS = @CURLLIBS@
+OSSAUDIO_LIB=@OSSAUDIO_LIB@
+OSSAUDIO_INCLUDE=@OSSAUDIO_INCLUDE@
+
+SPEEX_LIB=@SPEEX_LIB@
+SPEEX_INCLUDE=@SPEEX_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@
+
+MFCR2_LIB=@MFCR2_LIB@
+MFCR2_INCLUDE=@MFCR2_INCLUDE@
+
+OSPTK_LIB=@OSPTK_LIB@
+OSPTK_INCLUDE=@OSPTK_INCLUDE@
+
+ODBC_LIB=@ODBC_LIB@
+ODBC_INCLUDE=@ODBC_INCLUDE@
+
+PGSQL_LIB=@PGSQL_LIB@
+PGSQL_INCLUDE=@PGSQL_INCLUDE@
+
+SQLITE_LIB=@SQLITE_LIB@
+SQLITE_INCLUDE=@SQLITE_INCLUDE@
+
+TDS_LIB=@TDS_LIB@
+TDS_INCLUDE=@TDS_INCLUDE@
+
+POPT_LIB=@POPT_LIB@
+POPT_INCLUDE=@POPT_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@
+
+Z_LIB=@Z_LIB@
+Z_INCLUDE=@Z_INCLUDE@
+
QTDIR = @QTDIR@
KDEDIR = @KDEDIR@
@@ -46,16 +93,3 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
-
-CROSS_COMPILE_ROOT = @CROSS_COMPILE_ROOT@
-CROSS_COMPILE_BIN = @CROSS_COMPILE_BIN@
-CROSS_COMPILE_TARGET = @CROSS_COMPILE_TARGET@
-
-SSL_LIB = @SSL_LIB@
-SSL_INCLUDE = @SSL_INCLUDE@
-
-ODBC_LIB = @ODBC_LIB@
-ODBC_INCLUDE = @ODBC_INCLUDE@
-
-PGSQL_LIB = @PGSQL_LIB@
-PGSQL_INCLUDE = @PGSQL_INCLUDE@
Modified: team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in?rev=15064&r1=15063&r2=15064&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in Sun Mar 26 12:31:32 2006
@@ -1,26 +1,24 @@
-ASOUND=@PBX_ASOUND@
-CURL=@PBX_CURL@
-FREETDS=@PBX_FREETDS@
-GTK=@PBX_GTK@
-H323=@PBX_H323@
-IXJUSER=@PBX_IXJUSER@
-KDE=@PBX_KDE@
-LIBMFCR2=@PBX_LIBMFCR2@
-LIBNEWT=@PBX_LIBNEWT@
-LIBOSPTK=@PBX_LIBOSPTK@
-LIBPOPT=@PBX_LIBPOPT@
-LIBPRI=@PBX_LIBPRI@
-LIBSPEEX=@PBX_LIBSPEEX@
-LIBVORBIS=@PBX_LIBVORBIS@
-NBS=@PBX_NBS@
-OGGVORBIS=@PBX_OGGVORBIS@
-OSSAUDIO=@PBX_OSSAUDIO@
+ASOUND=@HAVE_LIBASOUND@
+CURL=@HAVE_CURL@
+FREETDS=@HAVE_LIBTDS@
+GTK=@HAVE_GTK@
+H323=@HAVE_H323@
+KDE=@HAVE_KDE@
+LIBMFCR2=@HAVE_LIBMFCR2@
+LIBNEWT=@HAVE_LIBNEWT@
+LIBOSPTK=@HAVE_LIBOSPTK@
+LIBPOPT=@HAVE_LIBPOPT@
+LIBPRI=@HAVE_LIBPRI@
+LIBSPEEX=@HAVE_LIBSPEEX@
+LIBVORBIS=@HAVE_LIBVORBIS@
+NBS=@HAVE_LIBNBS@
+OGGVORBIS=@HAVE_LIBVORBIS@
+OSSAUDIO=@HAVE_LIBOSSAUDIO@
PGSQL=@HAVE_PGSQL@
-POLL=@PBX_POLL@
-PTLIB=@PBX_PTLIB@
-QT=@PBX_QT@
-SQLITE=@PBX_SQLITE@
+PTLIB=@HAVE_LIBPWLIB@
+QT=@HAVE_QT@
+SQLITE=@HAVE_LIBSQLITE@
SSL=@HAVE_LIBSSL@
UNIXODBC=@HAVE_UNIXODBC@
-VPBAPI=@PBX_VPBAPI@
-ZAPTEL=@PBX_ZAPTEL@
+VPBAPI=@HAVE_LIBVPB@
+ZAPTEL=@HAVE_LIBZAPTEL@
More information about the asterisk-commits
mailing list