X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=ce9a7c175196ee269b2fedf4fb6675a1ba9e6e0c;hb=460360a85e2aa56f437ddb3ed25a7366a09569f5;hp=fd8bdf61651fdc0db46f2da93f8b763d7e084fc0;hpb=214396bc9f2f8fb89f7241e13168b22602ff0fef;p=vlc

diff --git a/configure.in b/configure.in
index fd8bdf6165..ce9a7c1751 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,24 @@
-dnl Autoconf settings for vlc
-AC_INIT(src/interface/main.c)
+dnl Autoconf settings for vlc and libdvdcss
+AC_INIT(include/common.h)
 AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.80
-AC_SUBST(VLC_VERSION)
-VLC_CODENAME=Ourumov
-AC_SUBST(VLC_CODENAME)
+HAVE_VLC=0
+if test -r src/interface/main.c; then
+  HAVE_VLC=1
+  VLC_VERSION=0.2.81
+  AC_SUBST(VLC_VERSION)
+  VLC_CODENAME=Ourumov
+  AC_SUBST(VLC_CODENAME)
+fi
+
+HAVE_LIBDVDCSS=0
+if test -r extras/libdvdcss/libdvdcss.c; then
+  HAVE_LIBDVDCSS=1
+  LIBDVDCSS_VERSION=0.0.2
+  AC_SUBST(LIBDVDCSS_VERSION)
+fi
 
 dnl Save CFLAGS
 save_CFLAGS="${CFLAGS}"
@@ -21,9 +32,6 @@ AC_PROG_RANLIB
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
-dnl Check for compiler environment
-AC_C_CONST
-
 dnl Check for endianness if not cross-compiling
 if test x${cross_compiling} != xyes; then
   AC_C_BIGENDIAN
@@ -50,12 +58,15 @@ AC_CHECK_FUNC(inet_aton,,[
 AC_CHECK_FUNCS(vasprintf)
 AC_CHECK_FUNCS(swab)
 
+AC_CHECK_FUNCS(sigrelse)
+
+dnl Check for getopt
+GETOPT=0
 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 [ # FreeBSD has a gnugetopt library for this:
   AC_CHECK_LIB([gnugetopt],[getopt_long],
     [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"],
     [GETOPT=1])])
-AC_SUBST(GETOPT)
 
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
@@ -67,32 +78,29 @@ CFLAGS="${CFLAGS} -I/usr/local/include"
 
 dnl Check for pthreads - borrowed from XMMS
 PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread,pthread_attr_init,PTHREAD_LIBS="-lpthread")
-if test "x${PTHREAD_LIBS}" = xerror; then
-  AC_CHECK_LIB(pthreads,pthread_attr_init,PTHREAD_LIBS="-lpthreads")
+AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
 fi
-if test "x${PTHREAD_LIBS}" = xerror; then
-  AC_CHECK_LIB(c_r,pthread_attr_init,PTHREAD_LIBS="-lc_r")
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
 fi
-if test "x${PTHREAD_LIBS}" = xerror; then
-  PTHREAD_LIBS=""
+if test "x${THREAD_LIB}" = xerror; then
+  THREAD_LIBS=""
   AC_CHECK_FUNC(pthread_attr_init)
 fi
-LIB="${LIB} ${PTHREAD_LIBS}"
 
 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.)
-])
+            Define if <pthread.h> defines pthread_cond_t.)])
 AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
-            Define if <strings.h> defines strncasecmp.)
-])
+            Define if <strings.h> defines strncasecmp.)])
 
 dnl Check for headers
 AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
-AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h)
 AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
@@ -109,6 +117,13 @@ void foo() { int meuh; ntohl(meuh); }],,
  AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
+dnl Check for inline function size limit
+CFLAGS="${save_CFLAGS} -finline-limit=31337"
+AC_MSG_CHECKING([if \$CC accepts -finline-limit])
+AC_TRY_COMPILE([],,
+ save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
 dnl Check for Darwin plugin linking flags
 CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
 AC_MSG_CHECKING([if \$CC compiles plugins with -bundle -undefined suppress])
@@ -148,38 +163,40 @@ ARCH=${host_cpu}
 dnl
 dnl  default modules
 dnl
-BUILTINS="${BUILTINS} es ps ts"
-PLUGINS="${PLUGINS} yuv idct idctclassic motion imdct downmix"
+BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix"
+PLUGINS="${PLUGINS}"
 
 dnl
 dnl  Accelerated modules
 dnl
-case x$host_os in
-  xmingw32msvc)
-    MMX_PLUGINS="idctmmx motionmmx"
-    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn"
-    ;;
-  *)
-    MMX_PLUGINS="yuvmmx idctmmx motionmmx"
-    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
-    ;;
-esac
+MMX_MODULES="yuvmmx idctmmx motionmmx"
+MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
 
 AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
-  ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMX_PLUGINS}"
+  ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
-  ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMXEXT_PLUGINS}"
+  ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl
-dnl  DVD module: check for DVD ioctls
+dnl  libdvdcss: check for DVD ioctls
 dnl
+
+dnl  default is no
+CAN_BUILD_LIBDVDCSS=0
+
+dnl  for windoze
+AC_CHECK_HEADERS(winioctl.h,[
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
+])
+
+dnl  for Un*x and BeOS
 AC_CHECK_HEADERS(sys/ioctl.h,[
-  BUILTINS="${BUILTINS} dvd"
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
   AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
   BSD_DVD_STRUCT=0
   dnl
@@ -211,35 +228,24 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   ])
 ])
 
-dnl
-dnl  dummy plugin
-dnl
-AC_ARG_ENABLE(dummy,
-  [  --disable-dummy         dummy module (default enabled)])
-if test x$enable_dummy != xno; then
-  BUILTINS="${BUILTINS} dummy"; fi
 
 dnl
-dnl  null plugin
+dnl  Check the operating system
 dnl
-AC_ARG_ENABLE(null,
-  [  --disable-null          Null module (default enabled)])
-if test x$enable_null != xno; then
-  BUILTINS="${BUILTINS} null"; fi
-
-dnl
-dnl  rc plugin
-dnl
-AC_ARG_ENABLE(rc,
-  [  --disable-rc            rc module (default enabled)])
-if test x$enable_rc != xno; then
-  BUILTINS="${BUILTINS} rc"; fi
+case ${host_os} in
+  darwin*)
+    SYS=darwin
+    ;;
+  *)
+    SYS=${host_os}
+    ;;
+esac
 
 dnl
 dnl  PentiumPro acceleration
 dnl
 AC_ARG_ENABLE(ppro,
-[  --disable-ppro          Disable PentiumPro optimizations (default enabled for x86)],
+  [  --disable-ppro          Disable PentiumPro optimizations (default enabled for x86)],
 [ if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi ],
 [ if test x${host_cpu} = xi686; then ARCH="${ARCH} ppro"; fi ])
 
@@ -249,32 +255,25 @@ dnl
 AC_ARG_ENABLE(mmx,
 [  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
 [ if test x$enableval = xyes; then ARCH="${ARCH} mmx";
-  PLUGINS="${PLUGINS} ${ACCEL_PLUGINS}"; fi ],
+  BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
 [ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86 -o x${host_cpu} = xi386; then ARCH="${ARCH} mmx";
-  PLUGINS="${PLUGINS} ${ACCEL_PLUGINS}"; fi ])
+  BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
 
 dnl
 dnl  AltiVec acceleration
 dnl
 AC_ARG_ENABLE(altivec,
 [  --enable-altivec        Enable altivec optimizations (default disabled since it is broken)],
-[ if test x$enableval = xyes; then ARCH="${ARCH} altivec";
-    PLUGINS="${PLUGINS} idctaltivec"
+[ if test x$enableval = xyes; then ARCH="${ARCH} altivec"
+    BUILTINS="${BUILTINS} idctaltivec"
     LIB_IDCTALTIVEC="-framework vecLib"
   fi ])
 #[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ])
 
-dnl
-dnl  CSS DVD decryption
-dnl
-AC_ARG_ENABLE(css,
-[  --disable-css           Disable DVD CSS decryption (default enabled)],
-[ if test x$enableval = xyes; then CSS=1; else CSS=0; fi ], [ CSS=1; ])
-if test x${CSS} = x1; then AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.) fi
-
 dnl
 dnl  Debugging mode
 dnl
+DEBUG=0
 AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debug mode (default disabled)],
 [ if test x$enableval = xyes; then DEBUG=1; fi ])
@@ -282,6 +281,7 @@ AC_ARG_ENABLE(debug,
 dnl
 dnl  Enable/disable statistics
 dnl
+STATS=0
 AC_ARG_ENABLE(stats,
 [  --enable-stats          Enable printing of statistics (default disabled)],
 [ if test x$enableval = xyes; then STATS=1; fi ])
@@ -289,10 +289,19 @@ AC_ARG_ENABLE(stats,
 dnl
 dnl  Trace mode
 dnl
+TRACE=0
 AC_ARG_ENABLE(trace,
 [  --enable-trace          Enable trace mode (default disabled)],
 [ if test x$enableval = xyes; then TRACE=1; fi ])
 
+dnl
+dnl  Trace mode
+dnl
+PROFILING=0
+AC_ARG_ENABLE(profiling,
+[  --enable-profiling      Enable gprof profiling (default disabled)],
+[ if test x$enableval = xyes; then PROFILING=1; fi ])
+
 dnl
 dnl  Enable/disable optimizations
 dnl
@@ -301,10 +310,130 @@ AC_ARG_ENABLE(optimizations,
 [ if test x$enableval = xno; then OPTIMS=0; fi ],
 [ OPTIMS=1 ])
 
-SYS=${host_os}
+dnl
+dnl  GNU portable threads
+dnl
+AC_ARG_ENABLE(pth,
+  [  --enable-pth            Enable GNU Pth support (default disabled)],
+  [ if test x$enableval = xyes; then
+    AC_CHECK_LIB(pth,pth_init)
+    AC_EGREP_HEADER(pth_init,pth.h,[
+      AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
+                Define if <pth.h> defines pth_init)
+    THREAD_LIB="-lpth"
+    fi])
+])
+
+LIB="${LIB} ${THREAD_LIB}"
+
+dnl
+dnl  DVD module: check for installed libdvdcss or local libdvdcss
+dnl
+LOCAL_LIBDVDCSS=0
+STATIC_LIBDVDCSS=0
+DUMMY_LIBDVDCSS=0
+AC_ARG_WITH(dvdcss,
+  [  --with-dvdcss[=name]    way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')],
+  [ case "x${withval}" in
+    xlocal-static|xyes)
+      # local libdvdcss, statically linked
+      if test x${CAN_BUILD_LIBDVDCSS} = x1
+      then
+        LOCAL_LIBDVDCSS=1
+        STATIC_LIBDVDCSS=1
+        BUILTINS="${BUILTINS} dvd"
+        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+        LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+      fi
+    ;;
+    xlocal-shared)
+      # local libdvdcss, dynamically linked
+      if test x${CAN_BUILD_LIBDVDCSS} = x1
+      then
+        LOCAL_LIBDVDCSS=1
+        BUILTINS="${BUILTINS} dvd"
+        CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+        LIB_DVD="${LIB_DVD} -Llib -ldvdcss"
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
+      fi
+    ;;
+    xno)
+      # don't use libdvdcss at all, build a DVD module that can dlopen() it
+      DUMMY_LIBDVDCSS=1
+      BUILTINS="${BUILTINS} dvd"
+      OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+      CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+      LIB_DVD="${LIB_DVD} -ldl"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+    ;;
+    *)
+      # existing libdvdcss
+      BUILTINS="${BUILTINS} dvd"
+      if test "x$withval" != "xyes"
+      then
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L"$withval"/lib"
+        CFLAGS_DVD="${CFLAGS_DVD} -I"$withval"/include"
+      fi
+      LIB_DVD="${LIB_DVD} -ldvdcss"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss"
+    esac ],
+  # user didn't decide, we choose to use local libdvdcss and link statically
+  # if libdvdcss is in the archive, or to use the dummy replacement otherwise.
+  [ if test x${CAN_BUILD_LIBDVDCSS} = x1
+    then
+      LOCAL_LIBDVDCSS=1
+      STATIC_LIBDVDCSS=1
+      BUILTINS="${BUILTINS} dvd"
+      CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
+      LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+    else
+      # XXX: no check for libdl is done, don't try this at home !
+      DUMMY_LIBDVDCSS=1
+      BUILTINS="${BUILTINS} dvd"
+      OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+      CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+      LIB_DVD="${LIB_DVD} -ldl"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+    fi ])
+
+dnl
+dnl  dummy plugin
+dnl
+AC_ARG_ENABLE(dummy,
+  [  --disable-dummy         dummy module (default enabled)])
+
+if test x$enable_dummy != xno
+then
+  BUILTINS="${BUILTINS} dummy"
+fi
+
+dnl
+dnl  null plugin
+dnl
+AC_ARG_ENABLE(null,
+  [  --disable-null          Null module (default enabled)])
+
+if test x$enable_null != xno
+then
+  BUILTINS="${BUILTINS} null"
+fi
+
+dnl
+dnl  rc plugin
+dnl
+AC_ARG_ENABLE(rc,
+  [  --disable-rc            rc module (default enabled)])
+
+if test x$enable_rc != xno
+then
+  BUILTINS="${BUILTINS} rc"
+fi
 
 dnl special case for BeOS
-if test x$host_os = xbeos; then
+if test x$SYS = xbeos
+then
     BUILTINS="${BUILTINS} beos"
     LIB_BEOS="-lbe -lgame -lroot -ltracker"
     PLCFLAGS="${PLCFLAGS} -nostart"
@@ -317,8 +446,11 @@ dnl  OSS /dev/dsp module
 dnl
 AC_ARG_ENABLE(dsp,
   [  --disable-dsp           Linux /dev/dsp support (default enabled)])
-if test x$enable_dsp != xno; then
-  if test -c /dev/dsp; then
+
+if test x$enable_dsp != xno
+then
+  if test -c /dev/dsp
+  then
     PLUGINS="${PLUGINS} dsp"
   fi
 fi
@@ -328,9 +460,11 @@ dnl  Esound module
 dnl
 AC_ARG_ENABLE(esd,
   [  --enable-esd            Esound library support (default disabled)],
-  [if test x$enable_esd = xyes; then
+  [if test x$enable_esd = xyes
+   then
      AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-     if test x${ESD_CONFIG} != xno; then
+     if test x${ESD_CONFIG} != xno
+     then
        PLUGINS="${PLUGINS} esd"
        LIB_ESD="`${ESD_CONFIG} --libs`"
      fi
@@ -351,7 +485,8 @@ dnl  MacOS X module
 dnl
 AC_ARG_ENABLE(macosx,
   [  --enable-macosx         Mac OS X interface support (default enabled in Mac OS X)],
-  [if test x$enable_macosx = xyes; then
+  [if test x$enable_macosx = xyes
+   then
      BUILTINS="${BUILTINS} macosx"
      LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
      LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
@@ -364,22 +499,38 @@ AC_ARG_ENABLE(macosx,
      LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
    )])
 
+dnl
+dnl  QNX RTOS module
+dnl
+AC_ARG_ENABLE(qnx,
+  [  --disable-qnx           QNX RTOS support (default enabled in QNX RTOS)])
+    if test x$enable_qnx != xno
+    then
+      AC_CHECK_HEADERS(Ph.h, [
+        PLUGINS="${PLUGINS} qnx"
+        LIB_QNX="-lasound -lph"
+      ])
+    fi
+
 dnl
 dnl  Linux framebuffer module
 dnl
 AC_ARG_ENABLE(fb,
   [  --enable-fb             Linux framebuffer support (default disabled)],
-  [if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi])
+  [ if test x$enable_fb = xyes
+    then
+      PLUGINS="${PLUGINS} fb"
+    fi ])
 
 dnl
 dnl  GGI module
 dnl
 AC_ARG_WITH(ggi,
   [  --with-ggi[=name]       GGI support (default disabled)],
-  [ if test "x$withval" != "xno";
+  [ if test "x$withval" != "xno"
     then
-      PLUGINS="${PLUGINS} ggi";
-      if test "x$withval" != "xyes";
+      PLUGINS="${PLUGINS} ggi"
+      if test "x$withval" != "xyes"
       then
         LIB_GGI="-l"$withval
       else
@@ -390,49 +541,74 @@ AC_ARG_WITH(ggi,
 dnl
 dnl  SDL module
 dnl
-AC_ARG_WITH(sdl,
-  [  --with-sdl[=name]       SDL support (default enabled)],
-  [ if test "x$withval" != "xno";
-    then
-      PLUGINS="${PLUGINS} sdl";
-      if test "x$withval" != "xyes";
-      then
-        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL"
-        CFLAGS_SDL="-I"$withval"/include"
-      else
-        AC_CHECK_HEADERS(SDL/SDL.h, , [echo "Cannot find SDL headers !"; exit])
-        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"
-      fi
-    fi ])
-    if test "x$withval" = "x";
+AC_ARG_ENABLE(sdl,
+  [  --disable-sdl           SDL support (default enabled)])
+if test "x$enable_sdl" != "xno"
+then
+  AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no)
+  SDL_CONFIG=${SDL12_CONFIG}
+  SDL_HEADER="SDL12/SDL.h"
+  if test x${SDL_CONFIG} = xno
+  then
+    AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no)
+    SDL_CONFIG=${SDL11_CONFIG}
+    SDL_HEADER="SDL11/SDL.h"
+  fi
+  if test x${SDL_CONFIG} = xno
+  then
+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+    SDL_HEADER="SDL/SDL.h"
+  fi
+  if test x${SDL_CONFIG} != xno
+  then
+    PLUGINS="${PLUGINS} sdl"
+    CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
+    LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $CFLAGS_SDL"
+    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),
+      [ echo "The development package for SDL is not installed. Please install it"
+        echo "and try again. Alternatively you can also configure with --disable-sdl."
+        exit 1 ])
+    CFLAGS=$save_CFLAGS
+    if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
     then
-      AC_CHECK_HEADERS(SDL/SDL.h,
-      [PLUGINS="${PLUGINS} sdl"
-       LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"])
+      echo "You need SDL version 1.1.5 or later. Install it and try again."
+      echo "Alternatively, you can also configure with --disable-sdl."
+      exit 1
     fi
+  elif test "x$enable_sdl" =  "xyes"
+  then
+    echo "I couldn't find the SDL package. You can download libSDL from"
+    echo "http://www.libsdl.org/, or configure with --disable-sdl. Have a"
+    echo "nice day."
+    exit 1
+  fi
+fi
 
 dnl
 dnl  Windows DirectX module
 dnl
 AC_ARG_WITH(directx,
   [  --with-directx[=name]   Windows DirectX support (default enabled)],
-  [ if test "x$withval" != "xno";
+  [ if test "x$withval" != "xno"
     then
-      PLUGINS="${PLUGINS} directx";
-      if test "x$withval" != "xyes";
+      PLUGINS="${PLUGINS} directx"
+      if test "x$withval" != "xyes"
       then
-        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lddraw -ldsound"
+        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
         INCLUDE="${INCLUDE} -I"$withval"/include"
       else
         AC_CHECK_HEADERS(directx.h, , [echo "Cannot find DirectX headers !"; exit])
-        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lddraw -ldsound"
+        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"
       fi
     fi ])
-    if test "x$withval" = "x";
+    if test "x$withval" = "x"
     then
       AC_CHECK_HEADERS(directx.h,
       [PLUGINS="${PLUGINS} directx"
-       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lddraw -ldsound"])
+       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"])
     fi
 
 dnl
@@ -440,10 +616,10 @@ dnl  Glide module
 dnl
 AC_ARG_WITH(glide,
   [  --with-glide[=name]     Glide (3dfx) support (default disabled)],
-  [ if test "x$withval" != "xno";
+  [ if test "x$withval" != "xno"
     then
-      PLUGINS="${PLUGINS} glide";
-      if test "x$withval" != "xyes";
+      PLUGINS="${PLUGINS} glide"
+      if test "x$withval" != "xyes"
       then
         LIB_GLIDE="-l"$withval" -lm"
       else
@@ -470,7 +646,7 @@ AC_ARG_ENABLE(qt,
      PLUGINS="${PLUGINS} qt"
      ALIASES="${ALIASES} qvlc"
      LIB_QT="-lqt -L${QTDIR}/lib"
-     if test -x ${QTDIR}/bin/moc ;
+     if test -x ${QTDIR}/bin/moc
      then
        MOC=${QTDIR}/bin/moc
      else
@@ -483,7 +659,17 @@ 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"; ALIASES="${ALIASES} kvlc"; fi])
+  [if test x$enable_kde = xyes; then
+     PLUGINS="${PLUGINS} kde"
+     ALIASES="${ALIASES} kvlc"
+     LIB_KDE="-L${KDEDIR}/lib -lkfile"
+     if test -x ${QTDIR}/bin/moc
+     then
+       MOC=${QTDIR}/bin/moc
+     else
+       MOC=moc
+     fi
+   fi])
 
 dnl
 dnl  Gnome module
@@ -501,14 +687,23 @@ dnl  Gtk+ module
 dnl
 AC_ARG_ENABLE(gtk,
   [  --disable-gtk           Gtk+ support (default enabled)])
-if test x$enable_gtk != xno; then
+if test x$enable_gtk != xno
+then
+  # look for gtk-config
   AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  if test x${GTK_CONFIG} != xno; then
-    PLUGINS="${PLUGINS} gtk"
-    ALIASES="${ALIASES} gvlc"
+  if test -x ${GTK_CONFIG}
+  then
     CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
     LIB_GTK="`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
   fi
+  # now look for the gtk.h header
+  saved_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
+  AC_CHECK_HEADERS(gtk/gtk.h, [
+    PLUGINS="${PLUGINS} gtk"
+    ALIASES="${ALIASES} gvlc"
+  ])
+  CPPFLAGS=$saved_CPPFLAGS
 fi
 
 dnl
@@ -560,10 +755,15 @@ dnl  ALSA module
 dnl
 AC_ARG_ENABLE(alsa,
   [  --enable-alsa           Alsa sound drivers support (Only for linux) (default disabled)],
-  [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/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} alsa"
-     LIB_ALSA="-lasound"
-   fi; fi])
+  [if test x$enable_alsa = xyes
+   then
+     AC_CHECK_HEADER(sys/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} alsa"
+       LIB_ALSA="-lasound"
+     fi
+   fi])
 
 dnl  end of non-BeOS stuff
 fi
@@ -580,10 +780,13 @@ AC_SUBST(DEFINE)
 AC_SUBST(INCLUDE)
 AC_SUBST(DEBUG)
 AC_SUBST(STATS)
+AC_SUBST(ASM)
 AC_SUBST(TRACE)
+AC_SUBST(PROFILING)
 AC_SUBST(OPTIMS)
-AC_SUBST(CSS)
+AC_SUBST(GETOPT)
 AC_SUBST(MOC)
+AC_SUBST(WINDRES)
 
 AC_SUBST(LCFLAGS)
 AC_SUBST(PLCFLAGS)
@@ -592,13 +795,17 @@ AC_SUBST(LIB)
 AC_SUBST(LIB_ALSA)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
+AC_SUBST(LIB_DVD)
+AC_SUBST(LIB_DVD_PLUGIN)
 AC_SUBST(LIB_ESD)
 AC_SUBST(LIB_GGI)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GNOME)
 AC_SUBST(LIB_GTK)
 AC_SUBST(LIB_IDCTALTIVEC)
+AC_SUBST(LIB_KDE)
 AC_SUBST(LIB_MACOSX)
+AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_NCURSES)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_TS)
@@ -609,27 +816,63 @@ AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
 
 AC_SUBST(CFLAGS_VLC)
+AC_SUBST(CFLAGS_DVD)
 AC_SUBST(CFLAGS_GTK)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)
 
+AC_SUBST(OBJ_DVD)
+
+AC_SUBST(LOCAL_LIBDVDCSS)
+
 AC_OUTPUT([Makefile.opts include/config.h])
 
 echo "
+global configuration
+--------------------
+system                : ${SYS}
+architecture          : ${ARCH}
+optimizations         : ${OPTIMS}"
+
+if test x${HAVE_VLC} = x1
+then
+  echo "
 vlc configuration
 -----------------
 vlc version           : ${VLC_VERSION}
-system                : ${SYS}
-architecture          : ${ARCH}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
 trace mode            : ${TRACE}
-optimizations         : ${OPTIMS}
-CSS decryption        : ${CSS}
+profiling             : ${PROFILING}
 need builtin getopt   : ${GETOPT}
 built-in modules      :${BUILTINS}
 plugin modules        :${PLUGINS}
-vlc aliases           :${ALIASES}
+vlc aliases           :${ALIASES}"
+fi
+
+echo "
+libdvdcss configuration
+-----------------------
+can be built          : ${CAN_BUILD_LIBDVDCSS}
+will be built         : ${LOCAL_LIBDVDCSS}"
+if test x${LOCAL_LIBDVDCSS} = x1
+then
+  echo "link statically       : ${STATIC_LIBDVDCSS}"
+else
+  echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
+fi
 
-You may now tune Makefile.opts at your convenience."
+echo "
+You may now tune Makefile.opts at your convenience, for instance to choose
+which modules get compiled as plugins.
+"
+if test x${HAVE_VLC} = x1
+then
+  echo "To build vlc and its plugins, type \`make vlc'."
+fi
+if test x${HAVE_LIBDVDCSS} = x1
+then
+  echo "To build libdvdcss only, type \`make libdvdcss'."
+fi
+echo ""