Typo (someone needs to test compile before committing his changes)
[asterisk/asterisk.git] / makeopts.in
index d08f756..9454242 100644 (file)
@@ -92,9 +92,6 @@ GTK2_LIB=@GTK2_LIB@
 IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@
 IKSEMEL_LIB=@IKSEMEL_LIB@
 
-GNUTLS_INCLUDE=@GNUTLS_INCLUDE@
-GNUTLS_LIB=@GNUTLS_LIB@
-
 IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
 IMAP_TK_LIB=@IMAP_TK_LIB@
 
@@ -102,6 +99,9 @@ KDEDIR=@KDEDIR@
 KDE_INCLUDE=@KDE_INCLUDE@
 KDE_LIB=@KDE_LIB@
 
+LUA_INCLUDE=@LUA_INCLUDE@
+LUA_LIB=@LUA_LIB@
+
 NBS_INCLUDE=@NBS_INCLUDE@
 NBS_LIB=@NBS_LIB@
 
@@ -120,8 +120,10 @@ OGG_LIB=@OGG_LIB@
 OSPTK_INCLUDE=@OSPTK_INCLUDE@
 OSPTK_LIB=@OSPTK_LIB@
 
-OSSAUDIO_INCLUDE=@OSS_INCLUDE@
-OSSAUDIO_LIB=@OSS_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@
 
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@
@@ -144,6 +146,18 @@ QT_LIB=@QT_LIB@
 RADIUS_INCLUDE=@RADIUS_INCLUDE@
 RADIUS_LIB=@RADIUS_LIB@
 
+FFMPEG_INCLUDE=@FFMPEG_INCLUDE@
+FFMPEG_LIB=@FFMPEG_LIB@
+
+X11_INCLUDE=@X11_INCLUDE@
+X11_LIB=@X11_LIB@
+
+SDL_INCLUDE=@SDL_INCLUDE@
+SDL_LIB=@SDL_LIB@
+
+SDL_IMAGE_INCLUDE=@SDL_IMAGE_INCLUDE@
+SDL_IMAGE_LIB=@SDL_IMAGE_LIB@
+
 SPEEX_INCLUDE=@SPEEX_INCLUDE@
 SPEEX_LIB=@SPEEX_LIB@
 
@@ -201,3 +215,6 @@ TERMCAP_DIR=@TERMCAP_DIR@
 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@