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"
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
- 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
- fi
if test -z $with_mozilla_sdk_path; then
with_mozilla_sdk_path=${topdir}/extras/contrib/gecko-sdk
fi
AC_PATH_XTRA()
dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal.
-
+dnl Make PKG_CONFIG_PATH precious so that it appears in the help and get saved
+AC_ARG_VAR(PKG_CONFIG_PATH,
+ [Paths where to find .pc not at the default location])
PKG_PROG_PKG_CONFIG()
dnl Check for hal
then
AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
fi
-
if test "${enable_livedotcom}" = "no"
then
enable_live555="no"
fi
+
AC_ARG_ENABLE(live555,
[ --enable-live555 live555 RTSP input plugin (default enabled)])
if test "${enable_live555}" != "no"; then
CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
fi
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
+
+ AC_CHECK_HEADERS(liveMedia_version.hh, [
+ AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+ AC_EGREP_CPP(yes,
+ [#include <liveMedia_version.hh>
+ #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
+ #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+ yes
+ #endif
+ #endif],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
+lternatively you can use --disable-live555 to disable the liveMedia plugin.])
+ ],[
+ AC_MSG_RESULT([yes])
+ ])
+ ])
+ other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
+ if test "${SYS}" = "mingw32"; then
+ # add ws2_32 for closesocket, select, recv
+ other_libs="$other_libs -lws2_32"
+ fi
AC_CHECK_HEADERS(liveMedia.hh, [
VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
- AC_CHECK_LIB(liveMedia_pic, main, [
- # We have -lliveMedia_pic, build plugins
- VLC_ADD_PLUGIN([live555])
- VLC_ADD_LIBS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
- ], [
AC_CHECK_LIB(liveMedia, main, [
- # We only have -lliveMedia, do builtins
VLC_ADD_PLUGIN([live555])
- VLC_ADD_LIBS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
- ])
- ])
- if test "${SYS}" = "mingw32"; then
- # add ws2_32 for closesocket, select, recv
- VLC_ADD_LIBS([live555],[-lws2_32])
- fi
+ VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
+ ],[],[${other_libs}])
])
CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++)
if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then
AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
+ AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/liveMedia_version.hh,[
+ AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+ AC_EGREP_CPP(yes,
+ [#include "${real_live555_tree}/liveMedia/include/liveMedia_version.hh"
+ #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
+ #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+ yes
+ #endif
+ #endif],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.
+lternatively you can use --disable-live555 to disable the liveMedia plugin.])
+ ],[
+ AC_MSG_RESULT([yes])
+ ])
+ ])
+
VLC_ADD_PLUGIN([live555])
if test "${SYS}" = "mingw32"; then
then
dnl Use a custom libraw1394
AC_MSG_RESULT(${real_dv_raw1394_tree}/src/.libs/libraw1394.a)
- VLC_ADD_BUILTINS([access_dv])
+ VLC_ADD_PLUGIN([access_dv])
VLC_ADD_LIBS([access_dv],[-L${real_dv_raw1394_tree}/src/.libs -lraw1394])
VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_raw1394_tree}])
else
then
dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
- VLC_ADD_BUILTINS([dvdread])
+ VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}])
VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}])
else
then
dnl Use a custom libdvbpsi
AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
- VLC_ADD_BUILTINS([ts])
+ VLC_ADD_PLUGIN([ts])
if test "${enable_sout}" != "no"; then
- VLC_ADD_BUILTINS([mux_ts])
+ VLC_ADD_PLUGIN([mux_ts])
fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src])
VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a])
fi
CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include"
AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
- if test -z "${with_dvbpsi_tree}"
- then
- VLC_ADD_PLUGIN([dvb])
- else
- VLC_ADD_BUILTINS([dvb])
- fi
+ VLC_ADD_PLUGIN([dvb])
],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)])
CPPFLAGS="${CPPFLAGS_save}"
fi
VLC_ADD_LIBS([mpgatofixed32],[-L${real_mad_tree}/.libs])
LDFLAGS="${LDFLAGS_save} ${LIBS_mpgatofixed32}"
AC_CHECK_LIB(mad, mad_bit_init, [
- VLC_ADD_BUILTINS([mpgatofixed32])
+ VLC_ADD_PLUGIN([mpgatofixed32])
VLC_ADD_LIBS([mpgatofixed32],[-lmad])
],[ AC_MSG_ERROR([the specified tree hasn't been compiled ])
],[])
then
dnl Use a custom faad
AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
- VLC_ADD_BUILTINS([faad])
+ VLC_ADD_PLUGIN([faad])
VLC_ADD_LIBS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
VLC_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include])
else
then
dnl Use a custom twolame
AC_MSG_RESULT(${real_twolame_tree}/libtwolame/.libs/libtwolame.a)
- VLC_ADD_BUILTINS([twolame])
+ VLC_ADD_PLUGIN([twolame])
VLC_ADD_LIBS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a])
VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/libtwolame -DLIBTWOLAME_STATIC])
else
(test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes")
then
if test "${SYS}" = "mingw32"; then
- VLC_ADD_BUILTINS([quicktime])
+ VLC_ADD_PLUGIN([quicktime])
else
AC_CHECK_HEADERS(QuickTime/QuickTime.h,
[ VLC_ADD_PLUGIN([quicktime])
VLC_ADD_LIBS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs])
LDFLAGS="${LDFLAGS_save} ${LIBS_a52tofloat32}"
AC_CHECK_LIB(a52, a52_free, [
- VLC_ADD_BUILTINS([a52tofloat32])
+ VLC_ADD_PLUGIN([a52tofloat32])
VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE])
VLC_ADD_LIBS([a52tofloat32],[-la52])
],[
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}"
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
real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
if test -f "${real_tarkin_tree}/tarkin.o"
then
- VLC_ADD_BUILTINS([tarkin])
+ VLC_ADD_PLUGIN([tarkin])
VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
VLC_ADD_LIBS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
AC_MSG_RESULT(yes)
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
AC_CHECK_LIB(Xv,XvPutImage,[
- # If libXv.so is available, xvideo can be a plugin. Otherwise, we
- # test for libXv_pic.
- if test -f /usr/X11R6/lib/libXv.so -o -f /usr/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then
VLC_ADD_PLUGIN([xvideo])
VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])
- else
- AC_CHECK_LIB(Xv_pic,XvPutImage,[
- VLC_ADD_PLUGIN([xvideo])
- VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
- VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic])
- ],[
- VLC_ADD_BUILTINS([xvideo])
- VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])
- VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
- ])
- fi
])
CFLAGS="${CFLAGS_save}"
]
dnl special case for BeOS
if test "${SYS}" = "beos"
then
- VLC_ADD_BUILTINS([beos])
+ VLC_ADD_PLUGIN([beos])
fi
dnl
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS])
])
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
+ QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
+ AC_SUBST(QT4LOCALEDIR)
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
[ --enable-wince Windows CE interface (default enabled with MinGW)])
if test "${enable_wince}" != "no"; then
if test "${SYS}" = "mingwce"; then
- VLC_ADD_BUILTINS([wince])
+ VLC_ADD_PLUGIN([wince])
VLC_ADD_CXXFLAGS([wince],[])
VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell])
dnl Gross hack
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QuickTime])
VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
dnl
dnl Stuff used by the program
dnl
-AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string])
+VERSION_MESSAGE="${VERSION} ${CODENAME}"
+COPYRIGHT_MESSAGE="VLC media player - version ${VERSION_MESSAGE} - (c) ${COPYRIGHT_YEARS} the VideoLAN team"
+AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number])
+AC_SUBST(COPYRIGHT_MESSAGE)
+AC_SUBST(VERSION_MESSAGE)
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_REVISION)
+AC_SUBST(COPYRIGHT_YEARS)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
if test "${build_os}" = "cygwin"
then
dnl
VLC_RESTORE_FLAGS
+dnl
+dnl Sort the modules list
+dnl
+PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs )
+
dnl
dnl Create the vlc-config script
dnl
AC_CONFIG_FILES([
extras/package/win32/vlc.win32.nsi
+ extras/package/macosx/Info.plist
+ extras/package/macosx/Resources/English.lproj/InfoPlist.strings
+ extras/package/macosx/plugin/Info.plist
+ extras/package/macosx/plugin/InstallerInfo.plist
+ extras/package/macosx/plugin/English.lproj/InfoPlist.strings
Makefile
projects/activex/Makefile
projects/activex/axvlc.inf
${SHELL} ./config.status --file=vlc-config
chmod 0755 vlc-config
-/bin/echo -n "Enabled modules :"
+/bin/echo -n "Enabled modules: "
./vlc-config --list plugin
dnl Shortcut to nice compile message