summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2003-12-12 11:44:16 +0000
committerCarl Worth <cworth@cworth.org>2003-12-12 11:44:16 +0000
commite232072c12d5bd4bc1d093658428007e47114a2e (patch)
tree1a0a277d2488e29703a74dbccc7fcca360c048c4 /configure.in
parenta02d8aaa595b4893f9b25715c0bd5fbc8ee7b3c8 (diff)
downloadcairo-e232072c12d5bd4bc1d093658428007e47114a2e.tar.gz
Add conditionals for ps_surface functions, etc.
Get rid of AC_PATH_XTRA. Instead, find X includes/libraries only via pkg-config xrender. Switch option from --without-x to --disable-xlib Add option --disable-ps Add -lz only if ps_surface backend is compiled.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in28
1 files changed, 23 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 8ff03736f..855fbfac4 100644
--- a/configure.in
+++ b/configure.in
@@ -36,22 +36,40 @@ AC_STDC_HEADERS
dnl ===========================================================================
-AC_PATH_XTRA
+AC_ARG_ENABLE(xlib,
+ AC_HELP_STRING([--disable-xlib], [Disable cairo's Xlib backend]),
+ [use_xlib=$enableval], [use_xlib=yes])
-if test "x$have_x" != "xyes"; then
+if test "x$use_xlib" != "xyes"; then
XLIB_SURFACE_FEATURE=CAIRO_HAS_NO_XLIB_SURFACE
+ AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, false)
else
XLIB_SURFACE_FEATURE=CAIRO_HAS_XLIB_SURFACE
PKG_CHECK_MODULES(XRENDER, xrender >= 0.6)
XRENDER_REQUIRES=xrender
+ AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, true)
fi
AC_SUBST(XLIB_SURFACE_FEATURE)
AC_SUBST(XRENDER_REQUIRES)
-dnl This is needed for conditional compilation of xlib code in Makefile.am :
-dnl XXX: I'd prefer to have only one test of $have_x, would that be easy?
-AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, test x$have_x = xyes)
+dnl ===========================================================================
+
+AC_ARG_ENABLE(ps,
+ AC_HELP_STRING([--disable-ps], [Disable cairo's PostScript backend]),
+ [use_ps=$enableval], [use_ps=yes])
+
+if test "x$use_ps" != "xyes"; then
+ PS_SURFACE_FEATURE=CAIRO_HAS_NO_PS_SURFACE
+ AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, false)
+else
+ PS_SURFACE_FEATURE=CAIRO_HAS_PS_SURFACE
+ PS_SURFACE_LIBS=-lz
+ AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, true)
+fi
+
+AC_SUBST(PS_SURFACE_LIBS)
+AC_SUBST(PS_SURFACE_FEATURE)
dnl ===========================================================================