Merged revisions 238230 via svnmerge from

[asterisk/asterisk.git] / makeopts.in

diff --git a/makeopts.in b/makeopts.in
index 3d564b7..d6bc6be 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -24,6 +24,8 @@ FETCH=@FETCH@
 DOWNLOAD=@DOWNLOAD@
 RUBBER=@RUBBER@
 KPATHSEA=@KPATHSEA@
+XMLSTARLET=@XMLSTARLET@
+MD5=@MD5@
 
 BUILD_PLATFORM=@BUILD_PLATFORM@
 BUILD_CPU=@BUILD_CPU@
@@ -45,6 +47,11 @@ GC_LDFLAGS=@GC_LDFLAGS@
 PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
 PTHREAD_LIBS=@PTHREAD_LIBS@
 
+CONFIG_CFLAGS=@CONFIG_CFLAGS@
+CONFIG_LDFLAGS=@CONFIG_LDFLAGS@
+
+GNU_LD=@GNU_LD@
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -62,12 +69,18 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 
 AST_DEVMODE=@AST_DEVMODE@
+NOISY_BUILD=@NOISY_BUILD@
 
 AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@
 AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
+AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
+AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
 
-ASOUND_INCLUDE=@ALSA_INCLUDE@
-ASOUND_LIB=@ALSA_LIB@
+ALSA_INCLUDE=@ALSA_INCLUDE@
+ALSA_LIB=@ALSA_LIB@
+
+BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@
+BLUETOOTH_LIB=@BLUETOOTH_LIB@
 
 CURL_INCLUDE=@CURL_INCLUDE@
 CURL_LIB=@CURL_LIB@
@@ -81,9 +94,14 @@ EDITLINE_LIB=@EDITLINE_LIB@
 FREETDS_INCLUDE=@FREETDS_INCLUDE@
 FREETDS_LIB=@FREETDS_LIB@
 
+GENERIC_ODBC_INCLUDE=@GENERIC_ODBC_INCLUDE@
+GENERIC_ODBC_LIB=@GENERIC_ODBC_LIB@
+
 GMIME_INCLUDE=@GMIME_INCLUDE@
 GMIME_LIB=@GMIME_LIB@
 
+HOARD_LIB=@HOARD_LIB@
+
 GSM_INTERNAL=@GSM_INTERNAL@
 GSM_INCLUDE=@GSM_INCLUDE@
 GSM_LIB=@GSM_LIB@
@@ -94,6 +112,9 @@ GTK_LIB=@GTK_LIB@
 GTK2_INCLUDE=@GTK2_INCLUDE@
 GTK2_LIB=@GTK2_LIB@
 
+ICAL_INCLUDE=@ICAL_INCLUDE@
+ICAL_LIB=@ICAL_LIB@
+
 ICONV_INCLUDE=@ICONV_INCLUDE@
 ICONV_LIB=@ICONV_LIB@
 
@@ -103,6 +124,9 @@ IKSEMEL_LIB=@IKSEMEL_LIB@
 IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
 IMAP_TK_LIB=@IMAP_TK_LIB@
 
+IODBC_INCLUDE=@IODBC_INCLUDE@
+IODBC_LIB=@IODBC_LIB@
+
 JACK_INCLUDE=@JACK_INCLUDE@
 JACK_LIB=@JACK_LIB@
 
@@ -112,6 +136,9 @@ LDAP_LIB=@LDAP_LIB@
 LUA_INCLUDE=@LUA_INCLUDE@
 LUA_LIB=@LUA_LIB@
 
+MYSQLCLIENT_INCLUDE=@MYSQLCLIENT_INCLUDE@
+MYSQLCLIENT_LIB=@MYSQLCLIENT_LIB@
+
 NBS_INCLUDE=@NBS_INCLUDE@
 NBS_LIB=@NBS_LIB@
 
@@ -119,6 +146,9 @@ NCURSES_INCLUDE=@NCURSES_INCLUDE@
 NCURSES_LIB=@NCURSES_LIB@
 NCURSES_DIR=@NCURSES_DIR@
 
+NEON_INCLUDE=@NEON_INCLUDE@
+NEON_LIB=@NEON_LIB@
+
 NETSNMP_INCLUDE=@NETSNMP_INCLUDE@
 NETSNMP_LIB=@NETSNMP_LIB@
 
@@ -133,8 +163,8 @@ OSPTK_LIB=@OSPTK_LIB@
 
 # ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
 # Because sdl_image in turn depends on sdl, we don't duplicate the include
-OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
-OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
+OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
+OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
 
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@
@@ -148,12 +178,21 @@ PORTAUDIO_LIB=@PORTAUDIO_LIB@
 PRI_INCLUDE=@PRI_INCLUDE@
 PRI_LIB=@PRI_LIB@
 
+RESAMPLE_INCLUDE=@RESAMPLE_INCLUDE@
+RESAMPLE_LIB=@RESAMPLE_LIB@
+
 SS7_INCLUDE=@SS7_INCLUDE@
 SS7_LIB=@SS7_LIB@
 
+OPENR2_INCLUDE=@OPENR2_INCLUDE@
+OPENR2_LIB=@OPENR2_LIB@
+
 PWLIB_INCLUDE=@PWLIB_INCLUDE@
 PWLIB_LIB=@PWLIB_LIB@
 
+AIS_INCLUDE=@AIS_INCLUDE@
+AIS_LIB=@AIS_LIB@
+
 RADIUS_INCLUDE=@RADIUS_INCLUDE@
 RADIUS_LIB=@RADIUS_LIB@
 
@@ -184,8 +223,8 @@ SQLITE_LIB=@SQLITE_LIB@
 SQLITE3_INCLUDE=@SQLITE3_INCLUDE@
 SQLITE3_LIB=@SQLITE3_LIB@
 
-SSL_INCLUDE=@OPENSSL_INCLUDE@
-SSL_LIB=@OPENSSL_LIB@
+OPENSSL_INCLUDE=@OPENSSL_INCLUDE@
+OPENSSL_LIB=@OPENSSL_LIB@
 
 CRYPTO_INCLUDE=@CRYPTO_INCLUDE@
 CRYPTO_LIB=@CRYPTO_LIB@
@@ -202,10 +241,10 @@ UNIXODBC_LIB=@UNIXODBC_LIB@
 VORBIS_INCLUDE=@VORBIS_INCLUDE@
 VORBIS_LIB=@VORBIS_LIB@
 
-VPBAPI_INCLUDE=@VPB_INCLUDE@
-VPBAPI_LIB=@VPB_LIB@
+VPB_INCLUDE=@VPB_INCLUDE@
+VPB_LIB=@VPB_LIB@
 
-ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@
+DAHDI_INCLUDE=@DAHDI_INCLUDE@
 
 ZLIB_INCLUDE=@ZLIB_INCLUDE@
 ZLIB_LIB=@ZLIB_LIB@
@@ -229,9 +268,13 @@ TERMCAP_INCLUDE=@TERMCAP_INCLUDE@
 TERMCAP_LIB=@TERMCAP_LIB@
 TERMCAP_DIR=@TERMCAP_DIR@
 
+LIBXML2_INCLUDE=@LIBXML2_INCLUDE@
+LIBXML2_LIB=@LIBXML2_LIB@
+
 TINFO_INCLUDE=@TINFO_INCLUDE@
 TINFO_LIB=@TINFO_LIB@
 TINFO_DIR=@TINFO_DIR@
 
 # if poll is not present, let the makefile know.
 POLL_AVAILABLE=@HAS_POLL@
+TIMERFD_INCLUDE=@TIMERFD_INCLUDE@