This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: configure.in cleanup
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 19 Aug 2004 22:47:20 +0200
- Subject: Patch: configure.in cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I wrote the attached patch to cleanup configure.in. Bootstrapped on
i686-pc-linux-gnu.
Ok to commit to trunk ?
Michael
2004-08-19 Michael Koch <konqueror@gmx.de>
* configure.in: Rewrote some obsolete stuff for autoconf 2.59.
* aclocal.m4, configure: Regenerated.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBJRHbWSOgCCdjSDsRAphnAKCd3fNgHIqS9YAftED4q9RrzyXRYQCgn5fj
z/ZAeKCj36XbapSvx2a4xTY=
=aFDx
-----END PGP SIGNATURE-----
Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libjava/aclocal.m4,v
retrieving revision 1.45
diff -u -r1.45 aclocal.m4
--- aclocal.m4 19 Aug 2004 18:12:16 -0000 1.45
+++ aclocal.m4 19 Aug 2004 20:40:47 -0000
@@ -426,30 +426,6 @@
_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
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure,v
retrieving revision 1.229
diff -u -r1.229 configure
--- configure 19 Aug 2004 18:12:16 -0000 1.229
+++ configure 19 Aug 2004 20:40:50 -0000
@@ -5740,8 +5740,6 @@
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 @@
:
else
cat > conftest.$ac_ext << EOF
-#line 5757 "configure"
+#line 5755 "configure"
struct S { ~S(); };
void bar();
void foo()
@@ -10748,9 +10746,7 @@
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'
@@ -15542,8 +15538,12 @@
# We get this from the environment.
- 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_files="$ac_config_files Makefile gcj/Makefile include/Makefile testsuite/Makefile libgcj.pc libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java"
+
+
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
@@ -16248,13 +16248,13 @@
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "gcj/Makefile" ) CONFIG_FILES="$CONFIG_FILES gcj/Makefile" ;;
+ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+ "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"libgcj.pc" ) CONFIG_FILES="$CONFIG_FILES libgcj.pc" ;;
"libgcj.spec" ) CONFIG_FILES="$CONFIG_FILES libgcj.spec" ;;
"libgcj-test.spec" ) CONFIG_FILES="$CONFIG_FILES libgcj-test.spec" ;;
"gnu/classpath/Configuration.java" ) CONFIG_FILES="$CONFIG_FILES gnu/classpath/Configuration.java" ;;
- "gcj/Makefile" ) CONFIG_FILES="$CONFIG_FILES gcj/Makefile" ;;
- "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"include/platform.h" ) CONFIG_LINKS="$CONFIG_LINKS include/platform.h:include/$PLATFORMH" ;;
"java/io/natFile.cc" ) CONFIG_LINKS="$CONFIG_LINKS java/io/natFile.cc:java/io/natFile${FILE-${PLATFORM}}.cc" ;;
"java/lang/ConcreteProcess.java" ) CONFIG_LINKS="$CONFIG_LINKS java/lang/ConcreteProcess.java:java/lang/${PLATFORM}Process.java" ;;
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.207
diff -u -r1.207 configure.in
--- configure.in 19 Aug 2004 18:12:15 -0000 1.207
+++ configure.in 19 Aug 2004 20:40:51 -0000
@@ -138,7 +138,7 @@
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 @@
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 @@
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 @@
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 @@
GCHDR=no-gc.h
;;
*)
- AC_MSG_ERROR(unrecognized collector \"$GC\")
+ AC_MSG_ERROR([unrecognized collector "$GC"])
;;
esac
AC_SUBST(GCLIBS)
@@ -818,8 +817,7 @@
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 @@
[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 @@
# 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
+gcj/Makefile
+include/Makefile
+testsuite/Makefile
+libgcj.pc
+libgcj.spec
+libgcj-test.spec
+gnu/classpath/Configuration.java
+)
+
+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 @@
CXX="${CXX}"
ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
)
+
+AC_OUTPUT