X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=4c4dbc33723c8aa0b7fc25782c4c31436cbef052;hb=a602c01e2e1b69dd1e7241d9d98686e25842ea41;hp=251800127c002fcede8874b91e58d68df50249f2;hpb=dfea366d0cf300a175d5efe39b7ec200c9fe7c4e;p=vlc

diff --git a/configure.ac b/configure.ac
index 251800127c..4c4dbc3372 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc, 0.9.0-test2)
+AC_INIT(vlc, 0.9.0-test3)
 VERSION_MAJOR="0"
 VERSION_MINOR="9"
 VERSION_REVISION="0"
@@ -142,12 +142,6 @@ AC_ARG_WITH(contrib,
     if test -z $with_cyberlink_tree; then
        with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc
     fi
-    if test -z $with_libmpeg2_tree; then
-       with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec
-    fi
-    if test -z $with_a52_tree; then
-       with_a52_tree=${topdir}/extras/contrib/src/a52dec
-    fi
 
     if test ".`uname -s`" = ".Darwin"; then
       export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
@@ -3401,8 +3395,7 @@ if test "${enable_libmpeg2}" != "no"
 then
   AC_ARG_WITH(libmpeg2-tree,
   [    --with-libmpeg2-tree=PATH libmpeg2 tree for static linking])
-  if test -n "${with_libmpeg2_tree}"
-  then
+  AS_IF([test -n "${with_libmpeg2_tree}"],[
     AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree})
     real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`"
     if test -z "${real_libmpeg2_tree}"
@@ -3415,34 +3408,22 @@ then
     then
       dnl  Use a custom libmpeg2
       AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
-      VLC_ADD_BUILTINS([libmpeg2])
+      VLC_ADD_PLUGIN([libmpeg2])
       VLC_ADD_LIBS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2])
       VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include])
-      eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`"
     else
       dnl  The given libmpeg2 wasn't built
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}])
     fi
-  else
-    AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
-      AC_MSG_CHECKING(for libmpeg2 version >= 0.3.2)
-      AC_EGREP_CPP(yes,
-        [#include <mpeg2dec/mpeg2.h>
-         #ifdef MPEG2_RELEASE
-         #if MPEG2_RELEASE >= MPEG2_VERSION(0,3,2)
-         yes
-         #endif
-         #endif],
-        [AC_MSG_RESULT([yes])
+  ],[
+   PKG_CHECK_MODULES(LIBMPEG2,[libmpeg2 > 0.3.2],[ 
           VLC_ADD_PLUGIN([libmpeg2])
-          VLC_ADD_LIBS([libmpeg2],[-lmpeg2])],
-        [AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
-
-      [AC_MSG_ERROR([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ (you need the cvs version). Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])]
-    )
-  fi
+          VLC_ADD_LIBS([libmpeg2], $LIBMPEG2_LIBS),
+          VLC_ADD_CFLAGS([libmpeg2], $LIBMPEG2_CFLAGS)
+       ], 
+      AC_MSG_WARN([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ . Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.]))
+  ])
 fi
 
 dnl