X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=3e98da498ebbe8a3522bc29d3577c946b6e1bd24;hb=d04d186e343ee397c133feb8ae150dc96d0a100b;hp=bde4e57af2417c13a437a893005554d3e8c3ce16;hpb=8ed3168ec340fa26f6a4da80ab27c76ea294573e;p=vlc diff --git a/configure.in b/configure.in index bde4e57af2..3e98da498e 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM HAVE_VLC=0 if test -r src/interface/main.c; then HAVE_VLC=1 - VLC_VERSION=0.2.83 + VLC_VERSION=0.2.91 AC_SUBST(VLC_VERSION) VLC_CODENAME=Ourumov AC_SUBST(VLC_CODENAME) @@ -16,8 +16,11 @@ fi HAVE_LIBDVDCSS=0 if test -r extras/libdvdcss/libdvdcss.c; then HAVE_LIBDVDCSS=1 - LIBDVDCSS_VERSION=0.0.3 + LIBDVDCSS_VERSION=1.0.0 AC_SUBST(LIBDVDCSS_VERSION) + if test -r extras/libdvdcss/csskeys.h; then + AC_DEFINE(HAVE_CSSKEYS,1,css decryption with player keys) + fi fi dnl Save CFLAGS and LDFLAGS @@ -28,14 +31,73 @@ dnl Check for tools AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP -AC_PROG_RANLIB +AC_CHECK_TOOL(RANLIB, ranlib, :) dnl AM_PROG_LIBTOOL AC_PROG_INSTALL -dnl Check for endianness if not cross-compiling +dnl +dnl Endianness check, with a special test for cross-compilation +dnl if test x${cross_compiling} != xyes; then AC_C_BIGENDIAN +else + dnl We are crosscompiling, give the user the opportunity to specify + dnl --with-words=big or --with-words=little ; otherwise, try to guess + AC_ARG_WITH(words, + [ --with-words=endianness Set endianness (big or little)]) + case "x$withval" in + xbig) + ac_cv_c_bigendian=yes + ;; + xlittle) + ac_cv_c_bigendian=no + ;; + *) + dnl Try to guess endianness by matching patterns on a compiled + dnl binary, by looking for an ASCII or EBCDIC string + ac_cv_c_bigendian=unknown + AC_MSG_CHECKING(what the byte order looks to be)[ + cat >conftest.c <config.log 2>&1 \ + && test -f conftest.o + then + if test `grep -l BIGenDianSyS conftest.o` + then + AC_MSG_RESULT("big endian") + ac_cv_c_bigendian=yes + fi + if test `grep -l LiTTleEnDian conftest.o` + then + AC_MSG_RESULT("little endian") + ac_cv_c_bigendian=no + fi + fi + fi + if test $ac_cv_c_bigendian = xunknown + then + AC_MSG_ERROR([Could not guess endianness, please use --with-words]) + fi + dnl Now we know what to use for endianness, just put it in the header + if test $ac_cv_c_bigendian = yes + then + cat >> confdefs.h <<\EOF +#define WORDS_BIGENDIAN 1 +EOF + fi + ;; + esac fi dnl Check for system libs needed @@ -58,6 +120,7 @@ AC_CHECK_FUNC(inet_aton,,[ ]) AC_CHECK_FUNCS(vasprintf) AC_CHECK_FUNCS(swab) +AC_CHECK_FUNCS([memalign valloc]) AC_CHECK_FUNCS(sigrelse) @@ -103,7 +166,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(stddef.h getopt.h strings.h) -AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h) +AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h) AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h) AC_CHECK_HEADERS(dlfcn.h image.h) AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) @@ -113,84 +176,75 @@ dnl Check for threads library AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) dnl Check for ntohl, etc. -CFLAGS="${save_CFLAGS} -Wall -Werror" -AC_MSG_CHECKING([for ntohl in sys/param.h]) -AC_TRY_COMPILE([#include -void foo() { int meuh; ntohl(meuh); }],, - AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) - AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) +AC_CACHE_CHECK([for ntohl in sys/param.h], + [ac_cv_c_ntohl_sys_param_h], + [CFLAGS="${save_CFLAGS} -Wall -Werror" + AC_TRY_COMPILE([#include ], + [void foo() { int meuh; ntohl(meuh); }], + ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)]) +if test x"$ac_cv_c_ntohl_sys_param_h" != x"no"; then + AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) +fi dnl Check for inline function size limit -CFLAGS="${save_CFLAGS} -finline-limit-20000" -AC_MSG_CHECKING([if \$CC accepts -finline-limit]) -AC_TRY_COMPILE([],, - save_CFLAGS="${save_CFLAGS} -finline-limit-20000"; AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) +AC_CACHE_CHECK([if \$CC accepts -finline-limit], + [ac_cv_c_inline_limit], + [CFLAGS="${save_CFLAGS} -finline-limit-30000" + AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)]) +if test x"$ac_cv_c_inline_limit" != x"no"; then + save_CFLAGS="${save_CFLAGS} -finline-limit-30000" +fi dnl Check for Darwin plugin linking flags -CFLAGS="${save_CFLAGS} -bundle -undefined suppress" -AC_MSG_CHECKING([if \$CC accepts -bundle -undefined suppress]) -AC_TRY_COMPILE([],, - PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) +AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error], + [ac_cv_ld_darwin], + [CFLAGS="${save_CFLAGS} -bundle -undefined error" + AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) +if test x"$ac_cv_ld_darwin" != x"no"; then + PLCFLAGS="${PLCFLAGS} -bundle -undefined error" +fi dnl Check for standard plugin linking flags -CFLAGS="${save_CFLAGS} -shared" -AC_MSG_CHECKING([if \$CC accepts -shared]) -AC_TRY_COMPILE([],, - PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - -dnl Check for standard soname setting -if test x"${SOFLAGS}" = x; then - try_SOFLAGS="-Wl,-soname -Wl," - LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" - AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0]) - AC_TRY_LINK([],, - SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) +AC_CACHE_CHECK([if \$CC accepts -shared], + [ac_cv_ld_plugins], + [CFLAGS="${save_CFLAGS} -shared" + AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)]) +if test x"$ac_cv_ld_plugins" != x"no"; then + PLCFLAGS="${PLCFLAGS} -shared" fi - -dnl Check for SunOS soname setting + +dnl Check for soname setting if test x"${SOFLAGS}" = x; then - try_SOFLAGS="-Wl,-h -Wl," - LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" - AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0]) - AC_TRY_LINK([],, - SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) + AC_CACHE_CHECK([for soname setting], + [ac_cv_ld_soname], + [ + # Standard + try_SOFLAGS="-Wl,-soname -Wl," + LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" + AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}", [ + # SunOS + try_SOFLAGS="-Wl,-h -Wl," + LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0" + AC_TRY_LINK([],,ac_cv_ld_soname="${try_SOFLAGS}", + ac_cv_ld_soname=none) + ])]) + if test x"$ac_cv_ld_soname" != x"none"; then + SOFLAGS=$ac_cv_ld_soname + else + echo " +------------ +Your system doesn't seem to have support for dynamic linking. You may +have problems using libdvdcss. +------------ +" + fi fi -dnl End of the bizarre compilation tests -CFLAGS="${save_CFLAGS}" -LDFLAGS="${save_LDFLAGS}" - -dnl Check for boolean_t -AC_MSG_CHECKING([for boolean_t in sys/types.h]) -AC_TRY_COMPILE([#include -void quux() { boolean_t foo; }],, - AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if defines boolean_t.) - AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) -AC_MSG_CHECKING([for boolean_t in pthread.h]) -AC_TRY_COMPILE([#include -void quux() { boolean_t foo; }],, - AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if defines boolean_t.) - AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) -AC_MSG_CHECKING([for boolean_t in cthreads.h]) -AC_TRY_COMPILE([#include -void quux() { boolean_t foo; }],, - AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if defines boolean_t.) - AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T -AC_HEADER_TIME - dnl Checks for __attribute__(aligned()) directive AC_CACHE_CHECK([__attribute__ ((aligned ())) support], [ac_cv_c_attribute_aligned], [ac_cv_c_attribute_aligned=0 + CFLAGS="${save_CFLAGS} -Werror" for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do AC_TRY_COMPILE([], [static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;], @@ -201,6 +255,39 @@ if test x"$ac_cv_c_attribute_aligned" != x"0"; then [$ac_cv_c_attribute_aligned],[Maximum supported data alignment]) fi +dnl End of the bizarre compilation tests +CFLAGS="${save_CFLAGS}" +LDFLAGS="${save_LDFLAGS}" + +dnl Check for boolean_t +AC_CACHE_CHECK([for boolean_t in sys/types.h], + [ac_cv_c_boolean_t_sys_types_h], + [AC_TRY_COMPILE([#include ], [boolean_t foo;], + ac_cv_c_boolean_t_sys_types_h=yes, ac_cv_c_boolean_t_sys_types_h=no)]) +if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then + AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if defines boolean_t.) +fi + +AC_CACHE_CHECK([for boolean_t in pthread.h], + [ac_cv_c_boolean_t_pthread_h], + [AC_TRY_COMPILE([#include ], [boolean_t foo;], + ac_cv_c_boolean_t_pthread_h=yes, ac_cv_c_boolean_t_pthread_h=no)]) +if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then + AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if defines boolean_t.) +fi + +AC_CACHE_CHECK([for boolean_t in cthreads.h], + [ac_cv_c_boolean_t_cthreads_h], + [AC_TRY_COMPILE([#include ], [boolean_t foo;], + ac_cv_c_boolean_t_cthreads_h=yes, ac_cv_c_boolean_t_cthreads_h=no)]) +if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then + AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if defines boolean_t.) +fi + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T +AC_HEADER_TIME ARCH=${target_cpu} @@ -208,8 +295,8 @@ ARCH=${target_cpu} dnl dnl default modules dnl -BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix" -PLUGINS="${PLUGINS}" +BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec" +PLUGINS="${PLUGINS} ac3_spdif spu_dec" dnl dnl Accelerated modules @@ -222,44 +309,110 @@ ALTIVEC_MODULES="idctaltivec motionaltivec" AC_CACHE_CHECK([if \$CC groks MMX inline assembly], [ac_cv_mmx_inline], - [AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],, - ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) + [AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], + ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) if test x"$ac_cv_mmx_inline" != x"no"; then ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" fi AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly], [ac_cv_mmxext_inline], - [AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],, - ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)]) + [AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], + ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)]) if test x"$ac_cv_mmxext_inline" != x"no"; then ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}" fi AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly], [ac_cv_3dnow_inline], - [AC_TRY_COMPILE([void quux(){void *p;asm("pfadd %%mm1,%%mm2"::"r"(p));}],, - ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) + [AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], + ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) if test x"$ac_cv_3dnow_inline" != x"no"; then + AC_DEFINE(HAVE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.) ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}" fi AC_CACHE_CHECK([if \$CC groks SSE inline assembly], [ac_cv_sse_inline], - [AC_TRY_COMPILE([void quux(){void *p;asm("xorps %%xmm1,%%xmm2"::"r"(p));}],, - ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) + [AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], + ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) if test x"$ac_cv_sse_inline" != x"no"; then + AC_DEFINE(HAVE_SSE, 1, Define if \$CC groks SSE inline assembly.) ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi AC_CACHE_CHECK([if \$CC groks Altivec inline assembly], [ac_cv_altivec_inline], - [AC_TRY_COMPILE([void quux(){asm("mtspr 256,%0"::"r"(-1));}],, - ac_cv_altivec_inline=yes, ac_cv_altivec_inline=no)]) + [AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], + ac_cv_altivec_inline=yes, + [save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Wa,-m7400" + AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], + [ac_cv_altivec_inline=yes; CFLAGS_ALTIVEC="-Wa,-m7400"], + ac_cv_altivec_inline=no) + CFLAGS=$save_CFLAGS + ])]) if test x"$ac_cv_altivec_inline" != x"no"; then + AC_DEFINE(HAVE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.) + ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" +fi + +AC_CACHE_CHECK([if \$CC groks Altivec C extensions], + [ac_cv_c_altivec], + [save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -faltivec" + # Darwin test + AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], + ac_cv_c_altivec=-faltivec, [ + # Linux/PPC test + CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec" + AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], + [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no) + ]) + CFLAGS=$save_CFLAGS + ]) +if test x"$ac_cv_c_altivec" != x"no"; then + AC_DEFINE(HAVE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.) + CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_c_altivec" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi +AC_CACHE_CHECK([if linker needs -framework vecLib], + [ac_cv_ld_altivec], + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -framework vecLib" + AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no) + LDFLAGS=$save_LDFLAGS + ]) +if test x"$ac_cv_ld_altivec" != x"no"; then + LIB_ALTIVEC="-framework vecLib" +fi + +dnl +dnl Check the operating system +dnl +case ${target_os} in + bsdi*) + SYS=bsdi + ;; + darwin*) + SYS=darwin + ;; + *mingw32*) + SYS=mingw32 + ;; + *) + SYS=${target_os} + ;; +esac + +dnl +dnl Windoze specific section +dnl +if test $SYS = mingw32; then +AC_CHECK_TOOL(WINDRES, windres, :) +fi + dnl dnl libdvdcss: check for DVD ioctls dnl @@ -278,21 +431,24 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h) BSD_DVD_STRUCT=0 LINUX_DVD_STRUCT=0 + OPENBSD_DVD_STRUCT=0 dnl dnl Old FreeBSD: sys/cdio.h dnl - AC_EGREP_HEADER(dvd_struct,sys/dvdio.h,[ - AC_DEFINE(DVD_STRUCT_IN_SYS_DVDIO_H, 1, - Define if defines dvd_struct.) - BSD_DVD_STRUCT=1 + AC_EGREP_HEADER(dvd_struct,sys/cdio.h,[ + AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1, + Define if defines dvd_struct.) + AC_EGREP_HEADER(struct dvd_struct,sys/cdio.h,[ + BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1; OPENBSD_DVD_STRUCT=1]) ]) dnl dnl Newer FreeBSD: sys/dvdio.h dnl - AC_EGREP_HEADER(dvd_struct,sys/cdio.h,[ - AC_DEFINE(DVD_STRUCT_IN_SYS_CDIO_H, 1, - Define if defines dvd_struct.) - BSD_DVD_STRUCT=1 + AC_EGREP_HEADER(dvd_struct,sys/dvdio.h,[ + AC_DEFINE(DVD_STRUCT_IN_SYS_DVDIO_H, 1, + Define if defines dvd_struct.) + AC_EGREP_HEADER(struct dvd_struct,sys/dvdio.h,[ + BSD_DVD_STRUCT=1],[LINUX_DVD_STRUCT=1]) ]) dnl dnl Linux: linux/cdrom.h @@ -337,37 +493,41 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ if test x$LINUX_DVD_STRUCT = x1; then AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1, Define if Linux-like dvd_struct is defined.) + if test x$OPENBSD_DVD_STRUCT = x1; then + AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1, + Define if OpenBSD-like dvd_struct is defined.) + fi else if test x$BSD_DVD_STRUCT = x1; then AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1, - Define if BSD-like dvd_struct is defined.) + Define if FreeBSD-like dvd_struct is defined.) fi fi ]) - dnl -dnl Check the operating system +dnl Special arch tuning dnl -case ${_os} in - bsdi*) - SYS=bsdi - ;; - darwin*) - SYS=darwin - ;; - *) - SYS=${target_os} - ;; -esac +AC_ARG_WITH(tuning, +[ --with-tuning=[arch] Enable special tuning for an architecture + (default i686 on IA-32 and 750 on PPC)]) +if test "x$withval" != "x"; then + TUNING=$withval +else + if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xi486 -o x${target_cpu} = xi386; then TUNING="pentiumpro" + else + if test x${target_cpu} = xpowerpc; then TUNING="750"; fi + fi +fi dnl -dnl PentiumPro acceleration +dnl Enable release-specific flags dnl -AC_ARG_ENABLE(ppro, - [ --disable-ppro Disable PentiumPro optimizations (default enabled for x86)], -[ if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi ], -[ if test x$ARCH = xi686; then ARCH="${ARCH} ppro"; fi ]) +AC_ARG_ENABLE(release, +[ --enable-release Activate extra optimizations (default disabled)], +[ if test x$enableval = xyes; then RELEASE=1; fi ], +[ VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`"; + LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ]) dnl dnl MMX acceleration @@ -397,14 +557,6 @@ AC_ARG_ENABLE(debug, [ --enable-debug Enable debug mode (default disabled)], [ if test x$enableval = xyes; then DEBUG=1; fi ]) -dnl -dnl Enable/disable statistics -dnl -STATS=0 -AC_ARG_ENABLE(stats, -[ --enable-stats Enable printing of statistics (default disabled)], -[ if test x$enableval = xyes; then STATS=1; fi ]) - dnl dnl Trace mode dnl @@ -462,7 +614,10 @@ NEED_LIBDVDCSS=0 STATIC_LIBDVDCSS=0 DUMMY_LIBDVDCSS=0 AC_ARG_WITH(dvdcss, - [ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')], + [ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', + or 'local-static', 'local-shared', or a path to + another libdvdcss such as '/usr/local' + (default 'local-static')], [ case "x${withval}" in xlocal-static|xyes) # local libdvdcss, statically linked @@ -528,6 +683,24 @@ AC_ARG_WITH(dvdcss, LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl" fi ]) +dnl +dnl VCD module +dnl +AC_ARG_ENABLE(vcd, + [ --enable-vcd VCD support for Linux (default enabled)]) + +if test x$enable_vcd != xno +then + AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ + BUILTINS="${BUILTINS} vcd" + ]) +fi + +if test x$enable_vcd != xno -a "${SYS}" = "bsdi" +then + BUILTINS="${BUILTINS} vcd" +fi + dnl dnl dummy plugin dnl @@ -573,11 +746,13 @@ else dnl dnl OSS /dev/dsp module +dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(dsp, [ --disable-dsp Linux /dev/dsp support (default enabled)]) -if test x$enable_dsp != xno +if test x$enable_dsp != xno && + (test $SYS != mingw32 || test x$enable_dsp = xyes) then if test -c /dev/dsp then @@ -596,15 +771,32 @@ AC_ARG_ENABLE(esd, if test x${ESD_CONFIG} != xno then PLUGINS="${PLUGINS} esd" + CFLAGS_ESD="`${ESD_CONFIG} --cflags`" LIB_ESD="`${ESD_CONFIG} --libs`" fi fi]) +dnl +dnl aRts module +dnl +AC_ARG_ENABLE(arts, + [ --enable-arts aRts sound server (default disabled)], + [if test x$enable_arts = xyes + then + AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) + if test x${ARTS_CONFIG} != xno + then + PLUGINS="${PLUGINS} arts" + CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`" + LIB_ARTS="`${ARTS_CONFIG} --libs `" + fi + fi]) + dnl dnl Darwin module dnl AC_ARG_ENABLE(darwin, - [ --enable-darwin Darwin sound support (default disabled)], + [ --enable-darwin Darwin sound support (default enabled on MacOS X)], [if test x$enable_darwin = xyes; then PLUGINS="${PLUGINS} darwin" LIB_DARWIN="-framework CoreAudio" @@ -614,28 +806,24 @@ dnl dnl MacOS X module dnl AC_ARG_ENABLE(macosx, - [ --enable-macosx Mac OS X interface support (default enabled in Mac OS X)], + [ --enable-macosx MacOS X support (default enabled on MacOS X)], [if test x$enable_macosx = xyes then BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL" - LIB_TS="${LIB_TS} -framework AGL -framework Carbon" - LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon" - LIB_ALTIVEC="-framework vecLib" + LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" + LIB="${LIB} -ObjC" fi], - [AC_CHECK_HEADERS(Carbon/Carbon.h, + [AC_CHECK_HEADERS(Cocoa/Cocoa.h, BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL" - LIB_TS="${LIB_TS} -framework AGL -framework Carbon" - LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon" - LIB_ALTIVEC="-framework vecLib" + LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" + LIB="${LIB} -ObjC" )]) dnl dnl QNX RTOS module dnl AC_ARG_ENABLE(qnx, - [ --disable-qnx QNX RTOS support (default enabled in QNX RTOS)]) + [ --disable-qnx QNX RTOS support (default enabled on QNX RTOS)]) if test x$enable_qnx != xno then AC_CHECK_HEADERS(Ph.h, [ @@ -729,28 +917,43 @@ fi dnl dnl Windows DirectX module dnl -AC_ARG_WITH(directx, - [ --with-directx[=name] Windows DirectX support (default enabled)], - [ if test "x$withval" != "xno" +AC_ARG_ENABLE(directx, + [ --disable-directx Windows DirectX support (default enabled on WIN32)], + [ if test "x$enableval" != "xno" then PLUGINS="${PLUGINS} directx" - if test "x$withval" != "xyes" + if test "x$enableval" = "xyes" then + AC_ARG_WITH(directx, + [--with-directx=[name] Windows DirectX support (default enabled)]) + if test "x$withval" = "x" + then + AC_CHECK_HEADERS(directx.h, [LIB_DIRECTX="-lgdi32 -ldxguid"], + AC_MSG_ERROR([Cannot find DirectX headers !])) + else LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid" INCLUDE="${INCLUDE} -I"$withval"/include" + fi else - AC_CHECK_HEADERS(directx.h, , - AC_MSG_ERROR([Cannot find DirectX headers !]) - ) - LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid" + AC_MSG_CHECKING(for directX headers in ${enableval}) + if test -f ${enableval}/include/directx.h + then + LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid" + INCLUDE="${INCLUDE} -I${enableval}/include" + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([Cannot find ${enableval}/include/directx.h!]) + fi fi - fi ]) - if test "x$withval" = "x" + fi ], + [ if test $SYS = mingw32 then AC_CHECK_HEADERS(directx.h, - [PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"]) - fi + [ PLUGINS="${PLUGINS} directx" + LIB_DIRECTX="-lgdi32 -ldxguid" ], + [ echo "Cannot find DirectX headers !" ]) + fi ]) dnl dnl Glide module @@ -846,8 +1049,15 @@ AC_ARG_ENABLE(gtk, [ --disable-gtk Gtk+ support (default enabled)]) if test x$enable_gtk != xno then + GTK_PATH=$PATH + AC_ARG_WITH(gtk-config-path, + [ --with-gtk-config-path=path gtk-config path (default search in \$PATH)], + [ if test "x$withval" != "xno" + then + GTK_PATH=$withval:$PATH + fi ]) # look for gtk-config - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH) if test -x ${GTK_CONFIG} then CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`" @@ -865,10 +1075,12 @@ fi dnl dnl X11 module +dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(x11, [ --disable-x11 X11 support (default enabled)]) -if test x$enable_x11 != xno; then +if test x$enable_x11 != xno && + (test $SYS != mingw32 || test x$enable_x11 = xyes); then if test x$x_includes = xNONE; then x_includes=/usr/X11R6/include fi @@ -887,10 +1099,12 @@ fi dnl dnl XVideo module +dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(xvideo, [ --disable-xvideo XVideo support (default enabled)]) -if test x$enable_xvideo != xno; then +if test x$enable_xvideo != xno && + (test $SYS != mingw32 || test x$enable_xvideo = xyes); then if test x$x_includes = xNONE; then x_includes=/usr/X11R6/include fi @@ -900,7 +1114,7 @@ if test x$enable_xvideo != xno; then saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ - PLUGINS="${PLUGINS} xvideo" + BUILTINS="${BUILTINS} xvideo" LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv" CFLAGS_X11="-I$x_includes" ] @@ -911,7 +1125,8 @@ dnl dnl ALSA module dnl AC_ARG_ENABLE(alsa, - [ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)], + [ --enable-alsa Alsa sound drivers support (Only for linux) + (default disabled)], [if test x$enable_alsa = xyes then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") @@ -925,6 +1140,18 @@ AC_ARG_ENABLE(alsa, dnl end of non-BeOS stuff fi +dnl +dnl Plug-ins - this must be AT THE END +dnl +AC_ARG_ENABLE(plugins, + [ --disable-plugins Make all plug-ins built-in (default plug-ins enabled)], + [if test x$enable_plugins = xno + then + BUILTINS="${BUILTINS} ${PLUGINS}" + PLUGINS= + fi]) + + dnl dnl Configuration is finished dnl @@ -936,12 +1163,13 @@ AC_SUBST(ALIASES) AC_SUBST(DEFINE) AC_SUBST(INCLUDE) AC_SUBST(DEBUG) -AC_SUBST(STATS) AC_SUBST(ASM) AC_SUBST(TRACE) AC_SUBST(CPROF) AC_SUBST(GPROF) AC_SUBST(OPTIMS) +AC_SUBST(TUNING) +AC_SUBST(RELEASE) AC_SUBST(NEED_GETOPT) AC_SUBST(MOC) AC_SUBST(WINDRES) @@ -952,6 +1180,8 @@ AC_SUBST(SOFLAGS) AC_SUBST(LIB) AC_SUBST(LIB_ALSA) +AC_SUBST(LIB_ALTIVEC) +AC_SUBST(LIB_ARTS) AC_SUBST(LIB_BEOS) AC_SUBST(LIB_DARWIN) AC_SUBST(LIB_DVD) @@ -961,7 +1191,6 @@ AC_SUBST(LIB_GGI) AC_SUBST(LIB_GLIDE) AC_SUBST(LIB_GNOME) AC_SUBST(LIB_GTK) -AC_SUBST(LIB_ALTIVEC) AC_SUBST(LIB_LIBDVDCSS) AC_SUBST(LIB_KDE) AC_SUBST(LIB_MACOSX) @@ -976,8 +1205,11 @@ AC_SUBST(LIB_XVIDEO) AC_SUBST(LIB_YUV) AC_SUBST(CFLAGS_VLC) +AC_SUBST(CFLAGS_ALTIVEC) AC_SUBST(CFLAGS_DVD) AC_SUBST(CFLAGS_LIBDVDCSS) +AC_SUBST(CFLAGS_ARTS) +AC_SUBST(CFLAGS_ESD) AC_SUBST(CFLAGS_GTK) AC_SUBST(CFLAGS_SDL) AC_SUBST(CFLAGS_X11) @@ -994,7 +1226,9 @@ global configuration -------------------- system : ${SYS} architecture : ${ARCH} -optimizations : ${OPTIMS}" +optimizations : ${OPTIMS} +tuning: : ${TUNING} +release: : ${RELEASE}" if test x${HAVE_VLC} = x1 then @@ -1003,12 +1237,11 @@ vlc configuration ----------------- vlc version : ${VLC_VERSION} debug mode : ${DEBUG} -statistics : ${STATS} trace mode : ${TRACE} cprof/gprof support : ${CPROF}/${GPROF} need builtin getopt : ${NEED_GETOPT} built-in modules :${BUILTINS} -plugin modules :${PLUGINS} +plug-in modules :${PLUGINS} vlc aliases :${ALIASES}" fi