From 6d03cee2fbc7d72108bce5b4a819e5de228628ec Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 21 Oct 2004 18:49:13 +0000 Subject: [PATCH] 2004-10-21 Mike Kestner * configure.in : guard against broken installs where enable_gnome fails but enable_gnomedb succeeds. [Fixes #67986] svn path=/trunk/gtk-sharp/; revision=35213 --- ChangeLog | 5 +++++ configure.in | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2b2498a45..0d1f721f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-21 Mike Kestner + + * configure.in : guard against broken installs where enable_gnome + fails but enable_gnomedb succeeds. [Fixes #67986] + 2004-10-20 Dan Winship * gdk/Window.custom: add a new constructor that takes a diff --git a/configure.in b/configure.in index 2fd288f42..73bced273 100644 --- a/configure.in +++ b/configure.in @@ -142,10 +142,13 @@ AC_SUBST(GLADE_LIBS) LIBGDA_REQUIRED_VERSION=1.0.0 PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no) + enable_gnomedb=no +if test "x$enable_gnome" = "xyes"; then if test "x$enable_gda" = "xyes"; then PKG_CHECK_MODULES(LIBGNOMEDB_DEPENDENCIES, libgnomedb >= $LIBGDA_REQUIRED_VERSION, enable_gnomedb=yes, enable_gnomedb=no) fi +fi RSVG_REQUIRED_VERSION=2.0.1 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)