Source files can be in subdirectories

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1160a61d8ab7e655b2a63820efcb208702ab2b73..200f15935ae54be2bf2f44058288a5099924bc65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -174,7 +174,7 @@ case "${host_os}" in
     VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
     VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
     VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup])
-    VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx],[-Wl,-read_only_relocs,suppress])
+    VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
     VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
     VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation])
     VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
@@ -460,9 +460,6 @@ dnl Plugin compilation stuff
 
 VLC_LIBRARY_SUFFIX
 
-VLC_SYMBOL_PREFIX
-AC_SUBST(SYMPREF)
-
 dnl The -DSYS_FOO flag
 CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}"
 
@@ -1200,7 +1197,7 @@ dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
 VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving croppadd dynamicoverlay blendbench])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving croppadd blendbench])
 VLC_ADD_PLUGINS([converter_fixed mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
 VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
@@ -1240,6 +1237,7 @@ dnl Some plugins aren't useful on some platforms
 dnl
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
     VLC_ADD_PLUGINS([screensaver motion])
+    VLC_ADD_PLUGINS([dynamicoverlay])
 elif test "${SYS}" != "mingwce"; then
     VLC_ADD_PLUGINS([ntservice access_smb dmo msn])
     VLC_ADD_LIBS([dmo],[-lole32 -luuid])
@@ -1638,22 +1636,22 @@ then
     AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead])
     PKG_CHECK_MODULES(LUA, lua >= 5.1,
       [ have_lua=yes ],
-      [ 
+      [
         have_lua=yes
-        AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], 
-         [],  
+        AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
+          [],
           [ have_lua=no ] )
-       AC_CHECK_LIB(  lua5.1 , luaL_newstate, 
+        AC_CHECK_LIB(  lua5.1 , luaL_newstate,
           [LUA_LIBS="-llua5.1"],
-         AC_CHECK_LIB( lua51 , luaL_newstate, 
+          AC_CHECK_LIB( lua51 , luaL_newstate,
             [LUA_LIBS="-llua51"],
-                 AC_CHECK_LIB( lua , luaL_newstate, 
-                   [LUA_LIBS="-llua"],
-             [ have_lua=no
+            AC_CHECK_LIB( lua , luaL_newstate,
+              [LUA_LIBS="-llua"],
+              [ have_lua=no
                 AC_MSG_WARN([lua >= 5.1 not found!])
               ])
-           )
-         )
+          )
+        )
       ])
     ])
   if test "x${have_lua}" = "xyes" ;  then
@@ -1663,6 +1661,7 @@ then
      VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
   fi
 fi
+AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
 
 dnl
 dnl HTTP daemon
@@ -1674,6 +1673,7 @@ then
   VLC_ADD_PLUGINS([http])
   AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
 fi
+AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
 
 dnl
 dnl VideoLAN manager
@@ -3736,9 +3736,10 @@ AC_CHECK_HEADERS(png.h, [
     VLC_ADD_PLUGINS([osdmenu osd_parser])
     AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
     [],[-lz])
-  LDFLAGS="${LDFLAGS_save}"
+    LDFLAGS="${LDFLAGS_save}"
   ])
 fi
+AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"])
 
 dnl
 dnl H264 encoder plugin (using libx264)
@@ -4201,9 +4202,9 @@ AC_ARG_ENABLE(fribidi,
   [  --enable-fribidi        fribidi support (default enabled)])
 if test "${enable_freetype}" != "no"
 then
-   PKG_CHECK_MODULES(FREETYPE, freetype2,[  
+   PKG_CHECK_MODULES(FREETYPE, freetype2,[
       VLC_ADD_PLUGINS([freetype])
-      have_freetype=yes     
+      have_freetype=yes
       VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
       VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
       if test "${SYS}" = "mingw32"; then
@@ -4948,7 +4949,7 @@ if test "${enable_skins2}" = "yes" ||
     VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11])
   fi fi fi
 fi
-
+AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
 
 dnl dnl
 dnl dnl  Gtk+ module
@@ -5037,6 +5038,7 @@ then
     NEED_GTK2_MAIN=yes
   fi
 fi
+AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
 
 dnl dnl
 dnl dnl  Gnome module
@@ -5213,9 +5215,9 @@ AS_IF([test "${enable_qt4}" != "no" &&
       AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
       ],
       AS_IF([test "${enable_qt4}" = "yes"],[
-    AC_MSG_ERROR(QT4 library not found)
+        AC_MSG_ERROR(QT4 library not found)
       ],[
-    AC_MSG_WARN(QT4 library not found)
+        AC_MSG_WARN(QT4 library not found)
       ])
     )
 ])
@@ -6015,7 +6017,6 @@ if test "${enable_python_bindings}" = "yes"; then
   )
   CFLAGS="${CFLAGS_save}"
 fi
-
 AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
 
 dnl
@@ -6129,7 +6130,6 @@ AS_IF([test "${enable_shared}" = "no"], [
 AS_IF([test "${plugin_support}" != "no"], [
   AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
 ])
-
 AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
 
 dnl Temporary(?) hack for plugins/builtins transition
@@ -6224,6 +6224,7 @@ AC_CONFIG_FILES([
   po/Makefile.in
   share/Makefile
   src/Makefile
+  test/Makefile
 ])
 
 AC_CONFIG_FILES([