refactor pkg-config tests and add explicit cairo test

diff --git a/ChangeLog b/ChangeLog
index 90fbea0ed4c556db06c83ba0597d235ec3ca30a0..c96f4f6945ec6159c9d9c55ddb48dfba5eddf50c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 b80bcb63f55c7c3d0f992f116add8c1394e31c44..f2b3f7797142dc894b56ee8c05655ce7d0fed582 100644 (file)
--- 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"