X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=f229200e2300d5b824e98481278e25213ff7bc2c;hb=258b7d503a81bc6e32d12daef3f980491317a6b0;hp=f2c562a32fe0e4dd50cbb80de4c6b0187173dcfe;hpb=a33d6accd4cf7ff908b2bf17bb6a01cc3e77daee;p=vlc diff --git a/configure.in b/configure.in index f2c562a32f..f229200e23 100644 --- a/configure.in +++ b/configure.in @@ -1,14 +1,15 @@ dnl Autoconf settings for vlc AC_INIT(include/main.h) AC_CONFIG_HEADER(include/defs.h) - AC_CANONICAL_SYSTEM -VERSION="0.3.0" +PACKAGE="vlc" +VERSION="0.4.5" CODENAME=Ourumov dnl Save CFLAGS and LDFLAGS save_CFLAGS="${CFLAGS}" +save_CPPFLAGS="${CPPFLAGS}" save_LDFLAGS="${LDFLAGS}" dnl Check for tools @@ -18,6 +19,7 @@ AC_PROG_CPP dnl Find the right ranlib, even when cross-compiling AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) dnl Check for GNU make AC_PATH_PROG(GMAKE, gmake, no) @@ -37,10 +39,10 @@ else fi dnl Gettext stuff -ALL_LINGUAS="de fr ja no ru nl" +ALL_LINGUAS="de en_GB fr ja no ru nl pl" -AC_DEFINE_UNQUOTED(PACKAGE, "vlc", [Package name]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version]) +AC_DEFINE_UNQUOTED(VLC_PACKAGE, "$PACKAGE", [Package name]) +AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version]) AM_GNU_GETTEXT dnl AM_PROG_LIBTOOL @@ -58,59 +60,96 @@ case x"${target_os}" in ;; xbsdi*) SYS=bsdi - LIB_DVD="${LIB_DVD} -ldvd" - LIB_VCD="${LIB_VCD} -ldvd" + save_CFLAGS="${save_CFLAGS} -pthread" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvd" + vcd_LDFLAGS="${vcd_LDFLAGS} -ldvd" + ;; + x*bsd*) + SYS="${target_os}" + save_CFLAGS="${save_CFLAGS} -pthread" ;; xdarwin*) SYS=darwin + save_CFLAGS="${save_CFLAGS} -no-cpp-precomp" ;; x*mingw32*) SYS=mingw32 AC_CHECK_TOOL(WINDRES, windres, :) - LIB_IPV4="${LIB_IPV4} -lws2_32" - LIB_RC="${LIB_RC} -lws2_32" + save_CFLAGS="${save_CFLAGS} -D_OFF_T_ -D_off_t=long" + vlc_LDFLAGS="${vlc_LDFLAGS} -mwindows -Xlinker --force-exe-suffix" + vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32" + ipv6_LDFLAGS="${ipv6_LDFLAGS} -lws2_32" + http_LDFLAGS="${http_LDFLAGS} -lws2_32" + rc_LDFLAGS="${rc_LDFLAGS} -lws2_32" ;; x*nto*) SYS=nto - LIB_X11="${LIB_X11} -lsocket" - LIB_XVIDEO="${LIB_XVIDEO} -lsocket" + x11_LDFLAGS="${x11_LDFLAGS} -lsocket" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket" ;; xbeos) SYS=beos - LIB_VLC="${LIB_VLC} -lbe" - LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" - LIB_IPV4="${LIB_IPV4} -lbind" - PLDFLAGS="${PLDFLAGS} -nostart" + save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" + vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" + plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -ltranslation -lstdc++.r4" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) SYS="${target_os}" ;; esac +dnl Flags for plugin compilation +if test x"${SYS}" != xmingw32; then + plugins_CFLAGS="${plugins_CFLAGS} -fPIC" +fi + +dnl Check for the need to include the mingwex lib for mingw32 +if test x$SYS = xmingw32 +then + AC_CHECK_LIB(mingwex,opendir, + AC_CHECK_LIB(mingw32,opendir,vlc_LDFLAGS="${vlc_LDFLAGS}", + [vlc_LDFLAGS="${vlc_LDFLAGS} -lmingwex" + gtk_LDFLAGS="${gtk_LDFLAGS} -lmingwex"]) + ) +fi + +dnl The -DSYS_FOO flag +save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`" + dnl Check for system libs needed -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign valloc) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll) AC_CHECK_FUNC(connect,,[ AC_CHECK_LIB(socket,connect, - LIB_IPV4="${LIB_IPV4} -lsocket" - LIB_VLC="${LIB_VLC} -lsocket" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket" + vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket" )]) AC_CHECK_FUNC(gethostbyname,,[ - AC_CHECK_LIB(nsl,gethostbyname,LIB_IPV4="${LIB_IPV4} -lnsl") + AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl") ]) AC_CHECK_FUNC(gethostbyname,,[ - AC_CHECK_LIB(bind,gethostbyname,LIB_IPV4="${LIB_IPV4} -lbind") + AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind") ]) -AC_CHECK_FUNC(nanosleep,,[ - AC_CHECK_LIB(rt,nanosleep,LIB_VLC="${LIB_VLC} -lrt",[ - AC_CHECK_LIB(posix4,nanosleep,LIB_VLC="${LIB_VLC} -lposix4") - ]) +have_nanosleep=0 +AC_CHECK_FUNC(nanosleep,have_nanosleep=1,[ + AC_CHECK_LIB(rt,nanosleep, + [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1], + [AC_CHECK_LIB(posix4,nanosleep, + [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"; have_nanosleep=1])] + ) ]) +if test x$have_nanosleep = x1; then + AC_DEFINE(HAVE_NANOSLEEP, 1, + Define if nanosleep is available.) +fi AC_CHECK_FUNC(inet_aton,,[ - AC_CHECK_LIB(resolv,inet_aton,LIB_IPV4="${LIB_IPV4} -lresolv") + AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") ]) AC_CHECK_FUNC(textdomain,,[ - AC_CHECK_LIB(intl,textdomain,LIB_VLC="${LIB_VLC} -lintl") + AC_CHECK_LIB(intl,textdomain,save_LDFLAGS="${save_LDFLAGS} -lintl") ]) dnl Check for getopt @@ -118,19 +157,19 @@ NEED_GETOPT=0 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], [ # FreeBSD has a gnugetopt library for this: AC_CHECK_LIB([gnugetopt],[getopt_long], - [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB_VLC="${LIB_VLC} -lgnugetopt"], + [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt"], [NEED_GETOPT=1])]) AC_TYPE_SIGNAL -AC_CHECK_LIB(dl,dlopen,LIB_VLC="${LIB_VLC} -ldl") +AC_CHECK_LIB(dl,dlopen,vlc_LDFLAGS="${vlc_LDFLAGS} -ldl") AC_CHECK_LIB(m,cos, - LIB_IMDCT="${LIB_IMDCT} -lm" - LIB_FILTER_DISTORT="${LIB_FILTER_DISTORT} -lm") + imdct_LDFLAGS="${imdct_LDFLAGS} -lm" + filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm") AC_CHECK_LIB(m,pow, - LIB_IMDCT="${LIB_IMDCT} -lm" - LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm" - LIB_IMDCTSSE="${LIB_IMDCTSSE} -lm" - LIB_CHROMA_I420_RGB="${LIB_CHROMA_I420_RGB} -lm" + imdct_LDFLAGS="${imdct_LDFLAGS} -lm" + imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" + imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" + chroma_i420_rgb_LDFLAGS="${chroma_i420_rgb_LDFLAGS} -lm" ) dnl Check for pthreads - borrowed from XMMS @@ -161,8 +200,8 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ Define if defines strncasecmp.)]) dnl Check for headers -AC_CHECK_HEADERS(getopt.h strings.h) -AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h) +AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h) +AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.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 sys/shm.h) @@ -170,6 +209,18 @@ AC_CHECK_HEADERS(linux/version.h) AC_HEADER_TIME +dnl Mac OS X and other OSes don't have declaration for nanosleep +AC_EGREP_HEADER(nanosleep,time.h,[ + AC_DEFINE(HAVE_DECL_NANOSLEEP, 1, + Define if defines nanosleep.) +]) + +dnl Make sure we have timespecs +AC_EGREP_HEADER(timespec,sys/time.h,[ + AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, + Define if defines struct timespec.) +]) + dnl Check for threads library AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) @@ -182,15 +233,14 @@ then if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + CPPFLAGS="$save_CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/extensions/dpms.h, [ AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[ AC_DEFINE(DPMSINFO_IN_DPMS_H, 1, Define if defines DPMSInfo.) ]) ]) - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi dnl Check for ntohl, etc. @@ -291,13 +341,30 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" fi +dnl Check for fnative-struct or mms-bitfields support for mingw32 +if test x$SYS = xmingw32 +then + AC_CACHE_CHECK([if \$CC accepts -mms-bitfields], + [ac_cv_c_mms_bitfields], + [CFLAGS="${save_CFLAGS} -mms-bitfields" + AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, + ac_cv_c_mms_bitfields=no)]) + if test x"$ac_cv_c_mms_bitfields" != x"no"; then + save_CFLAGS="${save_CFLAGS} -mms-bitfields" + plugins_CFLAGS="${plugins_CFLAGS} -mms-bitfields" + else + save_CFLAGS="${save_CFLAGS} -fnative-struct" + plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" + fi +fi + dnl Check for Darwin plugin linking flags AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], [ac_cv_ld_darwin], [CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic" AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) if test x"$ac_cv_ld_darwin" != x"no"; then - PLDFLAGS="${PLDFLAGS} -bundle -undefined error -lcc_dynamic" + plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" fi dnl Check for standard plugin linking flags @@ -306,9 +373,23 @@ 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 - PLDFLAGS="${PLDFLAGS} -shared" + plugins_LDFLAGS="${plugins_LDFLAGS} -shared" fi +dnl Check for variadic macros +AC_CACHE_CHECK([for variadic cpp macros], + [ac_cv_cpp_variadic_macros], + [CFLAGS="${save_CFLAGS}" + AC_TRY_COMPILE( + [#include + #define a(b,c...) printf(b,##c)], + [a("foo");a("%s","bar");a("%s%s","baz","quux");], + ac_cv_cpp_variadic_macros=yes, + ac_cv_cpp_variadic_macros=no)]) +if test x"$ac_cv_cpp_variadic_macros" != x"no"; then + AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros) +fi + dnl Checks for __attribute__(aligned()) directive AC_CACHE_CHECK([__attribute__ ((aligned ())) support], [ac_cv_c_attribute_aligned], @@ -326,6 +407,7 @@ fi dnl End of the bizarre compilation tests CFLAGS="${save_CFLAGS}" +CPPFLAGS="${save_CPPFLAGS}" LDFLAGS="${save_LDFLAGS}" dnl Check for boolean_t @@ -369,7 +451,12 @@ dnl dnl default modules dnl BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec" -PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort fx_scope" +PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope" + +dnl +dnl Network modules +dnl +NETWORK_MODULES="udp http rtp ipv4" dnl dnl Accelerated modules @@ -377,10 +464,13 @@ dnl 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" -if test x$SYS != xmingw32; then - SSE_MODULES="imdctsse downmixsse" +SSE_MODULES="imdctsse downmixsse" +ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec" + +if test x$SYS != xbeos +then + PLUGINS="${PLUGINS} ${NETWORK_MODULES}" fi -ALTIVEC_MODULES="idctaltivec motionaltivec" AC_CACHE_CHECK([if \$CC groks MMX inline assembly], [ac_cv_mmx_inline], @@ -411,7 +501,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly], [ac_cv_sse_inline], [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 +if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" fi @@ -433,10 +523,10 @@ 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_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline" - CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline" - CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_altivec_inline" - CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline" + idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline" + motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline" + memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_altivec_inline" + vlc_CFLAGS="$vlc_CFLAGS $ac_cv_altivec_inline" fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -449,7 +539,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_IDCTALTIVEC -fvec" + CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec" AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no) ]) @@ -457,10 +547,10 @@ 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_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec" - CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec" - CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_c_altivec" - CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec" + idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec" + motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec" + memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec" + vlc_CFLAGS="$vlc_CFLAGS $ac_cv_c_altivec" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -472,10 +562,10 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS=$save_LDFLAGS ]) if test x"$ac_cv_ld_altivec" != x"no"; then - LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib" - LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib" - LIB_MEMCPYALTIVEC="${LIB_MEMCPYALTIVEC} -framework vecLib" - LIB_VLC="${LIB_VLC} -framework vecLib" + idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib" + motionaltivec_LDFLAGS="${motionaltivec_LDFLAGS} -framework vecLib" + memcpyaltivec_LDFLAGS="${memcpyaltivec_LDFLAGS} -framework vecLib" + vlc_LDFLAGS="${vlc_LDFLAGS} -framework vecLib" fi fi # end if mingw32 @@ -489,8 +579,8 @@ dnl 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 +if test "x$with_tuning" != "x"; then + TUNING="$with_tuning" 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 @@ -512,7 +602,7 @@ dnl Enable/disable optimizations dnl AC_ARG_ENABLE(optimizations, [ --disable-optimizations disable compiler optimizations (default enabled)], -[ if test x$enableval = xno; then OPTIMS=0; fi ], +[ if test x$enable_optimizations = xno; then OPTIMS=0; fi ], [ OPTIMS=1 ]) dnl @@ -520,7 +610,7 @@ dnl AltiVec acceleration dnl AC_ARG_ENABLE(altivec, [ --disable-altivec disable altivec optimizations (default enabled on PPC)], -[ if test x$enableval = xyes; then ARCH="${ARCH} altivec"; +[ if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec"; BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ], [ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec"; BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ]) @@ -531,14 +621,15 @@ dnl DEBUG=0 AC_ARG_ENABLE(debug, [ --enable-debug debug mode (default disabled)], -[ if test x$enableval = xyes; then DEBUG=1; fi ]) +[ if test x$enable_debug = xyes; then DEBUG=1; fi ]) dnl dnl Enable release-specific flags dnl +RELEASE=0 AC_ARG_ENABLE(release, [ --enable-release activate extra optimizations (default disabled)], -[ if test x$enableval = xyes; then RELEASE=1; fi ], +[ if test x$enable_release = xyes; then RELEASE=1; fi ], [ VERSION="${VERSION}_`date +%Y-%m-%d`" ]) dnl @@ -552,7 +643,7 @@ dnl DVD module: optionally check for installed libdvdcss dnl AC_ARG_ENABLE(dvd, [ --enable-dvd DVD input module (default enabled)]) -if test "x$enableval" != "xno" +if test "x$enable_dvd" != "xno" then AC_ARG_WITH(dvdcss, [ --with-dvdcss=PATH libdvdcss headers and libraries]) @@ -564,7 +655,7 @@ then then AC_CHECK_HEADERS(dvdcss/dvdcss.h, [ PLUGINS="${PLUGINS} dvd" - LIB_DVD="${LIB_DVD} -ldvdcss" ], + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvdcss" ], [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.]) AC_MSG_ERROR([cannot find libdvdcss headers]) ]) else @@ -581,8 +672,8 @@ then dnl Use a custom libdvdcss AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) BUILTINS="${BUILTINS} dvd" - LIB_DVD="${LIB_DVD} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" - CFLAGS_DVD="${CFLAGS_DVD} -I${real_dvdcss_tree}/src" + dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" + dvd_CFLAGS="${dvd_CFLAGS} -I${real_dvdcss_tree}/src" else dnl The given libdvdcss wasn't built AC_MSG_RESULT(no) @@ -593,8 +684,8 @@ then xno) dnl Compile without dvdcss (dlopen version, works only under Linux) PLUGINS="${PLUGINS} dvd" - CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" - LIB_DVD="${LIB_DVD} -ldl" + dvd_CFLAGS="${dvd_CFLAGS} -DGOD_DAMN_DMCA" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldl" ;; *) AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss}) @@ -603,8 +694,8 @@ then dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h AC_MSG_RESULT(yes) PLUGINS="${PLUGINS} dvd" - LIB_DVD="${LIB_DVD} -L${with_dvdcss}/lib -ldvdcss" - CFLAGS_DVD="${CFLAGS_DVD} -I${with_dvdcss}/include" + dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss" + dvd_CFLAGS="${dvd_CFLAGS} -I${with_dvdcss}/include" else dnl No libdvdcss could be found, sorry AC_MSG_RESULT(no) @@ -619,28 +710,112 @@ dnl dvdread module: check for libdvdread plugin dnl AC_ARG_ENABLE(dvdread, [ --enable-dvdread dvdread input module (default disabled)]) -if test "x$enableval" != "xno" +if test "x$enable_dvdread" != "xno" then AC_ARG_WITH(dvdread, [ --with-dvdread=PATH libdvdread headers and libraries]) - case "x$with_dvdread" in - x) - AC_CHECK_HEADERS(dvdread/dvd_reader.h, - [ PLUGINS="${PLUGINS} dvdread" - LIB_DVDREAD="${LIB_DVDREAD} -ldvdread" ]) + if test "x$with_dvdread" = x + then + test_LDFLAGS="" + test_CFLAGS="" + else + test_LDFLAGS="-L${with_dvdread}/lib" + test_CFLAGS="-I${with_dvdread}/include" + fi + CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" + AC_CHECK_HEADERS(dvdread/dvd_reader.h, [ + AC_TRY_COMPILE([#include ], + [void foo() { int i=DVD_VIDEO_LB_LEN; }],[ + PLUGINS="${PLUGINS} dvdread" + dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread" + dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}" + ],[ + if test "x$enable_dvdread" != x + then + AC_MSG_ERROR([Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later]) + fi + ]) + ],[ + if test "x$enable_dvdread" != x + then + if test "x$with_dvdread" != x + then + AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include]) + else + AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h]) + fi + fi + ]) + CPPFLAGS="$save_CPPFLAGS" +fi + +dnl +dnl libdvbpsi ts demux +dnl +AC_ARG_ENABLE(dvbpsi, +[ --enable-dvbpsi dvbpsi ts demux module (default disabled)]) +if test "x$enable_dvbpsi" != "xno" +then + AC_ARG_WITH(dvbpsi, + [ --with-dvbpsi=PATH libdvbpsi headers and libraries]) + AC_ARG_WITH(dvbpsi, + [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking]) + case "x$with_dvbpsi" in + x|xyes) + if test "x$with_dvbpsi_tree" = x + then + AC_CHECK_HEADERS(dvbpsi/dr.h, + [ PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [], + [ AC_MSG_ERROR([cannot find libdvbpsi headers]) ]) + else + AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree}) + real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" + if test "x$real_dvbpsi_tree" = x + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_dvbpsi_tree}]) + fi + if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + then + dnl Use a custom libdvbpsi + AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) + BUILTINS="${BUILTINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} -I${real_dvbpsi_tree}/src" + else + dnl The given libdvbpsi wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}]) + fi + fi + ;; + xno) + dnl Compile without dvbpsi (dlopen version, works only under Linux) ;; *) - AC_MSG_CHECKING(for dvdread headers in ${withval}) - if test -f ${withval}/include/dvdread/dvd_reader.h + AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi}) + if test "x$with_dvbpsi" = x then - AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} dvdread" - LIB_DVDREAD="${LIB_DVDREAD} -L${withval}/lib -ldvdread" - CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I${withval}/include" + test_LDFLAGS="" + test_CFLAGS="" else - AC_MSG_RESULT(no) - AC_MSG_ERROR([Cannot find ${withval}/dvdread/dvd_reader.h]) + test_LDFLAGS="-L${with_dvbpsi}/lib" + test_CFLAGS="-I${with_dvbpsi}/include" fi + CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" + AC_CHECK_HEADER([dvbpsi/dr.h],[ + PLUGINS="${PLUGINS} mpeg_ts_dvbpsi" + mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" + mpeg_ts_dvbpsi_CFLAGS="${mpeg_ts_dvbpsi_CFLAGS} ${test_CFLAGS}" + ],[ + if test "x$enable_dvbpsi" != x + then + AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1]) + fi + ]) + CPPFLAGS="$save_CPPFLAGS" ;; esac fi @@ -649,14 +824,19 @@ dnl dnl VCD module dnl AC_ARG_ENABLE(vcd, - [ --enable-vcd VCD support for Linux and MacOS X (default enabled)]) + [ --enable-vcd VCD support for Linux, FreeBSD and MacOS X (default enabled)]) if test x$enable_vcd != xno then AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ PLUGINS="${PLUGINS} vcd" ]) - + + AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[ + PLUGINS="${PLUGINS} vcd" + AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support) + ]) + if test "x${SYS}" = "xbsdi" then PLUGINS="${PLUGINS} vcd" @@ -664,8 +844,8 @@ then if test "x${SYS}" = "xdarwin" then - PLUGINS="${PLUGINS} vcd" - LIB_VCD="${LIB_VCD} -framework IOKit -framework CoreFoundation" + # No need to add vcd to PLUGINS, Darwin is already based on FreeBSD + vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" fi fi @@ -676,14 +856,32 @@ AC_ARG_ENABLE(satellite, [ --enable-satellite satellite card support (default disabled)], [ if test x$enable_satellite = xyes then - BUILTINS="${BUILTINS} satellite" - AC_DEFINE(HAVE_SATELLITE, 1, define if compiling with satellite card support) + PLUGINS="${PLUGINS} satellite" fi]) dnl -dnl ipv6 plugin +dnl ipv6 plugin - not for QNX yet +dnl +if test x$SYS != xnto && test "x$SYS" != "xmingw32" +then + AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"]) +fi +if test "x$SYS" = "xmingw32" +then + AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h) + AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes) + PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)]) +fi + +dnl +dnl AVI demux plugin dnl -AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"]) +AC_ARG_ENABLE(avi, + [ --enable-avi AVI demux module (default enabled)]) +if test x$enable_avi != xno +then + PLUGINS="${PLUGINS} avi" +fi dnl dnl Codec plugins @@ -698,50 +896,185 @@ AC_ARG_ENABLE(mad, [ --enable-mad libmad module (default disabled)]) if test x$enable_mad = xyes then - PLUGINS="${PLUGINS} mad" - LIB_MAD="${LIB_MAD} -lmad" AC_ARG_WITH(mad, - [ --with-mad=PATH path to libmad], - [ if test "x$with_val" != "xno" -a "x$with_val" != "x" + [ --with-mad=PATH path to libmad],[],[]) + if test "x$with_mad" != "xno" -a "x$with_mad" != "x" + then + mad_CFLAGS="${mad_CFLAGS} -I$with_mad/include" + mad_LDFLAGS="${mad_LDFLAGS} -L$with_mad/lib" + fi + + AC_ARG_WITH(mad-tree, + [ --with-mad-tree=PATH mad tree for static linking],[],[]) + if test "x$with_mad_tree" != "xno" -a "x$with_mad_tree" != "x" + then + real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`" + if test "x$real_mad_tree" = x + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([${with_mad_tree} directory doesn't exist]) + fi + dnl Use a custom libmad + AC_MSG_CHECKING(for mad.h in ${real_mad_tree}/libmad) + if test -f ${real_mad_tree}/libmad/mad.h + then + AC_MSG_RESULT(yes) + mad_CFLAGS="${mad_CFLAGS} -I${real_mad_tree}/libmad" + mad_LDFLAGS="${mad_LDFLAGS} -L${real_mad_tree}/libmad/.libs" + save_LDFLAGS=$LDFLAGS + LDFLAGS=$mad_LDFLAGS + AC_CHECK_LIB(mad, mad_bit_init, [ + BUILTINS="${BUILTINS} mad" + mad_LDFLAGS="${mad_LDFLAGS} -lmad" + ],[ AC_MSG_ERROR([the specified tree hasn't been compiled ]) + ],[]) + LDFLAGS=$save_LDFLAGS + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([the specified tree doesn't have mad.h]) + fi + else + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $mad_CFLAGS" + LDFLAGS="$LDFLAGS $mad_LDFLAGS" + AC_CHECK_HEADERS(mad.h, , + [ AC_MSG_ERROR([Cannot find development headers for libmad...]) ]) + AC_CHECK_LIB(mad, mad_bit_init, [ + PLUGINS="${PLUGINS} mad" + mad_LDFLAGS="${mad_LDFLAGS} -lmad" ], + [ AC_MSG_ERROR([Cannot find libmad library...]) ]) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + fi +fi + +dnl +dnl ffmpeg decoder plugin +dnl +AC_ARG_ENABLE(ffmpeg, +[ --enable-ffmpeg ffmpeg codec (default disabled)]) +if test "x$enable_ffmpeg" = "xyes" +then + AC_ARG_WITH(ffmpeg, + [ --with-ffmpeg=PATH path to ffmpeg installation],[],[]) + if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x" + then + ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I$with_ffmpeg/include/libffmpeg" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -L$with_ffmpeg/lib" + fi + + AC_ARG_WITH(ffmpeg-tree, + [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking]) + if test "x$with_ffmpeg_tree" != "x" + then + AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) + real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" + if test "x$real_ffmpeg_tree" = x + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}]) + fi + if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a" + then + dnl Use a custom libffmpeg + AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) + BUILTINS="${BUILTINS} ffmpeg" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" + if test x$SYS != xbeos then - CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include" - LIB_MAD="${LIB_MAD} -L$with_val/lib" - 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 + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi + ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" + else + dnl The given libavcodec wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}]) + fi + else + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $ffmpeg_CFLAGS" + LDFLAGS="$LDFLAGS $ffmpeg_LDFLAGS" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi + AC_CHECK_LIB(avcodec, avcodec_init, [ + BUILTINS="${BUILTINS} ffmpeg" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" + if test x$SYS != xbeos + then + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" + fi ], + [ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + fi fi + dnl special case for BeOS if test x$SYS = xbeos then PLUGINS="${PLUGINS} beos" - -dnl default case -else +fi dnl dnl a52 AC3 decoder plugin dnl AC_ARG_ENABLE(a52, [ --enable-a52 AC3 support with liba52 (default enabled)]) -if test "x$enableval" != "xno" -a x$SYS != xmingw32 +if test "x$enable_a52" != "xno" +then + AC_ARG_WITH(a52-tree, + [ --with-a52-tree=PATH a52dec tree for static linking ],[],[]) + if test "x$with_a52_tree" != "xno" -a "x$with_a52_tree" != "x" then + real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`" + if test "x$real_a52_tree" = x + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([${with_a52_tree} directory doesn't exist]) + fi + dnl Use a custom a52dec + AC_MSG_CHECKING(for a52.h in ${real_a52_tree}/include) + if test -f ${real_a52_tree}/include/a52.h + then + AC_MSG_RESULT(yes) + a52_CFLAGS="${a52_CFLAGS} -I${real_a52_tree}" + a52_LDFLAGS="${a52_LDFLAGS} -L${real_a52_tree}/liba52/.libs" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$a52_LDFLAGS $LDFLAGS" + AC_CHECK_LIB(a52, a52_free, [ + BUILTINS="${BUILTINS} a52" + a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" + a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE" + ],[ + if test -f ${real_a52_tree}/liba52/.libs/liba52.a + then + AC_MSG_ERROR([make sure you have at least a52dec-0.7.3]) + else + AC_MSG_ERROR([the specified tree hasn't been compiled]) + fi + ],[-lm]) + LDFLAGS=$save_LDFLAGS + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([the specified tree doesn't have a52.h]) + fi + else dnl no with args AC_CHECK_HEADERS(a52dec/a52.h, [ - BUILTINS="${BUILTINS} a52" - LIB_A52="${LIB_A52} -la52 -lm" - ],[]) + AC_CHECK_LIB(a52, a52_free, [ + BUILTINS="${BUILTINS} a52" + a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" + a52_CFLAGS="${a52_CFLAGS}" + ],[],[-lm]) + ]) + fi fi dnl @@ -749,11 +1082,12 @@ dnl ogg vorbis plugin dnl AC_ARG_ENABLE(vorbis, [ --enable-vorbis Ogg/Vorbis decoder support (default enabled)]) -if test "x$enableval" != "xno" +if test "x$enable_vorbis" != "xno" then AC_CHECK_HEADERS(ogg/ogg.h, [ - PLUGINS="${PLUGINS} vorbis" - LIB_VORBIS="${LIB_VORBIS} -lvorbis" + dnl disabled for the moment + #PLUGINS="${PLUGINS} vorbis" + vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis" ],[]) fi @@ -777,14 +1111,13 @@ if test x$enable_x11 != xno && if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + CPPFLAGS="$save_CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/Xlib.h, [ PLUGINS="${PLUGINS} x11" - LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext" - CFLAGS_X11="${CFLAGS_X11} -I$x_includes" + x11_LDFLAGS="${x11_LDFLAGS} -L$x_libraries -lX11 -lXext" + x11_CFLAGS="${x11_CFLAGS} -I$x_includes" ]) - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi dnl @@ -801,23 +1134,23 @@ if test x$enable_xvideo != xno && if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$save_CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ - saved_CFLAGS=$CFLAGS + save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" AC_CHECK_LIB(Xv_pic,XvSetPortAttribute, # We have Xv_pic, that's good, we can build an xvideo.so plugin ! PLUGINS="${PLUGINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv_pic" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes", + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv_pic" + xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes", # We don't have Xv_pic, let's make xvideo.a as builtin BUILTINS="${BUILTINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes") - CFLAGS=$saved_CFLAGS + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv" + xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes") + CFLAGS="$save_CFLAGS" ] - CPPFLAGS=$saved_CPPFLAGS) + CPPFLAGS="$save_CPPFLAGS") fi dnl @@ -830,9 +1163,9 @@ then SDL_PATH=$PATH AC_ARG_WITH(sdl-config-path, [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)], - [ if test "x$withval" != "xno" + [ if test "x$with_sdl_config_path" != "xno" then - SDL_PATH=$withval:$PATH + SDL_PATH="$with_sdl_config_path:$PATH" fi ]) AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, $SDL_PATH) SDL_CONFIG=${SDL12_CONFIG} @@ -851,17 +1184,16 @@ then if test x${SDL_CONFIG} != xno then PLUGINS="${PLUGINS} sdl" - CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`" - LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_SDL" + sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`" + sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" + CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h), [ AC_MSG_ERROR([The development package for SDL is not installed. Please install it and try again. Alternatively you can also configure with --disable-sdl.]) ]) - CPPFLAGS=$save_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null then AC_MSG_ERROR([The development package for SDL is not installed. @@ -876,12 +1208,45 @@ from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. fi fi +dnl +dnl Qt Embedded module +dnl (disabled by default) +dnl +AC_ARG_ENABLE(qte, + [ --enable-qte QT Embedded support (default disabled)]) +if test "x${enable_qte}" != "xno" +then + AC_ARG_WITH(qte, + [ --with-qte=PATH Qt Embedded headers and libraries]) + if test "x${with_qte}" = "x" + then + test_LDFLAGS="-L${QTDIR}/lib" + test_CFLAGS="-I${QTDIR}/include" + else + test_LDFLAGS="-L${with_qte}/lib" + test_CFLAGS="-I${with_qte}/include" + fi + + CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" + AC_CHECK_HEADERS(qt.h, [ + qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" + if test "x${with_qte}" = "x" + then + PLUGINS="${PLUGINS} qte" + else + BUILTINS="${BUILTINS} qte" + fi + ]) + CPPFLAGS="${save_CPPFLAGS}" +fi + dnl dnl Windows DirectX module dnl AC_ARG_ENABLE(directx, [ --enable-directx Win32 DirectX support (default enabled on Win32)]) -if test "x$enableval" != "xno" +if test "x$enable_directx" != "xno" then if test x$SYS = xmingw32 then @@ -891,18 +1256,18 @@ then then AC_CHECK_HEADERS(ddraw.h, [ PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ]) + directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" ]) else - AC_MSG_CHECKING(for directX headers in ${withval}) - if test -f ${withval}/ddraw.h + AC_MSG_CHECKING(for directX headers in ${with_directx}) + if test -f ${with_directx}/ddraw.h then PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32" - INCLUDE="${INCLUDE} -I${withval}" + directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32" + directx_CFLAGS="${directx_CFLAGS} -I${with_directx}" AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - AC_MSG_ERROR([Cannot find ${withval}/ddraw.h!]) + AC_MSG_ERROR([Cannot find ${with_directx}/ddraw.h!]) fi fi fi @@ -938,13 +1303,13 @@ AC_ARG_ENABLE(ggi, if test x$enable_ggi = xyes then PLUGINS="${PLUGINS} ggi" - LIB_GGI="${LIB_GGI} -lggi" + ggi_LDFLAGS="${ggi_LDFLAGS} -lggi" AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], - [ if test "x$with_val" != "xno" -a "x$with_val" != "x" + [ if test "x$with_ggi" != "xno" -a "x$with_ggi" != "x" then - CFLAGS_GGI="${CFLAGS_GGI} -I$with_val/include" - LIB_GGI="${LIB_GGI} -L$with_val/lib" + CFLAGS_GGI="${CFLAGS_GGI} -I$with_ggi/include" + ggi_LDFLAGS="${ggi_LDFLAGS} -L$with_ggi/lib" fi ]) fi @@ -956,14 +1321,14 @@ AC_ARG_ENABLE(glide, if test x$enable_glide = xyes then PLUGINS="${PLUGINS} glide" - LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm" - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide" + glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm" + glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide" AC_ARG_WITH(glide, [ --with-glide=PATH path to libglide], - [ if test "x$with_val" != "xno" -a "x$with_val" != "x" + [ if test "x$with_glide" != "xno" -a "x$with_glide" != "x" then - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I$with_val/include" - LIB_GLIDE="${LIB_GLIDE} -L$with_val/lib" + glide_CFLAGS="${glide_CFLAGS} -I$with_glide/include" + glide_LDFLAGS="${glide_LDFLAGS} -L$with_glide/lib" fi ]) fi @@ -978,7 +1343,7 @@ then if test x$have_aa = xtrue then PLUGINS="${PLUGINS} aa" - LIB_AA="${LIB_AA} -laa" + aa_LDFLAGS="${aa_LDFLAGS} -laa" fi fi @@ -999,7 +1364,7 @@ if test x$enable_dsp != xno && then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ PLUGINS="${PLUGINS} dsp" - AC_CHECK_LIB(ossaudio,main,LIB_DSP="${LIB_DSP} -lossaudio") + AC_CHECK_LIB(ossaudio,main,dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio") ]) fi @@ -1014,8 +1379,8 @@ AC_ARG_ENABLE(esd, if test x${ESD_CONFIG} != xno then PLUGINS="${PLUGINS} esd" - CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`" - LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`" + esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`" + esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`" fi fi]) @@ -1030,8 +1395,8 @@ AC_ARG_ENABLE(arts, if test x${ARTS_CONFIG} != xno then PLUGINS="${PLUGINS} arts" - CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`" - LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `" + arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`" + arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `" fi fi]) @@ -1046,7 +1411,7 @@ AC_ARG_ENABLE(alsa, if test x$have_alsa = xtrue then PLUGINS="${PLUGINS} alsa" - LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl" + alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl" fi fi]) @@ -1055,10 +1420,10 @@ dnl win32 waveOut plugin dnl AC_ARG_ENABLE(waveout, [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) -if test "x$enableval" != "xno" -a x$SYS = xmingw32 +if test "x$enable_waveout" != "xno" -a x$SYS = xmingw32 then PLUGINS="${PLUGINS} waveout" - LIB_WAVEOUT="-lwinmm" + waveout_LDFLAGS="-lwinmm" fi dnl @@ -1077,9 +1442,9 @@ 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" + [ if test "x$with_gtk_config_path" != "xno" then - GTK_PATH=$withval:$PATH + GTK_PATH="$with_gtk_config_path:$PATH" fi ]) # look for gtk-config AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, $GTK_PATH) @@ -1094,11 +1459,10 @@ then 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="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`" - LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`" + gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" # now look for the gtk.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" + CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS" ac_cv_gtk_headers=yes AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [ ac_cv_gtk_headers=no @@ -1109,7 +1473,52 @@ then PLUGINS="${PLUGINS} gtk" ALIASES="${ALIASES} gvlc" fi - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" + fi +fi + +dnl +dnl Familiar module uses Gtk+ library +dnl +AC_ARG_ENABLE(familiar, + [ --enable-familiar Familiar Gtk+ support (default disabled)]) +if test "x${enable_familiar}" = "xyes" +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${with_gtk_config_path}" != "xno" + then + GTK_PATH="${with_gtk_config_path}:${PATH}" + fi ]) + # look for gtk-config + AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH}) + GTK_CONFIG=${GTK12_CONFIG} + if test "x${GTK_CONFIG}" = "xno" + then + AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH}) + fi + if test "x${GTK_CONFIG}" != "xno" + 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-familiar.]) + fi + familiar_CFLAGS="${familiar_CFLAGS} `${GTK_CONFIG} --cflags gtk gthread`" + familiar_LDFLAGS="${familiar_LDFLAGS} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`" + # now look for the gtk.h header + CPPFLAGS="${save_CPPFLAGS} ${familiar_CFLAGS}" + 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 "x${ac_cv_gtk_headers}" = "xyes" + then + PLUGINS="${PLUGINS} familiar" + NEED_GTK_MAIN=yes + fi + CPPFLAGS="${save_CPPFLAGS}" fi fi @@ -1123,12 +1532,11 @@ AC_ARG_ENABLE(gnome, AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) if test -x ${GNOME_CONFIG} then - CFLAGS_GNOME="${CFLAGS_GNOME} `${GNOME_CONFIG} --cflags gtk gnomeui`" - LIB_GNOME="${LIB_GNOME} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" + gnome_CFLAGS="${gnome_CFLAGS} `${GNOME_CONFIG} --cflags gtk gnomeui`" + gnome_LDFLAGS="${gnome_LDFLAGS} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" fi # now look for the gnome.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GNOME" + CPPFLAGS="$save_CPPFLAGS $gnome_CFLAGS" AC_CHECK_HEADERS(gnome.h, [ PLUGINS="${PLUGINS} gnome" ALIASES="${ALIASES} gnome-vlc" @@ -1136,8 +1544,7 @@ AC_ARG_ENABLE(gnome, AC_MSG_ERROR([Can't find gnome headers. Please install the gnome developement tools or remove the --enable-gnome option]) ]) - - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi]) dnl @@ -1148,8 +1555,8 @@ AC_ARG_ENABLE(qt, [if test x$enable_qt = xyes; then PLUGINS="${PLUGINS} qt" ALIASES="${ALIASES} qvlc" - LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib" - CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include" + qt_LDFLAGS="${qt_LDFLAGS} -lqt -L${QTDIR}/lib" + qt_CFLAGS="${qt_CFLAGS} -I/usr/include/qt -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -1166,9 +1573,37 @@ AC_ARG_ENABLE(kde, [if test x$enable_kde = xyes; then PLUGINS="${PLUGINS} kde" ALIASES="${ALIASES} kvlc" - 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" + kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile" + kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt" + kde_CFLAGS="${kde_CFLAGS} -I${KDEDIR}/include -I${QTDIR}/include" + if test -x ${QTDIR}/bin/moc + then + MOC=${QTDIR}/bin/moc + else + MOC=moc + fi + fi]) + +dnl +dnl Opie QT embedded module +dnl +AC_ARG_ENABLE(opie, + [ --enable-opie Qt embedded interface support (default disabled)], + [if test "x${enable_opie}" = "xyes"; then + AC_ARG_WITH(qte, + [ --with-qte=PATH Qt Embedded headers and libraries]) + if test "x${with_qte}" = "x" + then + test_LDFLAGS="-L${QTDIR}/lib" + test_CFLAGS="-I${QTDIR}/include" + else + test_LDFLAGS="-L${with_qte}/lib" + test_CFLAGS="-I${with_qte}/include" + fi + + PLUGINS="${PLUGINS} opie" + opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" + opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}-DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -1185,15 +1620,11 @@ AC_ARG_ENABLE(macosx, [if test x$enable_macosx = xyes then BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB_COMMON="${LIB_COMMON} -ObjC" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc -ObjC" fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB_COMMON="${LIB_COMMON} -ObjC" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc -ObjC" )]) dnl @@ -1205,19 +1636,25 @@ AC_ARG_ENABLE(qnx, then AC_CHECK_HEADERS(Ph.h, [ PLUGINS="${PLUGINS} qnx" - LIB_QNX="${LIB_QNX} -lasound -lph" + qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph" ]) fi dnl -dnl Windows MFC interface module +dnl Windows native interface module, built with Borland C++ Builder dnl -AC_ARG_ENABLE(win32, - [ --enable-win32 Win32 interface support (default disabled)], - [ if test "x$enableval" != "xno" +AC_ARG_ENABLE(intfwin, +[ --enable-intfwin Win32 interface support (default disabled)], +[ if test "x$enable_intfwin" != "xno" + then + AC_ARG_WITH(bcbuilder, + [ --with-bcbuilder=PATH Borland C++ Builder installation path]) + if test "x$with_bcbuilder" != "x" then - PLUGINS="${PLUGINS} win32" - fi ]) + BCBUILDER="$with_bcbuilder" + fi + PLUGINS="${PLUGINS} intfwin" + fi ]) dnl dnl ncurses module @@ -1226,7 +1663,7 @@ AC_ARG_ENABLE(ncurses, [ --enable-ncurses ncurses interface support (default disabled)], [if test x$enable_ncurses = xyes; then PLUGINS="${PLUGINS} ncurses" - LIB_NCURSES="${LIB_NCURSES} -lncurses" + ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses" fi]) dnl @@ -1240,13 +1677,10 @@ then if test x$have_lirc = xtrue then PLUGINS="${PLUGINS} lirc" - LIB_LIRC="${LIB_LIRC} -llirc_client" + lirc_LDFLAGS="${lirc_LDFLAGS} -llirc_client" fi fi -dnl end of non-BeOS stuff -fi - AC_ARG_WITH(,[Misc options:]) dnl @@ -1257,7 +1691,7 @@ 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 + case "x$with_words" in xbig) ac_cv_c_bigendian=yes ;; @@ -1282,7 +1716,7 @@ EOF ] if test -f conftest.c then - if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \ + if ${CC-cc} -c conftest.c -o conftest.o >config.log 2>&1 \ && test -f conftest.o then if test "`strings conftest.o | grep BIGenDianSyS`" @@ -1308,31 +1742,20 @@ then AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system) 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 Profiling dnl GPROF=0 AC_ARG_ENABLE(gprof, [ --enable-gprof gprof profiling (default disabled)], -[ if test x$enableval = xyes; then GPROF=1; fi ]) +[ if test "x$enable_gprof" = "xyes"; then GPROF=1; fi ]) CPROF=0 AC_ARG_ENABLE(cprof, [ --enable-cprof cprof profiling (default disabled)], -[ if test x$enableval = xyes; +[ if test "x$enable_cprof" = "xyes"; then - LIB_COMMON="${LIB_COMMON} -lcprof" + LDFLAGS="${LDFLAGS} -lcprof" CPROF=1 fi ]) @@ -1342,7 +1765,7 @@ dnl GNU portable threads dnl AC_ARG_ENABLE(pth, [ --enable-pth GNU Pth support (default disabled)], - [ if test x$enableval = xyes; then + [ if test "x$enable_pth" = "xyes"; then AC_CHECK_LIB(pth,pth_init) AC_EGREP_HEADER(pth_init,pth.h,[ AC_DEFINE(PTH_INIT_IN_PTH_H, 1, @@ -1356,7 +1779,7 @@ dnl State Threads dnl AC_ARG_ENABLE(st, [ --enable-st State Threads (default disabled)], - [ if test x$enableval = xyes; then + [ if test "x$enable_st" = "xyes"; then AC_CHECK_LIB(st,st_init) AC_EGREP_HEADER(st_init,st.h,[ AC_DEFINE(ST_INIT_IN_ST_H, 1, @@ -1365,7 +1788,7 @@ AC_ARG_ENABLE(st, fi]) ]) -LIB_COMMON="${LIB_COMMON} ${THREAD_LIB}" +LDFLAGS="${LDFLAGS} ${THREAD_LIB}" dnl dnl Plug-ins - this must be AT THE END @@ -1391,7 +1814,7 @@ fi dnl dnl Stuff used by the program dnl -AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN\n", [Simple version string]) +AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN", [Simple version string]) AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN", [Copyright string]) VLC_SYMBOL="`echo ${VERSION} | tr .- __`" @@ -1411,7 +1834,6 @@ AC_SUBST(ARCH) AC_SUBST(PLUGINS) AC_SUBST(BUILTINS) AC_SUBST(ALIASES) -AC_SUBST(INCLUDE) AC_SUBST(DEBUG) AC_SUBST(ASM) AC_SUBST(CPROF) @@ -1421,85 +1843,94 @@ AC_SUBST(TUNING) AC_SUBST(RELEASE) AC_SUBST(MOC) AC_SUBST(WINDRES) -AC_SUBST(DLL_PATH) +AC_SUBST(BCBUILDER) AC_SUBST(PACKAGE) AC_SUBST(VERSION) +AC_SUBST(NEED_GETOPT) -AC_SUBST(LDFLAGS) -AC_SUBST(PLDFLAGS) - -AC_SUBST(LIB_COMMON) -AC_SUBST(LIB_VLC) - -AC_SUBST(LIB_A52) -AC_SUBST(LIB_AA) -AC_SUBST(LIB_ALSA) -AC_SUBST(LIB_ARTS) -AC_SUBST(LIB_BEOS) -AC_SUBST(LIB_CHROMA_I420_RGB) -AC_SUBST(LIB_DARWIN) -AC_SUBST(LIB_DIRECTX) -AC_SUBST(LIB_DSP) -AC_SUBST(LIB_DVD) -AC_SUBST(LIB_DVDREAD) -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_IPV4) -AC_SUBST(LIB_IPV6) -AC_SUBST(LIB_KDE) -AC_SUBST(LIB_LIRC) -AC_SUBST(LIB_MACOSX) -AC_SUBST(LIB_MAD) -AC_SUBST(LIB_MEMCPYALTIVEC) -AC_SUBST(LIB_MOTIONALTIVEC) -AC_SUBST(LIB_MPEG_TS) -AC_SUBST(LIB_NCURSES) -AC_SUBST(LIB_QNX) -AC_SUBST(LIB_QT) -AC_SUBST(LIB_RC) -AC_SUBST(LIB_SDL) -AC_SUBST(LIB_VCD) -AC_SUBST(LIB_VORBIS) -AC_SUBST(LIB_WAVEOUT) -AC_SUBST(LIB_WIN32) -AC_SUBST(LIB_X11) -AC_SUBST(LIB_XVIDEO) - -AC_SUBST(CFLAGS_COMMON) -AC_SUBST(CFLAGS_VLC) - -AC_SUBST(CFLAGS_ARTS) -AC_SUBST(CFLAGS_DVD) -AC_SUBST(CFLAGS_DVDREAD) -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_MACOSX) -AC_SUBST(CFLAGS_MAD) -AC_SUBST(CFLAGS_MEMCPYALTIVEC) -AC_SUBST(CFLAGS_MOTIONALTIVEC) AC_SUBST(CFLAGS_OPTIM) AC_SUBST(CFLAGS_OPTIM_NODEBUG) -AC_SUBST(CFLAGS_QT) -AC_SUBST(CFLAGS_SDL) -AC_SUBST(CFLAGS_WIN32) -AC_SUBST(CFLAGS_X11) -AC_SUBST(CFLAGS_XVIDEO) - -AC_SUBST(NEED_GETOPT) +AC_SUBST(LDFLAGS) -AC_OUTPUT([Makefile.opts po/Makefile.in]) +AC_SUBST(vlc_CFLAGS) +AC_SUBST(plugins_CFLAGS) +AC_SUBST(builtins_CFLAGS) + +AC_SUBST(a52_CFLAGS) +AC_SUBST(arts_CFLAGS) +AC_SUBST(dvd_CFLAGS) +AC_SUBST(dvdread_CFLAGS) +AC_SUBST(mpeg_ts_dvbpsi_CFLAGS) +AC_SUBST(directx_CFLAGS) +AC_SUBST(esd_CFLAGS) +AC_SUBST(familiar_CFLAGS) +AC_SUBST(ffmpeg_CFLAGS) +AC_SUBST(glide_CFLAGS) +AC_SUBST(gnome_CFLAGS) +AC_SUBST(gtk_CFLAGS) +AC_SUBST(kde_CFLAGS) +AC_SUBST(idctaltivec_CFLAGS) +AC_SUBST(macosx_CFLAGS) +AC_SUBST(mad_CFLAGS) +AC_SUBST(memcpyaltivec_CFLAGS) +AC_SUBST(motionaltivec_CFLAGS) +AC_SUBST(opie_CFLAGS) +AC_SUBST(qt_CFLAGS) +AC_SUBST(qte_CFLAGS) +AC_SUBST(sdl_CFLAGS) +AC_SUBST(x11_CFLAGS) +AC_SUBST(xvideo_CFLAGS) + +AC_SUBST(vlc_LDFLAGS) +AC_SUBST(plugins_LDFLAGS) +AC_SUBST(builtins_LDFLAGS) + +AC_SUBST(a52_LDFLAGS) +AC_SUBST(aa_LDFLAGS) +AC_SUBST(alsa_LDFLAGS) +AC_SUBST(arts_LDFLAGS) +AC_SUBST(beos_LDFLAGS) +AC_SUBST(chroma_i420_rgb_LDFLAGS) +AC_SUBST(directx_LDFLAGS) +AC_SUBST(dsp_LDFLAGS) +AC_SUBST(dvd_LDFLAGS) +AC_SUBST(dvdread_LDFLAGS) +AC_SUBST(mpeg_ts_dvbpsi_LDFLAGS) +AC_SUBST(esd_LDFLAGS) +AC_SUBST(familiar_LDFLAGS) +AC_SUBST(filter_distort_LDFLAGS) +AC_SUBST(ffmpeg_LDFLAGS) +AC_SUBST(ggi_LDFLAGS) +AC_SUBST(glide_LDFLAGS) +AC_SUBST(gnome_LDFLAGS) +AC_SUBST(gtk_LDFLAGS) +AC_SUBST(http_LDFLAGS) +AC_SUBST(idctaltivec_LDFLAGS) +AC_SUBST(imdct_LDFLAGS) +AC_SUBST(imdct3dn_LDFLAGS) +AC_SUBST(imdctsse_LDFLAGS) +AC_SUBST(ipv4_LDFLAGS) +AC_SUBST(ipv6_LDFLAGS) +AC_SUBST(kde_LDFLAGS) +AC_SUBST(lirc_LDFLAGS) +AC_SUBST(macosx_LDFLAGS) +AC_SUBST(mad_LDFLAGS) +AC_SUBST(memcpyaltivec_LDFLAGS) +AC_SUBST(motionaltivec_LDFLAGS) +AC_SUBST(ncurses_LDFLAGS) +AC_SUBST(opie_LDFLAGS) +AC_SUBST(qnx_LDFLAGS) +AC_SUBST(qt_LDFLAGS) +AC_SUBST(qte_LDFLAGS) +AC_SUBST(rc_LDFLAGS) +AC_SUBST(sdl_LDFLAGS) +AC_SUBST(vcd_LDFLAGS) +AC_SUBST(vorbis_LDFLAGS) +AC_SUBST(waveout_LDFLAGS) +AC_SUBST(x11_LDFLAGS) +AC_SUBST(xvideo_LDFLAGS) + +AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in]) echo " vlc configuration