X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=3d53621162d57eefb4575bcde8dd9330958681d1;hb=473fef1b4da5a1592a692193ecfde77b8dcec3dc;hp=89073cb8e340cbbedb0d50ae5eba3dfcc2d9819a;hpb=2579d74e24fdfaa7d145b1928e4359149b0d8832;p=vlc diff --git a/configure.ac b/configure.ac index 89073cb8e3..3d53621162 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,15 @@ dnl them. And we need the comma otherwize automake will choke on it. AM_INIT_AUTOMAKE(vlc,0.8.5-svn) AM_CONFIG_HEADER(config.h) +dnl Too many people are not aware of maintainer mode: +dnl If you want to use it, you definitely know what you are doing, so +dnl you can specify "--disable-maintainer-mode". But if you want the default +dnl automake behavior, you've likely never heard of maintainer mode, so we +dnl can't expect you to enable it manually. + +AS_IF([test "x${enable_maintainer_mode}" != "xno"], + [enable_maintainer_mode="yes"]) + dnl HA! HA! AM_MAINTAINER_MODE @@ -87,8 +96,6 @@ AC_ARG_WITH(contrib, if test -d ${topdir}/extras/contrib/lib; then export PATH=${topdir}/extras/contrib/bin:$PATH -dnl kludge because only the debian package provides a ffmpeg-config - with_ffmpeg_config_path=${topdir}/extras/contrib/bin CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include" CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include" CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include" @@ -97,7 +104,7 @@ dnl kludge because only the debian package provides a ffmpeg-config CXXFLAGS_save="${CXXFLAGS_save} -I${topdir}/extras/contrib/include" OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include" OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include" - if test $build = $host; then + if test $build = $host -o $PKG_CONFIG_LIBDIR; then export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH else export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig @@ -108,8 +115,18 @@ dnl kludge because only the debian package provides a ffmpeg-config fi LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib" LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib" - with_livedotcom_tree=${topdir}/extras/contrib/src/live - with_goom_tree=${topdir}/extras/contrib/src/goom + +dnl kludge because only the debian package provides a ffmpeg-config + if test -z $with_ffmpeg_config_path; then + with_ffmpeg_config_path=${topdir}/extras/contrib/bin; + fi + if test -z $with_livedotcom_tree; then + with_livedotcom_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 ".`uname -s`" = ".Darwin"; then export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH @@ -143,7 +160,8 @@ case "${target_os}" in SYS="${target_os}" CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" ;; - darwin*) + darwin1.[0123]) + dnl Mac OS X < 10.3 SYS=darwin CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" @@ -154,6 +172,15 @@ case "${target_os}" in VLC_ADD_CFLAGS([vlc],[-x objective-c]) VLC_ADD_LDFLAGS([vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress]) ;; + darwin*) + SYS=darwin + CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}" + VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation]) + VLC_ADD_CFLAGS([libvlc],[-x objective-c]) + VLC_ADD_CFLAGS([vlc],[-x objective-c]) + ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) @@ -179,7 +206,7 @@ case "${target_os}" in # add ws2_32 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" VLC_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) - VLC_ADD_LDFLAGS([vcdx cddax],[-lwinmm]) + VLC_ADD_LDFLAGS([cdda vcdx cddax],[-lwinmm]) VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp telnet netsync],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then @@ -232,10 +259,24 @@ AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") +dnl +dnl Check for Mac OS X SDK settings +dnl +AC_ARG_WITH(macosx-sdk, + [ --with-macosx-sdk compile for Mac OS X 10.3 SDK],[], with_macosx_sdk=no) +if test "${with_macosx_sdk}" != "no" ; then + CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.3 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk"; OBJCFLAGS="${OBJCFLAGS_save}" + LDFLAGS_save="${LDFLAGS_save} -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk"; LDFLAGS="${LDFLAGS_save}" + export MACOSX_DEPLOYMENT_TARGET=10.3 + MACOSX_DEPLOYMENT_TARGET="10.3" +fi + dnl dnl Gettext stuff dnl -ALL_LINGUAS="ca da de en_GB es fr it ja ko nl pt_BR ro ru sv tr zh_CN zh_TW" +ALL_LINGUAS="ca da de en_GB es fr it ja ka ko nl oc pt_BR ro ru sv tr zh_CN zh_TW" AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then @@ -341,7 +382,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd dnl Check for system libs needed need_libc=false -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch assert) dnl Check for usual libc functions AC_CHECK_FUNCS(strdup strndup atof) @@ -367,7 +408,7 @@ fi AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket) + VLC_ADD_LDFLAGS([vlc ipv4 cdda cddax],-lsocket) ]) ]) @@ -379,7 +420,7 @@ AC_CHECK_FUNCS(send,,[ AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname,[ - VLC_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl]) + VLC_ADD_LDFLAGS([cdda cddax ipv4 vlc],[-lnsl]) ],[ AC_CHECK_LIB(bind,gethostbyname,[ VLC_ADD_LDFLAGS([ipv4 access_mms],[-lbind]) @@ -714,13 +755,8 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -dnl Default X headers and libraries -if test "${x_includes}" = "NONE"; then - x_includes="/usr/X11R6/include" -fi -if test "${x_libraries}" = "NONE"; then - x_libraries="/usr/X11R6/lib" -fi +dnl Find where are the X headers and libraries +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. @@ -910,15 +946,12 @@ if test "${ac_cv_c_dynamic_no_pic}" != "no"; then fi dnl Check for Darwin plugin linking flags -AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], +AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error], [ac_cv_ld_darwin], - [CFLAGS="${CFLAGS_save} -bundle -undefined error -lcc_dynamic" + [CFLAGS="${CFLAGS_save} -bundle -undefined error" AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) if test "${ac_cv_ld_darwin}" != "no"; then VLC_ADD_LDFLAGS([plugin],[-bundle -undefined error]) - AC_CHECK_LIB(cc_dynamic, main,[ - VLC_ADD_LDFLAGS([plugin],[-lcc_dynamic]) - ]) fi dnl Check for standard plugin linking flags @@ -1187,7 +1220,7 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [# OS X/PPC test (gcc 3.x) CFLAGS="${CFLAGS_save} -faltivec" AC_TRY_COMPILE([], - [vec_ld(0, (unsigned char *)0);], + [vec_ld(1 * sizeof(vector float), (unsigned char *)0);], [ac_cv_c_altivec="-faltivec"], dnl Below this are the Linux tests [# Linux/PPC test (gcc 4.x) @@ -1319,6 +1352,9 @@ dnl AC_ARG_ENABLE(debug, [ --enable-debug debug mode (default disabled)]) test "${enable_debug}" != "yes" && enable_debug="no" +AH_TEMPLATE(NDEBUG, + [Define to 1 if debug code should NOT be compiled]) +AS_IF([test "x${enable_debug}" == "xno"], [AC_DEFINE(NDEBUG)]) dnl dnl Enable release-specific flags @@ -1756,7 +1792,7 @@ dnl dnl libdvbpsi ts demux/mux dnl AC_ARG_ENABLE(dvbpsi, -[ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) + [ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) if test "${enable_dvbpsi}" != "no" then AC_ARG_WITH(dvbpsi, @@ -1881,7 +1917,7 @@ dnl dnl gnomeVFS access module dnl AC_ARG_ENABLE(gnomevfs, - [ --enable-gnomevfs GnomeVFS access module (default enabled)]) + [ --enable-gnomevfs GnomeVFS access module (default enabled)]) if test "${enable_gnomevfs}" != "no" -a "${SYS}" = "linux" then PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0, @@ -2031,7 +2067,18 @@ then then VLC_ADD_PLUGINS([vcd cdda]) VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-framework IOKit -framework CoreFoundation]) - VLC_ADD_LDFLAGS([vcdx cddax],[-liconv]) + VLC_ADD_LDFLAGS([vcdx cddax cdda],[-liconv]) + fi + + if test "$enable_libcddb" != "no"; then + PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ + HAVE_LIBCDDB=yes + AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed]) + VLC_ADD_LDFLAGS([cdda],[$LIBCDDB_LIBS]) + VLC_ADD_CFLAGS([cdda],[$LIBCDDB_CFLAGS]) + ],: + [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) + HAVE_LIBCDDB=no]) fi fi @@ -2082,11 +2129,11 @@ if test "${enable_screen}" != "no"; then VLC_ADD_CXXFLAGS([screen],[]) VLC_ADD_LDFLAGS([screen],[-lbe]) else - CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ VLC_ADD_PLUGINS([screen]) - VLC_ADD_LDFLAGS([screen],[-L${x_libraries} -lX11 -lXext]) - VLC_ADD_CPPFLAGS([screen],[-I${x_includes}]) + VLC_ADD_LDFLAGS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) + VLC_ADD_CPPFLAGS([screen],[${X_CFLAGS}]) ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2129,7 +2176,7 @@ AC_ARG_ENABLE(ogg, if test "${enable_ogg}" != "no" then AC_ARG_WITH(ogg-tree, - [ --with-ogg-tree=PATH ogg tree for static linking]) + [ --with-ogg-tree=PATH ogg tree for static linking]) if test -n "${with_ogg_tree}" then AC_MSG_CHECKING(for libogg.a in ${with_ogg_tree}) @@ -2297,7 +2344,7 @@ then fi AC_ARG_WITH(mad-tree, - [ --with-mad-tree=PATH mad tree for static linking],[],[]) + [ --with-mad-tree=PATH mad tree for static linking],[],[]) if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}" then real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`" @@ -3121,15 +3168,41 @@ dnl AC_ARG_ENABLE(dirac, [ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then - AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [ - AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [ + PKG_CHECK_MODULES(DIRAC,dirac, [ VLC_ADD_PLUGINS([dirac]) - VLC_ADD_LDFLAGS([dirac],[-ldirac_decoder -ldirac_encoder -lstdc++]) ],[ - AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])], - [-lstdc++]) + VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) + VLC_ADD_LDFLAGS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ + AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.]) ]) fi +dnl libvc1 decoder plugin +dnl +AC_ARG_ENABLE(libvc1, +[ --enable-libvc1 VC-1 codec (default disabled)]) +if test "${enable_libvc1}" = "yes" +then + AC_ARG_WITH(libvc1-tree, + [ --with-libvc1-tree=PATH libvc1 tree for static linking]) + if test -n "${with_libvc1_tree}" + then + AC_MSG_CHECKING(for vc1dec.o in ${with_libvc1_tree}) + real_libvc1_tree="`cd ${with_libvc1_tree} 2>/dev/null && pwd`" + if test -f "${real_libvc1_tree}/src/.libs/vc1dec.o" + then + VLC_ADD_BUILTINS([libvc1]) + VLC_ADD_CPPFLAGS([libvc1],[-I${real_libvc1_tree}/src]) + VLC_ADD_LDFLAGS([libvc1],[${real_libvc1_tree}/src/.libs/libvc1.a]) + AC_MSG_RESULT(yes) + else + dnl The given libvc1 tree wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_libvc1_tree}/src/.libs/vc1dec.o, + make sure you compiled libvc1 in ${with_libvc1_tree}]) + fi + fi +fi + dnl dnl PNG decoder module dnl @@ -3219,7 +3292,7 @@ AC_ARG_WITH(,[Video plugins:]) dnl Check for DPMS if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AC_CHECK_HEADERS(X11/extensions/dpms.h, [ AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h) AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[ @@ -3244,11 +3317,11 @@ AC_ARG_ENABLE(x11, if test "${enable_x11}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_x11}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ VLC_ADD_PLUGINS([x11]) - VLC_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext]) - VLC_ADD_CPPFLAGS([x11],[-I${x_includes}]) + VLC_ADD_LDFLAGS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) + VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -3262,25 +3335,25 @@ AC_ARG_ENABLE(xvideo, if test "${enable_xvideo}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_xvideo}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ - CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" + 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 "${x_libraries}"/libXv.so; then VLC_ADD_PLUGINS([xvideo]) - VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) - VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) + VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) + VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) else AC_CHECK_LIB(Xv_pic,XvPutImage,[ VLC_ADD_PLUGINS([xvideo]) - VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) - VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic]) + VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) + VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic]) ],[ VLC_ADD_BUILTINS([xvideo]) - VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) - VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) + VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) ]) fi ]) @@ -3298,12 +3371,12 @@ AC_ARG_ENABLE(glx, if test "${enable_glx}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_glx}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ AC_CHECK_HEADERS(GL/glx.h, [ VLC_ADD_PLUGINS([glx]) - VLC_ADD_LDFLAGS([glx],[-L${x_libraries} -lX11 -lXext -lGL -lGLU]) - VLC_ADD_CPPFLAGS([glx],[-I${x_includes}]) + VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) + VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) ]) ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -3315,8 +3388,8 @@ if test "${enable_xvideo}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_xvideo}" = "yes"); then ac_cv_have_xinerama="no" - CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" - CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" + CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" + CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ VLC_ADD_LDFLAGS([xvideo],[-lXinerama_pic]) @@ -3351,7 +3424,7 @@ if test "${enable_opengl}" != "no" && AC_CHECK_HEADERS(GL/gl.h, [ VLC_ADD_PLUGINS([opengl]) if test "${SYS}" != "mingw32"; then - VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU]) + VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU]) else VLC_ADD_LDFLAGS([opengl],[-lopengl32]) fi @@ -3718,6 +3791,41 @@ then VLC_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) fi +dnl +dnl DirectFB module +dnl +AC_ARG_ENABLE(directfb, + [ --enable-directfb DirectFB support (default disabled)]) +if test "${enable_directfb}" = "yes" +then + if test "${with_directfb}" = "no" + then + AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false") + if test "${have_directfb}"= "true" + then + VLC_ADD_PLUGINS([directfb]) + VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl]) + VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT]) + else + AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb]) + fi + else + CPPFLAGS_save="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include" + AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false") + CPPFLAGS="${CPPFLAGS_save}" + AC_ARG_WITH(directfb, + [ --with-directfb=PATH path to directfb], + [ if test "${with_directfb}" != "no" -a -n "${with_directfb}" + then + VLC_ADD_PLUGINS([directfb]) + VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT]) + VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl]) + fi ], + [ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include]) ]) + fi +fi + dnl dnl GGI module dnl @@ -3948,6 +4056,18 @@ then AC_LANG_POP([C++]) fi +dnl +dnl JACK module +dnl +AC_ARG_ENABLE(jack, + [ --enable-jack JACK audio module (default disabled)], + [if test "${enable_jack}" = "yes" + then + AC_CHECK_HEADERS(jack/jack.h, [ + VLC_ADD_PLUGINS([jack]) + VLC_ADD_LDFLAGS([jack],[-ljack]) ]) + fi]) + dnl dnl CyberLink for C++ UPnP stack dnl @@ -3980,7 +4100,37 @@ AS_IF([test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_c AC_MSG_CHECKING(for libclink.a in ${with_cyberlink_tree}) AS_IF([test -f "${real_cyberlink_tree}/lib/unix/libclink.a"], [ AC_MSG_RESULT(${real_cyberlink_tree}/lib/unix/libclink.a) - VLC_ADD_LDFLAGS([upnp], [${real_cyberlink_tree}/lib/unix/libclink.a -lexpat]) + dnl The mere fact that we have to make such an ugly check sucks + AC_MSG_CHECKING(for XML parser to link CyberLink with) + LIBS_save="$LIBS" + LIBS_cclink="no" + for l in "`xml2-config --libs`" -lexpat -lxerces-c; do + LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a -lpthread $l" + AC_LINK_IFELSE([AC_LANG_PROGRAM([ +#include +using namespace CyberLink; + +class testclass : public SearchResponseListener, public MediaPlayer +{ + virtual void deviceSearchResponseReceived( SSDPPacket *) + { + } + + public: + testclass (void) + { + addSearchResponseListener (this); + start (); + } +}; +],[testclass l;])],[LIBS_cclink="$l"]) + done + LIBS="${LIBS_save}" + dnl should not happen - otherwise this needs fixing - hence FAILURE + AS_IF([test "${LIBS_cclink}" == "no"], + [AC_MSG_FAILURE([cannot find XML parser for CyberLink])]) + AC_MSG_RESULT([${LIBS_cclink}]) + VLC_ADD_LDFLAGS([upnp], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}]) ], [ AC_MSG_RESULT(no) AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}]) @@ -4035,9 +4185,9 @@ if test "${enable_skins2}" = "yes" || else if test "${skins2_missing_lib}" = "no"; then VLC_ADD_PLUGINS([skins2]) ALIASES="${ALIASES} svlc" - VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -I${x_includes} -DX11_SKINS]) + VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LDFLAGS([skins2],[-L${x_libraries} -lXext -lX11]) + VLC_ADD_LDFLAGS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) fi fi fi @@ -4471,7 +4621,7 @@ then AC_CHECK_HEADERS(GL/gl.h, [ VLC_ADD_PLUGINS([galaktos]) if test "${SYS}" != "mingw32"; then - VLC_ADD_LDFLAGS([galaktos],[-L${x_libraries} -lGL -lGLU]) + VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU]) else VLC_ADD_LDFLAGS([galaktos],[-lopengl32]) fi @@ -4723,74 +4873,81 @@ AC_ARG_ENABLE(mozilla, AC_ARG_WITH(mozilla-sdk-path, [ --with-mozilla-sdk-path=PATH path to mozilla sdk]) -if test "${enable_mozilla}" = "yes" -a "${with_mozilla_sdk_path}" = "" +if test "${enable_mozilla}" = "yes" then - AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) - if test "${MOZILLA_CONFIG}" = "no" + if test "${with_mozilla_sdk_path}" = "" then - AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) + AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) + if test "${MOZILLA_CONFIG}" = "no" + then + AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) + else + if test "${SYS}" != "mingw32"; then + LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}" + AC_CHECK_LIB(Xt,XtStrings, + [VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])], + [], + [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE] + ]) + LDFLAGS="${LDFLAGS_save}" + fi + mozilla=: + dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 + VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) + VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" + AC_CHECK_HEADERS(mozilla-config.h) + CPPFLAGS="${CPPFLAGS_save}" + XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \ + `${MOZILLA_CONFIG} --idlflags plugin xpcom java` " + xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" + fi else - if test "${SYS}" != "mingw32"; then - LDFLAGS="${LDFLAGS_save} -L${x_libraries}" - AC_CHECK_LIB(Xt,XtStrings, - [VLC_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt -lX11 -lSM -lICE])], - [], - [[-L${x_libraries} -lX11 -lSM -lICE] - ]) - LDFLAGS="${LDFLAGS_save}" + dnl special case for mingw32 + if test "${SYS}" = "mingw32" + then + AC_CHECK_TOOL(CYGPATH, cygpath, "") + dnl latest gecko sdk does not have an xpcom directory + if test -d "${with_mozilla_sdk_path}/xpcom"; then + mozilla_sdk_xpcom="/xpcom" + fi fi - mozilla=: - dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 - VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) - VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" - AC_CHECK_HEADERS(mozilla-config.h) + + real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" + CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" + AC_CHECK_HEADERS(mozilla-config.h, [ + mozilla=: + VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) + VLC_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue]) + if test "${SYS}" = "mingw32"; then + LDFLAGS="${LDFLAGS_save}" + dnl latest gecko sdk does not have embedstring + if test -d "${real_mozilla_sdk}/embedstring/bin" + then + VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at]) + fi + fi + + XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl" + xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin" + + if test -n "${CYGPATH}"; then + real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" + XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl\"" + fi ]) CPPFLAGS="${CPPFLAGS_save}" fi - -dnl special case for mingw32 -elif test "${enable_mozilla}" = "yes" -then - if test "${SYS}" = "mingw32"; then - AC_CHECK_TOOL(CYGPATH, cygpath, "") - mozilla_sdk_xpcom="/xpcom" - fi - - real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" - CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" - AC_CHECK_HEADERS(mozilla-config.h, [ - mozilla=: - VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) - VLC_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue]) - if test "${SYS}" = "mingw32"; then - VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at]) + + if test "${mozilla}" != "false" + then + build_pic=yes + AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path} /usr/lib/mozilla) + if test "${XPIDL}" = "no"; then + AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.]) fi - - XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl" - XPIDL="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin/xpidl" - - if test -n "${CYGPATH}"; then - real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" - XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl\"" - fi ]) - CPPFLAGS="${CPPFLAGS_save}" -fi - -dnl Not necessarily in ${PATH} -if test -z "${XPIDL}" -o ! -x "${XPIDL}"; then - XPIDL="/usr/lib/mozilla/xpidl" -fi -AS_IF([test "${MOZILLA_CONFIG}"], [ - if test -z "${XPIDL_INCL}"; then - XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \ - `${MOZILLA_CONFIG} --idlflags plugin xpcom java` " fi -]) -AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) -if test "${mozilla}" != "false" -then - build_pic=yes fi +AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) dnl dnl Python bindings @@ -4798,7 +4955,7 @@ dnl AC_ARG_ENABLE(python-bindings, [ --enable-python-bindings Enable Python bindings (default disabled)]) dnl TODO: look for python dev headers -AM_CONDITIONAL( BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"] ) +AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"]) if test "${enable_python_bindings}" = "yes" then build_pic=yes @@ -4808,8 +4965,8 @@ dnl dnl Java bindings dnl AC_ARG_ENABLE(java-bindings, - [ --enable-java-bindings Enable Java bindings (default disabled)]) -AM_CONDITIONAL( BUILD_JAVA, [test "${enable_java_bindings}" = "yes"] ) + [ --enable-java-bindings Enable Java bindings (default disabled)]) +AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) if test "${enable_java_bindings}" = "yes" then build_pic=yes @@ -4950,7 +5107,7 @@ 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) 1996-2005 the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2006 the VideoLAN team", [Copyright string]) 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]) @@ -4976,11 +5133,6 @@ AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module func VLC_ENTRY="vlc_entry__${module_symbol}" AC_SUBST(VLC_ENTRY) -DATA_PATH="${ac_tool_prefix}/share/vlc" -AC_SUBST(DATA_PATH) -PLUGIN_PATH="${ac_tool_prefix}/lib/vlc" -AC_SUBST(PLUGIN_PATH) - dnl dnl Handle substvars that use $(top_srcdir) dnl @@ -5013,6 +5165,7 @@ AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) AC_SUBST(INCLUDES) AC_SUBST(ALL_LINGUAS) +AC_SUBST(MACOSX_DEPLOYMENT_TARGET) dnl Import substitutions generated by bootstrap VLC_SUBSTS