Commit bb6ed2ac by Bryce McKinlay Committed by Tom Tromey

configure: Rebuilt.

2003-11-28  Bryce McKinlay  <bryce@mckinlay.net.nz>

	* configure: Rebuilt.
	* configure.in: Require gtk and glib 2.2.0.

From-SVN: r74023
parent 48ee6fa0
2003-11-28 Bryce McKinlay <bryce@mckinlay.net.nz>
* configure: Rebuilt.
* configure.in: Require gtk and glib 2.2.0.
2003-11-27 Dalibor Topic <robilad@kaffe.org> 2003-11-27 Dalibor Topic <robilad@kaffe.org>
* java/text/FieldPosition.java (equals): Adapted to handle * java/text/FieldPosition.java (equals): Adapted to handle
......
dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -290,7 +290,7 @@ fi[]dnl ...@@ -290,7 +290,7 @@ fi[]dnl
dnl Usage: dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define]) dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE], AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AC_PROG_INSTALL]) [AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1] PACKAGE=[$1]
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
...@@ -318,7 +318,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])]) ...@@ -318,7 +318,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
# Check to make sure that the build environment is sane. # Check to make sure that the build environment is sane.
# #
AC_DEFUN([AM_SANITY_CHECK], AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane]) [AC_MSG_CHECKING([whether build environment is sane])
# Just in case # Just in case
sleep 1 sleep 1
...@@ -359,7 +359,7 @@ AC_MSG_RESULT(yes)]) ...@@ -359,7 +359,7 @@ AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version. dnl The program must properly implement --version.
AC_DEFUN([AM_MISSING_PROG], AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2) [AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
...@@ -378,7 +378,7 @@ AC_SUBST($1)]) ...@@ -378,7 +378,7 @@ AC_SUBST($1)])
# serial 1 # serial 1
AC_DEFUN([AM_MAINTAINER_MODE], AC_DEFUN(AM_MAINTAINER_MODE,
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode, AC_ARG_ENABLE(maintainer-mode,
...@@ -395,7 +395,7 @@ AC_DEFUN([AM_MAINTAINER_MODE], ...@@ -395,7 +395,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
# Define a conditional. # Define a conditional.
AC_DEFUN([AM_CONDITIONAL], AC_DEFUN(AM_CONDITIONAL,
[AC_SUBST($1_TRUE) [AC_SUBST($1_TRUE)
AC_SUBST($1_FALSE) AC_SUBST($1_FALSE)
if $2; then if $2; then
...@@ -408,7 +408,7 @@ fi]) ...@@ -408,7 +408,7 @@ fi])
# Like AC_CONFIG_HEADER, but automatically create stamp file. # Like AC_CONFIG_HEADER, but automatically create stamp file.
AC_DEFUN([AM_CONFIG_HEADER], AC_DEFUN(AM_CONFIG_HEADER,
[AC_PREREQ([2.12]) [AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1]) AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file. dnl When config.status generates a header, we must update the stamp-h file.
......
...@@ -840,8 +840,8 @@ else ...@@ -840,8 +840,8 @@ else
# Test for Gtk stuff, if asked for. # Test for Gtk stuff, if asked for.
if test "$use_gtk_awt" = yes; then if test "$use_gtk_awt" = yes; then
AM_PATH_GTK_2_0(2.0.0,,exit 1) AM_PATH_GTK_2_0(2.2.0,,exit 1)
AM_PATH_GLIB_2_0(2.0.0,,exit 1,gthread) AM_PATH_GLIB_2_0(2.2.0,,exit 1,gthread)
dnl XXX Fix me when libart.m4 has the compile test fixed! dnl XXX Fix me when libart.m4 has the compile test fixed!
enable_libarttest=no enable_libarttest=no
AM_PATH_LIBART(2.1.0,,exit 1) AM_PATH_LIBART(2.1.0,,exit 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment