summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@redhat.com>2005-06-29 20:27:03 +0000
committerThomas Fitzsimmons <fitzsim@redhat.com>2005-06-29 20:27:03 +0000
commit4e241b6d4cdb6a2df5e09cae3383c9d260259b0d (patch)
treeeae15419ea74464b5cb4ec3d9eec6c73f7275763
parent74f9e1961fcb12e8b79db932d89bba18b18a31c0 (diff)
downloadclasspath-4e241b6d4cdb6a2df5e09cae3383c9d260259b0d.tar.gz
2005-06-29 Thomas Fitzsimmons <fitzsim@redhat.com>
* INSTALL: Drop GTK requirement to 2.4. * NEWS: Likewise. * configure.ac: Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--INSTALL2
-rw-r--r--NEWS2
-rw-r--r--configure.ac2
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d6ee270b..6449e0534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-06-29 Thomas Fitzsimmons <fitzsim@redhat.com>
+ * INSTALL: Drop GTK requirement to 2.4.
+ * NEWS: Likewise.
+ * configure.ac: Likewise.
+
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:
Re-add GTK 2.4 support.
diff --git a/INSTALL b/INSTALL
index 84236ca95..9222ea50e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,7 +40,7 @@ Suggested Software
are required unless --disable-gtk-peer is used as an argument to
configure.
- - GTK+ 2.6.x (or higher)
+ - GTK+ 2.4.x (or higher)
- libart_lgpl 2.1.0
- gdk-pixbuf
diff --git a/NEWS b/NEWS
index 622945b92..ec2832b64 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@ New in release 0.16
try Classpath implementation, reporting the possible bugs.
* GdkGraphics2D has been updated to use Cairo 0.5.0 APIs.
-* Better GTK scrollbar peer implementation requiring GTK 2.6 or higher.
+* Better GTK scrollbar peer implementation when using GTK >= 2.6.
* New --with-vm-classes configure option, and new 'build' setting
for --with-glibj
diff --git a/configure.ac b/configure.ac
index 2b13b0429..777f256dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,7 +264,7 @@ if test "x${COMPILE_JNI}" = xyes; then
AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
[AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])],
[${X_LIBS}])
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
fi