From: mental <mental@users.sourceforge.net>
Date: Tue, 1 Aug 2006 22:29:47 +0000 (+0000)
Subject: refactor pkg-config tests and add explicit cairo test
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=754f856b57eee7dc0c59d9e90e441a7c4d3a3347;p=inkscape.git

refactor pkg-config tests and add explicit cairo test
---

diff --git a/ChangeLog b/ChangeLog
index 90fbea0ed..c96f4f694 100644
--- 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 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"