Fixed a bug in my previous commit.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 3e98da498ebbe8a3522bc29d3577c946b6e1bd24..ba34bfce912dbbbc220aae2a2e01793e7b7e43bc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -295,15 +295,15 @@ ARCH=${target_cpu}
 dnl
 dnl  default modules
 dnl
-BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
+BUILTINS="${BUILTINS} es ps ts memcpy yuv idct idctclassic motion imdct downmix mpeg_adec lpcm_adec ac3_adec mpeg_vdec"
 PLUGINS="${PLUGINS} ac3_spdif spu_dec"
 
 dnl
 dnl  Accelerated modules
 dnl
-MMX_MODULES="yuvmmx idctmmx motionmmx"
-MMXEXT_MODULES="idctmmxext motionmmxext"
-THREEDNOW_MODULES="imdct3dn downmix3dn"
+MMX_MODULES="memcpymmx yuvmmx idctmmx motionmmx"
+MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
+THREEDNOW_MODULES="memcpy3dn imdct3dn downmix3dn"
 SSE_MODULES="imdctsse downmixsse"
 ALTIVEC_MODULES="idctaltivec motionaltivec"
 
@@ -328,7 +328,7 @@ AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly],
     [AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
                     ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
 if test x"$ac_cv_3dnow_inline" != x"no"; then
-  AC_DEFINE(HAVE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
+  AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
   ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
 fi
 
@@ -337,7 +337,7 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
     [AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
                     ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
 if test x"$ac_cv_sse_inline" != x"no"; then
-  AC_DEFINE(HAVE_SSE, 1, Define if \$CC groks SSE inline assembly.)
+  AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
   ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
 fi
 
@@ -353,7 +353,7 @@ AC_CACHE_CHECK([if \$CC groks Altivec inline assembly],
           CFLAGS=$save_CFLAGS
          ])])
 if test x"$ac_cv_altivec_inline" != x"no"; then
-  AC_DEFINE(HAVE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.)
+  AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.)
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
 
@@ -372,7 +372,7 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
      CFLAGS=$save_CFLAGS
     ])
 if test x"$ac_cv_c_altivec" != x"no"; then
-  AC_DEFINE(HAVE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.)
+  AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.)
   CFLAGS_ALTIVEC="$CFLAGS_ALTIVEC $ac_cv_c_altivec"
   ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
 fi
@@ -392,6 +392,9 @@ dnl
 dnl  Check the operating system
 dnl
 case ${target_os} in
+  linux*)
+    SYS=linux
+       ;;
   bsdi*)
     SYS=bsdi
     ;;
@@ -411,6 +414,8 @@ dnl Windoze specific section
 dnl
 if test $SYS = mingw32; then
 AC_CHECK_TOOL(WINDRES, windres, :)
+LIB_TS="-lws2_32"
+LIB_RC="-lws2_32"
 fi
 
 dnl
@@ -683,6 +688,20 @@ AC_ARG_WITH(dvdcss,
       LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
     fi ])
 
+dnl
+dnl DVDREAD module: check for libdvdread plugin
+dnl
+AC_ARG_ENABLE(dvdread,
+[  --enable-dvdread          Enable dvdread support (default disabled)],
+[ if test x$enableval = xyes
+  then
+    NEED_LIBDVDCSS=1
+    STATIC_LIBDVDCSS=1
+    BUILTINS="${BUILTINS} dvdread" 
+    CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread"
+    LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a lib/libdvdcss.a"
+  fi ])
+
 dnl
 dnl  VCD module
 dnl
@@ -792,16 +811,6 @@ AC_ARG_ENABLE(arts,
      fi
    fi])
 
-dnl
-dnl  Darwin module
-dnl
-AC_ARG_ENABLE(darwin,
-  [  --enable-darwin         Darwin sound support (default enabled on MacOS X)],
-  [if test x$enable_darwin = xyes; then
-     PLUGINS="${PLUGINS} darwin"
-     LIB_DARWIN="-framework CoreAudio"
-   fi])
-
 dnl
 dnl  MacOS X module
 dnl
@@ -918,42 +927,33 @@ dnl
 dnl  Windows DirectX module
 dnl
 AC_ARG_ENABLE(directx,
-  [  --disable-directx       Windows DirectX support (default enabled on WIN32)],
-  [ if test "x$enableval" != "xno"
+  [  --disable-directx       Windows DirectX support (default enabled on WIN32)])
+if test "x$enableval" != "xno"
+then
+  if test $SYS = mingw32
+  then
+    AC_ARG_WITH(directx-path, 
+    [  --with-directx-path=path Windows DirectX headers and libraries])
+    if test "x$with_directx_path" = "x"
     then
-      PLUGINS="${PLUGINS} directx"
-      if test "x$enableval" = "xyes"
+      AC_CHECK_HEADERS(directx.h,
+      [ PLUGINS="${PLUGINS} directx"
+        LIB_DIRECTX="-lgdi32 -ldxguid" ])
+    else
+      AC_MSG_CHECKING(for directX headers in ${withval})
+      if test -f ${withval}/include/directx.h
       then
-       AC_ARG_WITH(directx, 
-       [--with-directx=[name] Windows DirectX support (default enabled)])
-       if test "x$withval" = "x"
-       then
-          AC_CHECK_HEADERS(directx.h, [LIB_DIRECTX="-lgdi32 -ldxguid"], 
-          AC_MSG_ERROR([Cannot find DirectX headers !]))
-       else
-        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lgdi32 -ldxguid"
-        INCLUDE="${INCLUDE} -I"$withval"/include"
-       fi
+        PLUGINS="${PLUGINS} directx"
+        LIB_DIRECTX="-L${withval}/lib -lgdi32 -ldxguid"
+        INCLUDE="${INCLUDE} -I${withval}/include"
+        AC_MSG_RESULT(yes)
       else
-        AC_MSG_CHECKING(for directX headers in ${enableval})
-        if test -f ${enableval}/include/directx.h
-        then
-          LIB_DIRECTX="-L${enableval}/lib -lgdi32 -ldxguid"
-          INCLUDE="${INCLUDE} -I${enableval}/include"
-          AC_MSG_RESULT(yes)
-        else
-          AC_MSG_RESULT(no)
-          AC_MSG_ERROR([Cannot find ${enableval}/include/directx.h!])
-        fi
+        AC_MSG_RESULT(no)
+        AC_MSG_ERROR([Cannot find ${withval}/include/directx.h!])
       fi
-    fi ],
-  [ if test $SYS = mingw32
-    then
-      AC_CHECK_HEADERS(directx.h,
-      [ PLUGINS="${PLUGINS} directx"
-        LIB_DIRECTX="-lgdi32 -ldxguid" ],
-      [ echo "Cannot find DirectX headers !" ])
-    fi ])
+    fi
+  fi
+fi
 
 dnl
 dnl  Glide module
@@ -1066,10 +1066,16 @@ then
   # now look for the gtk.h header
   saved_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
-  AC_CHECK_HEADERS(gtk/gtk.h, [
+  FOUND=
+  AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, ,
+  [
+    FOUND=no
+       echo "Cannot find gtk development headers."
+  ])
+  if test -z $FOUND; then
     PLUGINS="${PLUGINS} gtk"
     ALIASES="${ALIASES} gvlc"
-  ])
+  fi
   CPPFLAGS=$saved_CPPFLAGS
 fi
 
@@ -1129,7 +1135,7 @@ AC_ARG_ENABLE(alsa,
                           (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")
+     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} alsa"
@@ -1184,22 +1190,25 @@ AC_SUBST(LIB_ALTIVEC)
 AC_SUBST(LIB_ARTS)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
+AC_SUBST(LIB_DIRECTX)
 AC_SUBST(LIB_DVD)
 AC_SUBST(LIB_DVD_PLUGIN)
+AC_SUBST(LIB_DVDREAD)
+AC_SUBST(LIB_DVDREAD_PLUGIN)
 AC_SUBST(LIB_ESD)
 AC_SUBST(LIB_GGI)
 AC_SUBST(LIB_GLIDE)
 AC_SUBST(LIB_GNOME)
 AC_SUBST(LIB_GTK)
-AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_KDE)
+AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_MACOSX)
-AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_NCURSES)
+AC_SUBST(LIB_QNX)
 AC_SUBST(LIB_QT)
-AC_SUBST(LIB_TS)
+AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
-AC_SUBST(LIB_DIRECTX)
+AC_SUBST(LIB_TS)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
@@ -1207,6 +1216,7 @@ AC_SUBST(LIB_YUV)
 AC_SUBST(CFLAGS_VLC)
 AC_SUBST(CFLAGS_ALTIVEC)
 AC_SUBST(CFLAGS_DVD)
+AC_SUBST(CFLAGS_DVDREAD)
 AC_SUBST(CFLAGS_LIBDVDCSS)
 AC_SUBST(CFLAGS_ARTS)
 AC_SUBST(CFLAGS_ESD)