summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-03 15:50:23 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-10-05 08:18:49 +1000
commiteed319fd48299e49b2f6ae9ff452a5d6c64ea192 (patch)
tree6ccfb85b7e924ce5133ec933b06ae85457dde611
parentc3f08b7b0a0b1dd42dd00efe07ebc07f7085b433 (diff)
Require pkg-config to find the packages, no funky x11 lookups.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r--configure.ac41
1 files changed, 1 insertions, 40 deletions
diff --git a/configure.ac b/configure.ac
index b07cf53..fcc1186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,51 +44,12 @@ AC_PROG_CC
AC_PROG_LIBTOOL
XORG_CWARNFLAGS
-# Check for X
-PKG_CHECK_MODULES(X, x11,
- [x_found_with_pkgconfig=yes],
- [x_found_with_pkgconfig=no])
-
-if test "$x_found_with_pkgconfig" = "no"
-then
- AC_PATH_XTRA
- X_LIBS="$X_LIBS -lX11"
-
- if test "x$no_x" = "xyes"
- then
- AC_MSG_ERROR([X is required, but it was either disabled or not found.])
- fi
-
- save_LIBS="$LIBS"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- LIBS="$LIBS $X_LIBS"
-
- AC_MSG_CHECKING([for XTHREADS in Xlib])
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
- [[return XInitThreads() == 0 ? 0 : 1;]])],
- [xthreads=no],
- [xthreads=yes],
- [xthreads=yes])
-
- AC_MSG_RESULT($xthreads)
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
- if test "x$xthreads" = "xyes"
- then
- X_CFLAGS="$X_CFLAGS -DXTHREADS"
- fi
-fi
-
# Check damageext configuration, strip extra digits from package version to
# find the required protocol version
DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(DAMAGEEXT_VERSION)
-PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto)
+PKG_CHECK_MODULES(XDAMAGE, [damageproto >= $DAMAGEEXT_VERSION] xfixes fixesproto xextproto x11)
XDAMAGE_CFLAGS="$CWARNFLAGS $XDAMAGE_CFLAGS"
AC_SUBST(XDAMAGE_CFLAGS)