PatchSet 5849 Date: 2005/01/13 08:50:50 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: added check for gdk-pixbuf-2.0
2005-01-13 Dalibor Topic <[EMAIL PROTECTED]> Resynced with GNU Classpath. 2005-01-11 Michael Koch <[EMAIL PROTECTED]> * configure.ac: Check for gdk-pixbuf-2.0. Members: ChangeLog:1.3393->1.3394 configure:1.410->1.411 configure.ac:1.101->1.102 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3393 kaffe/ChangeLog:1.3394 --- kaffe/ChangeLog:1.3393 Thu Jan 13 08:05:02 2005 +++ kaffe/ChangeLog Thu Jan 13 08:50:50 2005 @@ -4,6 +4,14 @@ 2005-01-11 Michael Koch <[EMAIL PROTECTED]> + * configure.ac: Check for gdk-pixbuf-2.0. + +2005-01-13 Dalibor Topic <[EMAIL PROTECTED]> + + Resynced with GNU Classpath. + + 2005-01-11 Michael Koch <[EMAIL PROTECTED]> + * java/net/URL.java (URL): Handle specs like "/redir?http://domain2.com/index.html" which start with a slash. Index: kaffe/configure diff -u kaffe/configure:1.410 kaffe/configure:1.411 --- kaffe/configure:1.410 Fri Jan 7 17:54:46 2005 +++ kaffe/configure Thu Jan 13 08:50:52 2005 @@ -56242,23 +56242,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" >&5 -echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0... $ECHO_C" >&6 + 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 - if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0" ; then + if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 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"` + GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 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"` + GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0"` echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 echo "${ECHO_T}$GTK_LIBS" >&6 else @@ -56266,7 +56266,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"` + 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"` echo $GTK_PKG_ERRORS fi @@ -56281,8 +56281,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) 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) 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 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;} { (exit 1); exit 1; }; } fi Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.101 kaffe/configure.ac:1.102 --- kaffe/configure.ac:1.101 Fri Jan 7 17:54:53 2005 +++ kaffe/configure.ac Thu Jan 13 08:50:59 2005 @@ -1685,7 +1685,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) + 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) _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe