[PATCH/libXdamage] Require pkg-config to find the packages, no funky x11 lookups.
Peter Hutterer
peter.hutterer at who-t.net
Wed Sep 23 04:51:07 PDT 2009
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
Looks like a dawn-of-time leftover to me.
configure.ac | 41 +----------------------------------------
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)
--
1.6.3.rc1.2.g0164.dirty
More information about the xorg-devel
mailing list