summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-19 07:15:38 +0000
committerKevin E Martin <kem@kem.org>2005-11-19 07:15:38 +0000
commita85959a46e205dc63b9d13bcfb0a22f246d82f95 (patch)
tree2dd729b220ba08728231566aa027889a64047893 /configure.ac
parent315c08c29b58805884556c3709a57b98bd05bfd3 (diff)
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work with separate build roots.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac23
1 files changed, 13 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 2e6d5f0..6dbf7cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,35 +33,38 @@ AC_PROG_INSTALL
# Checks for pkg-config packages
PKG_CHECK_MODULES(XSET, xmu)
-PKG_CHECK_MODULES(SET_XEXT, xextproto xext,
+# This is used below to allow <X11/Xlib.h> to be found
+PKG_CHECK_MODULES(SET_X11, x11)
+
+PKG_CHECK_MODULES(SET_XEXT, xext,
[SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XEXT_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XEXT_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(SET_XKB, kbproto x11,
+PKG_CHECK_MODULES(SET_XKB, x11,
[SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(SET_XF86MISC, xf86miscproto xxf86misc,
+PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
[SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XF86MISC_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XF86MISC_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,,
[#include <X11/Xlib.h>
#include <X11/Xproto.h>])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(SET_FONTCACHE, fontcacheproto xfontcache,
+PKG_CHECK_MODULES(SET_FONTCACHE, xfontcache,
[SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_FONTCACHE_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_FONTCACHE_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include <X11/Xlib.h>])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(SET_XPRINT, printproto xp,
+PKG_CHECK_MODULES(SET_XPRINT, xp,
[SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XPRINT_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XPRINT_CFLAGS $SET_X11_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])