X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=1c3795100edbeeb7536d6a9e5ee8d91071bb691c;hb=de618db3601bac3939b0814d9d4701f507dd0e1c;hp=dd25e2bc89fc74ec87aca89105632cdcd4c2b36c;hpb=6f7cf7daf8150009b082f8f67116ff041fb80b93;p=vlc diff --git a/configure.ac b/configure.ac index dd25e2bc89..1c3795100e 100644 --- a/configure.ac +++ b/configure.ac @@ -1811,8 +1811,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 +1821,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 +2096,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 +3422,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 @@ -3750,26 +3768,26 @@ dnl MacOS X gui module dnl AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) -if test "x${enable_macosx}" != "xno" && -(test "${SYS}" = "darwin" || test "${enable_macosx}" = "yes") +if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin" then - VLC_ADD_LIBS([macosx minimal_macosx],[-Wl,-framework,Cocoa]) - VLC_ADD_LIBS([macosx minimal_macosx],[-Wl,-framework,OpenGL]) - VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,Carbon]) - VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) - VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,AGL]) - VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit]) - VLC_ADD_LIBS([macosx], [-Wl,-framework,IOKit]) - VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) - VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) - VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit]) - VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit]) - dnl For bug report - VLC_ADD_LIBS([macosx], [-Wl,-framework,AddressBook]) - VLC_ADD_LIBS([macosx], [-Wl,-framework,WebKit]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL]) VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] ) - VLC_ADD_PLUGIN([macosx minimal_macosx]) + + VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit]) + + 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} -Wl,-framework,BGHUDAppKit]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}]) + fi dnl @@ -3956,11 +3974,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"]) @@ -3980,14 +3993,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}.)]) @@ -3996,36 +4001,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 @@ -4076,10 +4051,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] ) ]) ]