X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=0924a1b3a30c870307deee738e0a9390d1aba566;hb=f52524a211617ca4db4fa290b7a867836e59fb78;hp=8603f46c58f8a63541261acac075fda34627f80a;hpb=f77bf7a10aa7b10a5e27701da137dcb29ae9f3bd;p=vlc diff --git a/configure.ac b/configure.ac index 8603f46c58..0924a1b3a3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Goldeneye" +CODENAME="Yellow Bastard" COPYRIGHT_YEARS="1996-2009" AC_PREREQ(2.59c) @@ -284,20 +284,6 @@ case "${host_os}" in OBJC="${OBJC} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" fi - if test "${host_cpu}" = "powerpc"; then - CPP="${CPP} -arch ppc" - CC="${CC} -arch ppc" - CXX="${CXX} -arch ppc" - OBJC="${OBJC} -arch ppc" - LD="${LD} -arch ppc" - fi - if test "${host_cpu}" = "i386"; then - CPP="${CPP} -arch i386" - CC="${CC} -arch i386" - CXX="${CXX} -arch i386" - OBJC="${OBJC} -arch i386" - LD="${LD} -arch i386" - fi AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) if test "${with_macosx_version_min}" != "" ; then @@ -335,12 +321,12 @@ case "${host_os}" in fi fi ;; - *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) + *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) case "${host_os}" in - *wince* | *mingwce* | *mingw32ce* | *pe*) + *wince* | *mingwce* | *mingw32ce*) SYS=mingwce dnl Sadly CeGCC still needs non-wince macros AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.]) @@ -367,11 +353,12 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([activex mozilla],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm]) - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd],[-lws2_32]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi],[-lws2_32]) + VLC_ADD_LIBS([access_file], [-lshlwapi]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv - VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2]) + VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) fi ;; @@ -754,12 +741,6 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for dynamic plugins ac_cv_have_plugins=no -# OS X style -AC_CHECK_HEADERS(mach-o/dyld.h, - [AC_CHECK_FUNCS(NSLinkModule, - [AC_DEFINE(HAVE_DL_DYLD, 1, [Define if you have the Darwin dyld API]) - ac_cv_have_plugins=yes])]) - # HP-UX style if test "${ac_cv_have_plugins}" = "no"; then AC_CHECK_HEADERS(dl.h) @@ -876,8 +857,8 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_MSG_RESULT(no)]) dnl Check for headers -AC_CHECK_HEADERS(getopt.h strings.h locale.h) -AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h) +AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h) +AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h) AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ @@ -886,7 +867,7 @@ AC_CHECK_HEADERS([net/if.h], [], [], ]) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) -AC_CHECK_HEADERS([linux/version.h linux/dccp.h]) +AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h]) AC_CHECK_HEADERS(syslog.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -1622,7 +1603,7 @@ if test -n "${with_tuning}"; then fi else if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then - CFLAGS_TUNING="-march=pentium-m -mtune=prescott" + CFLAGS_TUNING="-march=prescott -mtune=generic" elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" elif test "${host_cpu}" = "x86_64"; then @@ -1727,9 +1708,6 @@ AS_IF([test "${enable_sout}" != "no"], [ ]) AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) -AC_ARG_ENABLE(switcher, - [ --enable-switcher Stream-out switcher plugin (default disabled)]) - dnl Check for libshout AC_ARG_ENABLE(shout, [ --enable-shout libshout output plugin (default disabled)]) @@ -2276,9 +2254,6 @@ if test "${enable_smb}" != "no"; then [ if test -n "${enable_smb}"; then AC_MSG_ERROR([cannot find libsmbclient headers]) fi ]) - AC_CHECK_MEMBER([struct _SMBCCTX.close_fn], - AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),, - [#include ]) fi dnl @@ -2860,9 +2835,12 @@ AC_ARG_ENABLE(mpc, [ --enable-mpc Mpc demux support (default enabled)]) if test "${enable_mpc}" != "no" then - AC_CHECK_HEADERS(mpcdec/mpcdec.h, [ + AC_CHECK_HEADERS([mpc/mpcdec.h], [ + VLC_ADD_PLUGIN([mpc]) + VLC_ADD_LIBS([mpc],[-lmpcdec])], + [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [ VLC_ADD_PLUGIN([mpc]) - VLC_ADD_LIBS([mpc],[-lmpcdec])]) + VLC_ADD_LIBS([mpc],[-lmpcdec])])]) fi dnl @@ -3025,11 +3003,27 @@ then VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_RESTORE_FLAGS + have_avcodec="yes" ],[ AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.]) ]) fi +dnl +dnl stream_out switcher needs libavcodec +dnl +AC_ARG_ENABLE(switcher, + [ --enable-switcher Stream-out switcher plugin (default disabled)]) +AS_IF([test "${enable_switcher}" = "yes"], [ + AS_IF([test "x${have_avcodec}" = "xyes"], [ + VLC_ADD_PLUGIN([stream_out_switcher]) + VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS]) + VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS]) + ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec]) + ]) +]) + + dnl dnl avformat demuxer/muxer plugin dnl @@ -3744,26 +3738,26 @@ dnl uncompatible dnl AC_ARG_ENABLE(zvbi, AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with - libzvbi (default enabled)])) + libzvbi (default enabled)])) AC_ARG_ENABLE(telx, AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with - zvbi) (default enabled if zvbi is absent)])) + zvbi) (default enabled if zvbi is absent)])) AS_IF( [test "${enable_zvbi}" != "no"],[ PKG_CHECK_MODULES(ZVBI, - zvbi-0.2 >= 0.2.25, - [ - VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) - VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) + zvbi-0.2 >= 0.2.25, + [ + VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) + VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) VLC_ADD_PLUGIN([zvbi]) - AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) - AS_IF( [test "${enable_telx}" = "yes"],[ - AC_MSG_WARN([The zvbi and telx modules are uncompatibles. - Using zvbi.]) - ]) - ],[ - AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) - ]) + AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) + AS_IF( [test "${enable_telx}" = "yes"],[ + AC_MSG_WARN([The zvbi and telx modules are uncompatibles. + Using zvbi.]) + ]) + ],[ + AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) + ]) ]) AS_IF( [test "${enable_telx}" != "no" ],[ VLC_ADD_PLUGIN([telx]) @@ -3912,14 +3906,6 @@ CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AS_IF([test "${enable_x11}" != "no"], [ AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGIN([x11_screen]) - VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}]) - VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - - VLC_ADD_PLUGIN([panoramix]) - VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) - VLC_ADD_PLUGIN([x11]) VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) @@ -4086,6 +4072,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ PKG_CHECK_MODULES(XCB, [xcb]) PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) VLC_ADD_PLUGIN([xcb]) + VLC_ADD_PLUGIN([xcb_screen]) AS_IF([test "${enable_xvideo}" != "no"], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ @@ -4098,6 +4085,12 @@ AS_IF([test "${enable_xcb}" != "no"], [ ]) ]) + PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [ + VLC_ADD_PLUGIN([panoramix]) + VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}]) + VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}]) + ], [true]) + dnl xcb-utils PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms]) @@ -4388,9 +4381,9 @@ then if test -z "${with_directx}" then AC_CHECK_HEADERS(ddraw.h, - [ VLC_ADD_PLUGIN([vout_directx]) + [ VLC_ADD_PLUGIN([directx]) VLC_ADD_PLUGIN([aout_directx]) - VLC_ADD_LIBS([vout_directx],[-lgdi32]) + VLC_ADD_LIBS([directx],[-lgdi32]) ]) AC_CHECK_HEADERS(GL/gl.h, [ VLC_ADD_PLUGIN([glwin32]) @@ -4404,10 +4397,10 @@ then AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h then - VLC_ADD_PLUGIN([vout_directx]) + VLC_ADD_PLUGIN([directx]) VLC_ADD_PLUGIN([aout_directx]) - VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) - VLC_ADD_LIBS([vout_directx],[-lgdi32]) + VLC_ADD_CPPFLAGS([directx aout_directx],[-I${with_directx}]) + VLC_ADD_LIBS([directx],[-lgdi32]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -4974,7 +4967,7 @@ AS_IF([test "${enable_qt4}" != "no"], [ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"], [ VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11]) ], [ - VLC_ADD_LIBS([qt4],[$QT4_LIBS]) + VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32]) ]) QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/" AC_SUBST(QT4LOCALEDIR) @@ -5252,6 +5245,23 @@ then fi fi +dnl +dnl libprojectM visualization plugin +dnl +AC_ARG_ENABLE(projectm, + [ --enable-projectm projectM visualization plugin (default disabled)]) +AS_IF([test "${enable_projectm}" = "yes"], + [ + PKG_CHECK_MODULES(PROJECTM, libprojectM, + [ + VLC_ADD_PLUGIN([projectm]) + VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS]) + VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS]) + ],[ + AC_MSG_WARN(libprojectM library not found) + ]) + ]) + dnl dnl AtmoLight (homebrew AmbiLight) dnl @@ -5562,8 +5572,8 @@ then [ AC_PATH_PROGS(MOZILLA_CONFIG, [mozilla-config seamonkey-config xulrunner-config], - AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.]) - ) + [no]) + test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.]) ] ) dnl pkg-config failed but we might have found a mozilla-config