Audio - Refs:#473

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 44af209fd268b97d8dd7994428c174cf51b4ed74..196885f8c6f3f2e48112231d36b86bff65f481d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -738,12 +738,13 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
-dnl Default X headers and libraries
-if test "${x_includes}" = "NONE"; then
-  x_includes="/usr/X11R6/include"
-fi
-if test "${x_libraries}" = "NONE"; then
-  x_libraries="/usr/X11R6/lib"
+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.