summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZiga Mahkovec <ziga.mahkovec@klika.si>2005-07-04 14:30:58 +0000
committerZiga Mahkovec <ziga.mahkovec@klika.si>2005-07-04 14:30:58 +0000
commita5f4fb8559b0dd324337acc6bc395ddc3eb187af (patch)
tree6c2b94b34a0aded7cca69bea22b49841c7673fa2
parent1d12f0813c0639d9aa09559964eddfc16daa1698 (diff)
downloadclasspath-a5f4fb8559b0dd324337acc6bc395ddc3eb187af.tar.gz
2005-07-04 Ziga Mahkovec <ziga.mahkovec@klika.si>
* configure.ac: Remove libart dependency. * scripts/classpath.spec.in: Likewise. * INSTALL: Remove references to libart. * doc/hacking.texinfo: Likewise. * doc/www.gnu.org/faq/faq.wml: Likewise.
-rw-r--r--ChangeLog8
-rw-r--r--INSTALL1
-rw-r--r--configure.ac4
-rw-r--r--doc/hacking.texinfo4
-rw-r--r--doc/www.gnu.org/faq/faq.wml1
-rw-r--r--scripts/classpath.spec.in4
6 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 766b86fe8..5dbc5840f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-04 Ziga Mahkovec <ziga.mahkovec@klika.si>
+
+ * configure.ac: Remove libart dependency.
+ * scripts/classpath.spec.in: Likewise.
+ * INSTALL: Remove references to libart.
+ * doc/hacking.texinfo: Likewise.
+ * doc/www.gnu.org/faq/faq.wml: Likewise.
+
2005-07-03 Daniel Bonniot <bonniot@users.sf.net>
* java/io/ObjectStreamClass.java (inSamePackage): New private method.
diff --git a/INSTALL b/INSTALL
index 9222ea50e..b9cadee30 100644
--- a/INSTALL
+++ b/INSTALL
@@ -41,7 +41,6 @@ Suggested Software
configure.
- GTK+ 2.4.x (or higher)
- - libart_lgpl 2.1.0
- gdk-pixbuf
- XTest Extension (libXtst) for GdkRobot support in java.awt.
diff --git a/configure.ac b/configure.ac
index 69bb7c2c0..71a76ba7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,7 +254,7 @@ if test "x${COMPILE_JNI}" = xyes; then
AC_SUBST(XSLT_CFLAGS)
fi
- dnl Check for AWT related gthread/gtk/libart_lgpl
+ dnl Check for AWT related gthread/gtk
if test "x${COMPILE_GTK_PEER}" = xyes; then
AC_PATH_XTRA
if test "$no_x" = yes; then
@@ -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.4 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 gdk-pixbuf-2.0)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
fi
diff --git a/doc/hacking.texinfo b/doc/hacking.texinfo
index 865cb53c8..e2ce64d8e 100644
--- a/doc/hacking.texinfo
+++ b/doc/hacking.texinfo
@@ -419,10 +419,6 @@ libraries installed:
creating graphical user interfaces. It is used as the basis of the
GNU desktop project GNOME.
-@item libart-lgpl 2.1+
-@uref{http://www.gnome.org/start/,libart} is a GNOME library of
-functions for 2D graphics.
-
@item gdk-pixbuf
@uref{http://www.gnome.org/start/,gdk-pixbuf} is a GNOME library for
representing images.
diff --git a/doc/www.gnu.org/faq/faq.wml b/doc/www.gnu.org/faq/faq.wml
index dc747cdca..25c6dd1e8 100644
--- a/doc/www.gnu.org/faq/faq.wml
+++ b/doc/www.gnu.org/faq/faq.wml
@@ -339,7 +339,6 @@ For building the Java bytecode (.class files), one of these compilers are requir
For building the JNI native libraries, the following are required unless --disable-gtk-peer is used as an argument to configure.
<ul>
<li><createlink name="GTK+ 2" url="http://www.gtk.org/">
-<li>libart-gpl
<li>gdk-pixbuf
</ul>
diff --git a/scripts/classpath.spec.in b/scripts/classpath.spec.in
index 66af9ca27..50e975d58 100644
--- a/scripts/classpath.spec.in
+++ b/scripts/classpath.spec.in
@@ -1,4 +1,4 @@
-# $Id: classpath.spec.in,v 1.1 2005-03-22 19:06:33 archie172 Exp $
+# $Id: classpath.spec.in,v 1.2 2005-07-04 14:31:01 ziga Exp $
%define version_num @PACKAGE_VERSION@
%define release_num 1
@@ -27,7 +27,7 @@ for the Java programming language.
pushd ${RPM_BUILD_DIR}/classpath-%{version_num}
# Determine if we can build the GTK stuff
GTKPEER='disable'
-if pkg-config --exists 'gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0'; then
+if pkg-config --exists 'gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0'; then
GTKPEER='enable'
fi
%configure --with-jikes --enable-jni --${GTKPEER}-gtk-peer