diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-08-20 14:47:11 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-08-20 14:47:11 +0000 |
| commit | cad90591bdfef1e57ba7e0ca89f99d23bd85ff9c (patch) | |
| tree | a164bb24bb016d35bc96ee899bc456689713df88 /libjava/configure.in | |
| parent | fabead06137e34773b26c619b0085e2c03e06f4d (diff) | |
| download | gcc-cad90591bdfef1e57ba7e0ca89f99d23bd85ff9c.zip gcc-cad90591bdfef1e57ba7e0ca89f99d23bd85ff9c.tar.gz gcc-cad90591bdfef1e57ba7e0ca89f99d23bd85ff9c.tar.bz2 | |
configure.in: Rewrote some obsolete stuff for autoconf 2.59.
2004-08-20 Michael Koch <konqueror@gmx.de>
* configure.in: Rewrote some obsolete stuff for autoconf 2.59.
* aclocal.m4, configure: Regenerated.
From-SVN: r86322
Diffstat (limited to 'libjava/configure.in')
| -rw-r--r-- | libjava/configure.in | 31 |
1 files changed, 21 insertions, 10 deletions
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 |