diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/configure.in b/configure.in index 7d6aa47d5..27fe96fa3 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(src/cairo.h) dnl =========================================================================== # Package version number, (as distinct from shared library version) -CAIRO_VERSION=0.5.2 +CAIRO_VERSION=0.6.0 # libtool shared library version @@ -151,29 +151,6 @@ AC_SUBST(WIN32_FONT_FEATURE) dnl =========================================================================== -AC_ARG_ENABLE(ps, - [ --disable-ps Disable cairo's PostScript backend], - [use_ps=$enableval], [use_ps=yes]) - -# The postscript module requires zlib. -AC_CHECK_LIB(z, compress, - [AC_CHECK_HEADER(zlib.h, [], - [use_ps="no (requires zlib http://www.gzip.org/zlib/)"])], - [use_ps="no (requires zlib http://www.gzip.org/zlib/)"]) - -AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, test "x$use_ps" = "xyes") -if test "x$use_ps" = "xyes"; then - PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" - PS_LIBS=-lz -fi -AC_SUBST(PS_SURFACE_FEATURE) - -CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS" - -AC_SUBST(PS_LIBS) - -dnl =========================================================================== - AC_ARG_ENABLE(png, [ --disable-png Disable cairo's PNG functions], [use_png=$enableval], [use_png=yes]) @@ -200,6 +177,8 @@ fi AM_CONDITIONAL(CAIRO_HAS_PNG_FUNCTIONS, test "x$use_png" = "xyes") if test "x$use_png" = "xyes"; then PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1" +else + AC_MSG_WARN("*** To run the tests, cairo must be built with png support ***) fi AC_SUBST(PNG_FUNCTIONS_FEATURE) @@ -315,6 +294,34 @@ AC_CHECK_HEADERS([pthread.h]) dnl =========================================================================== +AC_ARG_ENABLE(ps, + [ --disable-ps Disable cairo's PostScript backend], + [use_ps=$enableval], [use_ps=yes]) + +if test x"$use_freetype" != "xyes" ; then + AC_MSG_WARN([PS backend requires FreeType, disabling]) + use_ps=no +fi + +# The postscript module requires zlib. +AC_CHECK_LIB(z, compress, + [AC_CHECK_HEADER(zlib.h, [], + [use_ps="no (requires zlib http://www.gzip.org/zlib/)"])], + [use_ps="no (requires zlib http://www.gzip.org/zlib/)"]) + +AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, test "x$use_ps" = "xyes") +if test "x$use_ps" = "xyes"; then + PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" + PS_LIBS=-lz +fi +AC_SUBST(PS_SURFACE_FEATURE) + +CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS" + +AC_SUBST(PS_LIBS) + +dnl =========================================================================== + AC_ARG_ENABLE(pdf, [ --disable-pdf Disable cairo's PDF backend], [use_pdf=$enableval], [use_pdf=yes]) |