Audio - Refs:#473

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 05b53db049a07a5039455960c054d1bc1593d0a8..196885f8c6f3f2e48112231d36b86bff65f481d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
 dnl $Id$
 
-AC_INIT(vlc,0.8.5-xtophe)
+AC_INIT(vlc,0.8.5-svn)
 VERSION_MAJOR="0"
 VERSION_MINOR="8"
 VERSION_REVISION="5"
@@ -17,7 +17,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.8.5-xtophe)
+AM_INIT_AUTOMAKE(vlc,0.8.5-svn)
 AM_CONFIG_HEADER(config.h)
 
 dnl HA! HA!
@@ -741,6 +741,12 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 dnl Find where are the X headers and libraries
 AC_PATH_X()
 
+dnl The rest of configure doesn't work if x_includes is null.
+dnl Cleaner way to do it welcomes
+if test -z ${x_includes} ;then
+       x_includes="/usr/includes"
+fi
+
 dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal.
 
 PKG_PROG_PKG_CONFIG()