Merged revisions 238230 via svnmerge from

[asterisk/asterisk.git] / makeopts.in

diff --git a/makeopts.in b/makeopts.in
index 09020e5..d6bc6be 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -47,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@
 
@@ -64,6 +69,7 @@ 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@
@@ -73,6 +79,9 @@ AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
 ALSA_INCLUDE=@ALSA_INCLUDE@
 ALSA_LIB=@ALSA_LIB@
 
+BLUETOOTH_INCLUDE=@BLUETOOTH_INCLUDE@
+BLUETOOTH_LIB=@BLUETOOTH_LIB@
+
 CURL_INCLUDE=@CURL_INCLUDE@
 CURL_LIB=@CURL_LIB@
 
@@ -85,6 +94,9 @@ 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@
 
@@ -100,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@
 
@@ -121,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@
 
@@ -128,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@
 
@@ -163,6 +184,9 @@ 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@