Make sure that build also works without libgtk 2.0.

merge-requests/2/head
Henning Geinitz 2004-04-09 20:44:12 +00:00
rodzic ea9431be26
commit fae5bbfc96
3 zmienionych plików z 9 dodań i 4 usunięć

Wyświetl plik

@ -1,6 +1,8 @@
2004-04-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* INSTALL: Updated supported Gimp versions.
* configure configure.in: Make sure that build also works without
libgtk 2.0.
2004-04-05 Gerard Klaver <gerard at gkall dot hobby dot nl>
* src/gtkglue.c UTF8 patch from Mattias Ellert for

7
configure vendored
Wyświetl plik

@ -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;}

Wyświetl plik

@ -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])