* Fixed an issue in Makefile.dep causing to rebuild unnecessary files

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 3d608a69ba164b6832f65192b223f474519f214a..dc23f580e2304ee873408bb07de668df5eeacc35 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,12 +34,13 @@ AC_PROG_CPP
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl Gettext stuff
+ALL_LINGUAS="de fr ru"
 PACKAGE="vlc"
 VERSION="$VLC_VERSION"
+
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_GNU_GETTEXT
-ALL_LINGUAS="de"
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
@@ -511,6 +512,14 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
     ])
   ])
   dnl
+  dnl HP-UX: sys/scsi.h
+  dnl
+  AC_CHECK_HEADER(sys/scsi.h,[
+    AC_EGREP_HEADER(sctl_io,sys/scsi.h,[
+      AC_DEFINE(HPUX_SCTL_IO, 1, Define if <sys/scsi.h> defines sctl_io.)
+    ])
+  ])
+  dnl
   dnl Final tests to check what was detected
   dnl
   if test x$LINUX_DVD_STRUCT = x1; then
@@ -529,21 +538,6 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
 ])
 
 
-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
@@ -1185,7 +1179,7 @@ if test x$enable_xvideo != xno &&
   AC_CHECK_HEADERS(X11/extensions/Xv.h, [
     BUILTINS="${BUILTINS} xvideo"
     LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
-    CFLAGS_X11="-I$x_includes"
+    CFLAGS_XVIDEO="-I$x_includes"
   ]
   CPPFLAGS=$saved_CPPFLAGS)
 fi
@@ -1290,6 +1284,7 @@ AC_SUBST(CFLAGS_GTK)
 AC_SUBST(CFLAGS_MAD)
 AC_SUBST(CFLAGS_SDL)
 AC_SUBST(CFLAGS_X11)
+AC_SUBST(CFLAGS_XVIDEO)
 
 AC_SUBST(OBJ_DVD)
 AC_SUBST(OBJ_LIBDVDCSS)