X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=abb494f8b5daab91b6795d084544327bd453ccec;hb=35b474003dac21d775f8c37f0c68e40e65bf2e9b;hp=067cf07e96644fd75dd3ef02faf2da0c0bd5e8c3;hpb=0220726f875614dc6369d89e6875792f7199a98c;p=vlc diff --git a/configure.in b/configure.in index 067cf07e96..abb494f8b5 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,7 @@ 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 $*" @@ -9,6 +10,9 @@ PACKAGE="vlc" VERSION="0.5.0-cvs" CODENAME="Natalya" +AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION}) +AM_CONFIG_HEADER(config.h) + dnl dnl Save *FLAGS dnl @@ -19,9 +23,10 @@ save_LDFLAGS="${LDFLAGS}" dnl dnl Check for tools dnl -AC_PROG_MAKE_SET 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, :) @@ -32,25 +37,23 @@ dnl Check for GNU make dnl AC_PATH_PROG(GMAKE, gmake, no) 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 - ac_cv_gmake="yes" - else - echo "This software needs you to install GNU make to compile properly." - echo "You can get it from http://www.gnu.org/." - exit - fi]) - VLC_MAKE="make" +AC_CACHE_CHECK([whether GNU make is installed], + [ac_cv_gmake], + [if make --version | grep -q -i gnu; then + ac_cv_gmake="yes" + else + echo "This software needs you to install GNU make to compile properly." + echo "You can get it from http://www.gnu.org/." + exit + fi]) +VLC_MAKE="make" else - VLC_MAKE="gmake" +VLC_MAKE="gmake" fi dnl Gettext stuff 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]) +AM_GNU_GETTEXT_VERSION(0.10.40) AM_GNU_GETTEXT dnl AM_PROG_LIBTOOL @@ -69,66 +72,66 @@ dnl dnl Check the operating system dnl case "x${target_os}" in - x) - SYS=unknown - ;; - xlinux*) - SYS=linux - ;; - xbsdi*) - SYS=bsdi - 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"; CFLAGS="${save_CFLAGS}" - ;; - xdarwin*) - SYS=darwin - 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"; 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*) - SYS=nto - 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"; CFLAGS="${save_CFLAGS}" - vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" - plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" - beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" - ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" - ;; - x*) - SYS="${target_os}" - ;; +x) +SYS=unknown +;; +xlinux*) +SYS=linux +;; +xbsdi*) +SYS=bsdi +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"; CFLAGS="${save_CFLAGS}" +;; +xdarwin*) +SYS=darwin +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"; 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*) +SYS=nto +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"; CFLAGS="${save_CFLAGS}" +vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" +plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" +beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker -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} -fnative-struct" +plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" else - plugins_CFLAGS="${plugins_CFLAGS} -fPIC" - plugins_LDFLAGS="${plugins_LDFLAGS} -fPIC" +plugins_CFLAGS="${plugins_CFLAGS} -fPIC" +plugins_LDFLAGS="${plugins_LDFLAGS} -fPIC" fi dnl The -DSYS_FOO flag @@ -138,80 +141,79 @@ dnl Check for system libs needed 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_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_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")]) ]) have_nanosleep=0 AC_CHECK_FUNC(nanosleep,have_nanosleep=1,[ AC_CHECK_LIB(rt,nanosleep, - [vlc_LDFLAGS="${vlc_LDFLAGS} -lrt"; have_nanosleep=1], + [pthread_LDFLAGS="${pthread_LDFLAGS} -lrt"; have_nanosleep=1], [AC_CHECK_LIB(posix4,nanosleep, - [vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4"; have_nanosleep=1])] + [pthread_LDFLAGS="${pthread_LDFLAGS} -lposix4"; have_nanosleep=1])] ) ]) if test x$have_nanosleep = x1; then - AC_DEFINE(HAVE_NANOSLEEP, 1, - Define if nanosleep is available.) +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_LIB(rt,sem_init, [pthread_LDFLAGS="${pthread_LDFLAGS} -lrt"]) AC_CHECK_FUNC(inet_aton,,[ - AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") +AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") ]) AC_CHECK_FUNC(textdomain,,[ - AC_CHECK_LIB(intl,textdomain, - vlc_LDFLAGS="${vlc_LDFLAGS} -lintl" - plugins_LDFLAGS="${plugins_LDFLAGS} -lintl" - ) +AC_CHECK_LIB(intl,textdomain, +vlc_LDFLAGS="${vlc_LDFLAGS} -lintl" +plugins_LDFLAGS="${plugins_LDFLAGS} -lintl" +) ]) dnl Check for getopt 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) vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt"], - [NEED_GETOPT=1])]) +AC_CHECK_LIB([gnugetopt],[getopt_long], +[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt"], +[NEED_GETOPT=1])]) AC_TYPE_SIGNAL AC_CHECK_LIB(dl,dlopen,vlc_LDFLAGS="${vlc_LDFLAGS} -ldl") AC_CHECK_LIB(m,cos, - imdct_LDFLAGS="${imdct_LDFLAGS} -lm" - filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm") +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" +ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm" +imdct_LDFLAGS="${imdct_LDFLAGS} -lm" +imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" +imdctsse_LDFLAGS="${imdctsse_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,main,THREAD_LIB="-lpthread") + AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread ${pthread_LDFLAGS}") fi if test "x${THREAD_LIB}" = "xerror"; then - AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads") + AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads ${pthread_LDFLAGS}") fi if test "x${THREAD_LIB}" = "xerror"; then - AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r") +AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r") fi if test "x${THREAD_LIB}" = "xerror"; then - AC_CHECK_FUNC(pthread_mutex_lock) - THREAD_LIB="" +AC_CHECK_FUNC(pthread_mutex_lock) +THREAD_LIB="" fi dnl Check for cthreads under GNU/Hurd for instance @@ -219,14 +221,14 @@ AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads") 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_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_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.)]) +AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1, + Define if defines strncasecmp.)]) dnl Check for headers AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h) @@ -240,14 +242,14 @@ 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.) +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.) +AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, + Define if defines struct timespec.) ]) dnl Check for threads library @@ -255,201 +257,210 @@ 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" +x_includes="/usr/X11R6/include" fi if test "x${x_libraries}" = "xNONE"; then - x_libraries="/usr/X11R6/lib" +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" then - 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} -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}" fi dnl Check for ntohl, etc. AC_CACHE_CHECK([for ntohl in sys/param.h], - [ac_cv_c_ntohl_sys_param_h], - [CFLAGS="${save_CFLAGS} -Wall -Werror" - AC_TRY_COMPILE([#include ], - [void foo() { int meuh; ntohl(meuh); }], - ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)]) +[ac_cv_c_ntohl_sys_param_h], +[CFLAGS="${save_CFLAGS} -Wall -Werror" + AC_TRY_COMPILE([#include ], + [void foo() { int meuh; ntohl(meuh); }], + ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)]) if test "x${ac_cv_c_ntohl_sys_param_h}" != "xno"; then - AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) +AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) fi dnl Check for inline function size limit 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)]) +[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}" != "xno"; then - save_CFLAGS="${save_CFLAGS} -finline-limit-30000"; CFLAGS="${save_CFLAGS}" +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="-Wall -Winline ${save_CFLAGS}" - AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)]) +[ac_cv_c_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}" != "xno"; then - save_CFLAGS="-Wall -Winline ${save_CFLAGS}"; CFLAGS="${save_CFLAGS}" +save_CFLAGS="-Wall -Winline ${save_CFLAGS}"; CFLAGS="${save_CFLAGS}" else - AC_CACHE_CHECK([if \$CC accepts -wall -winline], - [ac_cv_c_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}" != "xno"; then - save_CFLAGS="-wall -winline ${save_CFLAGS}"; CFLAGS="${save_CFLAGS}" - fi +AC_CACHE_CHECK([if \$CC accepts -wall -winline], + [ac_cv_c_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}" != "xno"; then + save_CFLAGS="-wall -winline ${save_CFLAGS}"; CFLAGS="${save_CFLAGS}" +fi fi dnl Check for -pipe 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)]) +[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}" != "xno"; then - save_CFLAGS="${save_CFLAGS} -pipe"; CFLAGS="${save_CFLAGS}" +save_CFLAGS="${save_CFLAGS} -pipe"; CFLAGS="${save_CFLAGS}" fi dnl Check for various optimization flags 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)]) +[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}" != "xno"; then - CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" +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}" != "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}" != "xno"; then - CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" - fi +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}" != "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}" != "xno"; then + CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" fi fi +fi dnl Check for -ffast-math 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)]) +[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}" != "xno"; then - CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math" +CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math" fi dnl Check for -funroll-loops 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)]) +[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}" != "xno"; then - CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops" +CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops" fi dnl Check for -fomit-frame-pointer 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)]) +[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}" != "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" +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 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)]) +[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}" != "xno"; then - plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" +plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" fi dnl Check for standard plugin linking flags 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)]) +[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}" != "xno"; then - plugins_LDFLAGS="${plugins_LDFLAGS} -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)]) +[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}" != "xno"; then - AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros) +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], - [ac_cv_c_attribute_aligned=0 - CFLAGS="${save_CFLAGS} -Werror" - for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do - AC_TRY_COMPILE([], - [static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;], - [ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"]) - done - CFLAGS="${save_CFLAGS}"]) +[ac_cv_c_attribute_aligned], +[ac_cv_c_attribute_aligned=0 + CFLAGS="${save_CFLAGS} -Werror" +for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do + AC_TRY_COMPILE([], + [static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;], + [ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"]) +done + 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]) +AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], + [${ac_cv_c_attribute_aligned}],[Maximum supported data alignment]) fi dnl dnl Check the CPU dnl case "x${target_cpu}" in - x) - ARCH=unknown - ;; - *) - ARCH="${target_cpu}" - ;; +x) +ARCH=unknown +;; +*) +ARCH="${target_cpu}" +;; esac dnl dnl default modules dnl BUILTINS="${BUILTINS}" -PLUGINS="${PLUGINS} misc/dummy/dummy misc/null/null" -PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file access/udp access/http misc/network/ipv4 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" -#PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/mpeg_audio/mpeg_audio codec/a52old/a52old 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/a52tospdif audio_filter/converter/fixed32tos16 audio_filter/converter/fixed32tofloat32" -PLUGINS="${PLUGINS} audio_filter/resampler/trivial" -PLUGINS="${PLUGINS} audio_mixer/trivial audio_mixer/spdif" +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 demux/a52sys" +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/mpeg_audio/mpeg_audio" +PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/a52old/a52old codec/a52 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 video_filter/motionblur" +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 audio_filter/converter/s16tofloat32swab" +PLUGINS="${PLUGINS} audio_filter/resampler/trivial audio_filter/resampler/ugly" +PLUGINS="${PLUGINS} audio_filter/channel_mixer/trivial" +PLUGINS="${PLUGINS} audio_mixer/float32 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 @@ -460,6 +471,11 @@ THREEDNOW_MODULES="misc/memcpy/memcpy3dn codec/a52old/imdct/imdct3dn codec/a52ol 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], [CFLAGS="${save_CFLAGS}" @@ -713,7 +729,7 @@ then CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" AC_CHECK_HEADERS(dvdread/dvd_reader.h, [ AC_TRY_COMPILE([#include ], - [void foo() { int i=DVD_VIDEO_LB_LEN; }],[ + [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}" @@ -1005,6 +1021,13 @@ then 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 @@ -1048,7 +1071,7 @@ then dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a -lm" + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a" ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec" else dnl The given libavcodec wasn't built @@ -1057,10 +1080,10 @@ then fi else CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" - LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS} -lm" + LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS}" AC_CHECK_LIB(avcodec, avcodec_init, [ BUILTINS="${BUILTINS} codec/ffmpeg/ffmpeg" - ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec -lm" ], + ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lavcodec" ], [ AC_MSG_ERROR([Cannot find libavcodec library...]) ]) LDFLAGS="${save_LDFLAGS}" CFLAGS="${save_CFLAGS}" @@ -1081,7 +1104,7 @@ then faad_CFLAGS="${faad_CFLAGS} -I${with_faad}/include" faad_LDFLAGS="${faad_LDFLAGS} -L${with_faad}/lib" fi - faad_LDFLAGS="${faad_LDFLAGS} -lm" + faad_LDFLAGS="${faad_LDFLAGS}" AC_ARG_WITH(faad-tree, [ --with-faad-tree=PATH faad tree for static linking]) @@ -1161,17 +1184,17 @@ then 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" - LDFLAGS="${save_LDFLAGS} ${a52_LDFLAGS}" + a52tofloat32_CFLAGS="${a52tofloat32_CFLAGS} -I${real_a52_tree}" + a52tofloat32_LDFLAGS="${a52tofloat32_LDFLAGS} -L${real_a52_tree}/liba52/.libs" + LDFLAGS="${save_LDFLAGS} ${a52tofloat32_LDFLAGS}" AC_CHECK_LIB(a52, a52_free, [ - BUILTINS="${BUILTINS} codec/a52" - a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" - a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE" + BUILTINS="${BUILTINS} audio_filter/converter/a52tofloat32" + a52tofloat32_LDFLAGS="${a52tofloat32_LDFLAGS} -la52 -lm" + a52tofloat32_CFLAGS="${a52tofloat32_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]) + AC_MSG_ERROR([make sure you have at least a52dec-0.7.4]) else AC_MSG_ERROR([the specified tree hasn't been compiled]) fi @@ -1196,9 +1219,9 @@ then LDFLAGS="${save_LDFLAGS} ${test_LDFLAGS}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ - BUILTINS="${BUILTINS} codec/a52" - a52_LDFLAGS="${a52_LDFLAGS} ${test_LDFLAGS} -la52 -lm" - a52_CFLAGS="${a52_CFLAGS} ${test_CFLAGS}" + BUILTINS="${BUILTINS} audio_filter/converter/a52tofloat32" + a52tofloat32_LDFLAGS="${a52tofloat32_LDFLAGS} ${test_LDFLAGS} -la52 -lm" + a52tofloat32_CFLAGS="${a52tofloat32_CFLAGS} ${test_CFLAGS}" ],[ if test "x${enable_dvbpsi}" != "x" then @@ -1243,7 +1266,7 @@ AC_ARG_ENABLE(dv, if test "x${enable_dv}" = "xyes" then AC_CHECK_HEADERS(libdv/dv.h, [ - BUILTINS="${BUILTINS} codec/dv/dv" + PLUGINS="${PLUGINS} codec/dv/dv" dv_LDFLAGS="${dv_LDFLAGS} -ldv" ],[]) fi @@ -1331,7 +1354,7 @@ then fi if test "x${SDL_CONFIG}" != "xno" then - PLUGINS="${PLUGINS} video_output/sdl/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}" @@ -1356,6 +1379,39 @@ 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} video_output/qte/qte" + else + BUILTINS="${BUILTINS} video_output/qte/qte" + fi + ]) + CPPFLAGS="${save_CPPFLAGS}" +fi + dnl dnl Windows DirectX module dnl @@ -1396,7 +1452,7 @@ AC_ARG_ENABLE(fb, if test "x${enable_fb}" != "xno" then AC_CHECK_HEADERS(linux/fb.h, [ - PLUGINS="${PLUGINS} video_output/fb/fb" + PLUGINS="${PLUGINS} video_output/fb" ]) fi @@ -1410,6 +1466,17 @@ AC_ARG_ENABLE(mga, 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 @@ -1417,7 +1484,7 @@ AC_ARG_ENABLE(ggi, [ --enable-ggi GGI support (default disabled)]) if test "x${enable_ggi}" = "xyes" then - PLUGINS="${PLUGINS} video_output/ggi/ggi" + PLUGINS="${PLUGINS} video_output/ggi" ggi_LDFLAGS="${ggi_LDFLAGS} -lggi" AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], @@ -1435,7 +1502,7 @@ AC_ARG_ENABLE(glide, [ --enable-glide Glide (3dfx) support (default disabled)]) if test "x${enable_glide}" = "xyes" then - PLUGINS="${PLUGINS} video_output/glide/glide" + PLUGINS="${PLUGINS} video_output/glide" glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm" glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide" AC_ARG_WITH(glide, @@ -1457,7 +1524,7 @@ then AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false") if test "x${have_aa}" = "xtrue" then - PLUGINS="${PLUGINS} video_output/aa/aa" + PLUGINS="${PLUGINS} video_output/aa" aa_LDFLAGS="${aa_LDFLAGS} -laa" fi fi @@ -1493,7 +1560,7 @@ AC_ARG_ENABLE(esd, AC_PATH_PROG(ESD_CONFIG, esd-config, no) if test "x${ESD_CONFIG}" != "xno" then - #PLUGINS="${PLUGINS} audio_output/esd" + PLUGINS="${PLUGINS} audio_output/esd" esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`" esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`" fi @@ -1509,7 +1576,7 @@ AC_ARG_ENABLE(arts, AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) if test "x${ARTS_CONFIG}" != "xno" then - #PLUGINS="${PLUGINS} audio_output/arts" + PLUGINS="${PLUGINS} audio_output/arts" arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`" arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `" fi @@ -1525,7 +1592,7 @@ AC_ARG_ENABLE(alsa, AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test "x${have_alsa}" = "xtrue" then - #PLUGINS="${PLUGINS} audio_output/alsa" + PLUGINS="${PLUGINS} audio_output/alsa" alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl" fi fi]) @@ -1580,8 +1647,8 @@ 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 - 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}" ac_cv_gtk_headers=yes @@ -1592,6 +1659,7 @@ then if test "x${ac_cv_gtk_headers}" = "xyes" then PLUGINS="${PLUGINS} gui/gtk/gtk" + NEED_GTK_MAIN=yes ALIASES="${ALIASES} gvlc" fi CPPFLAGS="${save_CPPFLAGS}" @@ -1625,8 +1693,8 @@ 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-familiar.]) fi - familiar_CFLAGS="${familiar_CFLAGS} `${GTK_CONFIG} --cflags gtk`" - familiar_LDFLAGS="${familiar_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + 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 @@ -1637,6 +1705,7 @@ then if test "x${ac_cv_gtk_headers}" = "xyes" then PLUGINS="${PLUGINS} gui/familiar/familiar" + NEED_GTK_MAIN=yes fi CPPFLAGS="${save_CPPFLAGS}" fi @@ -1659,6 +1728,7 @@ AC_ARG_ENABLE(gnome, CPPFLAGS="${save_CPPFLAGS} ${gnome_CFLAGS}" AC_CHECK_HEADERS(gnome.h, [ 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 @@ -1705,14 +1775,25 @@ AC_ARG_ENABLE(kde, fi]) dnl -dnl Qt embedded module +dnl Opie 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" +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} gui/opie/opie" + opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS} -lqte" + opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}" if test -x ${QTEDIR}/bin/moc then MOC=${QTEDIR}/bin/moc @@ -1784,6 +1865,9 @@ AC_ARG_ENABLE(xosd, 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" @@ -1943,12 +2027,22 @@ then LDFLAGS="${save_LDFLAGS}" fi MOZILLA=1 - mozilla_CFLAGS="${mozilla_CFLAGS} `${MOZILLA_CONFIG} --cflags plugin java --defines | xargs`" dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 - mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs | sed 's#-I\(.*\)/mozilla/\([^ ]*\)#-I\1/\2 -I\1/mozilla/\2#g'`" + [mozilla_CFLAGS="${CPPFLAGS_mozilla} `${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`"] + mozilla_LDFLAGS="${mozilla_LDFLAGS} `${MOZILLA_CONFIG} --libs plugin xpcom`" fi fi +dnl +dnl gtk_main plugin +dnl +if test "x${NEED_GTK_MAIN}" != "xno" +then + PLUGINS="${PLUGINS} misc/gtk_main" + gtk_main_CFLAGS="${gtk_main_CFLAGS} ${gtk_CFLAGS} ${familiar_CFLAGS} ${gnome_CFLAGS}" + gtk_main_LDFLAGS="${gtk_main_LDFLAGS} ${gtk_LDFLAGS} ${familiar_LDFLAGS} ${gnome_LDFLAGS}" +fi + dnl dnl Plug-ins - this must be AT THE END dnl @@ -2018,8 +2112,6 @@ AC_SUBST(RELEASE) AC_SUBST(MOC) AC_SUBST(WINDRES) AC_SUBST(BCBUILDER) -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) AC_SUBST(NEED_GETOPT) AC_SUBST(MOZILLA) @@ -2032,7 +2124,7 @@ AC_SUBST(plugins_CFLAGS) AC_SUBST(builtins_CFLAGS) AC_SUBST(mozilla_CFLAGS) -AC_SUBST(a52_CFLAGS) +AC_SUBST(a52tofloat32_CFLAGS) AC_SUBST(arts_CFLAGS) AC_SUBST(i420_yuy2_mmx_CFLAGS) AC_SUBST(dvd_CFLAGS) @@ -2047,7 +2139,9 @@ AC_SUBST(ffmpeg_CFLAGS) AC_SUBST(glide_CFLAGS) AC_SUBST(gnome_CFLAGS) AC_SUBST(gtk_CFLAGS) +AC_SUBST(gtk_main_CFLAGS) AC_SUBST(kde_CFLAGS) +AC_SUBST(opie_CFLAGS) AC_SUBST(idctaltivec_CFLAGS) AC_SUBST(macosx_CFLAGS) AC_SUBST(mad_CFLAGS) @@ -2056,6 +2150,7 @@ AC_SUBST(motionaltivec_CFLAGS) AC_SUBST(qt_CFLAGS) AC_SUBST(qte_CFLAGS) AC_SUBST(sdl_CFLAGS) +AC_SUBST(svgalib_CFLAGS) AC_SUBST(x11_CFLAGS) AC_SUBST(xvideo_CFLAGS) @@ -2064,7 +2159,7 @@ AC_SUBST(plugins_LDFLAGS) AC_SUBST(builtins_LDFLAGS) AC_SUBST(mozilla_LDFLAGS) -AC_SUBST(a52_LDFLAGS) +AC_SUBST(a52tofloat32_LDFLAGS) AC_SUBST(aa_LDFLAGS) AC_SUBST(alsa_LDFLAGS) AC_SUBST(arts_LDFLAGS) @@ -2076,6 +2171,7 @@ AC_SUBST(dvd_LDFLAGS) AC_SUBST(dvdread_LDFLAGS) AC_SUBST(dvdplay_LDFLAGS) AC_SUBST(ts_dvbpsi_LDFLAGS) +AC_SUBST(audio_LDFLAGS) AC_SUBST(esd_LDFLAGS) AC_SUBST(familiar_LDFLAGS) AC_SUBST(distort_LDFLAGS) @@ -2086,6 +2182,7 @@ AC_SUBST(ggi_LDFLAGS) AC_SUBST(glide_LDFLAGS) AC_SUBST(gnome_LDFLAGS) AC_SUBST(gtk_LDFLAGS) +AC_SUBST(gtk_main_LDFLAGS) AC_SUBST(http_LDFLAGS) AC_SUBST(idctaltivec_LDFLAGS) AC_SUBST(imdct_LDFLAGS) @@ -2100,21 +2197,33 @@ AC_SUBST(mad_LDFLAGS) AC_SUBST(memcpyaltivec_LDFLAGS) AC_SUBST(motionaltivec_LDFLAGS) AC_SUBST(ncurses_LDFLAGS) +AC_SUBST(opie_LDFLAGS) AC_SUBST(oss_LDFLAGS) AC_SUBST(qnx_LDFLAGS) AC_SUBST(qt_LDFLAGS) AC_SUBST(qte_LDFLAGS) AC_SUBST(rc_LDFLAGS) AC_SUBST(sdl_LDFLAGS) +AC_SUBST(svgalib_LDFLAGS) AC_SUBST(vcd_LDFLAGS) AC_SUBST(vorbis_LDFLAGS) AC_SUBST(waveout_LDFLAGS) AC_SUBST(x11_LDFLAGS) AC_SUBST(xvideo_LDFLAGS) AC_SUBST(xosd_LDFLAGS) - -AC_OUTPUT([Makefile.config Makefile.opts po/Makefile.in vlc-config]) -chmod a+x vlc-config +AC_SUBST(id3tag_LDFLAGS) + +AC_OUTPUT([ + Makefile + Makefile.config + Makefile.opts + m4/Makefile + intl/Makefile + po/Makefile.in + vlc-config +],[ + chmod a+x vlc-config +]) echo " vlc configuration @@ -2128,13 +2237,12 @@ debug mode : ${DEBUG} release : ${RELEASE} profiling : ${PROFILING} need builtin getopt : ${NEED_GETOPT} -built-in modules :${BUILTINS} -plug-in modules :${PLUGINS} +modules : (see Makefile.config) mozilla plugin : ${MOZILLA} vlc aliases :${ALIASES} -You may now tune Makefile.opts at your convenience, for instance to choose -which modules get compiled as plugins. +You may now tune Makefile.config and Makefile.opts at your convenience, for +instance to choose which modules get compiled as plugins, or tune CFLAGS. To build vlc and its plugins, type \`${VLC_MAKE}'. "