X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=294c3ef85579abfaad95d3e523ecc365353182f4;hb=5f4bb6a9e20e3860707229c31b9d1b83d4ec6732;hp=a169371b4bed1c7fd1a9c302671e4afa502a8c5d;hpb=8691e5de24bd884e7a589533b7ea75ffcd1ea1b0;p=vlc diff --git a/configure.ac b/configure.ac index a169371b4b..294c3ef855 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,19 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team]) +AC_COPYRIGHT([Copyright 2002-2011 VLC authors and VideoLAN]) -AC_INIT(vlc, 1.2.0-pre2) +AC_INIT(vlc, 1.3.0-git) VERSION_MAJOR=1 -VERSION_MINOR=2 +VERSION_MINOR=3 VERSION_REVISION=0 VERSION_EXTRA=0 -VERSION_DEV=pre1 +VERSION_DEV=git PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Twoflower" +CODENAME="Rincewind" COPYRIGHT_YEARS="1996-2011" AC_CONFIG_SRCDIR(src/libvlc.c) @@ -486,8 +486,6 @@ AC_PREPROC_IFELSE([AC_LANG_SOURCE([ AC_MSG_ERROR([Buggy GNU/libc (version 2.5 - 2.7) present. VLC would crash; there is no viable work-around for this. Check with your distribution vendor on how to update the glibc run-time. Alternatively, build with --disable-nls.]) - ], [ - AC_DEFINE(DISABLE_BUGGY_GLIBC_CHECK, 1, [Disables runtime check for buggy glibc.]) ]) ]) @@ -1811,8 +1809,6 @@ fi dnl dnl dvdread module: check for libdvdread dnl -dnl prepend -ldvdcss on OS that need it -AS_CASE(["${SYS}"], [mingw32|darwin], [VLC_ADD_LIBS([dvdread], [-ldvdcss])]) PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto]) dnl @@ -1823,9 +1819,6 @@ AC_ARG_ENABLE(dvdnav, [disable DVD navigation with libdvdnav (default auto)])]) if test "${enable_dvdnav}" != "no" then - dnl prepend -ldvdcss on OS that need it - AS_CASE(["${SYS}"], [mingw32|darwin], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])]) - PKG_CHECK_MODULES(DVDNAV, dvdnav, [ VLC_ADD_PLUGIN([dvdnav]) VLC_ADD_CFLAGS([dvdnav],[${DVDNAV_CFLAGS}]) @@ -2101,7 +2094,7 @@ then VLC_ADD_PLUGIN([qtcapture]) VLC_ADD_PLUGIN([qtsound]) fi -AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" && "x${enable_macosx_qtkit}" != "xno"]) +AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" -a "x${enable_macosx_qtkit}" != "xno"]) dnl @@ -3427,6 +3420,29 @@ dnl libcaca plugin dnl PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto]) +dnl +dnl OS/2 KVA plugin +dnl +AC_ARG_ENABLE(kva, + [AS_HELP_STRING([--enable-kva], + [support the K Video Accelerator KVA (default enabled on OS/2)])],, [ + AS_IF([test "$SYS" = "os2"], [ + enable_kva="yes" + ]) +]) +have_kva="no" +KVA_LIBS="" +AS_IF([test "$enable_kva" != "no"], [ + AC_CHECK_HEADERS([kva.h], [ + have_kva="yes" + AC_CHECK_LIB(kva, main, [ + KVA_LIBS="-lkva" + ]) + ]) +]) +AC_SUBST(KVA_LIBS) +AM_CONDITIONAL([HAVE_KVA], [test "${have_kva}" = "yes"]) + dnl dnl Audio plugins dnl @@ -3612,16 +3628,18 @@ AC_ARG_ENABLE(skins2, [AS_HELP_STRING([--enable-skins2], [skins interface module (default auto)])]) AS_IF([test "${enable_skins2}" != "no"], [ have_skins_deps="yes" + + dnl Win32 AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[-lgdi32 -lole32 -luuid -lmsimg32]) - + dnl MacOS ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) - + dnl Linux/Unix ], [ PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"]) PKG_CHECK_MODULES([XINERAMA], [xinerama],, [have_skins_deps="no"]) @@ -3629,8 +3647,9 @@ AS_IF([test "${enable_skins2}" != "no"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11]) - ]) + + dnl we need freetype AS_IF([test "${have_freetype}" != "yes"], [ have_skins_deps="no" ]) @@ -3645,6 +3664,7 @@ AS_IF([test "${enable_skins2}" != "no"], [ ], [ VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" + enable_skins2="yes" ]) ]) AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) @@ -3757,16 +3777,18 @@ then VLC_ADD_PLUGIN([macosx minimal_macosx]) VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit]) - AC_CHECK_HEADERS(Sparkle/Sparkle.h, [ - VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) - VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) + + CFLAGS="-I${CONTRIB_DIR}/Sparkle.framework/Headers ${CFLAGS_saved}" + AC_CHECK_HEADERS(Sparkle.h, [ + VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) ]) if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework then AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}]) fi - VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit]) - VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit]) + VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,BGHUDAppKit]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) fi @@ -3954,11 +3976,6 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [ ) ]) -if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then - AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_LIBS([rtp stream_out_rtp], [${GCRYPT_LIBS}]) - ]) -fi AC_SUBST(GCRYPT_CFLAGS) AC_SUBST(GCRYPT_LIBS) AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"]) @@ -3978,14 +3995,6 @@ AS_IF([test "${have_libgcrypt}" != "yes"], [ AS_IF([test "${enable_gnutls}" != "no"], [ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0.0], [ VLC_ADD_PLUGIN([gnutls]) - VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) - AS_IF([test "${SYS}" = "mingw32"], [ - dnl pkg-config --libs gnutls omits these - VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL} -lcrypt32]) - ]) - VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}]) - VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}]) - VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS]) ], [ AS_IF([test -n "${enable_gnutls}"], [ AC_MSG_ERROR([${GNUTLS_PKG_ERRORS}.)]) @@ -3994,36 +4003,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) -dnl -dnl RemoteOSD plugin (VNC client as video filter) -dnl -AC_MSG_CHECKING([whether to enable the RemoteOSD plugin]) -AS_IF([test "${have_libgcrypt}" = "yes"],[ - AC_MSG_RESULT(yes) - VLC_ADD_PLUGIN([remoteosd]) - VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) - VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) -], [ - AC_MSG_RESULT(no) - AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin]) -]) - - -dnl -dnl RAOP plugin -dnl -AC_MSG_CHECKING([whether to enable the RAOP plugin]) -AS_IF([test "${have_libgcrypt}" = "yes"], [ - AC_MSG_RESULT(yes) - VLC_ADD_PLUGIN([stream_out_raop]) - VLC_ADD_LIBS([stream_out_raop], [${GCRYPT_LIBS} -lgpg-error]) - VLC_ADD_CFLAGS([stream_out_raop], [${GCRYPT_CFLAGS}]) -], [ - AC_MSG_RESULT(no) - AC_MSG_WARN([libgcrypt support required for RAOP plugin]) -]) - - dnl dnl Nokia MCE plugin (Maemo screen unblanking) dnl @@ -4074,10 +4053,10 @@ AC_ARG_ENABLE(growl, [ --enable-growl growl notification plugin (default disabled)],, [enable_growl=no]) AS_IF([test "${enable_growl}" != "no"], [ - AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ + AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ VLC_ADD_PLUGIN([growl]) - VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) - VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}/Growl]) + VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,CoreFoundation]) + VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}]) VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) ]