This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[committed] Get libjava using target_noncanonical

From: neroden at twcny dot rr dot com (Nathanael Nerode)
To: java-patches at gcc dot gnu dot org
Date: Fri, 16 Jul 2004 01:35:43 -0400
Subject: [committed] Get libjava using target_noncanonical
Successful bootstrap and 'make check', committing.

Automake behaves very stupidy in some ways, you know?  It can't
figure out that certain macros included in acinclude.m4 are unused in
this particular configure.in.

	* 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.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.389
diff -u -r1.389 Makefile.am
--- Makefile.am	15 Jul 2004 00:58:40 -0000	1.389
+++ Makefile.am	16 Jul 2004 02:31:54 -0000
@@ -21,6 +21,9 @@
 
 ## ################################################################
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 ##
 ## What gets installed, and where.
 ##
@@ -28,7 +31,7 @@
 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 @@
 GCJH = gcjh
 else
 ZIP = jar
-GCJH = $(target_alias)-gcjh
+GCJH = $(target_noncanonical)-gcjh
 endif
 else # CANADIAN
 GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.414
diff -u -r1.414 Makefile.in
--- Makefile.in	15 Jul 2004 04:05:01 -0000	1.414
+++ Makefile.in	16 Jul 2004 02:31:59 -0000
@@ -71,6 +71,7 @@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -90,6 +91,7 @@
 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 @@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -137,11 +140,16 @@
 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 @@
 # $(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 @@
 @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
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure,v
retrieving revision 1.213
diff -u -r1.213 configure
--- configure	16 Jul 2004 02:11:27 -0000	1.213
+++ configure	16 Jul 2004 02:32:04 -0000
@@ -4617,7 +4617,7 @@
 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 @@
       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 @@
     # 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 @@
     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`
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.189
diff -u -r1.189 configure.in
--- configure.in	16 Jul 2004 02:11:33 -0000	1.189
+++ configure.in	16 Jul 2004 02:32:06 -0000
@@ -749,7 +749,7 @@
 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 @@
       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 @@
     # 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 @@
     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`
Index: gcj/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gcj/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- gcj/Makefile.am	15 Mar 2002 18:03:47 -0000	1.4
+++ gcj/Makefile.am	16 Jul 2004 02:32:06 -0000
@@ -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
 
Index: gcj/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gcj/Makefile.in,v
retrieving revision 1.46
diff -u -r1.46 Makefile.in
--- gcj/Makefile.in	15 Jul 2004 04:05:08 -0000	1.46
+++ gcj/Makefile.in	16 Jul 2004 02:32:06 -0000
@@ -71,6 +71,7 @@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -91,6 +92,7 @@
 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 @@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -139,11 +142,16 @@
 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 @@
 
 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
 
Index: include/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- include/Makefile.am	4 Apr 2001 23:38:52 -0000	1.4
+++ include/Makefile.am	16 Jul 2004 02:32:07 -0000
@@ -2,4 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+# autoconf2.13's target_alias
+target_noncanonical = @target_noncanonical@
+
 include_HEADERS = jni.h jvmpi.h
Index: include/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/Makefile.in,v
retrieving revision 1.47
diff -u -r1.47 Makefile.in
--- include/Makefile.in	15 Jul 2004 04:05:08 -0000	1.47
+++ include/Makefile.in	16 Jul 2004 02:32:07 -0000
@@ -71,6 +71,7 @@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -91,6 +92,7 @@
 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 @@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -139,11 +142,16 @@
 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 @@
 
 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 = 
Index: testsuite/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- testsuite/Makefile.am	24 Jun 2002 04:44:51 -0000	1.3
+++ testsuite/Makefile.am	16 Jul 2004 02:32:10 -0000
@@ -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 ; \
Index: testsuite/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- testsuite/Makefile.in	15 Jul 2004 04:05:09 -0000	1.57
+++ testsuite/Makefile.in	16 Jul 2004 02:32:10 -0000
@@ -71,6 +71,7 @@
 CC = @CC@
 CHECKREFSPEC = @CHECKREFSPEC@
 COMPPATH = @COMPPATH@
+CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 DIRLTDL = @DIRLTDL@
@@ -91,6 +92,7 @@
 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 @@
 LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBTOOL = @LIBTOOL@
+LN = @LN@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -139,11 +142,16 @@
 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 @@
 
 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 ; \

-- 
There are none so blind as those who will not see.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]