X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=1245e1ab1b0c81b3b1a1785a61d9d0e50de23d50;hb=e3401d578754e7fd0dd49ba18b95b527420f1630;hp=2cf038b270ee6015513f7580ff5deb95cedf360e;hpb=b4985b910a319c9d78dddc5ab8cf2b5d2241764b;p=vlc diff --git a/configure.in b/configure.in index 2cf038b270..1245e1ab1b 100644 --- a/configure.in +++ b/configure.in @@ -1,29 +1,42 @@ dnl Autoconf settings for vlc -AC_INIT(include/main.h) -AC_CONFIG_HEADER(include/defs.h) +AC_INIT(configure.in) + +AC_PREREQ(2.50) AC_CANONICAL_SYSTEM +CONFIGURE_LINE="$0 $*" + PACKAGE="vlc" -VERSION="0.3.1" -CODENAME=Ourumov +VERSION="0.5.0-cvs" +CODENAME="Natalya" -dnl Save CFLAGS and LDFLAGS -save_CFLAGS="${CFLAGS}" +AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) +AM_CONFIG_HEADER(config.h) + +dnl +dnl Save *FLAGS +dnl save_CPPFLAGS="${CPPFLAGS}" +save_CFLAGS="${CFLAGS}" save_LDFLAGS="${LDFLAGS}" +dnl dnl Check for tools -AC_PROG_MAKE_SET +dnl AC_PROG_CC AC_PROG_CPP +AC_PROG_MAKE_SET +AC_PROG_INSTALL dnl Find the right ranlib, even when cross-compiling AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) +dnl dnl Check for GNU make +dnl AC_PATH_PROG(GMAKE, gmake, no) -if test "x$GMAKE" = "xno"; then +if test "x${GMAKE}" = "xno"; then AC_CACHE_CHECK([whether GNU make is installed], [ac_cv_gmake], [if make --version | grep -q -i gnu; then @@ -39,19 +52,29 @@ else fi dnl Gettext stuff -ALL_LINGUAS="de en_GB fr ja no ru nl" +ALL_LINGUAS="de en_GB fr ja no ru nl pl se" -AC_DEFINE_UNQUOTED(VLC_PACKAGE, "$PACKAGE", [Package name]) -AC_DEFINE_UNQUOTED(VLC_VERSION, "$VERSION", [Package version]) +AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name]) +AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version]) +AM_GNU_GETTEXT_VERSION(0.10.40) AM_GNU_GETTEXT dnl AM_PROG_LIBTOOL AC_PROG_INSTALL +dnl Check for compiler properties +AC_C_CONST +AC_C_INLINE + +dnl +dnl Set default LDFLAGS +dnl +vlc_LDFLAGS="${LDFLAGS}" + dnl dnl Check the operating system dnl -case x"${target_os}" in +case "x${target_os}" in x) SYS=unknown ;; @@ -60,25 +83,28 @@ case x"${target_os}" in ;; xbsdi*) SYS=bsdi - save_CFLAGS="${save_CFLAGS} -pthread" + save_CFLAGS="${save_CFLAGS} -pthread"; CFLAGS="${save_CFLAGS}" dvd_LDFLAGS="${dvd_LDFLAGS} -ldvd" vcd_LDFLAGS="${vcd_LDFLAGS} -ldvd" ;; x*bsd*) SYS="${target_os}" - save_CFLAGS="${save_CFLAGS} -pthread" + save_CFLAGS="${save_CFLAGS} -pthread"; CFLAGS="${save_CFLAGS}" ;; xdarwin*) SYS=darwin - save_CFLAGS="${save_CFLAGS} -no-cpp-precomp" + save_CFLAGS="${save_CFLAGS} -no-cpp-precomp"; CFLAGS="${save_CFLAGS}" + vlc_LDFLAGS="${vlc_LDFLAGS} -all_load" ;; x*mingw32*) SYS=mingw32 AC_CHECK_TOOL(WINDRES, windres, :) - save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long" + save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long"; CFLAGS="${save_CFLAGS}" 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*) @@ -86,12 +112,15 @@ case x"${target_os}" in x11_LDFLAGS="${x11_LDFLAGS} -lsocket" xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket" ;; + xsolaris*) + SYS=solaris + ;; xbeos) SYS=beos - save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" + save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual"; CFLAGS="${save_CFLAGS}" vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" - beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -lstdc++.r4" ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) @@ -100,42 +129,56 @@ case x"${target_os}" in esac dnl Flags for plugin compilation -if test x"${SYS}" = xmingw32 +if test "x${SYS}" = "xmingw32" then plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" else plugins_CFLAGS="${plugins_CFLAGS} -fPIC" + plugins_LDFLAGS="${plugins_LDFLAGS} -fPIC" fi dnl The -DSYS_FOO flag -save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`" +save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CFLAGS="${save_CFLAGS}" dnl Check for system libs needed -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 atoll strndup) AC_CHECK_FUNC(connect,,[ AC_CHECK_LIB(socket,connect, ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket" vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket" )]) +AC_CHECK_FUNC(send,,[ + AC_CHECK_LIB(socket,send, + http_LDFLAGS="${http_LDFLAGS} -lsocket" +)]) AC_CHECK_FUNC(gethostbyname,,[ - AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl") -]) -AC_CHECK_FUNC(gethostbyname,,[ - AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind") + AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl",[ + AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind")]) ]) -AC_CHECK_FUNCS(nanosleep,,[ +have_nanosleep=0 +AC_CHECK_FUNC(nanosleep,have_nanosleep=1,[ AC_CHECK_LIB(rt,nanosleep, - [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"], + [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1], [AC_CHECK_LIB(posix4,nanosleep, - [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"])] + [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 +# HP/UX port +AC_CHECK_LIB(rt,sem_init, [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"]) + AC_CHECK_FUNC(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") ]) AC_CHECK_FUNC(textdomain,,[ - AC_CHECK_LIB(intl,textdomain,save_LDFLAGS="${save_LDFLAGS} -lintl") + AC_CHECK_LIB(intl,textdomain, + vlc_LDFLAGS="${vlc_LDFLAGS} -lintl" + plugins_LDFLAGS="${plugins_LDFLAGS} -lintl" + ) ]) dnl Check for getopt @@ -152,25 +195,27 @@ AC_CHECK_LIB(m,cos, imdct_LDFLAGS="${imdct_LDFLAGS} -lm" filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm") AC_CHECK_LIB(m,pow, + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -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" + i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm" + faad_LDFLAGS="${faad_LDFLAGS} -lm" ) dnl Check for pthreads - borrowed from XMMS THREAD_LIB=error -if test "x${THREAD_LIB}" = xerror; then - AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread") +if test "x${THREAD_LIB}" = "xerror"; then + AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread") fi -if test "x${THREAD_LIB}" = xerror; then - AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads") +if test "x${THREAD_LIB}" = "xerror"; then + AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads") fi -if test "x${THREAD_LIB}" = xerror; then - AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r") +if test "x${THREAD_LIB}" = "xerror"; then + AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r") fi -if test "x${THREAD_LIB}" = xerror; then - AC_CHECK_FUNC(pthread_attr_init) +if test "x${THREAD_LIB}" = "xerror"; then + AC_CHECK_FUNC(pthread_mutex_lock) THREAD_LIB="" fi @@ -181,12 +226,15 @@ dnl Check for misc headers AC_EGREP_HEADER(pthread_cond_t,pthread.h,[ AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1, Define if defines pthread_cond_t.)]) +AC_EGREP_HEADER(pthread_once,pthread.h,[ + AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1, + Define if defines pthread_once.)]) AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1, Define if defines strncasecmp.)]) dnl Check for headers -AC_CHECK_HEADERS(getopt.h strings.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) @@ -210,23 +258,28 @@ AC_EGREP_HEADER(timespec,sys/time.h,[ dnl Check for threads library AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) +dnl Default X headers and libraries +if test "x${x_includes}" = "xNONE"; then + x_includes="/usr/X11R6/include" +fi +if test "x${x_libraries}" = "xNONE"; then + x_libraries="/usr/X11R6/lib" +fi + +dnl Build the gtk_main plugin? +NEED_GTK_MAIN=no + dnl Check for DPMS -if test x$SYS != xmingw32 +if test "x${SYS}" != "xmingw32" then - if test x$x_includes = xNONE; then - x_includes=/usr/X11R6/include - fi - if test x$x_libraries = xNONE; then - x_libraries=/usr/X11R6/lib - fi - CPPFLAGS="$save_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="$save_CPPFLAGS" + CPPFLAGS="${save_CPPFLAGS}" fi dnl Check for ntohl, etc. @@ -236,7 +289,7 @@ AC_CACHE_CHECK([for ntohl in sys/param.h], AC_TRY_COMPILE([#include ], [void foo() { int meuh; ntohl(meuh); }], ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)]) -if test x"$ac_cv_c_ntohl_sys_param_h" != x"no"; then +if test "x${ac_cv_c_ntohl_sys_param_h}" != "xno"; then AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) fi @@ -245,24 +298,24 @@ AC_CACHE_CHECK([if \$CC accepts -finline-limit], [ac_cv_c_inline_limit], [CFLAGS="${save_CFLAGS} -finline-limit-30000" AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)]) -if test x"$ac_cv_c_inline_limit" != x"no"; then - save_CFLAGS="${save_CFLAGS} -finline-limit-30000" +if test "x${ac_cv_c_inline_limit}" != "xno"; then + save_CFLAGS="${save_CFLAGS} -finline-limit-30000"; CFLAGS="${save_CFLAGS}" fi dnl Check for -W or -w flags AC_CACHE_CHECK([if \$CC accepts -Wall -Winline], [ac_cv_c_Wall_Winline], - [CFLAGS="${save_CFLAGS} -Wall -Winline" + [CFLAGS="-Wall -Winline ${save_CFLAGS}" AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)]) -if test x"$ac_cv_c_Wall_Winline" != x"no"; then - save_CFLAGS="${save_CFLAGS} -Wall -Winline" +if test "x${ac_cv_c_Wall_Winline}" != "xno"; then + save_CFLAGS="-Wall -Winline ${save_CFLAGS}"; CFLAGS="${save_CFLAGS}" else AC_CACHE_CHECK([if \$CC accepts -wall -winline], [ac_cv_c_wall_winline], - [CFLAGS="${save_CFLAGS} -wall -winline" + [CFLAGS="-wall -winline ${save_CFLAGS}" AC_TRY_COMPILE([],,ac_cv_c_wall_winline=yes, ac_cv_c_wall_winline=no)]) - if test x"$ac_cv_c_wall_winline" != x"no"; then - save_CFLAGS="${save_CFLAGS} -wall -winline" + if test "x${ac_cv_c_wall_winline}" != "xno"; then + save_CFLAGS="-wall -winline ${save_CFLAGS}"; CFLAGS="${save_CFLAGS}" fi fi @@ -271,8 +324,8 @@ AC_CACHE_CHECK([if \$CC accepts -pipe], [ac_cv_c_pipe], [CFLAGS="${save_CFLAGS} -pipe" AC_TRY_COMPILE([],,ac_cv_c_pipe=yes, ac_cv_c_pipe=no)]) -if test x"$ac_cv_c_pipe" != x"no"; then - save_CFLAGS="${save_CFLAGS} -pipe" +if test "x${ac_cv_c_pipe}" != "xno"; then + save_CFLAGS="${save_CFLAGS} -pipe"; CFLAGS="${save_CFLAGS}" fi dnl Check for various optimization flags @@ -280,21 +333,21 @@ AC_CACHE_CHECK([if \$CC accepts -O3], [ac_cv_c_o3], [CFLAGS="${save_CFLAGS} -O3" AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) -if test x"$ac_cv_c_o3" != x"no"; then +if test "x${ac_cv_c_o3}" != "xno"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" else AC_CACHE_CHECK([if \$CC accepts -O2], [ac_cv_c_o2], [CFLAGS="${save_CFLAGS} -O2" AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) - if test x"$ac_cv_c_o2" != x"no"; then + if test "x${ac_cv_c_o2}" != "xno"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" else AC_CACHE_CHECK([if \$CC accepts -O], [ac_cv_c_o], [CFLAGS="${save_CFLAGS} -O" AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) - if test x"$ac_cv_c_o" != x"no"; then + if test "x${ac_cv_c_o}" != "xno"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" fi fi @@ -305,7 +358,7 @@ AC_CACHE_CHECK([if \$CC accepts -ffast-math], [ac_cv_c_fast_math], [CFLAGS="${save_CFLAGS} -ffast-math" AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)]) -if test x"$ac_cv_c_fast_math" != x"no"; then +if test "x${ac_cv_c_fast_math}" != "xno"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math" fi @@ -314,7 +367,7 @@ AC_CACHE_CHECK([if \$CC accepts -funroll-loops], [ac_cv_c_unroll_loops], [CFLAGS="${save_CFLAGS} -funroll-loops" AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)]) -if test x"$ac_cv_c_unroll_loops" != x"no"; then +if test "x${ac_cv_c_unroll_loops}" != "xno"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops" fi @@ -323,8 +376,10 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer], [ac_cv_c_omit_frame_pointer], [CFLAGS="${save_CFLAGS} -fomit-frame-pointer" AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)]) -if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then +if test "x${ac_cv_c_omit_frame_pointer}" != "xno"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" + # this plugin does not compile without -fomit-frame-pointer, damn gcc! + i420_yuy2_mmx_CFLAGS="${i420_yuy2_mmx_CFLAGS} -fomit-frame-pointer" fi dnl Check for Darwin plugin linking flags @@ -332,7 +387,7 @@ 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 +if test "x${ac_cv_ld_darwin}" != "xno"; then plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" fi @@ -341,7 +396,7 @@ AC_CACHE_CHECK([if \$CC accepts -shared], [ac_cv_ld_plugins], [CFLAGS="${save_CFLAGS} -shared" AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)]) -if test x"$ac_cv_ld_plugins" != x"no"; then +if test "x${ac_cv_ld_plugins}" != "xno"; then plugins_LDFLAGS="${plugins_LDFLAGS} -shared" fi @@ -355,7 +410,7 @@ AC_CACHE_CHECK([for variadic cpp macros], [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 +if test "x${ac_cv_cpp_variadic_macros}" != "xno"; then AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros) fi @@ -366,48 +421,19 @@ AC_CACHE_CHECK([__attribute__ ((aligned ())) support], 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 + [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 + CFLAGS="${save_CFLAGS}"]) +if test "x${ac_cv_c_attribute_aligned}" != "x0"; then AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], - [$ac_cv_c_attribute_aligned],[Maximum supported data alignment]) -fi - -dnl End of the bizarre compilation tests -CFLAGS="${save_CFLAGS}" -CPPFLAGS="${save_CPPFLAGS}" -LDFLAGS="${save_LDFLAGS}" - -dnl Check for boolean_t -AC_CACHE_CHECK([for boolean_t in sys/types.h], - [ac_cv_c_boolean_t_sys_types_h], - [AC_TRY_COMPILE([#include ], [boolean_t foo;], - ac_cv_c_boolean_t_sys_types_h=yes, ac_cv_c_boolean_t_sys_types_h=no)]) -if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then - AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if defines boolean_t.) -fi - -AC_CACHE_CHECK([for boolean_t in pthread.h], - [ac_cv_c_boolean_t_pthread_h], - [AC_TRY_COMPILE([#include ], [boolean_t foo;], - ac_cv_c_boolean_t_pthread_h=yes, ac_cv_c_boolean_t_pthread_h=no)]) -if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then - AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if defines boolean_t.) -fi - -AC_CACHE_CHECK([for boolean_t in cthreads.h], - [ac_cv_c_boolean_t_cthreads_h], - [AC_TRY_COMPILE([#include ], [boolean_t foo;], - ac_cv_c_boolean_t_cthreads_h=yes, ac_cv_c_boolean_t_cthreads_h=no)]) -if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then - AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if defines boolean_t.) + [${ac_cv_c_attribute_aligned}],[Maximum supported data alignment]) fi dnl dnl Check the CPU dnl -case x"${target_cpu}" in +case "x${target_cpu}" in x) ARCH=unknown ;; @@ -419,108 +445,131 @@ esac 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 mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone fx_scope" +BUILTINS="${BUILTINS}" +PLUGINS="${PLUGINS} misc/dummy/dummy misc/null" +PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file misc/memcpy/memcpy" +PLUGINS="${PLUGINS} demux/mpeg/es demux/mpeg/audio demux/mpeg/mpeg_system demux/mpeg/ps demux/mpeg/ts" +PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic codec/mpeg_video/motion/motion codec/mpeg_video/mpeg_video codec/spudec/spudec codec/spdif codec/mpeg_audio/mpeg_audio" +PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/a52old/a52old" +#PLUGINS="${PLUGINS} codec/lpcm/lpcm" +PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop" +PLUGINS="${PLUGINS} audio_filter/converter/float32tos16 audio_filter/converter/float32tos8 audio_filter/converter/float32tou16 audio_filter/converter/float32tou8 audio_filter/converter/a52tospdif audio_filter/converter/fixed32tofloat32 audio_filter/converter/fixed32tos16 audio_filter/converter/s16tofloat32" +PLUGINS="${PLUGINS} audio_filter/resampler/trivial audio_filter/resampler/ugly" +PLUGINS="${PLUGINS} audio_filter/channel_mixer/trivial" +PLUGINS="${PLUGINS} audio_mixer/trivial audio_mixer/spdif" +PLUGINS="${PLUGINS} audio_output/file" +#PLUGINS="${PLUGINS} visualization/scope/scope" +PLUGINS="${PLUGINS} video_chroma/i420_rgb video_chroma/i420_yuy2 video_chroma/i422_yuy2 video_chroma/i420_ymga" +PLUGINS="${PLUGINS} demux/util/id3" +dnl +dnl Network modules +dnl +NETWORK_MODULES="access/udp access/http access/rtp misc/network/ipv4" dnl dnl Accelerated modules 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" -SSE_MODULES="imdctsse downmixsse" -ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec" +MMX_MODULES="misc/memcpy/memcpymmx codec/mpeg_video/idct/idctmmx codec/mpeg_video/motion/motionmmx video_chroma/i420_rgb_mmx video_chroma/i420_yuy2_mmx video_chroma/i422_yuy2_mmx video_chroma/i420_ymga_mmx" +MMXEXT_MODULES="misc/memcpy/memcpymmxext codec/mpeg_video/idct/idctmmxext codec/mpeg_video/motion/motionmmxext" +THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52old/downmix/downmix3dn" +SSE_MODULES="codec/a52old/imdct/imdctsse codec/a52old/downmix/downmixsse" +ALTIVEC_MODULES="codec/mpeg_video/idct/idctaltivec codec/mpeg_video/motion/motionaltivec misc/memcpy/memcpyaltivec" + +if test x$SYS != xbeos +then + PLUGINS="${PLUGINS} ${NETWORK_MODULES}" +fi AC_CACHE_CHECK([if \$CC groks MMX inline assembly], [ac_cv_mmx_inline], - [AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], + [CFLAGS="${save_CFLAGS}" + 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 +if test "x${ac_cv_mmx_inline}" != "xno"; 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 *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], + [CFLAGS="${save_CFLAGS}" + 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 +if test "x${ac_cv_mmxext_inline}" != "xno"; 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 *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], + [CFLAGS="${save_CFLAGS}" + 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 +if test "x${ac_cv_3dnow_inline}" != "xno"; 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 *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], + [CFLAGS="${save_CFLAGS}" + 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" -a x$SYS != xmingw32; then +if test "x${ac_cv_sse_inline}" != "xno" -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 -# don't try to grok altivec with native mingw32 it doesn't work right now +# don't try to grok AltiVec with native mingw32 it doesn't work right now # we should be able to remove this test with future versions of mingw32 -if test x$SYS != xmingw32; then -AC_CACHE_CHECK([if \$CC groks Altivec inline assembly], +if test "x${SYS}" != "xmingw32"; then +AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly], [ac_cv_altivec_inline], - [AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], + [CFLAGS="${save_CFLAGS}" + AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], ac_cv_altivec_inline=yes, - [save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Wa,-m7400" + [CFLAGS="${save_CFLAGS} -Wa,-m7400" 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 - 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" +if test "x${ac_cv_altivec_inline}" != "xno"; then + AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.) + if test "x${ac_cv_altivec_inline}" != "xyes"; then + 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 -AC_CACHE_CHECK([if \$CC groks Altivec C extensions], +AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [ac_cv_c_altivec], - [save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -faltivec" + [CFLAGS="${save_CFLAGS} -faltivec" # Darwin test AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], ac_cv_c_altivec=-faltivec, [ # Linux/PPC test - CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -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) ]) - CFLAGS=$save_CFLAGS - ]) -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.) - 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" + CFLAGS="${save_CFLAGS}"]) +if test "x${ac_cv_c_altivec}" != "xno"; then + AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) + 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 AC_CACHE_CHECK([if linker needs -framework vecLib], [ac_cv_ld_altivec], - [save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -framework vecLib" + [LDFLAGS="${vlc_LDFLAGS} -framework vecLib" AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no) - LDFLAGS=$save_LDFLAGS + LDFLAGS="${save_LDFLAGS}" ]) -if test x"$ac_cv_ld_altivec" != x"no"; then +if test "x${ac_cv_ld_altivec}" != "xno"; then idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib" motionaltivec_LDFLAGS="${motionaltivec_LDFLAGS} -framework vecLib" memcpyaltivec_LDFLAGS="${memcpyaltivec_LDFLAGS} -framework vecLib" @@ -538,22 +587,22 @@ 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$with_tuning" != "x"; then - TUNING="$with_tuning" +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" + if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xi486" -o "x${target_cpu}" = "xi386"; then TUNING="pentiumpro" else - if test x${target_cpu} = xpowerpc; then TUNING="750"; fi + if test "x${target_cpu}" = "xpowerpc"; then TUNING="750"; fi fi fi dnl dnl x86 accelerations dnl -if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386 +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}" + PLUGINS="${PLUGINS} ${ACCEL_MODULES}" fi dnl @@ -561,17 +610,17 @@ dnl Enable/disable optimizations dnl AC_ARG_ENABLE(optimizations, [ --disable-optimizations disable compiler optimizations (default enabled)], -[ if test x$enable_optimizations = xno; then OPTIMS=0; fi ], +[ if test "x${enable_optimizations}" = "xno"; then OPTIMS=0; fi ], [ OPTIMS=1 ]) dnl dnl AltiVec acceleration dnl AC_ARG_ENABLE(altivec, -[ --disable-altivec disable altivec optimizations (default enabled on PPC)], -[ if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec"; +[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)], +[ 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"; +[ if test "x${target_cpu}" = "xpowerpc"; then ARCH="${ARCH} altivec"; BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ]) dnl @@ -580,7 +629,7 @@ dnl DEBUG=0 AC_ARG_ENABLE(debug, [ --enable-debug debug mode (default disabled)], -[ if test x$enable_debug = xyes; then DEBUG=1; fi ]) +[ if test "x${enable_debug}" = "xyes"; then DEBUG=1; fi ]) dnl dnl Enable release-specific flags @@ -588,7 +637,7 @@ dnl RELEASE=0 AC_ARG_ENABLE(release, [ --enable-release activate extra optimizations (default disabled)], -[ if test x$enable_release = xyes; then RELEASE=1; fi ], +[ if test "x${enable_release}" = "xyes"; then RELEASE=1; fi ], [ VERSION="${VERSION}_`date +%Y-%m-%d`" ]) dnl @@ -602,25 +651,25 @@ dnl DVD module: optionally check for installed libdvdcss dnl AC_ARG_ENABLE(dvd, [ --enable-dvd DVD input module (default enabled)]) -if test "x$enable_dvd" != "xno" +if test "x${enable_dvd}" != "xno" then AC_ARG_WITH(dvdcss, [ --with-dvdcss=PATH libdvdcss headers and libraries]) AC_ARG_WITH(dvdcss-tree, [ --with-dvdcss-tree=PATH libdvdcss tree for static linking]) - case "x$with_dvdcss" in + case "x${with_dvdcss}" in x|xyes) - if test "x$with_dvdcss_tree" = x + if test "x${with_dvdcss_tree}" = x then AC_CHECK_HEADERS(dvdcss/dvdcss.h, - [ PLUGINS="${PLUGINS} dvd" + [ PLUGINS="${PLUGINS} access/dvd/dvd" 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 AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree}) real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" - if test "x$real_dvdcss_tree" = x + if test "x${real_dvdcss_tree}" = "x" then dnl The given directory can't be found AC_MSG_RESULT(no) @@ -630,7 +679,7 @@ then then dnl Use a custom libdvdcss AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) - BUILTINS="${BUILTINS} dvd" + BUILTINS="${BUILTINS} access/dvd/dvd" dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" dvd_CFLAGS="${dvd_CFLAGS} -I${real_dvdcss_tree}/src" else @@ -642,7 +691,7 @@ then ;; xno) dnl Compile without dvdcss (dlopen version, works only under Linux) - PLUGINS="${PLUGINS} dvd" + PLUGINS="${PLUGINS} access/dvd/dvd" dvd_CFLAGS="${dvd_CFLAGS} -DGOD_DAMN_DMCA" dvd_LDFLAGS="${dvd_LDFLAGS} -ldl" ;; @@ -652,7 +701,7 @@ then then dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} dvd" + PLUGINS="${PLUGINS} access/dvd/dvd" dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss" dvd_CFLAGS="${dvd_CFLAGS} -I${with_dvdcss}/include" else @@ -669,11 +718,11 @@ dnl dvdread module: check for libdvdread plugin dnl AC_ARG_ENABLE(dvdread, [ --enable-dvdread dvdread input module (default disabled)]) -if test "x$enable_dvdread" != "xno" +if test "x${enable_dvdread}" != "xno" then AC_ARG_WITH(dvdread, [ --with-dvdread=PATH libdvdread headers and libraries]) - if test "x$with_dvdread" = x + if test "x${with_dvdread}" = "x" then test_LDFLAGS="" test_CFLAGS="" @@ -681,23 +730,23 @@ then test_LDFLAGS="-L${with_dvdread}/lib" test_CFLAGS="-I${with_dvdread}/include" fi - CPPFLAGS="$save_CPPFLAGS $test_CFLAGS" + 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" + [int foo() { return DVD_VIDEO_LB_LEN; }],[ + PLUGINS="${PLUGINS} access/dvdread/dvdread" dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread" dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}" ],[ - if test "x$enable_dvdread" != x + 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 + if test "x${enable_dvdread}" != "x" then - if test "x$with_dvdread" != x + if test "x${with_dvdread}" != "x" then AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h in ${with_dvdread}/include]) else @@ -709,56 +758,145 @@ then fi dnl -dnl libdvbpsi ts demux +dnl dvdplay module: check for libdvdplay dnl -AC_ARG_ENABLE(dvbpsi, -[ --enable-dvbpsi dvbpsi ts demux module (default disabled)]) -if test "x$enable_dvbpsi" != "xno" +AC_ARG_ENABLE(dvdplay, +[ --enable-dvdplay dvdplay input module (default disabled)]) +if test "x$enable_dvdplay" != "xno" then - AC_ARG_WITH(dvbpsi, - [ --with-dvbpsi=PATH libdvbpsi headers and libraries]) - if test "x$with_dvbpsi" = x + AC_ARG_WITH(dvdplay, + [ --with-dvdplay=PATH libdvdplay headers and libraries]) + if test "x$with_dvdplay" = x then test_LDFLAGS="" test_CFLAGS="" else - test_LDFLAGS="-L${with_dvbpsi}/lib" - test_CFLAGS="-I${with_dvbpsi}/include" + test_LDFLAGS="-L${with_dvdplay}/lib" + test_CFLAGS="-I${with_dvdplay}/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}" + AC_CHECK_HEADERS(dvdplay/dvdplay.h, [ + PLUGINS="${PLUGINS} access/dvdplay/dvdplay" + dvdplay_LDFLAGS="${dvdplay_LDFLAGS} ${test_LDFLAGS} -ldvdplay -ldvdread" + dvdplay_CFLAGS="${dvdplay_CFLAGS} ${test_CFLAGS}" ],[ - if test "x$enable_dvbpsi" != x + if test "x$enable_dvdplay" != 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]) + if test "x$with_dvdplay" != x + then + AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h in ${with_dvdplay}/include]) + else + AC_MSG_ERROR([Cannot find dvdplay/dvdplay.h]) + fi fi ]) - CPPFLAGS="$save_CPPFLAGS" + 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} demux/mpeg/ts_dvbpsi" + ts_dvbpsi_LDFLAGS="${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} demux/mpeg/ts_dvbpsi" + ts_dvbpsi_LDFLAGS="${ts_dvbpsi_LDFLAGS} ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" + ts_dvbpsi_CFLAGS="${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 + ;; + *) + AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi}) + if test "x${with_dvbpsi}" = "x" + then + test_LDFLAGS="" + test_CFLAGS="" + else + 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} demux/mpeg/ts_dvbpsi" + ts_dvbpsi_LDFLAGS="${ts_dvbpsi_LDFLAGS} ${test_LDFLAGS} -ldvbpsi" + ts_dvbpsi_CFLAGS="${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 + +dnl +dnl Video4Linux plugin +dnl +AC_ARG_ENABLE(v4l, + [ --enable-v4l Video4Linux input support (default disabled)]) +if test "x${enable_v4l}" = "xyes" +then + AC_CHECK_HEADERS(libv4l/v4l.h, [ + PLUGINS="${PLUGINS} access/v4l/v4l" + ],[]) fi - + dnl dnl VCD module dnl AC_ARG_ENABLE(vcd, [ --enable-vcd VCD support for Linux, FreeBSD and MacOS X (default enabled)]) -if test x$enable_vcd != xno +if test "x${enable_vcd}" != "xno" then AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ - PLUGINS="${PLUGINS} vcd" + PLUGINS="${PLUGINS} access/vcd/vcd" ]) AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[ - PLUGINS="${PLUGINS} vcd" + PLUGINS="${PLUGINS} access/vcd/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" + PLUGINS="${PLUGINS} access/vcd/vcd" fi if test "x${SYS}" = "xdarwin" @@ -773,17 +911,34 @@ dnl Satellite input module dnl AC_ARG_ENABLE(satellite, [ --enable-satellite satellite card support (default disabled)], - [ if test x$enable_satellite = xyes + [ if test "x${enable_satellite}" = "xyes" then - PLUGINS="${PLUGINS} satellite" + PLUGINS="${PLUGINS} access/satellite/satellite" fi]) dnl dnl ipv6 plugin - not for QNX yet dnl -if test x$SYS != xnto +if test "x${SYS}" != "xnto" && test "x${SYS}" != "xmingw32" +then + have_ipv6=0 + AC_CHECK_FUNC(inet_pton,[have_ipv6=1],[ + AC_CHECK_LIB(resolv,inet_pton, + [have_ipv6=1 + ipv6_LDFLAGS="${ipv6_LDFLAGS} -lresolv"]) + ]) + AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h) + AC_EGREP_HEADER(sockaddr_in6,netinet/in.h, + [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_ipv6=0]) + if test x$have_ipv6 = x1; then + PLUGINS="${PLUGINS} misc/network/ipv6" + fi +fi +if test "x${SYS}" = "xmingw32" then - AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"]) + AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h) + AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes) + PLUGINS="${PLUGINS} misc/network/ipv6"],[AC_MSG_RESULT(no)]) fi dnl @@ -791,9 +946,19 @@ dnl AVI demux plugin dnl AC_ARG_ENABLE(avi, [ --enable-avi AVI demux module (default enabled)]) -if test x$enable_avi != xno +if test "x${enable_avi}" != "xno" then - PLUGINS="${PLUGINS} avi" + PLUGINS="${PLUGINS} demux/avi/avi" +fi + +dnl +dnl AAC demux plugin +dnl +AC_ARG_ENABLE(aac, + [ --enable-aac AAC demux module (default enabled)]) +if test "x${enable_aac}" != "xno" +then + PLUGINS="${PLUGINS} demux/aac/aac" fi dnl @@ -807,22 +972,22 @@ dnl mad plugin dnl AC_ARG_ENABLE(mad, [ --enable-mad libmad module (default disabled)]) -if test x$enable_mad = xyes +if test "x${enable_mad}" = "xyes" then AC_ARG_WITH(mad, [ --with-mad=PATH path to libmad],[],[]) - if test "x$with_mad" != "xno" -a "x$with_mad" != "x" + 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" + 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" + 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 + if test "x${real_mad_tree}" = "x" then dnl The given directory can't be found AC_MSG_RESULT(no) @@ -835,56 +1000,71 @@ 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 + LDFLAGS="${save_LDFLAGS} ${mad_LDFLAGS}" AC_CHECK_LIB(mad, mad_bit_init, [ - BUILTINS="${BUILTINS} mad" + BUILTINS="${BUILTINS} codec/mad/mad" mad_LDFLAGS="${mad_LDFLAGS} -lmad" ],[ AC_MSG_ERROR([the specified tree hasn't been compiled ]) ],[]) - LDFLAGS=$save_LDFLAGS + 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" + CFLAGS="${save_CFLAGS} ${mad_CFLAGS}" + LDFLAGS="${save_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" + PLUGINS="${PLUGINS} codec/mad/mad" mad_LDFLAGS="${mad_LDFLAGS} -lmad" ], [ AC_MSG_ERROR([Cannot find libmad library...]) ]) - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS + CFLAGS="${save_CFLAGS}" + LDFLAGS="${save_LDFLAGS}" fi fi +dnl +dnl libid3tag support +dnl +AC_CHECK_HEADERS(id3tag.h, [ + id3tag_LDFLAGS="${id3tag_LDFLAGS} -lz -lid3tag" + PLUGINS="${PLUGINS} demux/util/id3tag"]) + dnl dnl ffmpeg decoder plugin dnl AC_ARG_ENABLE(ffmpeg, [ --enable-ffmpeg ffmpeg codec (default disabled)]) -if test "x$enable_ffmpeg" = "xyes" +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" + 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" + ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${with_ffmpeg}/include/libffmpeg" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -L${with_ffmpeg}/lib" fi + dnl Add postprocessing modules + PLUGINS="${PLUGINS} codec/ffmpeg/postprocessing/postprocessing_c" + if test "x${ac_cv_mmx_inline}" != "xno"; then + PLUGINS="${PLUGINS} codec/ffmpeg/postprocessing/postprocessing_mmx" + fi + + if test "x${ac_cv_mmxext_inline}" != "xno"; then + PLUGINS="${PLUGINS} codec/ffmpeg/postprocessing/postprocessing_mmxext" + fi + + AC_ARG_WITH(ffmpeg-tree, [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking]) - if test "x$with_ffmpeg_tree" != "x" + 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 + if test "x${real_ffmpeg_tree}" = x then dnl The given directory can't be found AC_MSG_RESULT(no) @@ -894,7 +1074,7 @@ then then dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - BUILTINS="${BUILTINS} ffmpeg" + BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" else @@ -903,39 +1083,101 @@ then 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" + CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" + LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS}" AC_CHECK_LIB(avcodec, avcodec_init, [ - BUILTINS="${BUILTINS} ffmpeg" + BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ], [ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS + LDFLAGS="${save_LDFLAGS}" + CFLAGS="${save_CFLAGS}" + fi +fi + +dnl +dnl faad decoder plugin +dnl +AC_ARG_ENABLE(faad, +[ --enable-faad faad codec (default disabled)]) +if test "x${enable_faad}" = "xyes" +then + AC_ARG_WITH(faad, + [ --with-faad=PATH path to faad installation],[],[]) + if test "x${with_faad}" != "xno" -a "x${with_faad}" != "x" + then + faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include" + faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib" + fi + faad_LDFLAGS="${faad_LDFLAGS}" + + AC_ARG_WITH(faad-tree, + [ --with-faad-tree=PATH faad tree for static linking]) + if test "x${with_faad_tree}" != "x" + then + AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree}) + real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`" + if test "x${real_faad_tree}" = x + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_faad_tree}]) + fi + if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a" + then + dnl Use a custom faad + AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) + BUILTINS="${BUILTINS} codec/faad/faad" + faad_LDFLAGS="${faad_LDFLAGS} ${real_faad_tree}/libfaad/.libs/libfaad.a" + faad_CFLAGS="${faad_CFLAGS} -I${real_faad_tree}/include" + else + dnl The given libfaad wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_faad_tree}/libfaad/.libs/libfaad.a, make sure you compiled libfaad in ${with_faad_tree}]) + fi + else + CFLAGS="${save_CFLAGS} ${faad_CFLAGS}" + LDFLAGS="${save_LDFLAGS} ${faad_LDFLAGS}" + AC_CHECK_HEADERS(faad.h, , + [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) + AC_CHECK_LIB(faad, faacDecOpen, [ + PLUGINS="${PLUGINS} codec/faad/faad" + faad_LDFLAGS="${faad_LDFLAGS} -lfaad" ], + [ AC_MSG_ERROR([Cannot find libfaad library...]) ]) + LDFLAGS="${save_LDFLAGS}" + CFLAGS="${save_CFLAGS}" fi fi -dnl special case for BeOS -if test x$SYS = xbeos + +dnl +dnl MP4 module +dnl +AC_ARG_ENABLE(mp4, + [ --enable-mp4 MP4 demux module (default enabled)]) +if test "x${enable_mp4}" != "xno" then - PLUGINS="${PLUGINS} beos" + + PLUGINS="${PLUGINS} demux/mp4/mp4" + AC_CHECK_HEADERS(zlib.h, + [ mp4_LDFLAGS="${mp4_LDFLAGS} -lz" ] ) fi dnl dnl a52 AC3 decoder plugin dnl AC_ARG_ENABLE(a52, - [ --enable-a52 AC3 support with liba52 (default enabled)]) -if test "x$enable_a52" != "xno" + [ --enable-a52 A/52 support with liba52 (default enabled)]) +if test "x${enable_a52}" != "xno" then + AC_ARG_WITH(a52, + [ --with-a52=PATH a52 headers and libraries]) 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" + 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 + if test "x${real_a52_tree}" = "x" then dnl The given directory can't be found AC_MSG_RESULT(no) @@ -948,10 +1190,9 @@ 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" + LDFLAGS="${save_LDFLAGS} ${a52_LDFLAGS}" AC_CHECK_LIB(a52, a52_free, [ - BUILTINS="${BUILTINS} a52" + BUILTINS="${BUILTINS} codec/a52" a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE" ],[ @@ -962,36 +1203,78 @@ then AC_MSG_ERROR([the specified tree hasn't been compiled]) fi ],[-lm]) - LDFLAGS=$save_LDFLAGS + 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 + else + if test "x${with_a52}" = "x" + then + test_LDFLAGS="" + test_CFLAGS="" + else + test_LDFLAGS="-L${with_a52}/lib" + test_CFLAGS="-I${with_a52}/include" + fi + save_CPPFLAGS="${CPPFLAGS}" + save_LDFLAGS="${LDFLAGS}" + CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" + LDFLAGS="${save_LDFLAGS} ${test_LDFLAGS}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ - BUILTINS="${BUILTINS} a52" - a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" - a52_CFLAGS="${a52_CFLAGS}" - ],[],[-lm]) + BUILTINS="${BUILTINS} codec/a52" + a52_LDFLAGS="${a52_LDFLAGS} ${test_LDFLAGS} -la52 -lm" + a52_CFLAGS="${a52_CFLAGS} ${test_CFLAGS}" + ],[ + if test "x${enable_dvbpsi}" != "x" + then + AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net]) + fi + ],[-lm]) ]) + CPPFLAGS="${save_CPPFLAGS}" + LDFLAGS="${save_LDFLAGS}" fi fi +dnl +dnl cinepak plugin +dnl +AC_ARG_ENABLE(cinepak, + [ --enable-cinepak Cinepak decoder (default enabled)]) +if test "x${enable_cinepak}" != "xno" +then + PLUGINS="${PLUGINS} codec/cinepak/cinepak" +fi + dnl dnl ogg vorbis plugin dnl AC_ARG_ENABLE(vorbis, [ --enable-vorbis Ogg/Vorbis decoder support (default enabled)]) -if test "x$enable_vorbis" != "xno" +if test "x${enable_vorbis}" != "xno" then AC_CHECK_HEADERS(ogg/ogg.h, [ dnl disabled for the moment - #PLUGINS="${PLUGINS} vorbis" + #PLUGINS="${PLUGINS} demux/ogg/ogg codec/vorbis/vorbis" vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis" ],[]) fi +dnl +dnl DV plugin +dnl +AC_ARG_ENABLE(dv, + [ --enable-dv DV decoder support (default disabled)]) +if test "x${enable_dv}" = "xyes" +then + AC_CHECK_HEADERS(libdv/dv.h, [ + BUILTINS="${BUILTINS} codec/dv/dv" + dv_LDFLAGS="${dv_LDFLAGS} -ldv" + ],[]) +fi + dnl dnl Video plugins dnl @@ -1004,21 +1287,15 @@ dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(x11, [ --enable-x11 X11 support (default enabled)]) -if test x$enable_x11 != xno && - (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then - if test x$x_includes = xNONE; then - x_includes=/usr/X11R6/include - fi - if test x$x_libraries = xNONE; then - x_libraries=/usr/X11R6/lib - fi - CPPFLAGS="$save_CPPFLAGS -I$x_includes" +if test "x${enable_x11}" != "xno" && + (test "x${SYS}" != "xmingw32" || test "x${enable_x11}" = "xyes"); then + CPPFLAGS="${save_CPPFLAGS} -I${x_includes}" AC_CHECK_HEADERS(X11/Xlib.h, [ - PLUGINS="${PLUGINS} x11" - x11_LDFLAGS="${x11_LDFLAGS} -L$x_libraries -lX11 -lXext" - x11_CFLAGS="${x11_CFLAGS} -I$x_includes" + PLUGINS="${PLUGINS} video_output/x11/x11" + x11_LDFLAGS="${x11_LDFLAGS} -L${x_libraries} -lX11 -lXext" + x11_CFLAGS="${x11_CFLAGS} -I${x_includes}" ]) - CPPFLAGS="$save_CPPFLAGS" + CPPFLAGS="${save_CPPFLAGS}" fi dnl @@ -1027,31 +1304,28 @@ dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(xvideo, [ --enable-xvideo XVideo support (default enabled)]) -if test x$enable_xvideo != xno && - (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then - if test x$x_includes = xNONE; then - x_includes=/usr/X11R6/include - fi - if test x$x_libraries = xNONE; then - x_libraries=/usr/X11R6/lib - fi - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$save_CPPFLAGS -I$x_includes" +if test "x${enable_xvideo}" != "xno" && + (test "x${SYS}" != "xmingw32" || test "x${enable_xvideo}" = "xyes"); then + CPPFLAGS="${save_CPPFLAGS} -I${x_includes}" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" - AC_CHECK_LIB(Xv_pic,XvSetPortAttribute, + CFLAGS="${save_CFLAGS} -L${x_libraries} -lX11 -lXext" + AC_CHECK_LIB(Xv_pic,XvPutImage, # We have Xv_pic, that's good, we can build an xvideo.so plugin ! - PLUGINS="${PLUGINS} xvideo" - 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" - xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv" - xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes") - CFLAGS="$save_CFLAGS" + PLUGINS="${PLUGINS} video_output/x11/xvideo" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L${x_libraries} -lX11 -lXext -lXv_pic" + xvideo_CFLAGS="${xvideo_CFLAGS} -I${x_includes}", + AC_CHECK_LIB(Xv,XvPutImage, + # We don't have Xv_pic, but we have Xv, let's make xvideo.a as builtin + PLUGINS="${PLUGINS} video_output/x11/xvideo" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L${x_libraries} -lX11 -lXext -lXv" + xvideo_CFLAGS="${xvideo_CFLAGS} -I${x_includes}", + # Otherwise... well, do nothing. + : + ) + ) + CFLAGS="${save_CFLAGS}" ] - CPPFLAGS="$save_CPPFLAGS") + CPPFLAGS="${save_CPPFLAGS}") fi dnl @@ -1059,49 +1333,49 @@ dnl SDL module dnl AC_ARG_ENABLE(sdl, [ --enable-sdl SDL support (default enabled)]) -if test "x$enable_sdl" != "xno" +if test "x${enable_sdl}" != "xno" then - SDL_PATH=$PATH + SDL_PATH="${PATH}" AC_ARG_WITH(sdl-config-path, [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)], - [ if test "x$with_sdl_config_path" != "xno" + [ if test "x${with_sdl_config_path}" != "xno" then - SDL_PATH="$with_sdl_config_path:$PATH" + SDL_PATH="${with_sdl_config_path}:${PATH}" fi ]) - AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, $SDL_PATH) - SDL_CONFIG=${SDL12_CONFIG} + AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, ${SDL_PATH}) + SDL_CONFIG="${SDL12_CONFIG}" SDL_HEADER="SDL12/SDL.h" - if test x${SDL_CONFIG} = xno + if test "x${SDL_CONFIG}" = "xno" then - AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, $SDL_PATH) + AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, ${SDL_PATH}) SDL_CONFIG=${SDL11_CONFIG} SDL_HEADER="SDL11/SDL.h" fi - if test x${SDL_CONFIG} = xno + if test "x${SDL_CONFIG}" = "xno" then - AC_PATH_PROG(SDL_CONFIG, sdl-config, no, $SDL_PATH) + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH}) SDL_HEADER="SDL/SDL.h" fi - if test x${SDL_CONFIG} != xno + if test "x${SDL_CONFIG}" != "xno" then - PLUGINS="${PLUGINS} sdl" + PLUGINS="${PLUGINS} video_output/sdl audio_output/sdl" sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`" sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" - CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" + 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" - if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null + 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. Please install it and try again. Alternatively you can also configure with --disable-sdl.]) fi - elif test "x$enable_sdl" = "xyes" + elif test "x${enable_sdl}" = "xyes" then AC_MSG_ERROR([I couldn't find the SDL package. You can download libSDL from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day. @@ -1114,23 +1388,23 @@ dnl Windows DirectX module dnl AC_ARG_ENABLE(directx, [ --enable-directx Win32 DirectX support (default enabled on Win32)]) -if test "x$enable_directx" != "xno" +if test "x${enable_directx}" != "xno" then - if test x$SYS = xmingw32 + if test "x${SYS}" = "xmingw32" then AC_ARG_WITH(directx, - [ --with-directx=PATH Win32 DirectX headers and libraries]) - if test "x$with_directx" = "x" + [ --with-directx=PATH Win32 DirectX headers]) + if test "x${with_directx}" = "x" then AC_CHECK_HEADERS(ddraw.h, - [ PLUGINS="${PLUGINS} directx" + [ PLUGINS="${PLUGINS} video_output/directx/directx" directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h then - PLUGINS="${PLUGINS} directx" - directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32" + PLUGINS="${PLUGINS} video_output/directx/directx" + directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" directx_CFLAGS="${directx_CFLAGS} -I${with_directx}" AC_MSG_RESULT(yes) else @@ -1146,10 +1420,10 @@ dnl Linux framebuffer module dnl AC_ARG_ENABLE(fb, [ --enable-fb Linux framebuffer support (default enabled on Linux)]) - if test x$enable_fb != xno + if test "x${enable_fb}" != "xno" then AC_CHECK_HEADERS(linux/fb.h, [ - PLUGINS="${PLUGINS} fb" + PLUGINS="${PLUGINS} video_output/fb" ]) fi @@ -1158,26 +1432,37 @@ dnl Linux MGA module dnl AC_ARG_ENABLE(mga, [ --enable-mga Linux kernel Matrox support (default disabled)], - [ if test x$enable_mga = xyes + [ if test "x${enable_mga}" = "xyes" then - PLUGINS="${PLUGINS} mga xmga" + PLUGINS="${PLUGINS} video_output/mga/mga video_output/mga/xmga" fi ]) +dnl +dnl SVGAlib module +dnl +AC_ARG_ENABLE(svgalib, + [ --enable-svgalib SVGAlib support (default disabled)]) +if test "x${enable_svgalib}" = "xyes" +then + PLUGINS="${PLUGINS} video_output/svgalib" + svgalib_LDFLAGS="${svgalib_LDFLAGS} -lvgagl -lvga" +fi + dnl dnl GGI module dnl AC_ARG_ENABLE(ggi, [ --enable-ggi GGI support (default disabled)]) -if test x$enable_ggi = xyes +if test "x${enable_ggi}" = "xyes" then - PLUGINS="${PLUGINS} ggi" + PLUGINS="${PLUGINS} video_output/ggi" ggi_LDFLAGS="${ggi_LDFLAGS} -lggi" AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], - [ if test "x$with_ggi" != "xno" -a "x$with_ggi" != "x" + [ if test "x${with_ggi}" != "xno" -a "x${with_ggi}" != "x" then - CFLAGS_GGI="${CFLAGS_GGI} -I$with_ggi/include" - ggi_LDFLAGS="${ggi_LDFLAGS} -L$with_ggi/lib" + CFLAGS_GGI="${CFLAGS_GGI} -I${with_ggi}/include" + ggi_LDFLAGS="${ggi_LDFLAGS} -L${with_ggi}/lib" fi ]) fi @@ -1186,17 +1471,17 @@ dnl Glide module dnl AC_ARG_ENABLE(glide, [ --enable-glide Glide (3dfx) support (default disabled)]) -if test x$enable_glide = xyes +if test "x${enable_glide}" = "xyes" then - PLUGINS="${PLUGINS} glide" + PLUGINS="${PLUGINS} video_output/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_glide" != "xno" -a "x$with_glide" != "x" + [ if test "x${with_glide}" != "xno" -a "x${with_glide}" != "x" then - glide_CFLAGS="${glide_CFLAGS} -I$with_glide/include" - glide_LDFLAGS="${glide_LDFLAGS} -L$with_glide/lib" + glide_CFLAGS="${glide_CFLAGS} -I${with_glide}/include" + glide_LDFLAGS="${glide_LDFLAGS} -L${with_glide}/lib" fi ]) fi @@ -1205,12 +1490,12 @@ dnl AA plugin dnl AC_ARG_ENABLE(aa, [ --enable-aa aalib output (default disabled)]) -if test x$enable_aa = xyes +if test "x${enable_aa}" = "xyes" then AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false") - if test x$have_aa = xtrue + if test "x${have_aa}" = "xtrue" then - PLUGINS="${PLUGINS} aa" + PLUGINS="${PLUGINS} video_output/aa" aa_LDFLAGS="${aa_LDFLAGS} -laa" fi fi @@ -1224,15 +1509,15 @@ AC_ARG_WITH(,[Audio plugins:]) dnl dnl OSS /dev/dsp module (enabled by default except on win32) dnl -AC_ARG_ENABLE(dsp, - [ --enable-dsp Linux /dev/dsp support (enabled on Linux)]) +AC_ARG_ENABLE(oss, + [ --enable-oss Linux OSS /dev/dsp support (enabled on Linux)]) -if test x$enable_dsp != xno && - (test x$SYS != xmingw32 || test x$enable_dsp = xyes) +if test "x${enable_oss}" != "xno" && + (test "x${SYS}" != "xmingw32" || test "x${enable_oss}" = "xyes") then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ - PLUGINS="${PLUGINS} dsp" - AC_CHECK_LIB(ossaudio,main,dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio") + PLUGINS="${PLUGINS} audio_output/oss" + AC_CHECK_LIB(ossaudio,main,oss_LDFLAGS="${oss_LDFLAGS} -lossaudio") ]) fi @@ -1241,12 +1526,12 @@ dnl Esound module dnl AC_ARG_ENABLE(esd, [ --enable-esd Esound library support (default disabled)], - [if test x$enable_esd = xyes + [if test "x${enable_esd}" = "xyes" then AC_PATH_PROG(ESD_CONFIG, esd-config, no) - if test x${ESD_CONFIG} != xno + if test "x${ESD_CONFIG}" != "xno" then - PLUGINS="${PLUGINS} esd" + PLUGINS="${PLUGINS} audio_output/esd" esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`" esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`" fi @@ -1257,12 +1542,12 @@ dnl aRts module dnl AC_ARG_ENABLE(arts, [ --enable-arts aRts sound server (default disabled)], - [if test x$enable_arts = xyes + [if test "x${enable_arts}" = "xyes" then AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) - if test x${ARTS_CONFIG} != xno + if test "x${ARTS_CONFIG}" != "xno" then - PLUGINS="${PLUGINS} arts" + PLUGINS="${PLUGINS} audio_output/arts" arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`" arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `" fi @@ -1273,12 +1558,12 @@ dnl ALSA module dnl AC_ARG_ENABLE(alsa, [ --enable-alsa ALSA sound support for Linux (default disabled)], - [if test x$enable_alsa = xyes + [if test "x${enable_alsa}" = "xyes" then 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 + if test "x${have_alsa}" = "xtrue" then - PLUGINS="${PLUGINS} alsa" + PLUGINS="${PLUGINS} audio_output/alsa" alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl" fi fi]) @@ -1288,9 +1573,9 @@ dnl win32 waveOut plugin dnl AC_ARG_ENABLE(waveout, [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) -if test "x$enable_waveout" != "xno" -a x$SYS = xmingw32 +if test "x${enable_waveout}" != "xno" -a "x${SYS}" = "xmingw32" then - PLUGINS="${PLUGINS} waveout" + PLUGINS="${PLUGINS} audio_output/waveout" waveout_LDFLAGS="-lwinmm" fi @@ -1300,48 +1585,100 @@ dnl AC_ARG_WITH(,[Interface plugins:]) +dnl special case for BeOS +if test "x${SYS}" = "xbeos" +then + PLUGINS="${PLUGINS} gui/beos/beos" +fi + dnl dnl Gtk+ module dnl AC_ARG_ENABLE(gtk, [ --enable-gtk Gtk+ support (default enabled)]) -if test x$enable_gtk != xno +if test "x${enable_gtk}" != "xno" then - GTK_PATH=$PATH + 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" + [ if test "x${with_gtk_config_path}" != "xno" then - GTK_PATH="$with_gtk_config_path:$PATH" + GTK_PATH="${with_gtk_config_path}:${PATH}" fi ]) # look for gtk-config - AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, $GTK_PATH) + AC_PATH_PROG(GTK12_CONFIG, gtk12-config, no, ${GTK_PATH}) GTK_CONFIG=${GTK12_CONFIG} - if test x${GTK_CONFIG} = xno + if test "x${GTK_CONFIG}" = "xno" then - AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH) + AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH}) fi - if test x${GTK_CONFIG} != xno + if test "x${GTK_CONFIG}" != "xno" then - if expr 1.2.0 \> `$GTK_CONFIG --version` >/dev/null + 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 - gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`" - gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk gthread`" + gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`" # now look for the gtk.h header - CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS" + 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 echo "Cannot find gtk development headers." ]) - if test "x$ac_cv_gtk_headers" = xyes + if test "x${ac_cv_gtk_headers}" = "xyes" then - PLUGINS="${PLUGINS} gtk" + PLUGINS="${PLUGINS} gui/gtk/gtk" + NEED_GTK_MAIN=yes ALIASES="${ALIASES} gvlc" fi - CPPFLAGS="$save_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} gui/familiar/familiar" + NEED_GTK_MAIN=yes + fi + CPPFLAGS="${save_CPPFLAGS}" fi fi @@ -1350,7 +1687,7 @@ dnl Gnome module dnl AC_ARG_ENABLE(gnome, [ --enable-gnome Gnome interface support (default disabled)], - [if test x$enable_gnome = xyes; then + [if test "x${enable_gnome}" = "xyes"; then # look for gnome-config AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) if test -x ${GNOME_CONFIG} @@ -1359,15 +1696,16 @@ AC_ARG_ENABLE(gnome, gnome_LDFLAGS="${gnome_LDFLAGS} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" fi # now look for the gnome.h header - CPPFLAGS="$save_CPPFLAGS $gnome_CFLAGS" + CPPFLAGS="${save_CPPFLAGS} ${gnome_CFLAGS}" AC_CHECK_HEADERS(gnome.h, [ - PLUGINS="${PLUGINS} gnome" + PLUGINS="${PLUGINS} gui/gtk/gnome" + NEED_GTK_MAIN=yes ALIASES="${ALIASES} gnome-vlc" ],[ AC_MSG_ERROR([Can't find gnome headers. Please install the gnome developement tools or remove the --enable-gnome option]) ]) - CPPFLAGS="$save_CPPFLAGS" + CPPFLAGS="${save_CPPFLAGS}" fi]) dnl @@ -1375,8 +1713,8 @@ dnl Qt module dnl AC_ARG_ENABLE(qt, [ --enable-qt Qt interface support (default disabled)], - [if test x$enable_qt = xyes; then - PLUGINS="${PLUGINS} qt" + [if test "x${enable_qt}" = "xyes"; then + PLUGINS="${PLUGINS} gui/qt/qt" ALIASES="${ALIASES} qvlc" qt_LDFLAGS="${qt_LDFLAGS} -lqt -L${QTDIR}/lib" qt_CFLAGS="${qt_CFLAGS} -I/usr/include/qt -I${QTDIR}/include" @@ -1393,8 +1731,8 @@ dnl KDE module dnl AC_ARG_ENABLE(kde, [ --enable-kde KDE interface support (default disabled)], - [if test x$enable_kde = xyes; then - PLUGINS="${PLUGINS} kde" + [if test "x${enable_kde}" = "xyes"; then + PLUGINS="${PLUGINS} gui/kde/kde" ALIASES="${ALIASES} kvlc" kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile" kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt" @@ -1407,19 +1745,37 @@ AC_ARG_ENABLE(kde, fi fi]) +dnl +dnl Qt embedded module +dnl +AC_ARG_ENABLE(qte, + [ --enable-qte Qt embedded interface support (default disabled)], + [if test "x${enable_qte}" = "xyes"; then + PLUGINS="${PLUGINS} gui/qte/qte" + qte_LDFLAGS="${qte_LDFLAGS} -lqte -L${QTEDIR}/lib" + qte_CFLAGS="${qte_CFLAGS} -I/usr/include/qte -I${QTEDIR}/include" + if test -x ${QTEDIR}/bin/moc + then + MOC=${QTEDIR}/bin/moc + else + MOC=moc + fi + fi]) + + dnl dnl MacOS X module dnl AC_ARG_ENABLE(macosx, [ --enable-macosx MacOS X support (default enabled on MacOS X)], - [if test x$enable_macosx = xyes + [if test "x${enable_macosx}" = "xyes" then - BUILTINS="${BUILTINS} macosx" - macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc -ObjC" + BUILTINS="${BUILTINS} gui/macosx/macosx" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework AGL -framework QuickTime -lobjc -ObjC" fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, - BUILTINS="${BUILTINS} macosx" - macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework AGL -framework QuickTime -lobjc -ObjC" + BUILTINS="${BUILTINS} gui/macosx/macosx" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework AGL -framework QuickTime -lobjc -ObjC" )]) dnl @@ -1427,10 +1783,10 @@ dnl QNX RTOS module dnl AC_ARG_ENABLE(qnx, [ --enable-qnx QNX RTOS support (default enabled on QNX RTOS)]) - if test x$enable_qnx != xno + if test "x${enable_qnx}" != "xno" then AC_CHECK_HEADERS(Ph.h, [ - PLUGINS="${PLUGINS} qnx" + PLUGINS="${PLUGINS} gui/qnx/qnx" qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph" ]) fi @@ -1440,15 +1796,15 @@ dnl Windows native interface module, built with Borland C++ Builder dnl AC_ARG_ENABLE(intfwin, [ --enable-intfwin Win32 interface support (default disabled)], -[ if test "x$enable_intfwin" != "xno" +[ 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" + if test "x${with_bcbuilder}" != "x" then - BCBUILDER="$with_bcbuilder" + BCBUILDER="${with_bcbuilder}" fi - PLUGINS="${PLUGINS} intfwin" + PLUGINS="${PLUGINS} gui/win32/win32" fi ]) dnl @@ -1456,22 +1812,40 @@ dnl ncurses module dnl AC_ARG_ENABLE(ncurses, [ --enable-ncurses ncurses interface support (default disabled)], - [if test x$enable_ncurses = xyes; then - PLUGINS="${PLUGINS} ncurses" + [if test "x${enable_ncurses}" = "xyes"; then + PLUGINS="${PLUGINS} gui/ncurses/ncurses" ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses" fi]) +dnl +dnl XOSD plugin +dnl +AC_ARG_ENABLE(xosd, + [ --enable-xosd xosd interface support (default disabled)]) +if test "x${enable_xosd}" = "xyes" +then + AC_CHECK_HEADER(xosd.h, have_xosd="true", have_xosd="false") + AC_TRY_COMPILE([#include ], + [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],, + AC_DEFINE(HAVE_OLD_XOSD_H, 1, Define if is pre-1.0.0)) + if test "x${have_xosd}" = "xtrue" + then + PLUGINS="${PLUGINS} visualization/xosd/xosd" + xosd_LDFLAGS="${xosd_LDFLAGS} -lxosd" + fi +fi + dnl dnl Lirc plugin dnl AC_ARG_ENABLE(lirc, [ --enable-lirc lirc support (default disabled)]) -if test x$enable_lirc = xyes +if test "x${enable_lirc}" = "xyes" then AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") - if test x$have_lirc = xtrue + if test "x${have_lirc}" = "xtrue" then - PLUGINS="${PLUGINS} lirc" + PLUGINS="${PLUGINS} control/lirc/lirc" lirc_LDFLAGS="${lirc_LDFLAGS} -llirc_client" fi fi @@ -1486,7 +1860,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$with_words" in + case "x${with_words}" in xbig) ac_cv_c_bigendian=yes ;; @@ -1498,7 +1872,7 @@ AC_ARG_WITH(words, dnl binary, by looking for an ASCII or EBCDIC string AC_CACHE_CHECK([whether the byte order is big-endian], [ac_cv_c_bigendian], - [ac_cv_c_bigendian=unknown + [ac_cv_c_bigendian="unknown" [cat >conftest.c <