X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=41ff06287cb45a0f083d48fcb2f6da59693f3283;hb=350a1263d4e350a4bd4cf180cff6dcbe2c63aa9b;hp=fecbb44e3bb4cda225cd70cc029921731d1c27b3;hpb=53feb898b958fe27d98d6e9ddf88e6de990d9005;p=monky

diff --git a/configure.ac b/configure.ac
index fecbb44..41ff062 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,12 @@ dnl
 dnl C Compiler
 dnl
 
+dnl prevent libtool setting LTCFLAGS to default of -g -O2 when CFLAGS unset.
+dnl libtool must be deleted with make distclean to see this fix.
+if test x"$CFLAGS" = x""; then
+    AC_SUBST(CFLAGS, [ ])
+fi
+
 AC_PROG_CC
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG([0.17.2])
@@ -422,10 +428,10 @@ dnl
 dnl X
 dnl
 
-dah=yes
+want_double_buffer=yes
 AC_ARG_ENABLE(double_buffer,
 [  --enable-double-buffer  enable if you want to support flicker-free operation [[default=yes]]],
-  [dah="$enableval"])
+  [want_double_buffer="$enableval"])
 
 want_xdamage=yes
 AC_ARG_ENABLE(xdamage,
@@ -444,13 +450,21 @@ if test "x$want_x11" = "xyes"; then
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	LIBS="$LIBS $X_LIBS $X11_LIBS"
 	LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
-	if test "x$X_DISPLAY_MISSING" = xyes; then
+	
+	if test "x$no_x" = xyes; then
 		AC_MSG_ERROR([something went wrong when checking for X11, you're probably missing headers or it's not installed, either re-run configure with --disable-x11, or fix this])
 	fi
+	
+	AC_CHECK_LIB(
+		[X11], [XOpenDisplay],[], 
+		AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
+	)
+
 	AC_DEFINE(X11, 1, [Define if you want to use X11])
 	AC_DEFINE(HAVE_X11, 1, [Define if you have X11])
 	AM_CONDITIONAL(BUILD_X11, true)
-	if test "x$dah" != xno; then
+	
+	if test "x$want_double_buffer" != xno; then
 		AC_DEFINE(DOUBLE_BUFFER, 1, [Define if you want support for the DBE extension])
 		AC_CHECK_LIB(Xext, XdbeQueryExtension, [AC_DEFINE([HAVE_XDBE], 1, [Xdbe]) LIBS="$LIBS -lXext"],
 		     [AC_MSG_ERROR([something went wrong when checking for Xdbe (double buffer extension)])])