configure.in: Use target_noncanonical rather than target_alias for forward-compatibil...

	* configure.in: Use target_noncanonical rather than
	target_alias for forward-compatibility with autoconf 2.59.
	* configure: Regenerate.
	* Makefile.am, gcj/Makefile.am, include/Makefile.am,
	testsuite/Makefile.am: Substitute target_noncanonical.
	* Makefile.in, gcj/Makefile.in, include/Makefile.in,
	testsuite/Makefile.in: Regenerate.

From-SVN: r84802

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b5235cfe88f45f25e608de19dea7c78e1866f397..d6e06aa20599ec76584534de1f24199b9bba2f04 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,13 @@
 2004-07-15  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+       * configure.in: Use target_noncanonical rather than
+       target_alias for forward-compatibility with autoconf 2.59.
+       * configure: Regenerate.
+       * Makefile.am, gcj/Makefile.am, include/Makefile.am,
+       testsuite/Makefile.am: Substitute target_noncanonical.
+       * Makefile.in, gcj/Makefile.in, include/Makefile.in,
+       testsuite/Makefile.in: Regenerate.
+
        * configure.in: Move as much as possible below AC_CANONICAL_SYSTEM.
        Introduce _GCC_TOPLEV_NONCANONICAL_TARGET.
        * acinclude.m4: Include acx.m4.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 7e5f6af001a905bd56ed33badfa576b81120dc8a..ef3a7bbc4c822c6ff66222f945d6fc833a16c404 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -21,6 +21,9 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o
 
 ## ################################################################
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 ##
 ## What gets installed, and where.
 ##
@@ -28,7 +31,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o
 if XLIB_AWT
 cond_x_ltlibrary = lib-gnu-awt-xlib.la
 ## We require libstdc++-v3 to be in the same build tree.
-xlib_includes = -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++
+xlib_includes = -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_noncanonical) -I$(srcdir)/../libstdc++-v3/libsupc++
 else
 cond_x_ltlibrary =
 xlib_includes =
@@ -78,7 +81,7 @@ ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
 GCJH = gcjh
 else
 ZIP = jar
-GCJH = $(target_alias)-gcjh
+GCJH = $(target_noncanonical)-gcjh
 endif
 else # CANADIAN
 GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index c90ffc01efdb7b7051f02ca7d2c818d75df3eb99..a835fbd387933ec45fbdd603a1fff597d94fbd38 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -71,6 +71,7 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -90,6 +91,7 @@ GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
+GNATBIND = @GNATBIND@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
@@ -108,6 +110,7 @@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -137,11 +140,16 @@ ZINCS = @ZINCS@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
+build_subdir = @build_subdir@
+do_compare = @do_compare@
 gcc_version = @gcc_version@
 glibjava_CXX = @glibjava_CXX@
 here = @here@
+host_subdir = @host_subdir@
 libgcj_basedir = @libgcj_basedir@
 mkinstalldirs = @mkinstalldirs@
+ncn_cv_ = @ncn_cv_@
+target_subdir = @target_subdir@
 tool_include_dir = @tool_include_dir@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
@@ -161,9 +169,12 @@ ACLOCAL_AMFLAGS = -I .
 # $(1): variable containing entries to iterate over
 # $(2): output file
 write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2)))
+
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
 @XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@lib-gnu-awt-xlib.la
 @XLIB_AWT_FALSE@cond_x_ltlibrary = 
-@XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++
+@XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_noncanonical) -I$(srcdir)/../libstdc++-v3/libsupc++
 @XLIB_AWT_FALSE@xlib_includes = 
 @GTK_AWT_TRUE@cond_gtk_ltlibrary = @GTK_AWT_TRUE@lib-gnu-java-awt-peer-gtk.la
 @GTK_AWT_FALSE@cond_gtk_ltlibrary = 
@@ -189,7 +200,7 @@ bin_SCRIPTS = addr2name.awk
 @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
 @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
 @CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh
+@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_noncanonical)-gcjh
 @CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
 
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated

diff --git a/libjava/configure b/libjava/configure
index 9bd59274075f77a53f1103f91a4ad869e2305ae4..8fd9b65f7f61d435d6792e7fd19d852a20cd6ced 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -4617,7 +4617,7 @@ GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
 gcc_version_trigger=${libgcj_basedir}/../gcc/version.c
 gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
-tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include
+tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
 
 
 
@@ -7194,9 +7194,9 @@ case "${which_gcj}" in
       if test "x${with_newlib}" = "xyes"; then
          # FIXME (comment): Why is this needed?
          GCC_UNWIND_INCLUDE=
-         GCJ="${target_alias}-gcj"
+         GCJ="${target_noncanonical}-gcj"
       else
-         GCJ="${target_alias}-gcj -B`${PWDCMD-pwd}`/"
+         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
    ;;
    path)
@@ -7433,8 +7433,8 @@ case ${version_specific_libs} in
     # Need the gcc compiler version to know where to install libraries
     # and header files if --enable-version-specific-runtime-libs option
     # is selected.
-    includedir='${libdir}/gcc/${target_alias}/'$gcc_version/include/
-    toolexecdir='$(libdir)/gcc/$(target_alias)'
+    includedir='${libdir}/gcc/${target_noncanonical}/'$gcc_version/include/
+    toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
     toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
     toolexeclibdir=$toolexecmainlibdir
     ;;
@@ -7442,10 +7442,10 @@ case ${version_specific_libs} in
     if test -n "$with_cross_host" &&
        test x"$with_cross_host" != x"no"; then
       # Install a library built with a cross compiler in tooldir, not libdir.
-      toolexecdir='$(exec_prefix)/$(target_alias)'
+      toolexecdir='$(exec_prefix)/$(target_noncanonical)'
       toolexecmainlibdir='$(toolexecdir)/lib'
     else
-      toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+      toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
       toolexecmainlibdir='$(libdir)'
     fi
     multi_os_directory=`$CC -print-multi-os-directory`

diff --git a/libjava/configure.in b/libjava/configure.in
index 33f240ee979e7753c40f763d9a0f4667a7b6296f..0d6d92852b567e2b2532a1de787cdbb731a66545 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -749,7 +749,7 @@ changequote(,)dnl
 gcc_version_trigger=${libgcj_basedir}/../gcc/version.c
 gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
 gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
-tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include
+tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
 changequote([,])dnl
 AC_SUBST(tool_include_dir)
 AC_SUBST(gcc_version)
@@ -1099,9 +1099,9 @@ case "${which_gcj}" in
       if test "x${with_newlib}" = "xyes"; then
          # FIXME (comment): Why is this needed?
          GCC_UNWIND_INCLUDE=
-         GCJ="${target_alias}-gcj"
+         GCJ="${target_noncanonical}-gcj"
       else
-         GCJ="${target_alias}-gcj -B`${PWDCMD-pwd}`/"
+         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
    ;;
    path)
@@ -1176,8 +1176,8 @@ case ${version_specific_libs} in
     # Need the gcc compiler version to know where to install libraries
     # and header files if --enable-version-specific-runtime-libs option
     # is selected.
-    includedir='${libdir}/gcc/${target_alias}/'$gcc_version/include/
-    toolexecdir='$(libdir)/gcc/$(target_alias)'
+    includedir='${libdir}/gcc/${target_noncanonical}/'$gcc_version/include/
+    toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
     toolexecmainlibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
     toolexeclibdir=$toolexecmainlibdir
     ;;
@@ -1185,10 +1185,10 @@ case ${version_specific_libs} in
     if test -n "$with_cross_host" &&
        test x"$with_cross_host" != x"no"; then
       # Install a library built with a cross compiler in tooldir, not libdir.
-      toolexecdir='$(exec_prefix)/$(target_alias)'
+      toolexecdir='$(exec_prefix)/$(target_noncanonical)'
       toolexecmainlibdir='$(toolexecdir)/lib'
     else
-      toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+      toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
       toolexecmainlibdir='$(libdir)'
     fi
     multi_os_directory=`$CC -print-multi-os-directory`

diff --git a/libjava/gcj/Makefile.am b/libjava/gcj/Makefile.am
index e5b80e678d19ab24c7c20f2c989e28f5669f4711..313ff6ad2fae716249e5e142d4456ec0fb2952c3 100644 (file)
--- a/libjava/gcj/Makefile.am
+++ b/libjava/gcj/Makefile.am
@@ -2,6 +2,9 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 gcjdir = $(includedir)/gcj
 gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
 

diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in
index 2d273056175f7dc66175f77493f33d36becd0394..af1b861092d679c45f23cfe073ca6ad3a6112024 100644 (file)
--- a/libjava/gcj/Makefile.in
+++ b/libjava/gcj/Makefile.in
@@ -71,6 +71,7 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -91,6 +92,7 @@ GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
+GNATBIND = @GNATBIND@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
@@ -110,6 +112,7 @@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -139,11 +142,16 @@ ZINCS = @ZINCS@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
+build_subdir = @build_subdir@
+do_compare = @do_compare@
 gcc_version = @gcc_version@
 glibjava_CXX = @glibjava_CXX@
 here = @here@
+host_subdir = @host_subdir@
 libgcj_basedir = @libgcj_basedir@
 mkinstalldirs = @mkinstalldirs@
+ncn_cv_ = @ncn_cv_@
+target_subdir = @target_subdir@
 tool_include_dir = @tool_include_dir@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
@@ -151,6 +159,9 @@ toolexecmainlibdir = @toolexecmainlibdir@
 
 AUTOMAKE_OPTIONS = foreign
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 gcjdir = $(includedir)/gcj
 gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
 

diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am
index 8c0814abb1bf24b3c9a82399e02505dfc7f4a57d..64c87a85f36771256b68a17a885b36c3207d6a6b 100644 (file)
--- a/libjava/include/Makefile.am
+++ b/libjava/include/Makefile.am
@@ -2,4 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 include_HEADERS = jni.h jvmpi.h

diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in
index d0c2090f9dddbded61e2c4ebcfcb93838ec118ab..68f9e9afceb0cec3f1da6df11f856d666326fd7e 100644 (file)
--- a/libjava/include/Makefile.in
+++ b/libjava/include/Makefile.in
@@ -71,6 +71,7 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -91,6 +92,7 @@ GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
+GNATBIND = @GNATBIND@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
@@ -110,6 +112,7 @@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -139,11 +142,16 @@ ZINCS = @ZINCS@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
+build_subdir = @build_subdir@
+do_compare = @do_compare@
 gcc_version = @gcc_version@
 glibjava_CXX = @glibjava_CXX@
 here = @here@
+host_subdir = @host_subdir@
 libgcj_basedir = @libgcj_basedir@
 mkinstalldirs = @mkinstalldirs@
+ncn_cv_ = @ncn_cv_@
+target_subdir = @target_subdir@
 tool_include_dir = @tool_include_dir@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
@@ -151,6 +159,9 @@ toolexecmainlibdir = @toolexecmainlibdir@
 
 AUTOMAKE_OPTIONS = foreign
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 include_HEADERS = jni.h jvmpi.h
 CONFIG_HEADER = config.h ../gcj/libgcj-config.h
 CONFIG_CLEAN_FILES = 

diff --git a/libjava/testsuite/Makefile.am b/libjava/testsuite/Makefile.am
index 4bfc50dbb110e99dfe6eede2dfcd6cf0d5298145..0cd4aee0b88ebbef0eba1bed3cab0d8d26bf46d7 100644 (file)
--- a/libjava/testsuite/Makefile.am
+++ b/libjava/testsuite/Makefile.am
@@ -2,6 +2,9 @@
 
 AUTOMAKE_OPTIONS = foreign dejagnu
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 # Setup the testing framework, if you have one
 EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \
             echo $(top_builddir)/../expect/expect ; \

diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in
index fefc118b6264cd0770180049852c1fb344ab3fe8..89f758db06ac648e166e86adef26fc198d7a3ecc 100644 (file)
--- a/libjava/testsuite/Makefile.in
+++ b/libjava/testsuite/Makefile.in
@@ -71,6 +71,7 @@ CAIRO_LIBS = @CAIRO_LIBS@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -91,6 +92,7 @@ GCSPEC = @GCSPEC@
 GCTESTSPEC = @GCTESTSPEC@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
+GNATBIND = @GNATBIND@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HASH_SYNC_SPEC = @HASH_SYNC_SPEC@
@@ -110,6 +112,7 @@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -139,11 +142,16 @@ ZINCS = @ZINCS@
 ZLIBS = @ZLIBS@
 ZLIBSPEC = @ZLIBSPEC@
 ZLIBTESTSPEC = @ZLIBTESTSPEC@
+build_subdir = @build_subdir@
+do_compare = @do_compare@
 gcc_version = @gcc_version@
 glibjava_CXX = @glibjava_CXX@
 here = @here@
+host_subdir = @host_subdir@
 libgcj_basedir = @libgcj_basedir@
 mkinstalldirs = @mkinstalldirs@
+ncn_cv_ = @ncn_cv_@
+target_subdir = @target_subdir@
 tool_include_dir = @tool_include_dir@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
@@ -151,6 +159,9 @@ toolexecmainlibdir = @toolexecmainlibdir@
 
 AUTOMAKE_OPTIONS = foreign dejagnu
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 # Setup the testing framework, if you have one
 EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \
             echo $(top_builddir)/../expect/expect ; \