diff options
| author | Keith Packard <keithp@keithp.com> | 2006-02-14 16:33:38 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2006-02-14 16:33:38 +0000 |
| commit | 21ce0f2bab1743ed15474ba1468286d6782bf781 (patch) | |
| tree | af0f415ffac6a50f3be4df5bbb27cdbe37799ccf /configure.ac | |
| parent | 32393ee83c8ad63dbb54aab709cdd4dc5802a74c (diff) | |
Split detection of Xrender and Xft. Add detection of MIT-SHM. Clean up
CFLAGS in Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a6c2b97..d6b1a16 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,40 @@ AC_TYPE_SIGNAL PKG_CHECK_MODULES(X11PERF, x11 xmuu) AC_SUBST(X11PERF_CFLAGS) AC_SUBST(X11PERF_LIBS) -PKG_CHECK_MODULES(XRENDER, xrender xft, have_xrender=yes, have_xrender=no) -if test "x$have_xrender" = "xyes"; then - AC_DEFINE(XRENDER, 1, [Define to 1 if you have xrender and xft]) - X11PERF_CFLAGS="$X11PERF_CFLAGS $XRENDER_CFLAGS" - X11PERF_LIBS="$X11PERF_LIBS $XRENDER_LIBS" -fi + +# Check for Xrender library +PKG_CHECK_MODULES(XRENDER, xrender, [xrender_found=yes], [xrender_found=no]) +AC_SUBST(XRENDER_CFLAGS) +AC_SUBST(XRENDER_LIBS) +case "$xrender_found" in +yes) + AC_DEFINE(XRENDER,1,[Xrender library available]) + ;; +esac + +# Check for Xft library +PKG_CHECK_MODULES(XFT, xft, [xft_found=yes], [xft_found=no]) +AC_SUBST(XFT_CFLAGS) +AC_SUBST(XFT_LIBS) +case "$xft_found" in +yes) + AC_DEFINE(XFT,1,[Xft library available]) + ;; +esac + +# Check for MIT-SHM extension +PKG_CHECK_MODULES(XEXT, xext, [xext_found=yes], [xext_found=no]) +AC_SUBST(XEXT_CFLAGS) +AC_SUBST(XEXT_LIBS) +case "$xext_found" in +yes) + save_LIBS="$LIBS" + LIBS="$XEXT_LIBS $LIBS" + AC_CHECK_FUNCS([XShmQueryExtension], + AC_DEFINE(MITSHM, 1, [MIT-SHM extension available])) + LIBS="$save_LIBS" + ;; +esac XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |