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)
# add ws2 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
+ AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
fi
;;
*nto*)
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_ARG_VAR([LUAC], [LUA byte compiler])
- AC_PATH_PROG(LUAC, luac, [
+ AC_PATH_PROG(LUAC, luac, [false])
+ AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
fi
[ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no"
then
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil],
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.2.0 libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
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
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
fi
fi
-
-
-dnl
-dnl GGI module
-dnl
-AC_ARG_ENABLE(ggi,
- [ --enable-ggi GGI support (default disabled)])
-if test "${enable_ggi}" = "yes"
-then
- AC_CHECK_HEADER([ggi/ggi.h],[
- VLC_ADD_PLUGIN([ggi])
- VLC_ADD_LIBS([ggi],[-lggi])
- AC_ARG_WITH(ggi,
- [ --with-ggi=PATH path to libggi],
- [ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
- then
- VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
- VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib])
- fi ])
- ],[
- AC_MSG_ERROR([LibGGI development files can't be found])
- ])
-fi
-
dnl
dnl AA plugin
dnl
soliddatadir=""
AS_IF([test "${with_kde_solid}" != "no"], [
AS_IF([test "${with_kde_solid}" = "yes"], [
- soliddatadir="`${KDE4_CONFIG} --install data`solid/actions"
- AS_IF([test "x${soliddatadir}" = "x"], [
- soliddatadir='$(datadir)/kde4/apps/solid/actions'
- ])
+ kde4datadir="`${KDE4_CONFIG} --install data`"
+ AS_IF([test "x$kde4datadir" = "x"], [kde4datadir='${datadir}/kde4/apps'])
+ soliddatadir="${kde4datadir}/solid/actions"
], [
soliddatadir="${with_kde_solid}"
])
found=1
else
if test -n "$PKG_CONFIG"; then
- for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
+ 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
fi
AC_MSG_RESULT([no])
fi
- done
+ done
fi
fi
AS_IF( [test $found = 1],[
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"
],
[
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 (version 1.9.2 or higher) or use --disable-mozilla.])
]