]> git.sesse.net Git - vlc/blobdiff - configure.in
* Audio volume management now works properly. See src/audio_output/intf.c
[vlc] / configure.in
index 8f9448906c38a90c9c28751344c25b8fde88918d..abb494f8b5daab91b6795d084544327bd453ccec 100644 (file)
@@ -37,25 +37,22 @@ 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
 
@@ -75,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 -lstdc++.r4"
-    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
@@ -144,79 +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_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"
-  i420_rgb_LDFLAGS="${i420_rgb_LDFLAGS} -lm"
-  faad_LDFLAGS="${faad_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
@@ -224,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 <pthread.h> defines pthread_cond_t.)])
+AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
+        Define if <pthread.h> defines pthread_cond_t.)])
 AC_EGREP_HEADER(pthread_once,pthread.h,[
-  AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
-            Define if <pthread.h> defines pthread_once.)])
+AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
+        Define if <pthread.h> defines pthread_once.)])
 AC_EGREP_HEADER(strncasecmp,strings.h,[
-  AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
-            Define if <strings.h> defines strncasecmp.)])
+AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
+        Define if <strings.h> defines strncasecmp.)])
 
 dnl Check for headers
 AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
@@ -245,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 <time.h> defines nanosleep.)
+AC_DEFINE(HAVE_DECL_NANOSLEEP, 1,
+        Define if <time.h> defines nanosleep.)
 ])
 
 dnl Make sure we have timespecs
 AC_EGREP_HEADER(timespec,sys/time.h,[
-  AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
-            Define if <sys/time.h> defines struct timespec.)
+AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
+        Define if <sys/time.h> defines struct timespec.)
 ])
 
 dnl Check for threads library
@@ -260,10 +257,10 @@ 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?
@@ -272,174 +269,174 @@ 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 <X11/extensions/dpms.h> 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 <X11/extensions/dpms.h> 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 <sys/param.h>],
-        [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 <sys/param.h>],
+    [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 <sys/param.h> defines ntohl.)
+AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> 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 <stdio.h>
-          #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 <stdio.h>
+      #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
@@ -448,15 +445,14 @@ dnl
 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} 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"
+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/trivial audio_mixer/spdif"
+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"
@@ -1188,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
@@ -1223,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
@@ -1270,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  
@@ -1383,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
@@ -1746,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
@@ -1987,9 +2027,9 @@ 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
 
@@ -2072,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)
 
@@ -2086,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)
@@ -2103,6 +2141,7 @@ 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)
@@ -2120,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)
@@ -2158,6 +2197,7 @@ 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)