diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 73 |
1 files changed, 43 insertions, 30 deletions
diff --git a/configure.in b/configure.in index 5ab37391a..b17c91006 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_INIT(src/cairo.h) dnl =========================================================================== # Package version number, (as distinct from shared library version) -CAIRO_VERSION=0.1.23 +CAIRO_VERSION=0.2.0 # libtool shared library version @@ -60,9 +60,10 @@ else AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, true) fi +CAIRO_CFLAGS="$CAIRO_CFLAGS $XRENDER_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS $XRENDER_LIBS" + AC_SUBST(XLIB_SURFACE_FEATURE) -AC_SUBST(XRENDER_CFLAGS) -AC_SUBST(XRENDER_LIBS) AC_SUBST(XRENDER_REQUIRES) dnl =========================================================================== @@ -84,9 +85,10 @@ else AM_CONDITIONAL(CAIRO_HAS_XCB_SURFACE, true) fi +CAIRO_CFLAGS="$CAIRO_CFLAGS $XCB_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS $XCB_LIBS" + AC_SUBST(XCB_SURFACE_FEATURE) -AC_SUBST(XCB_CFLAGS) -AC_SUBST(XCB_LIBS) dnl =========================================================================== @@ -103,6 +105,8 @@ else AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, true) fi +CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS" + AC_SUBST(PS_SURFACE_FEATURE) AC_SUBST(PS_LIBS) @@ -129,35 +133,37 @@ else AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, true) fi +CAIRO_CFLAGS="$CAIRO_CFLAGS $PNG_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS $PNG_LIBS" + AC_SUBST(PNG_SURFACE_FEATURE) -AC_SUBST(PNG_CFLAGS) -AC_SUBST(PNG_LIBS) AC_SUBST(PNG_REQUIRES) dnl =========================================================================== -AC_ARG_ENABLE(gl, - [ --disable-gl Disable cairo's OpenGL backend], - [use_gl=$enableval], [use_gl=yes]) +AC_ARG_ENABLE(glitz, + [ --disable-glitz Disable cairo's glitz backend], + [use_glitz=$enableval], [use_glitz=yes]) -if test "x$use_gl" = "xyes"; then - PKG_CHECK_MODULES(GL, glitz >= 0.1.5, [ - GL_REQUIRES=glitz - use_gl=yes], [use_gl="no (requires glitz http://freedesktop.org/software/glitz)"]) +if test "x$use_glitz" = "xyes"; then + PKG_CHECK_MODULES(GLITZ, glitz >= 0.2.3, [ + GLITZ_REQUIRES=glitz + use_glitz=yes], [use_glitz="no (requires glitz http://freedesktop.org/software/glitz)"]) fi -if test "x$use_gl" != "xyes"; then - GL_SURFACE_FEATURE=CAIRO_HAS_NO_GL_SURFACE - AM_CONDITIONAL(CAIRO_HAS_GL_SURFACE, false) +if test "x$use_glitz" != "xyes"; then + GLITZ_SURFACE_FEATURE=CAIRO_HAS_NO_GLITZ_SURFACE + AM_CONDITIONAL(CAIRO_HAS_GLITZ_SURFACE, false) else - GL_SURFACE_FEATURE=CAIRO_HAS_GL_SURFACE - AM_CONDITIONAL(CAIRO_HAS_GL_SURFACE, true) + GLITZ_SURFACE_FEATURE=CAIRO_HAS_GLITZ_SURFACE + AM_CONDITIONAL(CAIRO_HAS_GLITZ_SURFACE, true) fi -AC_SUBST(GL_LIBS) -AC_SUBST(GL_CFLAGS) -AC_SUBST(GL_SURFACE_FEATURE) -AC_SUBST(GL_REQUIRES) +CAIRO_CFLAGS="$CAIRO_CFLAGS $GLITZ_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS $GLITZ_LIBS" + +AC_SUBST(GLITZ_SURFACE_FEATURE) +AC_SUBST(GLITZ_REQUIRES) dnl =========================================================================== @@ -176,7 +182,12 @@ AC_SUBST(SANITY_CHECKING_FEATURE) dnl =========================================================================== PKG_CHECK_MODULES(FONTCONFIG, fontconfig) -PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.1) +CAIRO_CFLAGS="$CAIRO_CFLAGS $FONTCONFIG_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS $FONTCONFIG_LIBS" + +PKG_CHECK_MODULES(PIXMAN, libpixman >= 0.1.1) +CAIRO_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS $PIXMAN_LIBS" # Test for freetype2 separate from pkg-config since at least up to # 2003-06-07, there was no freetype2.pc in the release. @@ -218,13 +229,9 @@ FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) - CAIRO_CFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS" CAIRO_LIBS="$CAIRO_LIBS $FREETYPE_LIBS" -AC_SUBST(CAIRO_CFLAGS) -AC_SUBST(CAIRO_LIBS) - dnl =========================================================================== dnl Checks for precise integer types @@ -239,7 +246,12 @@ if test "x$GCC" = "xyes"; then -Wmissing-prototypes -Wmissing-declarations \ -Wnested-externs -fno-strict-aliasing" fi -AC_SUBST(WARN_CFLAGS) + +CAIRO_CFLAGS="$CAIRO_CFLAGS $WARN_CFLAGS" +CAIRO_LIBS="$CAIRO_LIBS -lm" + +AC_SUBST(CAIRO_CFLAGS) +AC_SUBST(CAIRO_LIBS) dnl =========================================================================== @@ -248,6 +260,7 @@ cairo.pc Makefile src/Makefile src/cairo-features.h +test/Makefile ]) dnl =========================================================================== @@ -258,6 +271,6 @@ echo " Xlib: $use_xlib" echo " XCB: $use_xcb" echo " PostScript: $use_ps" echo " PNG: $use_png" -echo " OpenGL: $use_gl" +echo " glitz: $use_glitz" echo "" |