X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=2b7f853ec25ea9e5f282693c50615761b97bbda3;hb=b3b880766e2b815d460916cb0c44e5d6f7b593c3;hp=1c0ba32a22527eca516db9d19012814989171357;hpb=4945d2bb3621b899aca49359c435d0dcfcc2ec1b;p=vlc

diff --git a/configure.in b/configure.in
index 1c0ba32a22..2b7f853ec2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,18 +1,28 @@
 dnl Autoconf settings for vlc and libdvdcss
-AC_INIT(include/main.h)
+AC_INIT(include/common.h)
 AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.81
-AC_SUBST(VLC_VERSION)
-LIBDVDCSS_VERSION=0.0.2
-AC_SUBST(LIBDVDCSS_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.83
+  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.3
+  AC_SUBST(LIBDVDCSS_VERSION)
+fi
 
-dnl Save CFLAGS
+dnl Save CFLAGS and LDFLAGS
 save_CFLAGS="${CFLAGS}"
+save_LDFLAGS="${LDFLAGS}"
 
 dnl Check for tools
 AC_PROG_MAKE_SET
@@ -23,9 +33,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
@@ -55,24 +62,23 @@ AC_CHECK_FUNCS(swab)
 AC_CHECK_FUNCS(sigrelse)
 
 dnl Check for getopt
-GETOPT=0
+NEED_GETOPT=0
 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 [ # FreeBSD has a gnugetopt library for this:
   AC_CHECK_LIB([gnugetopt],[getopt_long],
     [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB="${LIB} -lgnugetopt"],
-    [GETOPT=1])])
+    [NEED_GETOPT=1])])
 
 AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
 AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
 
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-CFLAGS="${CFLAGS} -I/usr/local/include"
-
 dnl Check for pthreads - borrowed from XMMS
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+THREAD_LIB=error
+if test "x${THREAD_LIB}" = xerror; then
+  AC_CHECK_LIB(pthread,pthread_attr_init,THREAD_LIB="-lpthread")
+fi
 if test "x${THREAD_LIB}" = xerror; then
   AC_CHECK_LIB(pthreads,pthread_attr_init,THREAD_LIB="-lpthreads")
 fi
@@ -80,10 +86,13 @@ if test "x${THREAD_LIB}" = xerror; then
   AC_CHECK_LIB(c_r,pthread_attr_init,THREAD_LIB="-lc_r")
 fi
 if test "x${THREAD_LIB}" = xerror; then
-  THREAD_LIBS=""
   AC_CHECK_FUNC(pthread_attr_init)
+  THREAD_LIB=""
 fi
 
+dnl Check for cthreads under GNU/Hurd for instance
+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,
@@ -94,7 +103,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 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)
@@ -112,28 +121,49 @@ void foo() { int meuh; ntohl(meuh); }],,
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl Check for inline function size limit
-CFLAGS="${save_CFLAGS} -finline-limit=12"
+CFLAGS="${save_CFLAGS} -finline-limit-20000"
 AC_MSG_CHECKING([if \$CC accepts -finline-limit])
 AC_TRY_COMPILE([],,
- save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
+ save_CFLAGS="${save_CFLAGS} -finline-limit-20000"; 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])
+AC_MSG_CHECKING([if \$CC accepts -bundle -undefined suppress])
 AC_TRY_COMPILE([],,
  PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; AC_MSG_RESULT(yes),
  AC_MSG_RESULT(no))
 
 dnl Check for standard plugin linking flags
 CFLAGS="${save_CFLAGS} -shared"
-AC_MSG_CHECKING([if \$CC compiles plugins with -shared])
+AC_MSG_CHECKING([if \$CC accepts -shared])
 AC_TRY_COMPILE([],,
  PLCFLAGS="${PLCFLAGS} -shared"; AC_MSG_RESULT(yes),
  AC_MSG_RESULT(no))
 
+dnl Check for standard soname setting
+if test x"${SOFLAGS}" = x; then
+  try_SOFLAGS="-Wl,-soname -Wl,"
+  LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+  AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0])
+  AC_TRY_LINK([],,
+   SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+fi
+
+dnl Check for SunOS soname setting
+if test x"${SOFLAGS}" = x; then
+  try_SOFLAGS="-Wl,-h -Wl,"
+  LDFLAGS="${save_LDFLAGS} ${try_SOFLAGS}foo.so.0"
+  AC_MSG_CHECKING([if linker accepts ${try_SOFLAGS}foo.so.0])
+  AC_TRY_LINK([],,
+   SOFLAGS="${try_SOFLAGS}"; AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+fi
+
 dnl End of the bizarre compilation tests
 CFLAGS="${save_CFLAGS}"
+LDFLAGS="${save_LDFLAGS}"
 
 dnl Check for boolean_t
 AC_MSG_CHECKING([for boolean_t in sys/types.h])
@@ -146,12 +176,33 @@ AC_TRY_COMPILE([#include <pthread.h>
 void quux() { boolean_t foo; }],,
  AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_MSG_CHECKING([for boolean_t in cthreads.h])
+AC_TRY_COMPILE([#include <cthreads.h>
+void quux() { boolean_t foo; }],,
+ AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
+ AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
+dnl Checks for __attribute__(aligned()) directive
+AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
+    [ac_cv_c_attribute_aligned],
+    [ac_cv_c_attribute_aligned=0
+    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
+    AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
+        [$ac_cv_c_attribute_aligned],[Maximum supported data alignment])
+fi
+
+
+
 ARCH=${host_cpu}
 
 dnl
@@ -164,32 +215,53 @@ dnl
 dnl  Accelerated modules
 dnl
 MMX_MODULES="yuvmmx idctmmx motionmmx"
-MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
+MMXEXT_MODULES="idctmmxext motionmmxext"
+THREEDNOW_MODULES="imdct3dn downmix3dn"
+SSE_MODULES="imdctsse downmixsse"
 
 AC_MSG_CHECKING([if \$CC groks MMX inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
   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_MSG_CHECKING([if \$CC groks MMX EXT inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
   ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
+AC_MSG_CHECKING([if \$CC groks 3D Now! inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("pfadd %%mm1,%%mm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks SSE inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("xorps %%xmm1,%%xmm2"::"r"(p));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([if \$CC groks Altivec inline assembly])
+AC_TRY_COMPILE([void quux(){void *p;asm("mtspr 256,%0"::"r"(-1));}],,
+  ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+
 dnl
 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=1
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
 ])
 
-dnl  for Un*x
+dnl  for Un*x and BeOS
 AC_CHECK_HEADERS(sys/ioctl.h,[
-  CAN_BUILD_LIBDVDCSS=1
-  AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
+  CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
+  AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h)
   BSD_DVD_STRUCT=0
+  LINUX_DVD_STRUCT=0
   dnl
   dnl Old FreeBSD: sys/cdio.h
   dnl
@@ -206,23 +278,65 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
               Define if <sys/cdio.h> defines dvd_struct.)
     BSD_DVD_STRUCT=1
   ])
-  if test x$BSD_DVD_STRUCT = x1; then
-    AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
-              Define if BSD-like dvd_struct is defined.)
-  fi
   dnl
   dnl Linux: linux/cdrom.h
   dnl
   AC_EGREP_HEADER(dvd_struct,linux/cdrom.h,[
     AC_DEFINE(DVD_STRUCT_IN_LINUX_CDROM_H, 1,
               Define if <linux/cdrom.h> defines DVD_STRUCT.)
+    LINUX_DVD_STRUCT=1
   ])
+  dnl
+  dnl BSDI: dvd.h
+  dnl
+  NEED_BSDI_LIBDVD=0
+  AC_EGREP_HEADER(dvd_struct,dvd.h,[
+    AC_DEFINE(DVD_STRUCT_IN_DVD_H, 1,
+              Define if <dvd.h> defines DVD_STRUCT.)
+    LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd"
+    LINUX_DVD_STRUCT=1
+  ],[
+    dnl
+    dnl BSDI: /sys/dev/scsi/scsi_ioctl.h, using our own libdvd
+    dnl
+    AC_CHECK_HEADERS(/sys/dev/scsi/scsi_ioctl.h,[
+      NEED_BSDI_LIBDVD=1
+      AC_DEFINE(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H, 1,
+                Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT.)
+      OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
+      LINUX_DVD_STRUCT=1
+    ])
+  ])
+  dnl
+  dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
+  dnl
+  AC_CHECK_HEADER(sys/scsi/scsi_types.h,[
+    AC_CHECK_HEADER(sys/scsi/impl/uscsi.h,[
+      AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
+    ])
+  ])
+  dnl
+  dnl Final tests to check what was detected
+  dnl
+  if test x$LINUX_DVD_STRUCT = x1; then
+    AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
+              Define if Linux-like dvd_struct is defined.)
+  else
+    if test x$BSD_DVD_STRUCT = x1; then
+      AC_DEFINE(HAVE_BSD_DVD_STRUCT, 1,
+                Define if BSD-like dvd_struct is defined.)
+    fi
+  fi
 ])
 
+
 dnl
 dnl  Check the operating system
 dnl
 case ${host_os} in
+  bsdi*)
+    SYS=bsdi
+    ;;
   darwin*)
     SYS=darwin
     ;;
@@ -245,20 +359,19 @@ dnl
 AC_ARG_ENABLE(mmx,
 [  --disable-mmx           Disable MMX optimizations (default enabled for x86)],
 [ if test x$enableval = xyes; then ARCH="${ARCH} mmx";
-  BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; 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";
-  BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; 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"
-    BUILTINS="${BUILTINS} idctaltivec"
-    LIB_IDCTALTIVEC="-framework vecLib"
-  fi ])
-#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ])
+[  --disable-altivec       Disable altivec optimizations (default enabled on PPC)],
+[ if test x$enableval = xyes; then ARCH="${ARCH} altivec";
+    BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
+[ if test x${host_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
+    BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ])
 
 dnl
 dnl  Debugging mode
@@ -285,12 +398,22 @@ AC_ARG_ENABLE(trace,
 [ if test x$enableval = xyes; then TRACE=1; fi ])
 
 dnl
-dnl  Trace mode
+dnl  Profiling
 dnl
-PROFILING=0
-AC_ARG_ENABLE(profiling,
-[  --enable-profiling      Enable gprof profiling (default disabled)],
-[ if test x$enableval = xyes; then PROFILING=1; fi ])
+GPROF=0
+AC_ARG_ENABLE(gprof,
+[  --enable-gprof          Enable gprof profiling (default disabled)],
+[ if test x$enableval = xyes; then GPROF=1; fi ])
+
+CPROF=0
+AC_ARG_ENABLE(cprof,
+[  --enable-cprof          Enable cprof profiling (default disabled)],
+[ if test x$enableval = xyes;
+  then
+    LIB="${LIB} -lcprof"
+    CPROF=1
+  fi
+])
 
 dnl
 dnl  Enable/disable optimizations
@@ -319,34 +442,45 @@ LIB="${LIB} ${THREAD_LIB}"
 dnl
 dnl  DVD module: check for installed libdvdcss or local libdvdcss
 dnl
-LOCAL_LIBDVDCSS=0
+NEED_LIBDVDCSS=0
 STATIC_LIBDVDCSS=0
+DUMMY_LIBDVDCSS=0
 AC_ARG_WITH(dvdcss,
-  [  --with-dvdcss[=name]    way to use libdvdcss, either local-static, local-shared or a path to another libdvdcss such as /usr/local (default local-static)],
+  [  --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
+        NEED_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"
+        LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+        LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}"
       fi
     ;;
     xlocal-shared)
       # local libdvdcss, dynamically linked
       if test x${CAN_BUILD_LIBDVDCSS} = x1
       then
-        LOCAL_LIBDVDCSS=1
+        NEED_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"
+      CFLAGS_DVD="${CFLAGS_DVD} -DLIBDVDCSS_VERSION=\"${LIBDVDCSS_VERSION}\""
+      LIB_DVD="${LIB_DVD} -ldl"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+    ;;
     *)
       # existing libdvdcss
       BUILTINS="${BUILTINS} dvd"
@@ -359,33 +493,25 @@ AC_ARG_WITH(dvdcss,
       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
+      NEED_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"
+      LIB_DVD="${LIB_DVD} lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+      LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a ${LIB_LIBDVDCSS}"
+    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  CSS DVD decryption (for libdvdcss)
-dnl
-CSS=0
-AC_ARG_ENABLE(css,
-  [  --disable-css           Disable DVD CSS decryption (default enabled)],
-  [ if test x$enableval = xyes
-    then
-      CSS=1
-    fi ],
-  [ CSS=1; ])
-
-if test x${CSS} = x1
-then
-  AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.)
-fi
-
 dnl
 dnl  dummy plugin
 dnl
@@ -479,12 +605,14 @@ AC_ARG_ENABLE(macosx,
      LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
      LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
      LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
+	 LIB_ALTIVEC="-framework vecLib"
    fi],
   [AC_CHECK_HEADERS(Carbon/Carbon.h,
      BUILTINS="${BUILTINS} macosx"
      LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
      LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
      LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
+	 LIB_ALTIVEC="-framework vecLib"
    )])
 
 dnl
@@ -505,7 +633,10 @@ 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
@@ -528,39 +659,54 @@ dnl  SDL module
 dnl
 AC_ARG_ENABLE(sdl,
   [  --disable-sdl           SDL support (default enabled)])
-if test "x$withval" != "xno"
+if test "x$enable_sdl" != "xno"
 then
-  AC_DEFINE(HAVE_SDL_SDL_H, 0, Define if you have SDL/SDL.h)
-  AC_DEFINE(HAVE_SDL11_SDL_H, 0, Define if you have SDL/SDL11.h)
-  AC_DEFINE(HAVE_SDL12_SDL_H, 0, Define if you have SDL/SDL12.h)
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-  SDL_HEADER="SDL/SDL.h"
-  if test x${SDL_CONFIG} = xno; then
-    AC_PATH_PROG(SDL_CONFIG, sdl11-config, no)
+  SDL_PATH=$PATH
+  AC_ARG_WITH(sdl-config-path,
+    [  --with-sdl-config-path=path sdl-config path (default search in \$PATH)],
+    [ if test "x$withval" != "xno"
+      then
+        SDL_PATH=$withval:$PATH
+      fi ])
+  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
+  then
+    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; then
-    AC_PATH_PROG(SDL_CONFIG, sdl12-config, no)
-    SDL_HEADER="SDL12/SDL.h"
+  if test x${SDL_CONFIG} = xno
+  then
+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, $SDL_PATH)
+    SDL_HEADER="SDL/SDL.h"
   fi
-  if test x${SDL_CONFIG} != xno; then
-    AC_CHECK_HEADERS($SDL_HEADER, [],
-	[ echo "The development package for SDL is not installed. Please install it"
-	  echo "and try again."
-	  exit ])
-    if expr 1.1.5 \> $($SDL_CONFIG --version) >/dev/null
-    then
-      echo "You need SDL version 1.1.5 or later."
-      exit
-    fi
+  if test x${SDL_CONFIG} != xno
+  then
     PLUGINS="${PLUGINS} sdl"
     CFLAGS_SDL="`${SDL_CONFIG} --cflags`"
     LIB_SDL="`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
-  elif test "x$withval" =  "xyes"
+    save_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $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 ])
+    CPPFLAGS=$save_CPPFLAGS
+    if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
+    then
+      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/."
-    exit
+    echo "http://www.libsdl.org/, or configure with --disable-sdl. Have a"
+    echo "nice day."
+    exit 1
   fi
 fi
 
@@ -639,7 +785,13 @@ AC_ARG_ENABLE(kde,
   [if test x$enable_kde = xyes; then
      PLUGINS="${PLUGINS} kde"
      ALIASES="${ALIASES} kvlc"
-     LIB_KDE="-lkfile"
+     LIB_KDE="-L${KDEDIR}/lib -lkfile"
+     if test -x ${QTDIR}/bin/moc
+     then
+       MOC=${QTDIR}/bin/moc
+     else
+       MOC=moc
+     fi
    fi])
 
 dnl
@@ -658,14 +810,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
@@ -744,17 +905,18 @@ AC_SUBST(DEBUG)
 AC_SUBST(STATS)
 AC_SUBST(ASM)
 AC_SUBST(TRACE)
-AC_SUBST(PROFILING)
+AC_SUBST(CPROF)
+AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
-AC_SUBST(GETOPT)
-AC_SUBST(CSS)
+AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 
 AC_SUBST(LCFLAGS)
 AC_SUBST(PLCFLAGS)
-AC_SUBST(LIB)
+AC_SUBST(SOFLAGS)
 
+AC_SUBST(LIB)
 AC_SUBST(LIB_ALSA)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
@@ -765,7 +927,8 @@ AC_SUBST(LIB_GGI)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GNOME)
 AC_SUBST(LIB_GTK)
-AC_SUBST(LIB_IDCTALTIVEC)
+AC_SUBST(LIB_ALTIVEC)
+AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_KDE)
 AC_SUBST(LIB_MACOSX)
 AC_SUBST(LIB_QNX)
@@ -780,11 +943,15 @@ AC_SUBST(LIB_YUV)
 
 AC_SUBST(CFLAGS_VLC)
 AC_SUBST(CFLAGS_DVD)
+AC_SUBST(CFLAGS_LIBDVDCSS)
 AC_SUBST(CFLAGS_GTK)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)
 
-AC_SUBST(LOCAL_LIBDVDCSS)
+AC_SUBST(OBJ_DVD)
+AC_SUBST(OBJ_LIBDVDCSS)
+
+AC_SUBST(NEED_LIBDVDCSS)
 
 AC_OUTPUT([Makefile.opts include/config.h])
 
@@ -793,31 +960,48 @@ global configuration
 --------------------
 system                : ${SYS}
 architecture          : ${ARCH}
-optimizations         : ${OPTIMS}
+optimizations         : ${OPTIMS}"
 
+if test x${HAVE_VLC} = x1
+then
+  echo "
 vlc configuration
 -----------------
 vlc version           : ${VLC_VERSION}
 debug mode            : ${DEBUG}
 statistics            : ${STATS}
 trace mode            : ${TRACE}
-profiling             : ${PROFILING}
-need builtin getopt   : ${GETOPT}
+cprof/gprof support   : ${CPROF}/${GPROF}
+need builtin getopt   : ${NEED_GETOPT}
 built-in modules      :${BUILTINS}
 plugin modules        :${PLUGINS}
-vlc aliases           :${ALIASES}
+vlc aliases           :${ALIASES}"
+fi
 
+echo "
 libdvdcss configuration
 -----------------------
-need to be built      : ${LOCAL_LIBDVDCSS}"
-
-if test x${LOCAL_LIBDVDCSS} = x1
+can be built          : ${CAN_BUILD_LIBDVDCSS}
+will be built         : ${NEED_LIBDVDCSS}"
+if test x${NEED_LIBDVDCSS} = x1
 then
-  echo "link statically       : ${STATIC_LIBDVDCSS}
-CSS decryption        : ${CSS}"
+  echo "need BSDI libdvd      : ${NEED_BSDI_LIBDVD}"
+  echo "link statically       : ${STATIC_LIBDVDCSS}"
+else
+  echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
 fi
 
 echo "
-You may now tune Makefile.opts at your convenience. To build vlc, type
-\`make vlc'. To build libdvdcss only, type \`make libdvdcss'."
+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 ""