serial version uid added

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index c2eb0d6275bf69058b9790f406bc1e42a53e8acf..b6eff1567ddbbb8f34b0bc8459b70e1710c304e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -257,6 +257,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
 
 dnl
+dnl Sadly autoconf doesn't think about testing foo.exe when ask to test 
+dnl for program foo on win32
+
+case "${build_os}" in
+    cygwin|msys)
+        ac_executable_extensions=".exe"
+       ;;
+    *)
+       ;;
+esac
+
+dnl 
 dnl  Libtool
 dnl  It's very bad, but our former custom system was worst
 dnl  -- Courmisch
@@ -290,7 +302,7 @@ fi
 dnl
 dnl Gettext stuff
 dnl
-ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fr fur gl he hi hu it ja ka ko lt lv ms my ne nl no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW"
+ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fa fr fur gl he hi hu it ja ka ko lt lv ms my ne nl no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW"
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT
 AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
@@ -1163,6 +1175,7 @@ VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify puzzle colorth
 VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
 VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
 VLC_ADD_PLUGINS([access_http access_mms access_ftp])
+VLC_ADD_PLUGINS([access_filter_bandwidth])
 VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264])
 VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
 VLC_ADD_PLUGINS([packetizer_vc1])
@@ -1987,7 +2000,7 @@ then
       AC_CHECK_HEADERS(dshow.h,
       [ VLC_ADD_PLUGINS([bda])
         VLC_ADD_CXXFLAGS([bda],[])
-        VLC_ADD_LDFLAGS([bda],[-lole32 -loleaut32 -luuid]) ])
+        VLC_ADD_LDFLAGS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ])
   fi
 fi
 
@@ -4498,16 +4511,18 @@ then
 fi
 
 dnl
-dnl  JACK module
+dnl  JACK modules
 dnl
 AC_ARG_ENABLE(jack,
- [  --enable-jack           JACK audio module (default disabled)],
- [if test "${enable_jack}" = "yes"
-  then
-    AC_CHECK_HEADERS(jack/jack.h, [
-      VLC_ADD_PLUGINS([jack])
-      VLC_ADD_LDFLAGS([jack],[-ljack]) ])
-  fi])
+ [  --enable-jack           JACK audio I/O modules (default disabled)],,
+ [enable_jack="no"])
+
+AS_IF([test "${enable_jack}" != "no"], [
+  AC_CHECK_HEADERS(jack/jack.h, [
+    VLC_ADD_PLUGINS([access_jack jack])
+    VLC_ADD_LDFLAGS([access_jack jack],[-ljack])
+  ],[AC_MSG_ERROR([cannot find JACK headers])])
+])
 
 dnl
 dnl  CyberLink for C++ UPnP stack
@@ -4915,9 +4930,10 @@ AS_IF([test "${enable_qt4}" != "no" &&
       enableqt4=true
       VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
       VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
-      MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
-      RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc
-      UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
+      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+      AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
+      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)
       ],[
@@ -5564,6 +5580,18 @@ fi
 AC_LANG_POP(C++)
 AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
 
+dnl Tests for Osso and Xsp
+AC_CHECK_LIB(osso, osso_display_blanking_pause,[
+   PKG_CHECK_MODULES(GLIB2, glib-2.0, [                                                  
+       VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+       VLC_ADD_LDFLAGS([x11],[-losso])
+   ])
+])
+AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
+   VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
+   VLC_ADD_LDFLAGS([x11],[-lXsp])
+])
+
 dnl
 dnl  Mediacontrol Python bindings
 dnl