diff options
| author | MenTaLguY <mental@rydia.net> | 2006-08-01 22:29:47 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-08-01 22:29:47 +0000 |
| commit | 275d7e6535a06de766b01acf3f1928731b5e21b5 (patch) | |
| tree | 6fa51fc05cbd43e779b44acfedd5ee1ad995f877 | |
| parent | add #include <pango> for people with older versions (diff) | |
| download | inkscape-275d7e6535a06de766b01acf3f1928731b5e21b5.tar.gz inkscape-275d7e6535a06de766b01acf3f1928731b5e21b5.zip | |
refactor pkg-config tests and add explicit cairo test
(bzr r1539)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2006-08-01 MenTaLguY <mental@rydia.net> + + * configure.ac: refactor pkg-config tests and add explicit cairo test + 2006-07-29 John Bintz <jcoswell@coswellproductions.org> * src/nodepath.cpp: diff --git a/configure.ac b/configure.ac index b80bcb63f..f2b3f7797 100644 --- a/configure.ac +++ b/configure.ac @@ -513,10 +513,11 @@ dnl *** NOTE: when we move to gtk 2.6 or later, we can remove the dnl ********* the override for g_ascii_strtod below... dnl sigc++-2.0 >= 2.0.12: using "visit_each" not available in 2.0.10 if test $cc_vers_major -gt 3; then - PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.4.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 sigc++-2.0 >= 2.0.12 $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2) + min_sigc_version=2.0.12 else - PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.4.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 sigc++-2.0 >= 2.0.11 $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2) + min_sigc_version=2.0.11 fi +PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4 glibmm-2.4 gtkmm-2.4 gtk+-2.0 >= 2.4.0 libxml-2.0 >= 2.6.11 libxslt >= 1.0.15 cairo sigc++-2.0 >= $min_sigc_version $ink_spell_pkg gthread-2.0 >= 2.0 libpng >= 1.2) dnl Shouldn't we test for libpng and libz? INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz" |