X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=b0f0641db86d1131509670281d73466f936c4f37;hb=a7592866a083dec4ef8e1d22b26a40a37e1bba30;hp=a607ad89161427e849def69726073b820eee18fb;hpb=36ac7f925aafbaca7b7145c77cf24eb3bf46385b;p=vlc diff --git a/configure.in b/configure.in index a607ad8916..b0f0641db8 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.92-dev" 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.1-dev" 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,16 +31,82 @@ dnl Check for tools AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP -AC_PROG_RANLIB +AC_CHECK_TOOL(RANLIB, ranlib, :) + +dnl Gettext stuff +ALL_LINGUAS="de fr ru" +PACKAGE="vlc" +VERSION="$VLC_VERSION" + +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AM_GNU_GETTEXT dnl AM_PROG_LIBTOOL AC_PROG_INSTALL -dnl Check for endianness -dnl if we cross compile for win32, we don't need to test it. -dnl quick and udly hack. Gonna search the way to do it better. -if eval "test $CC = gcc"; then -AC_C_BIGENDIAN +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 @@ -75,6 +144,7 @@ AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], AC_FUNC_MMAP AC_TYPE_SIGNAL AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl") +AC_CHECK_LIB(m,cos,LIB_IMDCT="${LIB_IMDCT} -lm") AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm") dnl Check for pthreads - borrowed from XMMS @@ -106,7 +176,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) @@ -177,7 +247,22 @@ Your system doesn't seem to have support for dynamic linking. You may have problems using libdvdcss. ------------ " - fi + fi +fi + +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;], + [ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try]) + done]) +if test x"$ac_cv_c_attribute_aligned" != x"0"; then + AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], + [$ac_cv_c_attribute_aligned],[Maximum supported data alignment]) fi dnl End of the bizarre compilation tests @@ -187,7 +272,7 @@ 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 ], [void quux() { boolean_t foo; }], + [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.) @@ -195,7 +280,7 @@ fi AC_CACHE_CHECK([for boolean_t in pthread.h], [ac_cv_c_boolean_t_pthread_h], - [AC_TRY_COMPILE([#include ], [void quux() { boolean_t foo; }], + [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.) @@ -203,7 +288,7 @@ fi AC_CACHE_CHECK([for boolean_t in cthreads.h], [ac_cv_c_boolean_t_cthreads_h], - [AC_TRY_COMPILE([#include ], [void quux() { boolean_t foo; }], + [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.) @@ -214,83 +299,75 @@ 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 - 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;], - [ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try]) - done]) -if test x"$ac_cv_c_attribute_aligned" != x"0"; then - AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], - [$ac_cv_c_attribute_aligned],[Maximum supported data alignment]) -fi - - ARCH=${target_cpu} dnl dnl default modules dnl -BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix" -PLUGINS="${PLUGINS}" +#BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy yuv2rgb8 idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec" +BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec" +PLUGINS="${PLUGINS} ac3_spdif spudec" dnl dnl Accelerated modules dnl -MMX_MODULES="yuvmmx idctmmx motionmmx" -MMXEXT_MODULES="idctmmxext motionmmxext" -THREEDNOW_MODULES="imdct3dn downmix3dn" +MMX_MODULES="memcpymmx idctmmx motionmmx" +MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext" +THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn" SSE_MODULES="imdctsse downmixsse" 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(CAN_COMPILE_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(CAN_COMPILE_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_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], ac_cv_altivec_inline=yes, [save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" - AC_TRY_COMPILE(,[void quux(){asm("mtspr 256,%0"::"r"(-1));}], - [ac_cv_altivec_inline=yes; CFLAGS_ALTIVEC="-Wa,-m7400"], - ac_cv_altivec_inline=no) + AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], + [ac_cv_altivec_inline="-Wa,-m7400"], + ac_cv_altivec_inline=no) CFLAGS=$save_CFLAGS ])]) if test x"$ac_cv_altivec_inline" != x"no"; then + AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.) + if test x"$ac_cv_altivec_inline" != x"yes"; then + CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_altivec_inline" + fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -299,18 +376,19 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions], [save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -faltivec" # Darwin test - AC_TRY_COMPILE(,[void quux(){vec_mtvscr((vector unsigned int)(0));}], + 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(,[void quux(){vec_mtvscr((vector unsigned int)(0));}], + 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.) + AC_DEFINE(CAN_COMPILE_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], @@ -324,6 +402,41 @@ 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 + linux*) + SYS=linux + ;; + bsdi*) + SYS=bsdi + ;; + darwin*) + SYS=darwin + ;; + *mingw32*) + SYS=mingw32 + ;; + *nto*) + SYS=nto + LIB_X11="${LIB_X11} -lsocket" + LIB_XVIDEO="${LIB_XVIDEO} -lsocket" + ;; + *) + SYS=${target_os} + ;; +esac + +dnl +dnl Windoze specific section +dnl +if test $SYS = mingw32; then +AC_CHECK_TOOL(WINDRES, windres, :) +LIB_MPEG_TS="-lws2_32" +LIB_RC="-lws2_32" +fi + dnl dnl libdvdcss: check for DVD ioctls dnl @@ -342,21 +455,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 @@ -401,10 +517,14 @@ 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 ]) @@ -434,12 +554,21 @@ AC_ARG_WITH(tuning, if test "x$withval" != "x"; then TUNING=$withval else - if test x$ARCH = xi686; then TUNING="pentiumpro" + 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$ARCH = ppc; then TUNING="750"; fi + if test x${target_cpu} = xpowerpc; then TUNING="750"; fi fi fi +dnl +dnl Enable release-specific flags +dnl +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 dnl @@ -594,6 +723,38 @@ AC_ARG_WITH(dvdcss, LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl" fi ]) +dnl +dnl DVDREAD module: check for libdvdread plugin +dnl +AC_ARG_ENABLE(dvdread, +[ --enable-dvdread Enable dvdread support (default disabled)], +[ if test x$enableval = xyes + then + NEED_LIBDVDCSS=1 + STATIC_LIBDVDCSS=1 + BUILTINS="${BUILTINS} dvdread" + CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread" + LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a lib/libdvdcss.a" + 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 @@ -620,13 +781,42 @@ dnl dnl rc plugin dnl AC_ARG_ENABLE(rc, - [ --disable-rc rc module (default enabled)]) + [ --disable-rc Remote Control module (default enabled)]) if test x$enable_rc != xno then BUILTINS="${BUILTINS} rc" fi +dnl +dnl mad plugin +dnl +AC_ARG_WITH(mad, + [ --with-mad[=PATH] libmad module (default disabled)], + [ if test "x$with_val" != "xno"; then + if test -n $with_val; then + CFLAGS_MAD="-I$with_val/include" + LIB_MAD="-L$with_val/lib -lmad" + else + LIB_MAD="-lmad" + fi + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $CFLAGS_MAD" + LDFLAGS="$LDFLAGS $LIB_MAD" + AC_CHECK_HEADERS(mad.h, , + [ echo "Cannot find development headers for libmad..." + exit 1 + ]) + AC_CHECK_LIB(mad, mad_bit_init, , + [ echo "Cannot find libmad library..." + exit 1 + ]) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + PLUGINS="${PLUGINS} mad" + fi ]) + dnl special case for BeOS if test x$SYS = xbeos then @@ -639,11 +829,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 @@ -662,18 +854,25 @@ 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 Darwin module +dnl aRts module dnl -AC_ARG_ENABLE(darwin, - [ --enable-darwin Darwin sound support (default enabled on MacOS X)], - [if test x$enable_darwin = xyes; then - PLUGINS="${PLUGINS} darwin" - LIB_DARWIN="-framework CoreAudio" +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 @@ -684,15 +883,13 @@ AC_ARG_ENABLE(macosx, [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_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_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" + LIB="${LIB} -ObjC" )]) dnl @@ -793,28 +990,34 @@ 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 + if test $SYS = mingw32 + then + AC_ARG_WITH(directx-path, + [ --with-directx-path=path Windows DirectX headers and libraries]) + if test "x$with_directx_path" = "x" then - PLUGINS="${PLUGINS} directx" - if test "x$withval" != "xyes" + AC_CHECK_HEADERS(directx.h, + [ PLUGINS="${PLUGINS} directx" + LIB_DIRECTX="-lgdi32 -ldxguid" ]) + else + AC_MSG_CHECKING(for directX headers in ${withval}) + if test -f ${withval}/include/directx.h then - LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid" - INCLUDE="${INCLUDE} -I"$withval"/include" + PLUGINS="${PLUGINS} directx" + LIB_DIRECTX="-L${withval}/lib -lgdi32 -ldxguid" + INCLUDE="${INCLUDE} -I${withval}/include" + AC_MSG_RESULT(yes) else - AC_CHECK_HEADERS(directx.h, , - AC_MSG_ERROR([Cannot find DirectX headers !]) - ) - LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid" + AC_MSG_RESULT(no) + AC_MSG_ERROR([Cannot find ${withval}/include/directx.h!]) fi - fi ]) - if test "x$withval" = "x" - then - AC_CHECK_HEADERS(directx.h, - [PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"]) fi + fi +fi dnl dnl Glide module @@ -910,8 +1113,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`" @@ -920,19 +1130,27 @@ then # now look for the gtk.h header saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" - AC_CHECK_HEADERS(gtk/gtk.h, [ + FOUND= + AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , + [ + FOUND=no + echo "Cannot find gtk development headers." + ]) + if test -z $FOUND; then PLUGINS="${PLUGINS} gtk" ALIASES="${ALIASES} gvlc" - ]) + fi CPPFLAGS=$saved_CPPFLAGS 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 @@ -942,7 +1160,7 @@ if test x$enable_x11 != xno; then saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/Xlib.h, [ - PLUGINS="${PLUGINS} x11" + #PLUGINS="${PLUGINS} x11" LIB_X11="-L$x_libraries -lX11 -lXext" CFLAGS_X11="-I$x_includes" ] @@ -951,10 +1169,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 @@ -964,7 +1184,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" ] @@ -979,7 +1199,7 @@ AC_ARG_ENABLE(alsa, (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") + AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test x$have_alsa = xtrue then PLUGINS="${PLUGINS} alsa" @@ -1019,9 +1239,12 @@ 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) +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) AC_SUBST(LCFLAGS) AC_SUBST(PLCFLAGS) @@ -1030,24 +1253,29 @@ 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_DIRECTX) AC_SUBST(LIB_DVD) AC_SUBST(LIB_DVD_PLUGIN) +AC_SUBST(LIB_DVDREAD) +AC_SUBST(LIB_DVDREAD_PLUGIN) AC_SUBST(LIB_ESD) AC_SUBST(LIB_GGI) AC_SUBST(LIB_GLIDE) AC_SUBST(LIB_GNOME) AC_SUBST(LIB_GTK) -AC_SUBST(LIB_LIBDVDCSS) AC_SUBST(LIB_KDE) +AC_SUBST(LIB_LIBDVDCSS) AC_SUBST(LIB_MACOSX) -AC_SUBST(LIB_QNX) +AC_SUBST(LIB_MAD) +AC_SUBST(LIB_MPEG_TS) AC_SUBST(LIB_NCURSES) +AC_SUBST(LIB_QNX) AC_SUBST(LIB_QT) -AC_SUBST(LIB_TS) +AC_SUBST(LIB_RC) AC_SUBST(LIB_SDL) -AC_SUBST(LIB_DIRECTX) AC_SUBST(LIB_X11) AC_SUBST(LIB_XVIDEO) AC_SUBST(LIB_YUV) @@ -1055,8 +1283,12 @@ AC_SUBST(LIB_YUV) AC_SUBST(CFLAGS_VLC) AC_SUBST(CFLAGS_ALTIVEC) AC_SUBST(CFLAGS_DVD) +AC_SUBST(CFLAGS_DVDREAD) AC_SUBST(CFLAGS_LIBDVDCSS) +AC_SUBST(CFLAGS_ARTS) +AC_SUBST(CFLAGS_ESD) AC_SUBST(CFLAGS_GTK) +AC_SUBST(CFLAGS_MAD) AC_SUBST(CFLAGS_SDL) AC_SUBST(CFLAGS_X11) @@ -1065,7 +1297,8 @@ AC_SUBST(OBJ_LIBDVDCSS) AC_SUBST(NEED_LIBDVDCSS) -AC_OUTPUT([Makefile.opts include/config.h]) +AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in]) +#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in]) echo " global configuration @@ -1073,7 +1306,8 @@ global configuration system : ${SYS} architecture : ${ARCH} optimizations : ${OPTIMS} -tuning: : ${TUNING}" +tuning: : ${TUNING} +release: : ${RELEASE}" if test x${HAVE_VLC} = x1 then