aboutsummaryrefslogtreecommitdiffstats
path: root/makeopts.in
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-24 19:43:31 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-24 19:43:31 +0000
commit41af2260b79cbef918e170240ece6fd38962011c (patch)
treec9ee092b1529897cefb9171ca38ad1c5f74d293a /makeopts.in
parent3df43d0174f5ed6d1521ddc2f0d460d690fcd19b (diff)
The Eurostar Commit! (it's amazing how much work you can get done on a 150 minute train ride from Paris to London <G>)
support the new location for zaptel.h and tonezone.h use the dependency information output by menuselect to build Makefile rules for each module for header files and libraries combine the common rules into a top-level Makefile.rules file remove all (now) unnecessary stuff from subdir Makefiles change translator API so that the newpvt() callback returns an int instead of a pointer (it no longer allocates memory) alphabetize --with-<foo> options in configure script enhance Net-SNMP support in configure script to provide a --with-netsnmp option fix support for --with-pq so that if pg-config is not found when --with-pq is specified, an error will be generated add 'optional package' usage to modules now that menuselect can output it allow res_snmp to build by default, since the new loader changes coming soon will solve the function naming problem (and users can disable it via menuselect anyway) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
-rw-r--r--makeopts.in52
1 files changed, 28 insertions, 24 deletions
diff --git a/makeopts.in b/makeopts.in
index 28da92e85..c2a7565e6 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -1,3 +1,7 @@
+# NOTE: Names of _INCLUDE and _LIB entries in this file must be
+# the exact uppercase equivalents of the names used for
+# dependencies in menuselect for the same package.
+
CC=@CC@
HOST_CC=@CC@
CXX=@CXX@
@@ -38,11 +42,11 @@ sysconfdir = @sysconfdir@
AST_DEVMODE=@AST_DEVMODE@
-OGG_LIB=@OGG_LIB@
-OGG_INCLUDE=@OGG_INCLUDE@
+LIBOGG_LIB=@OGG_LIB@
+LIBOGG_INCLUDE=@OGG_INCLUDE@
-VORBIS_LIB=@VORBIS_LIB@
-VORBIS_INCLUDE=@VORBIS_INCLUDE@
+LIBVORBIS_LIB=@VORBIS_LIB@
+LIBVORBIS_INCLUDE=@VORBIS_INCLUDE@
ASOUND_LIB=@ALSA_LIB@
ASOUND_INCLUDE=@ALSA_INCLUDE@
@@ -53,25 +57,25 @@ NBS_INCLUDE=@NBS_INCLUDE@
OSSAUDIO_LIB=@OSS_LIB@
OSSAUDIO_INCLUDE=@OSS_INCLUDE@
-SPEEX_LIB=@SPEEX_LIB@
-SPEEX_INCLUDE=@SPEEX_INCLUDE@
+LIBSPEEX_LIB=@SPEEX_LIB@
+LIBSPEEX_INCLUDE=@SPEEX_INCLUDE@
TONEZONE_LIB=@TONEZONE_LIB@
TONEZONE_INCLUDE=@TONEZONE_INCLUDE@
ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@
-VPB_LIB=@VPB_LIB@
-VPB_INCLUDE=@VPB_INCLUDE@
+VPBAPI_LIB=@VPB_LIB@
+VPBAPI_INCLUDE=@VPB_INCLUDE@
-PRI_LIB=@LIBPRI_LIB@
-PRI_INCLUDE=@LIBPRI_INCLUDE@
+LIBPRI_LIB=@LIBPRI_LIB@
+LIBPRI_INCLUDE=@LIBPRI_INCLUDE@
-OSPTK_LIB=@OSPTK_LIB@
-OSPTK_INCLUDE=@OSPTK_INCLUDE@
+LIBOSPTK_LIB=@OSPTK_LIB@
+LIBOSPTK_INCLUDE=@OSPTK_INCLUDE@
-ODBC_LIB=@UNIXODBC_LIB@
-ODBC_INCLUDE=@UNIXODBC_INCLUDE@
+UNIXODBC_LIB=@UNIXODBC_LIB@
+UNIXODBC_INCLUDE=@UNIXODBC_INCLUDE@
PGSQL_LIB=@pq_LIB@
PGSQL_INCLUDE=@pq_INCLUDE@
@@ -79,8 +83,8 @@ PGSQL_INCLUDE=@pq_INCLUDE@
SQLITE_LIB=@SQLITE_LIB@
SQLITE_INCLUDE=@SQLITE_INCLUDE@
-TDS_LIB=@FREETDS_LIB@
-TDS_INCLUDE=@FREETDS_INCLUDE@
+FREETDS_LIB=@FREETDS_LIB@
+FREETDS_INCLUDE=@FREETDS_INCLUDE@
POPT_LIB=@POPT_LIB@
POPT_INCLUDE=@POPT_INCLUDE@
@@ -97,23 +101,23 @@ IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@
SSL_LIB=@OPENSSL_LIB@
SSL_INCLUDE=@OPENSSL_INCLUDE@
-Z_LIB=@ZLIB_LIB@
-Z_INCLUDE=@ZLIB_INCLUDE@
+ZLIB_LIB=@ZLIB_LIB@
+ZLIB_INCLUDE=@ZLIB_INCLUDE@
QT_LIB=@QT_LIB@
QT_INCLUDE=@QT_INCLUDE@
KDEDIR=@KDEDIR@
KDE_INCLUDE=@KDE_INCLUDE@
-KDE_LIBS=@KDE_LIBS@
+KDE_LIB=@KDE_LIBS@
GTK_INCLUDE=@GTK_INCLUDE@
-GTK_LIBS=@GTK_LIBS@
+GTK_LIB=@GTK_LIBS@
CURL_LIB=@CURLLIBS@
-GSM_LIB=@gsm_LIB@
-GSM_INCLUDE=@gsm_INCLUDE@
+LIBGSM_LIB=@gsm_LIB@
+LIBGSM_INCLUDE=@gsm_INCLUDE@
CURSES_LIB=@CURSES_LIB@
CURSES_INCLUDE=@CURSES_INCLUDE@
@@ -121,9 +125,9 @@ CURSES_INCLUDE=@CURSES_INCLUDE@
NCURSES_LIB=@NCURSES_LIB@
NCURSES_INCLUDE=@NCURSES_INCLUDE@
-EDITLINE_LIBS=@EDITLINE_LIBS@
+EDITLINE_LIB=@EDITLINE_LIBS@
RADIUSCLIENT_LIB=@RADIUSCLIENT_LIB@
RADIUSCLIENT_INCLUDE=@RADIUSCLIENT_INCLUDE@
-NETSNMP_LIBS=@NETSNMP_LIBS@
+NETSNMP_LIB=@NETSNMP_LIBS@