]> git.sesse.net Git - vlc/blobdiff - configure.ac
So-called "RTSP" VOD: advertise the actual audio frequency
[vlc] / configure.ac
index 071e55fb30b134745edd26abc36ff449df62b998..6ea583a737a9250d1278e7c36fc9ab133948d5b2 100644 (file)
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.9.0-git)
+AC_INIT(vlc, 0.9.0-test2)
 VERSION_MAJOR="0"
 VERSION_MINOR="9"
 VERSION_REVISION="0"
@@ -1133,6 +1133,7 @@ VLC_ADD_PLUGIN([extract])
 VLC_ADD_PLUGIN([sharpen])
 VLC_ADD_PLUGIN([seamcarving])
 VLC_ADD_PLUGIN([croppadd])
+VLC_ADD_PLUGIN([canvas])
 VLC_ADD_PLUGIN([blendbench])
 VLC_ADD_PLUGIN([blend])
 VLC_ADD_PLUGIN([scale])
@@ -1203,7 +1204,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([i422_i420])
   VLC_ADD_PLUGIN([yuy2_i422])
   VLC_ADD_PLUGIN([yuy2_i420])
-  VLC_ADD_PLUGIN([chroma_chain])
+  VLC_ADD_PLUGIN([chain])
   VLC_ADD_PLUGIN([aout_file])
   VLC_ADD_PLUGIN([linear_resampler])
   VLC_ADD_PLUGIN([bandlimited_resampler])
@@ -1215,6 +1216,7 @@ if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGIN([normvol])
   VLC_ADD_PLUGIN([equalizer])
   VLC_ADD_PLUGIN([param_eq])
+  VLC_ADD_PLUGIN([scaletempo])
   VLC_ADD_PLUGIN([converter_float])
   VLC_ADD_PLUGIN([a52tospdif])
   VLC_ADD_PLUGIN([dtstospdif])
@@ -1665,6 +1667,21 @@ then
 fi
 AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
 
+dnl
+dnl libproxy support
+dnl
+AC_ARG_ENABLE(libproxy,
+  [  --enable-libproxy       libproxy support (default auto)])
+AS_IF([test "${enable_libproxy}" != "no"], [
+  AC_CHECK_HEADERS(proxy.h, [
+    VLC_ADD_LIBS([access_http],[-lproxy])
+  ], [
+    AS_IF([test "x${enable_libproxy}" != "x"], [
+      AC_MSG_ERROR([libproxy could not be found on your system])
+    ])
+  ])
+])
+
 dnl
 dnl VideoLAN manager
 dnl
@@ -1678,6 +1695,7 @@ AS_IF([test "${enable_vlm}" != "no"], [
   AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
   VLC_ADD_PLUGIN([telnet])
 ])
+AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
 
 dnl
 dnl Growl notification plugin
@@ -2029,11 +2047,16 @@ then
         [ VLC_ADD_PLUGIN([dvdread])
           VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
         ],[
-          if test -n "${enable_dvdread}"
-          then
-            AC_MSG_ERROR([cannot find libdvdread headers])
-          fi
-        ])
+         AC_CHECK_HEADERS(libdvdread/dvd_reader.h,
+            [ VLC_ADD_PLUGIN([dvdread])
+             VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
+           ],[
+             if test -n "${enable_dvdread}"
+             then
+             AC_MSG_ERROR([cannot find libdvdread headers])
+            fi
+          ])
+       ])
     else
       AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree})
       real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`"
@@ -3556,14 +3579,30 @@ dnl
 AC_ARG_ENABLE(dirac,
 [  --enable-dirac          experimental dirac codec (default disabled)])
 if test "${enable_dirac}" = "yes"; then
-  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [
+  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.10.0], [
       VLC_ADD_PLUGIN([dirac])
       VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
       VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
-      AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])
+      AC_MSG_ERROR([libdirac >= 0.10.0 doesn't appear to be installed on your system.])
   ])
 fi
 
+dnl
+dnl  schroedinger decoder plugin (for dirac format video)
+dnl
+AC_ARG_ENABLE(schroedinger,
+[  --disable-schroedinger   high performance dirac codec (default enabled)])
+if test "${enable_schroedinger}" != "no"; then
+  PKG_CHECK_MODULES(SCHROEDINGER,[schroedinger-1.0 >= 1.0], [
+      VLC_ADD_PLUGIN([schroedinger])
+      VLC_ADD_CFLAGS([schroedinger],[$SCHROEDINGER_CFLAGS])
+      VLC_ADD_LIBS([schroedinger],[$SCHROEDINGER_LIBS]) ], [
+        AS_IF([test "x${enable_schroedinger}" != "x"], [
+          AC_MSG_ERROR([${SCHROEDINGER_PKG_ERRORS}])
+        ])
+])
+fi
+
 dnl
 dnl  PNG decoder module
 dnl
@@ -4396,33 +4435,6 @@ then
       fi ])
 fi
 
-dnl
-dnl  Glide module
-dnl
-AC_ARG_ENABLE(glide,
-  [  --enable-glide          Glide (3dfx) support (default disabled)])
-if test "${enable_glide}" = "yes"
-then
-  CFLAGS_save="${CFLAGS}"
-  AC_ARG_WITH(glide,
-    [    --with-glide=PATH     path to libglide],
-    [ if test "${with_glide}" != "no" -a -n "${with_glide}"
-      then
-        VLC_ADD_CPPFLAGS([glide],[-I${with_glide}/include])
-        VLC_ADD_LIBS([glide],[-L${with_glide}/lib])
-        CFLAGS="$CFLAGS -I${with_glide}/include"
-    fi ])
-   CFLAGS="$CFLAGS -I/usr/include/glide"
-   AC_CHECK_HEADER(glide.h,[   
-      VLC_ADD_PLUGIN([glide])
-      VLC_ADD_LIBS([glide],[-lglide2x -lm])
-      VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
-    ],[
-      AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide])
-     ])
-   CFLAGS="${CFLAGS_save}"
-fi
-
 dnl
 dnl  AA plugin
 dnl
@@ -4951,7 +4963,7 @@ then
  
   ORIGCFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -x objective-c"
-  AC_CHECK_HEADER(QuartzCore/CALayer.h
+  AC_TRY_COMPILE([#import <QuartzCore/CALayer.h>]
   [VLC_ADD_PLUGIN([opengllayer])
   VLC_ADD_OBJCFLAGS([opengllayer], [-isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5])])
   CFLAGS=$ORIGCFLAGS
@@ -5184,7 +5196,7 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
 ])
 if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
   AS_IF([test "${have_libgcrypt}" = "yes"],[
-    VLC_ADD_LIBS([rtp], [${LIBGCRYPT_LIBS}])
+    VLC_ADD_LIBS([rtp stream_out_rtp], [${LIBGCRYPT_LIBS}])
   ])
 fi
 AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
@@ -5319,13 +5331,13 @@ then
           AC_CHECK_HEADERS(objsafe.h,
             VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
             [
-            #if HAVE_OLE2_H
+             #if HAVE_OLE2_H
              #   include <ole2.h>
              #endif
-            ]
+            ]
           )
           activex=:
-         PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex"
+          PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex"
         ],
         [ AC_MSG_ERROR([required OLE headers are missing from your system]) ]
       )],
@@ -5408,24 +5420,70 @@ then
         CPPFLAGS="${CPPFLAGS_save}"
       ],
       [
-        AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
-        if test "${MOZILLA_CONFIG}" = "no"
-        then
-          AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
-          if test "${SEAMONKEY_CONFIG}" = "no"
-          then
-            AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
-            if test "${XULRUNNER_CONFIG}" = "no"
+        PKG_CHECK_MODULES([XULRUNNER], [libxul],
+          [
+            PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom],
+              [],
+              [
+                PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr],
+                  [],
+                  [
+                    PKG_CHECK_MODULES([NSPR], [nspr],
+                      [],
+                      [
+                        AC_MSG_ERROR([Please install the nspr development tools.])
+                      ]
+                    )
+                  ]
+                )
+              ]
+            )
+            CPPFLAGS="${CPPFLAGS_save} ${XULRUNNER_CFLAGS} ${XULRUNNER_CPPFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+            MOZILLA_REQUIRED_HEADERS=1
+            AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
+            AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0,
+              [#if HAVE_NPAPI_H
+               # include <npapi.h>
+               #endif
+              ])
+            if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
+                AC_MSG_ERROR([Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found.])
+            fi
+            MOZILLA_REQUIRED_HEADERS=
+            mozilla=:
+            AC_DEFINE([XP_UNIX],[1],[Defined for Mozilla as we are Unix])
+            AC_DEFINE([MOZ_X11],[1],[Defined as Unix mozilla uses X11])
+            AC_DEFINE([OJI],[1],[Java Runtime Interface])
+            AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
+            VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
+            VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
+            VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}])
+            VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}])
+            VLC_ADD_PLUGIN([mozilla])
+            MOZILLA_CONFIG=
+            CPPFLAGS="${CPPFLAGS_save}"
+          ],
+          [
+            AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
+            if test "${MOZILLA_CONFIG}" = "no"
             then
-              AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
-            else
-              have_xul=true
-              MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+              AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
+              if test "${SEAMONKEY_CONFIG}" = "no"
+              then
+                AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
+                if test "${XULRUNNER_CONFIG}" = "no"
+                then
+                  AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
+                else
+                  have_xul=true
+                  MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
+                fi
+              else
+                MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
+              fi
             fi
-          else
-            MOZILLA_CONFIG="${SEAMONKEY_CONFIG}"
-          fi
-        fi
+          ]
+        )
       ]
     )
     if test ! -z "${MOZILLA_CONFIG}"
@@ -5554,16 +5612,6 @@ then
   VLC_ADD_PLUGIN([test4])
 fi
 
-dnl
-dnl Microsoft Layer for Unicode for WIN9x/ME
-dnl
-if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
-then
-    AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [
-        VLC_ADD_LDFLAGS([vlc libvlc],[-Wl,--exclude-libs,libunicows.a -lunicows])
-    ])
-fi
-
 dnl
 dnl  gtk_main plugin
 dnl
@@ -5671,7 +5719,7 @@ dnl  Handle substvars that use $(top_srcdir)
 dnl
 VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
 AC_SUBST(VLC_CONFIG)
-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
+CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}"
 
 dnl
 dnl  Restore *FLAGS