Distribute xcb_keysym.h.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index b148e986c446386655ae1677dfa2b8e3416c70ee..e51943c3eb409a6ac579b85d874dcc8eaf0d28b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,16 +2,16 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
 
-AC_INIT(vlc, 1.1.0-pre1)
+AC_INIT(vlc, 1.2.0-git)
 VERSION_MAJOR="1"
-VERSION_MINOR="1"
+VERSION_MINOR="2"
 VERSION_REVISION="0"
-VERSION_EXTRA="-pre1"
+VERSION_EXTRA="-git"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="The Luggage"
+CODENAME="Twoflower"
 COPYRIGHT_YEARS="1996-2010"
 
 AC_PREREQ(2.59c)
@@ -1629,7 +1629,10 @@ then
   else
       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
   fi
-  AC_PATH_PROG(LUAC, luac)
+  AC_ARG_VAR([LUAC], [LUA byte compiler])
+  AC_PATH_PROG(LUAC, luac, [
+    AC_MSG_ERROR([Could not find the LUA byte compiler.])
+  ])
 fi
 AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
 
@@ -3295,6 +3298,9 @@ dnl  Xlib
 dnl
 
 AC_PATH_XTRA()
+AC_CHECK_HEADERS(X11/Xlib.h, [
+  VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+])
 
 dnl
 dnl  X C Bindings modules
@@ -3608,8 +3614,6 @@ AC_ARG_ENABLE(omapfb,
     then
       AC_CHECK_HEADERS(asm/arch-omap/omapfb.h, [
         VLC_ADD_PLUGIN([omapfb])
-        AC_CHECK_HEADERS(X11/Xlib.h, [
-          VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ])
       ])
       VLC_ADD_PLUGIN([swscale_omap])
     fi
@@ -4549,23 +4553,29 @@ then
     AC_ARG_VAR([MOZILLA_LIBS], [linker flags for Mozilla, overriding pkg-config])
     AC_MSG_NOTICE([Checking for Mozilla])
     found=0
-    if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
+    if test -n "$MOZILLA_CFLAGS" -o -n "$MOZILLA_LIBS"
     then
       found=1
     else
       if test -n "$PKG_CONFIG"; then
-       for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
-         echo "Trying to find $i.pc files" >&5
-         if $PKG_CONFIG --exists --print-errors "$i" 2>&5
-         then
-            echo "Using $i.pc files." >&5
-            echo "Using $i.pc files." >&6
-           found=1
-           MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
-           MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
-           break
-         fi
-       done
+        for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+          if test -n "$i"
+          then
+            echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+            AC_MSG_CHECKING([for $i >= 1.9.2])
+            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
+            then
+              echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+              echo "Using $i package." >&AS_MESSAGE_FD
+              found=1
+              MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+              MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
+              AC_MSG_RESULT([yes])
+              break
+            fi
+            AC_MSG_RESULT([no])
+          fi
+        done
       fi
     fi
     AS_IF( [test $found = 1],[
@@ -4578,21 +4588,21 @@ then
            #endif
           ])
         if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
-            AC_MSG_ERROR([Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found.])
+            AC_MSG_ERROR([Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found.])
         fi
         MOZILLA_REQUIRED_HEADERS=
         mozilla=:
         AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"],[
-          VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX -DOJI])
-          AS_IF([ test "${SYS}" != "darwin"],[
-            PKG_CHECK_MODULES(XPM, [xpm xt],[
-               VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
-            ],[
-               AC_MSG_ERROR([Please install the libXpm and libXt development files.])
-            ])
+           VLC_ADD_CPPFLAGS([mozilla],[-DXP_UNIX])
+           AS_IF([ test "${SYS}" != "darwin"],[
+             PKG_CHECK_MODULES(XPM, [xpm xt],[
+                VLC_ADD_CPPFLAGS([mozilla],[-DMOZ_X11])
+             ],[
+                AC_MSG_ERROR([Please install the libXpm and libXt development files.])
+             ])
           ])
         ])
-       VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
+        VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
         VLC_ADD_LIBS([mozilla],[${MOZILLA_LIBS} ${XPM_LIBS}])
         VLC_ADD_PLUGIN([mozilla])
         PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
@@ -4601,9 +4611,9 @@ then
           ],
           [
             AC_PATH_PROGS(MOZILLA_CONFIG,
-           [mozilla-config seamonkey-config xulrunner-config],
+            [mozilla-config seamonkey-config xulrunner-config],
         [no])
-            test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
+            test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla.])
           ]
         )
     dnl pkg-config failed but we might have found a mozilla-config