From fae5bbfc961c60fef66b73fae718aabe7d32e0a3 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Fri, 9 Apr 2004 20:44:12 +0000 Subject: [PATCH] Make sure that build also works without libgtk 2.0. --- Changelog | 2 ++ configure | 7 ++++--- configure.in | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 59a25a1..96b78e5 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,8 @@ 2004-04-09 Henning Meier-Geinitz * INSTALL: Updated supported Gimp versions. + * configure configure.in: Make sure that build also works without + libgtk 2.0. 2004-04-05 Gerard Klaver * src/gtkglue.c UTF8 patch from Mattias Ellert for diff --git a/configure b/configure index 382b541..4ea1317 100755 --- a/configure +++ b/configure @@ -6636,9 +6636,10 @@ rm -f conftest.err conftest.$ac_objext \ GTK_LIBS="" if test "${USE_GIMP}" = "yes"; then - { { echo "$as_me:$LINENO: error: *** GIMP 2.0 plugin requested, but GTK+ 2.0 not found ***" >&5 -echo "$as_me: error: *** GIMP 2.0 plugin requested, but GTK+ 2.0 not found ***" >&2;} - { (exit 1); exit 1; }; } + { echo "$as_me:$LINENO: WARNING: *** GIMP 2.0 plugin requested, but GTK+ 2.0 not found, falling back to GIMP/GTK+ < 2.0 if possible ***" >&5 +echo "$as_me: WARNING: *** GIMP 2.0 plugin requested, but GTK+ 2.0 not found, falling back to GIMP/GTK+ < 2.0 if possible ***" >&2;} + USE_GIMP=no + USE_GIMP12=yes else { echo "$as_me:$LINENO: WARNING: *** GTK+ 2.0 not found, falling back to GTK+ < 2.0 if possible ***" >&5 echo "$as_me: WARNING: *** GTK+ 2.0 not found, falling back to GTK+ < 2.0 if possible ***" >&2;} diff --git a/configure.in b/configure.in index 8325925..726f8ce 100644 --- a/configure.in +++ b/configure.in @@ -136,7 +136,9 @@ if test "${USE_GUI}" = "yes"; then if test "${USE_GTK2}" = "yes" || test "${USE_GIMP}" = "yes"; then AM_PATH_GTK_2_0(2.0.0, HAVE_GTK=yes, [ if test "${USE_GIMP}" = "yes"; then - AC_MSG_ERROR([*** GIMP 2.0 plugin requested, but GTK+ 2.0 not found ***]) + AC_MSG_WARN([*** GIMP 2.0 plugin requested, but GTK+ 2.0 not found, falling back to GIMP/GTK+ < 2.0 if possible ***]) + USE_GIMP=no + USE_GIMP12=yes else AC_MSG_WARN([*** GTK+ 2.0 not found, falling back to GTK+ < 2.0 if possible ***]) fi])