X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=6d97190aeced8e7c164ee3b55f1294fdec25b589;hb=37759cf5b60693275a264209bdb98b558ae4846a;hp=c8ee0f1d0f8204ed8865bf5c052b748390fce833;hpb=4d2a1b463b8a49529c8327acd1af76faf13db5a5;p=vlc diff --git a/configure.in b/configure.in index c8ee0f1d0f..6d97190aec 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Autoconf settings for vlc and libdvdcss -AC_INIT(include/common.h) +AC_INIT(include/main.h) AC_CONFIG_HEADER(include/defs.h) AC_CANONICAL_SYSTEM @@ -8,9 +8,7 @@ HAVE_VLC=0 if test -r src/interface/main.c; then HAVE_VLC=1 VLC_VERSION="0.2.92-dev" - AC_SUBST(VLC_VERSION) VLC_CODENAME=Ourumov - AC_SUBST(VLC_CODENAME) fi HAVE_LIBDVDCSS=0 @@ -31,30 +29,25 @@ dnl Check for tools AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP -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") +AC_DEFINE_UNQUOTED(PACKAGE, "vlc") +AC_DEFINE_UNQUOTED(VERSION, "$VLC_VERSION") AM_GNU_GETTEXT dnl AM_PROG_LIBTOOL AC_PROG_INSTALL dnl -dnl Endianness check, with a special test for cross-compilation +dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling 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)]) +dnl We give the user the opportunity to specify +dnl --with-words=big or --with-words=little ; otherwise, try to guess +dnl +AC_ARG_WITH(words, + [ --with-words=endianness Set endianness (big or little)]) case "x$withval" in xbig) ac_cv_c_bigendian=yes @@ -107,11 +100,9 @@ EOF fi ;; esac -fi dnl Check for system libs needed -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol) -AC_CHECK_FUNCS(setenv putenv) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty) AC_CHECK_FUNC(connect,,[ AC_CHECK_LIB(socket,connect,LIB="${LIB} -lsocket") ]) @@ -141,11 +132,16 @@ AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"], [NEED_GETOPT=1])]) -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") +AC_CHECK_LIB(m,cos, + LIB_IMDCT="${LIB_IMDCT} -lm" + LIB_FILTER_DISTORT="${LIB_FILTER_DISTORT} -lm") +AC_CHECK_LIB(m,pow, + LIB_IMDCT="${LIB_IMDCT} -lm" + LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm" + LIB_IMDCTSSE="${LIB_IMDCTSSE} -lm" +) dnl Check for pthreads - borrowed from XMMS THREAD_LIB=error @@ -175,13 +171,15 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ Define if defines strncasecmp.)]) dnl Check for headers -AC_CHECK_HEADERS(stddef.h getopt.h strings.h) +AC_CHECK_HEADERS(getopt.h strings.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) AC_CHECK_HEADERS(machine/param.h) +AC_HEADER_TIME + dnl Check for threads library AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) @@ -211,7 +209,7 @@ AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error], [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" + PLDFLAGS="${PLDFLAGS} -bundle -undefined error" fi dnl Check for standard plugin linking flags @@ -220,7 +218,7 @@ AC_CACHE_CHECK([if \$CC accepts -shared], [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" + PLDFLAGS="${PLDFLAGS} -shared" fi dnl Check for soname setting @@ -254,7 +252,7 @@ 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" + 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;], @@ -294,25 +292,28 @@ 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} +dnl +dnl Check the CPU +dnl +case x"${target_cpu}" in + x) + ARCH=unknown + ;; + *) + ARCH=${target_cpu} + ;; +esac dnl dnl default modules dnl -#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" +BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec lpcm_adec ac3_adec mpeg_vdec" +PLUGINS="${PLUGINS} ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort" dnl dnl Accelerated modules dnl -MMX_MODULES="memcpymmx idctmmx motionmmx" +MMX_MODULES="memcpymmx idctmmx motionmmx chroma_i420_rgb_mmx chroma_i420_yuy2_mmx chroma_i422_yuy2_mmx chroma_i420_ymga_mmx" MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext" THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn" SSE_MODULES="imdctsse downmixsse" @@ -366,7 +367,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec inline assembly], 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" + CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline" + CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline" + CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline" fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -379,7 +382,7 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions], AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], ac_cv_c_altivec=-faltivec, [ # Linux/PPC test - CFLAGS="$save_CFLAGS $CFLAGS_ALTIVEC -fvec" + CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec" AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no) ]) @@ -387,7 +390,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions], ]) if test x"$ac_cv_c_altivec" != x"no"; then AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.) - CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_c_altivec" + CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec" + CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec" + CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -399,43 +404,66 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS=$save_LDFLAGS ]) if test x"$ac_cv_ld_altivec" != x"no"; then - LIB_ALTIVEC="-framework vecLib" + LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib" + LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib" + LIB="${LIB} -framework vecLib" fi dnl dnl Check the operating system dnl -case ${target_os} in - linux*) +case x"${target_os}" in + x) + SYS=unknown + ;; + xlinux*) SYS=linux - ;; - bsdi*) + ;; + xbsdi*) SYS=bsdi ;; - darwin*) + xdarwin*) SYS=darwin ;; - *mingw32*) + x*mingw32*) SYS=mingw32 + AC_CHECK_TOOL(WINDRES, windres, :) + LIB_MPEG_TS="-lws2_32" + LIB_RC="-lws2_32" ;; - *nto*) + x*nto*) SYS=nto LIB_X11="${LIB_X11} -lsocket" LIB_XVIDEO="${LIB_XVIDEO} -lsocket" ;; - *) + xbeos) + SYS=beos + LIB="${LIB} -lbe" + LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" + PLDFLAGS="${PLDFLAGS} -nostart" + ;; + x*) SYS=${target_os} ;; esac dnl -dnl Windoze specific section +dnl DVD and VCD devices dnl -if test $SYS = mingw32; then -AC_CHECK_TOOL(WINDRES, windres, :) -LIB_MPEG_TS="-lws2_32" -LIB_RC="-lws2_32" -fi +case $SYS in + mingw32) + DVD_DEVICE="E:" + VCD_DEVICE="E:" + ;; + *) + DVD_DEVICE="/dev/dvd" + VCD_DEVICE="/dev/cdrom" + ;; +esac + +AC_DEFINE_UNQUOTED(DVD_DEVICE, "$DVD_DEVICE") +AC_DEFINE_UNQUOTED(VCD_DEVICE, "$VCD_DEVICE") + dnl dnl libdvdcss: check for DVD ioctls @@ -499,7 +527,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ NEED_BSDI_LIBDVD=1 AC_DEFINE(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H, 1, Define if defines DVD_STRUCT.) - OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o" + SRC_DVDCSS_EXTRA="${SRC_DVDCSS_EXTRA} bsdi_dvdioctl.c" LINUX_DVD_STRUCT=1 ]) ]) @@ -512,6 +540,14 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ ]) ]) dnl + dnl HP-UX: sys/scsi.h + dnl + AC_CHECK_HEADER(sys/scsi.h,[ + AC_EGREP_HEADER(sctl_io,sys/scsi.h,[ + AC_DEFINE(HPUX_SCTL_IO, 1, Define if defines sctl_io.) + ]) + ]) + dnl dnl Final tests to check what was detected dnl if test x$LINUX_DVD_STRUCT = x1; then @@ -529,7 +565,6 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ fi ]) - dnl dnl Special arch tuning dnl @@ -555,14 +590,13 @@ AC_ARG_ENABLE(release, LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ]) dnl -dnl MMX acceleration +dnl x86 accelerations dnl -AC_ARG_ENABLE(mmx, -[ --disable-mmx Disable MMX optimizations (default enabled for x86)], -[ if test x$enableval = xyes; then ARCH="${ARCH} mmx"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ], -[ if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386; then ARCH="${ARCH} mmx"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ]) +if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386 +then + ARCH="${ARCH} mmx" + BUILTINS="${BUILTINS} ${ACCEL_MODULES}" +fi dnl dnl AltiVec acceleration @@ -654,6 +688,7 @@ AC_ARG_WITH(dvdcss, CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" fi ;; xlocal-shared) @@ -665,17 +700,19 @@ AC_ARG_WITH(dvdcss, CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" LIB_DVD="${LIB_DVD} -Llib -ldvdcss" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -L../../lib -ldvdcss" fi ;; xno) # don't use libdvdcss at all, build a DVD module that can dlopen() it DUMMY_LIBDVDCSS=1 BUILTINS="${BUILTINS} dvd" - OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o" + SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c" CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" CFLAGS_DVD="${CFLAGS_DVD} -DLIBDVDCSS_VERSION=\"${LIBDVDCSS_VERSION}\"" LIB_DVD="${LIB_DVD} -ldl" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -ldl" ;; *) # existing libdvdcss @@ -683,10 +720,12 @@ AC_ARG_WITH(dvdcss, if test "x$withval" != "xyes" then LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L"$withval"/lib" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -L"$withval"/lib" CFLAGS_DVD="${CFLAGS_DVD} -I"$withval"/include" fi LIB_DVD="${LIB_DVD} -ldvdcss" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -ldvdcss" esac ], # user didn't decide, we choose to use local libdvdcss and link statically # if libdvdcss is in the archive, or to use the dummy replacement otherwise. @@ -698,14 +737,16 @@ AC_ARG_WITH(dvdcss, CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss" LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}" else # XXX: no check for libdl is done, don't try this at home ! DUMMY_LIBDVDCSS=1 BUILTINS="${BUILTINS} dvd" - OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o" + SRC_DVD_EXTRA="${SRC_DVD_EXTRA} dummy_dvdcss.c" CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" LIB_DVD="${LIB_DVD} -ldl" LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl" + LIB_DVDREAD_PLUGIN="${LIB_DVDREAD_PLUGIN} -ldl" fi ]) dnl @@ -780,7 +821,7 @@ 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" + CFLAGS_MAD="-I$with_val/include" LIB_MAD="-L$with_val/lib -lmad" else LIB_MAD="-lmad" @@ -806,8 +847,6 @@ dnl special case for BeOS if test x$SYS = xbeos then BUILTINS="${BUILTINS} beos" - LIB_BEOS="-lbe -lgame -lroot -ltracker" - PLCFLAGS="${PLCFLAGS} -nostart" dnl default case else @@ -868,12 +907,14 @@ AC_ARG_ENABLE(macosx, [if test x$enable_macosx = xyes then BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" + LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc" + CFLAGS_MACOSX="-ObjC" LIB="${LIB} -ObjC" fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime" + LIB_MACOSX="-framework CoreAudio -framework Cocoa -framework AGL -framework QuickTime -lobjc" + CFLAGS_MACOSX="-ObjC" LIB="${LIB} -ObjC" )]) @@ -900,6 +941,16 @@ AC_ARG_ENABLE(fb, PLUGINS="${PLUGINS} fb" fi ]) +dnl +dnl Linux MGA module +dnl +AC_ARG_ENABLE(mga, + [ --enable-mga Linux kernel Matrox support (default disabled)], + [ if test x$enable_mga = xyes + then + PLUGINS="${PLUGINS} mga xmga" + fi ]) + dnl dnl GGI module dnl @@ -1018,6 +1069,7 @@ AC_ARG_WITH(glide, else LIB_GLIDE="-lglide2x -lm" fi + CFLAGS_GLIDE="-I/usr/include/glide" fi ]) dnl @@ -1039,6 +1091,7 @@ AC_ARG_ENABLE(qt, PLUGINS="${PLUGINS} qt" ALIASES="${ALIASES} qvlc" LIB_QT="-lqt -L${QTDIR}/lib" + CFLAGS_QT="-I/usr/include/qt -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -1055,7 +1108,9 @@ AC_ARG_ENABLE(kde, [if test x$enable_kde = xyes; then PLUGINS="${PLUGINS} kde" ALIASES="${ALIASES} kvlc" - LIB_KDE="-L${KDEDIR}/lib -lkfile" + LIB_KDE="${LIB_KDE} -L${KDEDIR}/lib -lkfile" + CFLAGS_KDE="${CFLAGS_KDE} -I/usr/include/kde -I/usr/include/qt" + CFLAGS_KDE="${CFLAGS_KDE} -I${KDEDIR}/include -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -1074,7 +1129,7 @@ AC_ARG_ENABLE(gnome, AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) if test -x ${GNOME_CONFIG} then - CFLAGS_GNOME="`${GNOME_CONFIG} --cflags gnomeui`" + CFLAGS_GNOME="`${GNOME_CONFIG} --cflags gtk gnomeui`" LIB_GNOME="`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" fi # now look for the gnome.h header @@ -1109,19 +1164,23 @@ then AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH) if test -x ${GTK_CONFIG} then + if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null + then + AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.]) + fi CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`" LIB_GTK="`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" fi # now look for the gtk.h header saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" - FOUND= - AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , - [ - FOUND=no - echo "Cannot find gtk development headers." + ac_cv_gtk_headers=yes + AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [ + ac_cv_gtk_headers=no + echo "Cannot find gtk development headers." ]) - if test -z $FOUND; then + if test "x$ac_cv_gtk_headers" = xyes + then PLUGINS="${PLUGINS} gtk" ALIASES="${ALIASES} gvlc" fi @@ -1145,9 +1204,9 @@ if test x$enable_x11 != xno && saved_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/Xlib.h, [ - #PLUGINS="${PLUGINS} x11" - LIB_X11="-L$x_libraries -lX11 -lXext" - CFLAGS_X11="-I$x_includes" + PLUGINS="${PLUGINS} x11" + LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext" + CFLAGS_X11="${CFLAGS_X11} -I$x_includes" ] CPPFLAGS=$saved_CPPFLAGS) fi @@ -1170,8 +1229,8 @@ if test x$enable_xvideo != xno && CPPFLAGS="$CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ BUILTINS="${BUILTINS} xvideo" - LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv" - CFLAGS_X11="-I$x_includes" + LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv" + CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes" ] CPPFLAGS=$saved_CPPFLAGS) fi @@ -1188,7 +1247,7 @@ AC_ARG_ENABLE(alsa, if test x$have_alsa = xtrue then PLUGINS="${PLUGINS} alsa" - LIB_ALSA="-lasound" + LIB_ALSA="-lasound -lm -ldl" fi fi]) @@ -1206,6 +1265,31 @@ AC_ARG_ENABLE(plugins, PLUGINS= fi]) +dnl +dnl DLLs - used for Win32 package build +dnl +DLL_PATH=. +AC_ARG_WITH(dll-path, + [ --with-dll-path=path Path to Win32 DLLs (default search in \$PWD)], + [ if test "x$withval" != "xno" + then + DLL_PATH=$withval + fi ]) + +dnl +dnl Stuff used by the program +dnl +AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VLC_VERSION $VLC_CODENAME Copyright 1996-2001 VideoLAN\n") +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VLC_VERSION $VLC_CODENAME - (c) 1996-2002 VideoLAN") + +VLC_SYMBOL="`echo ${VLC_VERSION} | tr .- __`" +AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_$VLC_SYMBOL") +AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $VLC_SYMBOL) + +DATA_PATH="${ac_tool_prefix}/share/videolan" +AC_SUBST(DATA_PATH) +PLUGIN_PATH="${ac_tool_prefix}/share/videolan" +AC_SUBST(PLUGIN_PATH) dnl dnl Configuration is finished @@ -1225,19 +1309,20 @@ AC_SUBST(GPROF) AC_SUBST(OPTIMS) AC_SUBST(TUNING) AC_SUBST(RELEASE) -AC_SUBST(NEED_GETOPT) AC_SUBST(MOC) AC_SUBST(WINDRES) +AC_SUBST(DLL_PATH) AC_SUBST(PACKAGE) AC_SUBST(VERSION) +AC_SUBST(VCD_DEVICE) +AC_SUBST(DVD_DEVICE) -AC_SUBST(LCFLAGS) -AC_SUBST(PLCFLAGS) +AC_SUBST(LDFLAGS) +AC_SUBST(PLDFLAGS) 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) @@ -1247,14 +1332,20 @@ AC_SUBST(LIB_DVD_PLUGIN) AC_SUBST(LIB_DVDREAD) AC_SUBST(LIB_DVDREAD_PLUGIN) AC_SUBST(LIB_ESD) +AC_SUBST(LIB_FILTER_DISTORT) AC_SUBST(LIB_GGI) AC_SUBST(LIB_GLIDE) AC_SUBST(LIB_GNOME) AC_SUBST(LIB_GTK) +AC_SUBST(LIB_IDCTALTIVEC) +AC_SUBST(LIB_IMDCT) +AC_SUBST(LIB_IMDCT3DN) +AC_SUBST(LIB_IMDCTSSE) AC_SUBST(LIB_KDE) AC_SUBST(LIB_LIBDVDCSS) AC_SUBST(LIB_MACOSX) AC_SUBST(LIB_MAD) +AC_SUBST(LIB_MOTIONALTIVEC) AC_SUBST(LIB_MPEG_TS) AC_SUBST(LIB_NCURSES) AC_SUBST(LIB_QNX) @@ -1263,27 +1354,33 @@ AC_SUBST(LIB_RC) AC_SUBST(LIB_SDL) AC_SUBST(LIB_X11) AC_SUBST(LIB_XVIDEO) -AC_SUBST(LIB_YUV) AC_SUBST(CFLAGS_VLC) -AC_SUBST(CFLAGS_ALTIVEC) +AC_SUBST(CFLAGS_ARTS) AC_SUBST(CFLAGS_DVD) AC_SUBST(CFLAGS_DVDREAD) -AC_SUBST(CFLAGS_LIBDVDCSS) -AC_SUBST(CFLAGS_ARTS) AC_SUBST(CFLAGS_ESD) +AC_SUBST(CFLAGS_GLIDE) +AC_SUBST(CFLAGS_GNOME) AC_SUBST(CFLAGS_GTK) +AC_SUBST(CFLAGS_KDE) +AC_SUBST(CFLAGS_IDCTALTIVEC) +AC_SUBST(CFLAGS_LIBDVDCSS) +AC_SUBST(CFLAGS_MACOSX) AC_SUBST(CFLAGS_MAD) +AC_SUBST(CFLAGS_MOTIONALTIVEC) +AC_SUBST(CFLAGS_QT) AC_SUBST(CFLAGS_SDL) AC_SUBST(CFLAGS_X11) +AC_SUBST(CFLAGS_XVIDEO) -AC_SUBST(OBJ_DVD) -AC_SUBST(OBJ_LIBDVDCSS) +AC_SUBST(SRC_DVD_EXTRA) +AC_SUBST(SRC_DVDCSS_EXTRA) +AC_SUBST(NEED_GETOPT) AC_SUBST(NEED_LIBDVDCSS) -AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in]) -#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in]) +AC_OUTPUT([Makefile.opts po/Makefile.in]) echo " global configuration @@ -1328,7 +1425,7 @@ which modules get compiled as plugins. " if test x${HAVE_VLC} = x1 then - echo "To build vlc and its plugins, type \`make vlc'." + echo "To build vlc and its plugins, type \`make vlc plugins'." fi if test x${HAVE_LIBDVDCSS} = x1 then