X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=421ba14e2577436986c626fa4ba7622bd2a2e37a;hb=41a7f1cb2d61ff2aa24eefb6af0fbb803644a624;hp=9192c109209417efcbbcf5657e5114df17f6314e;hpb=7d575ec68e3c562306b40e8bdfa9823fdea73123;p=vlc diff --git a/configure.ac b/configure.ac index 9192c10920..421ba14e25 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,6 @@ case "${host_os}" in ARCH_flag="-arch x86_64" ;; arm*) - ARCH_flag="-arch armv7" ac_cv_c_bigendian="no" ac_cv_c_attribute_packed="no" ;; @@ -237,17 +236,20 @@ case "${host_os}" in DESTDIR="`pwd`/_win32/" dnl - dnl NSIS Installer prefix and WIN64 + dnl NSIS/MSI Installer prefix and WIN64 dnl case "${host}" in amd64*|x86_64*) HAVE_WIN64="1" + WINDOWS_ARCH="x64" PROGRAMFILES="PROGRAMFILES64" ;; *) + WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" ;; esac + AC_SUBST(WINDOWS_ARCH) AC_SUBST(PROGRAMFILES) fi @@ -879,7 +881,7 @@ AS_IF([test "${enable_coverage}" != "no"], [ LDFLAGS="-lgcov ${LDFLAGS}" ]) -AS_IF([test "${SYS}" != "mingw32"], [ +AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "os2"], [ VLC_SAVE_FLAGS CFLAGS="${CFLAGS} -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" @@ -1524,6 +1526,9 @@ then AS_IF([test "${LUAC}" = "false"], [ AC_MSG_ERROR([Could not find the LUA byte compiler.]) ]) + AS_IF([test -f ${CONTRIB_DIR}/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [ + AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.]) + ]) fi AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) @@ -1720,16 +1725,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0] dnl dnl libsmbclient plugin dnl -AC_ARG_ENABLE(smb, - [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])]) -if test "${enable_smb}" != "no"; then - AC_CHECK_HEADERS(libsmbclient.h, - [ VLC_ADD_PLUGIN([access_smb]) - VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], - [ if test -n "${enable_smb}"; then - AC_MSG_ERROR([cannot find libsmbclient headers]) - fi ]) -fi +PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto]) dnl @@ -1764,7 +1760,7 @@ if test "${enable_decklink}" != "no" then if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" then - VLC_ADD_CXXFLAGS([decklink],[-I${with_decklink_sdk}/include]) + VLC_ADD_CXXFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include]) fi VLC_SAVE_FLAGS CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}" @@ -2223,23 +2219,25 @@ dnl AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], - [ - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" - CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - AC_CHECK_HEADERS(libavcodec/avcodec.h) - AC_CHECK_HEADERS(libavutil/avutil.h) - VLC_ADD_PLUGIN([avcodec]) - VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) - AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic]) - ]) - VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) - VLC_RESTORE_FLAGS - have_avcodec="yes" - ],[ - AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ + PKG_CHECK_EXISTS([libavcodec < 55],, [ + AC_MSG_ERROR([libavcodec versions 55 and later are not supported yet.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" + CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" + AC_CHECK_HEADERS(libavcodec/avcodec.h) + AC_CHECK_HEADERS(libavutil/avutil.h) + VLC_ADD_PLUGIN([avcodec]) + VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) + AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ + VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic]) + ]) + VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) + VLC_RESTORE_FLAGS + have_avcodec="yes" + ],[ + AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) ]) ], [ have_avcodec="no" @@ -3160,7 +3158,6 @@ AC_ARG_ENABLE(ios-vout, if test "${enable_ios_vout}" = "yes" then VLC_ADD_PLUGIN([vout_ios]) - VLC_ADD_CFLAGS([vout_ios], [-DUSE_OPENGL_ES=1]) VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi @@ -3469,7 +3466,7 @@ if test "x${enable_macosx_audio}" != "xno" && then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) - VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) + VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3673,7 +3670,7 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin" then - VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices]) VLC_ADD_OBJCFLAGS([macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([macosx]) @@ -3812,12 +3809,6 @@ AS_IF([test "${enable_atmo}" != no], [ ]) ]) -AC_ARG_ENABLE(osdmenu, - AS_HELP_STRING([--enable-osdmenu],[OSD menu (default disabled)]),, [ - enable_osdmenu="no" -]) -AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_osdmenu}" != "no"]) - EXTEND_HELP_STRING([Service Discovery plugins:]) dnl @@ -3888,17 +3879,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) -dnl -dnl Nokia MCE plugin (Maemo screen unblanking) -dnl -PKG_CHECK_MODULES([MCE], [dbus-1 mce], [VLC_ADD_PLUGIN([mce])], [true]) - - -AS_IF([test -f "/etc/maemo_version"], [ - AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.]) -]) - - dnl dnl Taglib plugin dnl @@ -4150,6 +4130,7 @@ AM_COND_IF([HAVE_WIN32], [ AC_CONFIG_FILES([ extras/package/win32/NSIS/spad.nsi extras/package/win32/NSIS/vlc.win32.nsi + extras/package/win32/msi/config.wxi ]) ])