* aRts audio output courtesy of Emmanuel Blindauer <manu@agat.net>.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index a4e2a73470c014270dae721a1ff442beb12b994f..3e98da498ebbe8a3522bc29d3577c946b6e1bd24 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ dnl Check for tools
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_RANLIB
+AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
@@ -374,6 +374,7 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
 if test x"$ac_cv_c_altivec" != x"no"; then
   AC_DEFINE(HAVE_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
 
 AC_CACHE_CHECK([if linker needs -framework vecLib],
@@ -387,6 +388,31 @@ if test x"$ac_cv_ld_altivec" != x"no"; then
   LIB_ALTIVEC="-framework vecLib"
 fi
 
+dnl
+dnl  Check the operating system
+dnl
+case ${target_os} in
+  bsdi*)
+    SYS=bsdi
+    ;;
+  darwin*)
+    SYS=darwin
+    ;;
+  *mingw32*)
+    SYS=mingw32
+    ;;
+  *)
+    SYS=${target_os}
+    ;;
+esac
+
+dnl
+dnl Windoze specific section
+dnl
+if test $SYS = mingw32; then
+AC_CHECK_TOOL(WINDRES, windres, :)
+fi
+
 dnl
 dnl  libdvdcss: check for DVD ioctls
 dnl
@@ -479,21 +505,6 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   fi
 ])
 
-dnl
-dnl  Check the operating system
-dnl
-case ${target_os} in
-  bsdi*)
-    SYS=bsdi
-    ;;
-  darwin*)
-    SYS=darwin
-    ;;
-  *)
-    SYS=${target_os}
-    ;;
-esac
-
 dnl
 dnl  Special arch tuning
 dnl
@@ -735,11 +746,13 @@ else
 
 dnl
 dnl  OSS /dev/dsp module
+dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(dsp,
   [  --disable-dsp           Linux /dev/dsp support (default enabled)])
 
-if test x$enable_dsp != xno
+if test x$enable_dsp != xno &&
+  (test $SYS != mingw32 || test x$enable_dsp = xyes)
 then
   if test -c /dev/dsp
   then
@@ -758,10 +771,27 @@ AC_ARG_ENABLE(esd,
      if test x${ESD_CONFIG} != xno
      then
        PLUGINS="${PLUGINS} esd"
+       CFLAGS_ESD="`${ESD_CONFIG} --cflags`"
        LIB_ESD="`${ESD_CONFIG} --libs`"
      fi
    fi])
 
+dnl
+dnl  aRts module
+dnl
+AC_ARG_ENABLE(arts,
+  [  --enable-arts           aRts sound server (default disabled)],
+  [if test x$enable_arts = xyes
+   then
+     AC_PATH_PROG(ARTS_CONFIG, artsc-config, no)
+     if test x${ARTS_CONFIG} != xno
+     then
+       PLUGINS="${PLUGINS} arts"
+       CFLAGS_ARTS="`${ARTS_CONFIG} --cflags`"
+       LIB_ARTS="`${ARTS_CONFIG} --libs `"
+     fi
+   fi])
+
 dnl
 dnl  Darwin module
 dnl
@@ -887,28 +917,43 @@ fi
 dnl
 dnl  Windows DirectX module
 dnl
-AC_ARG_WITH(directx,
-  [  --with-directx[=name]   Windows DirectX support (default enabled)],
-  [ if test "x$withval" != "xno"
+AC_ARG_ENABLE(directx,
+  [  --disable-directx       Windows DirectX support (default enabled on WIN32)],
+  [ if test "x$enableval" != "xno"
     then
       PLUGINS="${PLUGINS} directx"
-      if test "x$withval" != "xyes"
+      if test "x$enableval" = "xyes"
       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
       else
-        AC_CHECK_HEADERS(directx.h, , 
-          AC_MSG_ERROR([Cannot find DirectX headers !])
-        )
-        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"
+        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
       fi
-    fi ])
-    if test "x$withval" = "x"
+    fi ],
+  [ if test $SYS = mingw32
     then
       AC_CHECK_HEADERS(directx.h,
-      [PLUGINS="${PLUGINS} directx"
-       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lgdi32 -ldxguid"])
-    fi
+      [ PLUGINS="${PLUGINS} directx"
+        LIB_DIRECTX="-lgdi32 -ldxguid" ],
+      [ echo "Cannot find DirectX headers !" ])
+    fi ])
 
 dnl
 dnl  Glide module
@@ -1004,8 +1049,15 @@ AC_ARG_ENABLE(gtk,
   [  --disable-gtk           Gtk+ support (default enabled)])
 if test x$enable_gtk != xno
 then
+  GTK_PATH=$PATH
+  AC_ARG_WITH(gtk-config-path,
+    [  --with-gtk-config-path=path gtk-config path (default search in \$PATH)],
+    [ if test "x$withval" != "xno"
+      then
+        GTK_PATH=$withval:$PATH
+      fi ])
   # look for gtk-config
-  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no, $GTK_PATH)
   if test -x ${GTK_CONFIG}
   then
     CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
@@ -1023,10 +1075,12 @@ fi
 
 dnl
 dnl  X11 module
+dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(x11,
   [  --disable-x11           X11 support (default enabled)])
-if test x$enable_x11 != xno; then
+if test x$enable_x11 != xno &&
+  (test $SYS != mingw32 || test x$enable_x11 = xyes); then
   if test x$x_includes = xNONE; then
     x_includes=/usr/X11R6/include
   fi
@@ -1045,10 +1099,12 @@ fi
 
 dnl
 dnl  XVideo module
+dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(xvideo,
   [  --disable-xvideo        XVideo support (default enabled)])
-if test x$enable_xvideo != xno; then
+if test x$enable_xvideo != xno &&
+  (test $SYS != mingw32 || test x$enable_xvideo = xyes); then
   if test x$x_includes = xNONE; then
     x_includes=/usr/X11R6/include
   fi
@@ -1125,6 +1181,7 @@ AC_SUBST(SOFLAGS)
 AC_SUBST(LIB)
 AC_SUBST(LIB_ALSA)
 AC_SUBST(LIB_ALTIVEC)
+AC_SUBST(LIB_ARTS)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
 AC_SUBST(LIB_DVD)
@@ -1151,6 +1208,8 @@ AC_SUBST(CFLAGS_VLC)
 AC_SUBST(CFLAGS_ALTIVEC)
 AC_SUBST(CFLAGS_DVD)
 AC_SUBST(CFLAGS_LIBDVDCSS)
+AC_SUBST(CFLAGS_ARTS)
+AC_SUBST(CFLAGS_ESD)
 AC_SUBST(CFLAGS_GTK)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)