PatchSet 6697
Date: 2005/07/04 15:46:14
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: removed libart dependency
2005-07-04 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-07-04 Ziga Mahkovec <[EMAIL PROTECTED]>
* configure.ac: Remove libart dependency.
Members:
ChangeLog:1.4221->1.4222
configure:1.466->1.467
configure.ac:1.150->1.151
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4221 kaffe/ChangeLog:1.4222
--- kaffe/ChangeLog:1.4221 Mon Jul 4 15:37:32 2005
+++ kaffe/ChangeLog Mon Jul 4 15:46:14 2005
@@ -2,6 +2,14 @@
Resynced with GNU Classpath.
+ 2005-07-04 Ziga Mahkovec <[EMAIL PROTECTED]>
+
+ * configure.ac: Remove libart dependency.
+
+2005-07-04 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-07-03 Daniel Bonniot <[EMAIL PROTECTED]>
* java/io/ObjectStreamClass.java (inSamePackage): New private method.
Index: kaffe/configure
diff -u kaffe/configure:1.466 kaffe/configure:1.467
--- kaffe/configure:1.466 Mon Jul 4 00:03:36 2005
+++ kaffe/configure Mon Jul 4 15:46:20 2005
@@ -48244,23 +48244,23 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
libart-2.0 gdk-pixbuf-2.0" >&5
-echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0
gdk-pixbuf-2.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
gdk-pixbuf-2.0" >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
gdk-pixbuf-2.0... $ECHO_C" >&6
- 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
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
- GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 >=
2.2 libart-2.0 gdk-pixbuf-2.0"`
+ GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 >=
2.2 gdk-pixbuf-2.0"`
echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
echo "${ECHO_T}$GTK_CFLAGS" >&6
echo "$as_me:$LINENO: checking GTK_LIBS" >&5
echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
- GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
libart-2.0 gdk-pixbuf-2.0"`
+ GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
gdk-pixbuf-2.0"`
echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
echo "${ECHO_T}$GTK_LIBS" >&6
else
@@ -48268,7 +48268,7 @@
GTK_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
echo $GTK_PKG_ERRORS
fi
@@ -48283,8 +48283,8 @@
if test $succeeded = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 2.4
gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0) not met; consider adjusting the
PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard
prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
libart-2.0 gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH
environment variable if your libraries are in a nonstandard prefix so
pkg-config can find them." >&2;}
+ { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= 2.4
gthread-2.0 >= 2.2 gdk-pixbuf-2.0) not met; consider adjusting the
PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard
prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2
gdk-pixbuf-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment
variable if your libraries are in a nonstandard prefix so pkg-config can find
them." >&2;}
{ (exit 1); exit 1; }; }
fi
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.150 kaffe/configure.ac:1.151
--- kaffe/configure.ac:1.150 Mon Jul 4 00:03:45 2005
+++ kaffe/configure.ac Mon Jul 4 15:46:31 2005
@@ -1791,7 +1791,7 @@
AC_MSG_ERROR([Configuration --with-classpath-gtk-awt not
supported - only available with pthreads])
fi
- dnl Check for AWT related gthread/gtk/libart_lgpl.
+ dnl Check for AWT related gthread/gtk.
dnl for some obscure reason, it doesn't work without AC_PATH_X
dnl with Kaffe's configure acript, but it works without it with
dnl classpath's script. m4 is bizarre.
@@ -1804,7 +1804,7 @@
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)
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
