if test -z $with_ffmpeg_config_path; then
with_ffmpeg_config_path=${topdir}/extras/contrib/bin;
fi
- if test -z $with_livedotcom_tree; then
- with_livedotcom_tree=${topdir}/extras/contrib/src/live
+ if test -z $with_live555_tree; then
+ with_live555_tree=${topdir}/extras/contrib/src/live
fi
if test -z $with_goom_tree; then
with_goom_tree=${topdir}/extras/contrib/src/goom
VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LDFLAGS([vlc logger],[-lbe])
VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
-
+ VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl])
+ VLC_ADD_LDFLAGS([access_file],[-lpoll])
+ LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}"
dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then
VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket])
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="ca da de en_GB es fr gl he hi hu it ja ka ko nl oc pt_BR ro ru sv tr zh_CN zh_TW"
+ALL_LINGUAS="ca cs da de en_GB es fr gl he hi hu it ja ka ko nl oc pt_BR ro ru sv tr zh_CN zh_TW"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
dnl Don't link with rt when using GNU-pth
if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
- dnl HP/UX port
- AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])])
+ AC_CHECK_LIB(rt, clock_nanosleep, [
+ VLC_ADD_LDFLAGS([vlc],[-lrt])
+ AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.])
+ ], [
+ dnl HP/UX port
+ AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])])
+ ])
have_nanosleep=false
AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
AC_ARG_ENABLE(hal,
[ --enable-hal Linux HAL services discovery (default enabled)])
-if test "${enable_hal}" != "no" -a "${SYS}" = "linux"
+if test "${enable_hal}" != "no"
then
PKG_CHECK_MODULES(HAL, hal >= 0.5.0,
[ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API])
AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)])
-if test "${enable_dbus}" != "no" -a "${SYS}" = "linux"
+if test "${enable_dbus}" != "no"
then
PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
[ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the new D-BUS library API])
AC_ARG_WITH(,[Input plugins:])
-dnl live.com input
+dnl live555 input
dnl
-AC_ARG_ENABLE(livedotcom,
-[ --enable-livedotcom live.com RTSP input plugin (default disabled)])
-if test "${enable_livedotcom}" = "yes"; then
- AC_ARG_WITH(livedotcom-tree,
- [ --with-livedotcom-tree=PATH live.com tree for static linking])
+if test "${enable_livedotcom}"
+then
+ AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
+fi
+
+if test "${enable_livedotcom}" = "yes"
+then
+ enable_live555="yes"
+fi
+AC_ARG_ENABLE(live555,
+[ --enable-live555 live555 RTSP input plugin (default disabled)])
+if test "${enable_live555}" = "yes"; then
+ AC_ARG_WITH(live555-tree,
+ [ --with-live555-tree=PATH live.com tree for static linking])
dnl
- dnl test for --with-livedotcom-tree
+ dnl test for --with-live555-tree
dnl
- if test -z "${with_livedotcom_tree}" -a "${CXX}" != ""; then
+ if test "${with_livedotcom_tree}"
+ then
+ AC_MSG_WARN(--with-livedotcom-tree is deprecated. Use --with-live555-tree instead.)
+ with_live555_tree="${with_livedotcom_tree}"
+ fi
+
+ if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
- CPPFLAGS_livedotcom="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+ CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
if test "${SYS}" = "solaris"; then
- CPPFLAGS_livedotcom="${CPPFLAGS_livedotcom} -DSOLARIS"
+ CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
fi
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_livedotcom}"
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
AC_CHECK_HEADERS(liveMedia.hh, [
- VLC_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}])
+ VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
AC_CHECK_LIB(liveMedia_pic, main, [
# We have -lliveMedia_pic, build plugins
- VLC_ADD_PLUGINS([livedotcom])
- VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
+ VLC_ADD_PLUGINS([live555])
+ VLC_ADD_LDFLAGS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
], [
AC_CHECK_LIB(liveMedia, main, [
# We only have -lliveMedia, do builtins
- VLC_ADD_BUILTINS([livedotcom])
- VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
+ VLC_ADD_BUILTINS([live555])
+ VLC_ADD_LDFLAGS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
])
])
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
- VLC_ADD_LDFLAGS([livedotcom],[-lws2_32])
+ VLC_ADD_LDFLAGS([live555],[-lws2_32])
fi
])
CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++)
else
- AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_livedotcom_tree})
- real_livedotcom_tree="`cd ${with_livedotcom_tree} 2>/dev/null && pwd`"
- if test -z "${real_livedotcom_tree}"; then
+ AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_live555_tree})
+ real_live555_tree="`cd ${with_live555_tree} 2>/dev/null && pwd`"
+ if test -z "${real_live555_tree}"; then
dnl The given directory can't be found
AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_livedotcom_tree}])
+ AC_MSG_ERROR([cannot cd to ${with_live555_tree}])
fi
- if test -f "${real_livedotcom_tree}/liveMedia/libliveMedia.a"; then
- AC_MSG_RESULT(${real_livedotcom_tree}/liveMedia/libliveMedia.a)
+ if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then
+ AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
- VLC_ADD_BUILTINS([livedotcom])
+ VLC_ADD_BUILTINS([live555])
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
- VLC_ADD_LDFLAGS([livedotcom],[-lws2_32])
+ VLC_ADD_LDFLAGS([live555],[-lws2_32])
fi
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia])
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock])
- VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
+ VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include])
- VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/liveMedia/include])
+ VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/UsageEnvironment/include ])
if test "${SYS}" = "solaris"; then
- VLC_ADD_CXXFLAGS([livedotcom],[-DSOLARIS])
+ VLC_ADD_CXXFLAGS([live555],[-DSOLARIS])
fi
else
- dnl The given live.com wasn't built
+ dnl The given live555 wasn't built
AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_livedotcom_tree}/liveMedia/libliveMedia.a, make sure you compiled live.com in ${with_livedotcom_tree}])
+ AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
fi
fi
fi
dnl
AC_ARG_ENABLE(gnomevfs,
[ --enable-gnomevfs GnomeVFS access module (default enabled)])
-if test "${enable_gnomevfs}" != "no" -a "${SYS}" = "linux"
+if test "${enable_gnomevfs}" != "no"
then
PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0,
VLC_ADD_LDFLAGS([access_gnomevfs],[$GNOMEVFS_LIBS])
if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi],
- [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
+ [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
AC_CHECK_LIB(avformat, av_open_input_stream, [
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
test "${enable_glx}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
- AC_CHECK_HEADERS(X11/Xlib.h, [
- AC_CHECK_HEADERS(GL/glx.h, [
+ AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h, [
VLC_ADD_PLUGINS([glx])
VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU])
VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}])
- ]) ])
+ ])
CPPFLAGS="${CPPFLAGS_save}"
fi
fi
fi
+dnl
+dnl QT 4
+dnl
+enableqt4=false
+AC_ARG_ENABLE(qt4,
+ [ --enable-qt4 QT 4 support (default disabled) ],
+ [if test "${enable_qt4}" = "yes"; then
+ PKG_CHECK_MODULES(QT4, QtCore QtGui,
+ [ VLC_ADD_PLUGINS([qt4])
+ enableqt4=true
+ VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
+ MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
+ UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
+ [AC_MSG_WARN(QT4 library not found)])
+ fi])
+AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
+
dnl
dnl WinCE GUI module
dnl
[if test "${enable_macosx}" = "yes"
then
VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+ VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL])
+ VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
)])
CFLAGS=$ORIGCFLAGS
[ --enable-galaktos OpenGL visualisation plugin (default disabled)])
if test "${enable_galaktos}" = "yes"
then
- AC_CHECK_HEADERS(GL/gl.h, [
+ AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
VLC_ADD_PLUGINS([galaktos])
if test "${SYS}" != "mingw32"; then
VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU])
if test "${MOZILLA_CONFIG}" = "no"
then
AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
- if test "${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}"
- else
- AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
- fi
- fi
+ fi
+
if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
AC_CHECK_LIB(Xt,XtStrings,
xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
fi
fi
+ dnl End of moz_sdk = ""
else
dnl special case for mingw32
if test "${SYS}" = "mingw32"
if test "${mozilla}" != "false"
then
build_pic=yes
- AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla)
+ AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner)
if test "${XPIDL}" = "no"; then
AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.])
fi
-
+ fi
fi
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
-dnl New definitions with value matching 0.8.5 release
-module_symbol="0_8_5"
+dnl New definitions with value matching 0.8.6 release
+module_symbol="0_8_6"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
VLC_ENTRY="vlc_entry__${module_symbol}"
AC_SUBST(ALIASES)
AC_SUBST(ASM)
AC_SUBST(MOC)
+AC_SUBST(UIC)
AC_SUBST(WINDRES)
AC_SUBST(MOZILLA_SDK_PATH)
AC_SUBST(XPIDL)
modules/gui/pda/Makefile
modules/gui/macosx/Makefile
modules/gui/qnx/Makefile
+ modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/gui/wxwidgets/Makefile
modules/gui/wince/Makefile