diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/aclocal.m4 | 24 | ||||
| -rwxr-xr-x | libjava/configure | 12 | ||||
| -rw-r--r-- | libjava/configure.in | 31 |
4 files changed, 32 insertions, 40 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index dfefb6a..102a19c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Michael Koch <konqueror@gmx.de> + + * configure.in: Rewrote some obsolete stuff for autoconf 2.59. + * aclocal.m4, configure: Regenerated. + 2004-08-19 Thomas Fitzsimmons <fitzsim@redhat.com> Michael Koch <konqueror@gmx.de> diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index 3897a24..b44303e 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -426,30 +426,6 @@ AC_SUBST(GCJFLAGS) _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 7 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # This macro actually does too much some checks are only needed if diff --git a/libjava/configure b/libjava/configure index 682a4e3..81a73da 100755 --- a/libjava/configure +++ b/libjava/configure @@ -5740,8 +5740,6 @@ INTERPRETER="$libgcj_interpreter" echo "$as_me:$LINENO: checking for exception model to use" >&5 echo $ECHO_N "checking for exception model to use... $ECHO_C" >&6 - - ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5754,7 +5752,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 5757 "configure" +#line 5755 "configure" struct S { ~S(); }; void bar(); void foo() @@ -10748,9 +10746,7 @@ echo $ECHO_N "checking whether gethostbyname_r declaration requires -D_REENTRANT if test "${libjava_cv_gethostbyname_r_needs_reentrant+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - - ac_ext=cc + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -15543,7 +15539,11 @@ here=`${PWDCMD-pwd}` ac_config_files="$ac_config_files Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile" + + ac_config_commands="$ac_config_commands default" + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/libjava/configure.in b/libjava/configure.in index 76b9805..59e5cd3 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -138,7 +138,7 @@ AC_SUBST(LIBGCJ_CFLAGS) AC_SUBST(LIBGCJ_CXXFLAGS) AC_SUBST(LIBGCJ_JAVAFLAGS) -AM_CONFIG_HEADER(include/config.h gcj/libgcj-config.h) +AC_CONFIG_HEADERS([include/config.h gcj/libgcj-config.h]) # Only use libltdl for non-newlib builds. if test "x${with_newlib}" = "x" || test "x${with_newlib}" = "xno"; then @@ -155,7 +155,7 @@ fi AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) AC_SUBST(DIRLTDL) -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL AM_PROG_GCJ AM_PROG_CC_C_O AC_CONFIG_SUBDIRS(libltdl) @@ -271,8 +271,7 @@ INTERPRETER="$libgcj_interpreter" AC_SUBST(INTERPRETER) AC_MSG_CHECKING([for exception model to use]) -AC_LANG_SAVE -AC_LANG_CPLUSPLUS +AC_LANG_PUSH(C++) AC_ARG_ENABLE(sjlj-exceptions, AS_HELP_STRING([--enable-sjlj-exceptions], [force use of builtin_setjmp for exceptions]), @@ -314,7 +313,7 @@ elif test x$enable_sjlj_exceptions = xno; then else AC_MSG_ERROR([unable to detect exception model]) fi -AC_LANG_RESTORE +AC_LANG_POP(C++) AC_MSG_RESULT($ac_exception_model_name) # If we are non using SJLJ exceptions, and this host does not have support @@ -581,7 +580,7 @@ case "$GC" in GCHDR=no-gc.h ;; *) - AC_MSG_ERROR(unrecognized collector \"$GC\") + AC_MSG_ERROR([unrecognized collector "$GC"]) ;; esac AC_SUBST(GCLIBS) @@ -818,8 +817,7 @@ else dnl On DU4.0, gethostbyname_r is only declared with -D_REENTRANT AC_CACHE_CHECK([whether gethostbyname_r declaration requires -D_REENTRANT], [libjava_cv_gethostbyname_r_needs_reentrant], - [ AC_LANG_SAVE - AC_LANG_CPLUSPLUS + [ AC_LANG_PUSH(C++) AC_TRY_COMPILE([#include <netdb.h>], [gethostbyname_r("", 0, 0);], [libjava_cv_gethostbyname_r_needs_reentrant=no], [dnl @@ -830,7 +828,7 @@ else [libjava_cv_gethostbyname_r_needs_reentrant=fail]) CPPFLAGS="$CPPFLAGS_SAVE" ]) - AC_LANG_RESTORE + AC_LANG_POP(C++) ]) if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads]) @@ -1356,7 +1354,18 @@ AC_SUBST(here) # We get this from the environment. AC_SUBST(GCJFLAGS) -AC_OUTPUT(Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile, +AC_CONFIG_FILES([ +Makefile +libgcj.pc +libgcj.spec +libgcj-test.spec +gnu/classpath/Configuration.java +gcj/Makefile +include/Makefile +testsuite/Makefile +]) + +AC_CONFIG_COMMANDS([default], [# Only add multilib support code if we just rebuilt top-level Makefile. case " $CONFIG_FILES " in *" Makefile "*) @@ -1395,3 +1404,5 @@ CC="${CC}" CXX="${CXX}" ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" ) + +AC_OUTPUT |