diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-01-19 18:30:27 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:43 +0100 |
| commit | 2fef45d7931ce12d78e27cb32f34426559dbdeed (patch) | |
| tree | 0203a62290cd772dcd24b45a0527e47719095828 /configure.ac | |
| parent | 4355449194274d766fb0aec964e6bfce8fa9acdf (diff) | |
Check for PangoCairo as well
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9590ae62..1f496744 100644 --- a/configure.ac +++ b/configure.ac @@ -204,6 +204,14 @@ AS_IF([test "x$enable_pango" != "xno"], ], [ have_pango=false ]) + PKG_CHECK_MODULES([PangoCairo], [pangocairo], + [ + have_pangocairo=true + AC_DEFINE([HAVE_PANGOCAIRO], [1], + [Define to 1 if PangoCairo is available]) + ], [ + have_pangocairo=false + ]) ], [ AC_MSG_RESULT([no]) ]) @@ -266,6 +274,8 @@ AM_CONDITIONAL([BUILD_HDFSEE], test x$have_gdk_pixbuf = xtrue \ AM_CONDITIONAL([HAVE_CAIRO], test x$have_cairo = xtrue) +AM_CONDITIONAL([HAVE_PANGOCAIRO], test x$have_pangocairo = xtrue) + AM_CONDITIONAL([HAVE_PANGO], test x$have_pango = xtrue) AM_CONDITIONAL([HAVE_FFTW], test x$have_fftw = xtrue) @@ -277,6 +287,7 @@ MAIN_CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $OPENCL_CFLAGS -pthread" MAIN_CFLAGS="$MAIN_CFLAGS $GTK_CFLAGS $LIBTIFF_CFLAGS -D_GNU_SOURCE " MAIN_CFLAGS="$MAIN_CFLAGS $libPNG_CFLAGS $Cairo_CFLAGS $GDK_pixbuf_CFLAGS" MAIN_CFLAGS="$MAIN_CFLAGS $GDK_pixbuf_2_CFLAGS $FFTW_CFLAGS $Pango_CFLAGS" +MAIN_CFLAGS="$MAIN_CFLAGS $PangoCairo_CFLAGS" AC_SUBST([MAIN_CFLAGS]) LIBCRYSTFEL_CFLAGS="$CFLAGS $HDF5_CFLAGS $GSL_CFLAGS $FFTW_CFLAGS" @@ -285,7 +296,7 @@ AC_SUBST([LIBCRYSTFEL_CFLAGS]) MAIN_LIBS="$LIBS $HDF5_LIBS -lm -lz $GSL_LIBS $GTK_LIBS $OPENCL_LIBS -pthread" MAIN_LIBS="$MAIN_LIBS $LIBTIFF_LIBS $libPNG_LIBS $Cairo_LIBS $GDK_pixbuf_LIBS" MAIN_LIBS="$MAIN_LIBS $GDK_pixbuf_2_LIBS $TIMER_LIBS $FFTW_LIBS" -MAIN_LIBS="$MAIN_LIBS $Pango_LIBS $LDFLAGS" +MAIN_LIBS="$MAIN_LIBS $Pango_LIBS $PangoCairo_LIBS $LDFLAGS" AC_SUBST([MAIN_LIBS]) LIBCRYSTFEL_LIBS="$LIBS $HDF5_LIBS $GSL_LIBS $FFTW_LIBS $LDFLAGS" |