Index: configure.in =================================================================== RCS file: /cvs/rhug/rhug/configure.in,v retrieving revision 1.21 diff -u -r1.21 configure.in --- configure.in 2001/11/09 05:29:53 1.21 +++ configure.in 2002/01/22 11:51:38 @@ -5,7 +5,15 @@ AM_INIT_AUTOMAKE(rhug,1.0) AM_PROG_LIBTOOL -AM_PROG_GCJ +# AM_PROG_GCJ isn't good enough, we have to roll our own. +AC_CHECK_TOOL(GCJ, gcj) +test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH]) +if test "x${GCJFLAGS-unset}" = xunset; then + GCJFLAGS="-g -O2" +fi +AC_SUBST(GCJFLAGS) +AC_CHECK_TOOL(GCJH, gcjh) +test -z "$GCJH" && AC_MSG_ERROR([no acceptable gcjh found in \$PATH]) AC_PROG_INSTALL AC_PROG_LN_S Index: ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/ChangeLog,v retrieving revision 1.19 diff -u -r1.19 ChangeLog --- ChangeLog 2001/10/24 21:56:08 1.19 +++ ChangeLog 2002/01/22 11:51:38 @@ -1,3 +1,9 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * configure.in: Add check for $(GCJH) and re-code $(GCJ) check + for easier support of alternate compiler toolchains. + * configure: Rebuilt. + 2001-10-24 Tom Tromey * configure: Rebuilt. Index: ./BCEL/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/BCEL/Makefile.am,v retrieving revision 1.7 diff -u -r1.7 Makefile.am --- Makefile.am 2001/09/14 01:02:46 1.7 +++ Makefile.am 2002/01/22 11:51:39 @@ -965,7 +965,7 @@ CLASSFILES = $(lib_de_fub_bytecode_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;) + (cd upstream; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;) (cd upstream; jar cf ../$@ `find ./ -name \*.class`) ## Install the headers. It is fairly ugly that we have to do this by Index: ./BCEL/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/BCEL/ChangeLog,v retrieving revision 1.7 diff -u -r1.7 ChangeLog --- ChangeLog 2001/09/14 01:02:46 1.7 +++ ChangeLog 2002/01/22 11:51:39 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Thu Sep 13 17:46:27 2001 Anthony Green * Makefile.am (EXTRA_DIST): Replace VERSION with info.rml. Index: ./bsf/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/bsf/Makefile.am,v retrieving revision 1.1 diff -u -r1.1 Makefile.am --- Makefile.am 2001/10/12 07:31:19 1.1 +++ Makefile.am 2002/01/22 11:51:39 @@ -138,7 +138,7 @@ CLASSFILES = $(lib_com_ibm_bsf_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) (here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@ com/ibm/bsf/Languages.properties) Index: ./bsf/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/bsf/ChangeLog,v retrieving revision 1.1 diff -u -r1.1 ChangeLog --- ChangeLog 2001/10/12 07:31:19 1.1 +++ ChangeLog 2002/01/22 11:51:39 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Sun Oct 7 16:41:50 2001 Anthony Green * Makefile.am: New file. Index: ./BouncyCastle/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/BouncyCastle/Makefile.am,v retrieving revision 1.4 diff -u -r1.4 Makefile.am --- Makefile.am 2001/10/19 21:20:02 1.4 +++ Makefile.am 2002/01/22 11:51:39 @@ -465,7 +465,7 @@ BC_CLASSFILES = $(lib_org_bouncycastle_la_SOURCES:.java=.class) $(JARFILE): $(JAVAX_CLASSFILES) $(BC_CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) ## Install the headers. It is fairly ugly that we have to do this by Index: ./BouncyCastle/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/BouncyCastle/ChangeLog,v retrieving revision 1.4 diff -u -r1.4 ChangeLog --- ChangeLog 2001/10/19 21:20:02 1.4 +++ ChangeLog 2002/01/22 11:51:39 @@ -1,3 +1,8 @@ +2002-01-22 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + 2001-10-19 Tom Tromey * Makefile.in: Rebuilt. Index: ./cup/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/cup/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- Makefile.am 2001/09/02 08:08:20 1.2 +++ Makefile.am 2002/01/22 11:51:39 @@ -147,7 +147,7 @@ CLASSFILES = $(lib_java_cup_runtime_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;) + (cd upstream; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;) (cd upstream; jar cf ../$@ `find ./ -name \*.class`) ## Install the headers. It is fairly ugly that we have to do this by Index: ./cup/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/cup/ChangeLog,v retrieving revision 1.3 diff -u -r1.3 ChangeLog --- ChangeLog 2001/09/14 00:40:32 1.3 +++ ChangeLog 2002/01/22 11:51:39 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Thu Sep 13 17:35:47 2001 Anthony Green * info.rml: New file. Index: ./gnu.readline/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/gnu.readline/Makefile.am,v retrieving revision 1.2 diff -u -r1.2 Makefile.am --- Makefile.am 2001/11/09 05:29:55 1.2 +++ Makefile.am 2002/01/22 11:51:39 @@ -51,7 +51,7 @@ # There's probably a cleaner generic way to handle this situation org_gnu_readline_Readline.h: $(lib_org_gnu_readline_la_DEPENDENCIES) - gcjh -jni `echo $(lib_org_gnu_readline_la_DEPENDENCIES) | sed 's/\.class//g'` -o $@ + $(GCJH) -jni `echo $(lib_org_gnu_readline_la_DEPENDENCIES) | sed 's/\.class//g'` -o $@ ./upstream/src/native/org_gnu_readline_Readline.c: org_gnu_readline_Readline.h # Building the tests @@ -69,9 +69,8 @@ $(GCJ) -C --encoding=UTF-8 -fCLASSPATH=$(srcdir)/upstream/src -d upstream/src $< $(JARFILE): $(CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) - (here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@) MOSTLYCLEANFILES = $(JARFILE) Index: ./gnu.readline/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/gnu.readline/ChangeLog,v retrieving revision 1.2 diff -u -r1.2 ChangeLog --- ChangeLog 2001/10/19 23:40:03 1.2 +++ ChangeLog 2002/01/22 11:51:39 @@ -1,3 +1,11 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am + (org_gnu_readline_Readline.h): Use $(GCJH) instead of + hard-coded "gcjh". + ($(JARFILE) rule): Don't try to update jar with no files. + * Makefile.in: Rebuilt. + 2001-10-15 Alexandre Petit-Bianco * upstream/src/native/org_gnu_readline_Readline.c (stdio.h): Include. Index: ./jakarta-regexp/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/jakarta-regexp/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- Makefile.am 2001/09/14 01:04:12 1.3 +++ Makefile.am 2002/01/22 11:51:39 @@ -144,6 +144,6 @@ $(LN_S) upstream/src/java/org org $(nobase_include_HEADERS): org upstream/jakarta-regexp-1.2.jar - gcjh -classpath $(srcdir)/upstream/jakarta-regexp-1.2.jar -d upstream/src/java $(@:.h=) + $(GCJH) -classpath $(srcdir)/upstream/jakarta-regexp-1.2.jar -d upstream/src/java $(@:.h=) CLEANFILES = org Index: ./jakarta-regexp/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/jakarta-regexp/ChangeLog,v retrieving revision 1.4 diff -u -r1.4 ChangeLog --- ChangeLog 2001/09/14 01:04:12 1.4 +++ ChangeLog 2002/01/22 11:51:39 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Thu Sep 13 17:49:05 2001 Anthony Green * Makefile.am (EXTRA_DIST): Replace VERSION with info.rml. Index: ./jakarta-servletapi/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/jakarta-servletapi/Makefile.am,v retrieving revision 1.5 diff -u -r1.5 Makefile.am --- Makefile.am 2001/09/10 01:44:10 1.5 +++ Makefile.am 2002/01/22 11:51:40 @@ -156,7 +156,7 @@ CLASSFILES = $(lib_javax_servlet_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream/src/share; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src/share; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src/share; jar cf ../../../$@ `find ./ -name \*.class`) (here=`pwd`; cd $(srcdir)/upstream/src/share; jar uf $$here/$@ javax/servlet/http/LocalStrings.properties javax/servlet/http/LocalStrings_es.properties javax/servlet/LocalStrings.properties) Index: ./jakarta-servletapi/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/jakarta-servletapi/ChangeLog,v retrieving revision 1.5 diff -u -r1.5 ChangeLog --- ChangeLog 2001/09/10 01:44:10 1.5 +++ ChangeLog 2002/01/22 11:51:40 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Sun Sep 9 18:39:20 2001 Anthony Green * Makefile.am (install-data-local): Fix for srcdir==builddir. Index: ./pgsql-jdbc/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/pgsql-jdbc/Makefile.am,v retrieving revision 1.1 diff -u -r1.1 Makefile.am --- Makefile.am 2001/10/10 06:22:54 1.1 +++ Makefile.am 2002/01/22 11:51:40 @@ -91,7 +91,7 @@ CLASSFILES = $(lib_org_postgresql_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream; jar cf ../$@ `find ./ -name \*.class`) ## Install the headers. It is fairly ugly that we have to do this by Index: ./pgsql-jdbc/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/pgsql-jdbc/ChangeLog,v retrieving revision 1.1 diff -u -r1.1 ChangeLog --- ChangeLog 2001/10/10 06:22:54 1.1 +++ ChangeLog 2002/01/22 11:51:40 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Tue Oct 9 23:10:52 2001 Anthony Green * Makefile.am: New file. Index: ./rhino/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/rhino/Makefile.am,v retrieving revision 1.3 diff -u -r1.3 Makefile.am --- Makefile.am 2001/10/20 17:08:19 1.3 +++ Makefile.am 2002/01/22 11:51:40 @@ -190,7 +190,7 @@ CLASSFILES = $(lib_org_mozilla_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) (here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@ org/mozilla/javascript/resources/Messages.properties org/mozilla/javascript/resources/Security.properties) Index: ./rhino/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/rhino/ChangeLog,v retrieving revision 1.2 diff -u -r1.2 ChangeLog --- ChangeLog 2001/10/10 06:27:33 1.2 +++ ChangeLog 2002/01/22 11:51:40 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Tue Oct 9 23:26:19 2001 Anthony Green * Makefile.am: Remove hack work-around for bug fixed by Index: ./xalan/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/xalan/Makefile.am,v retrieving revision 1.10 diff -u -r1.10 Makefile.am --- Makefile.am 2001/10/07 23:52:30 1.10 +++ Makefile.am 2002/01/22 11:51:40 @@ -754,7 +754,7 @@ $(lib_org_apache_xpath_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) ## Install the headers. It is fairly ugly that we have to do this by Index: ./xalan/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/xalan/ChangeLog,v retrieving revision 1.11 diff -u -r1.11 ChangeLog --- ChangeLog 2001/10/07 23:52:32 1.11 +++ ChangeLog 2002/01/22 11:51:40 @@ -1,3 +1,8 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh". + * Makefile.in: Rebuilt. + Sun Oct 7 16:30:42 2001 Anthony Green * Makefile.am: Fix bug in how core properties are named. Index: ./xerces/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/xerces/Makefile.am,v retrieving revision 1.10 diff -u -r1.10 Makefile.am --- Makefile.am 2001/10/23 06:46:49 1.10 +++ Makefile.am 2002/01/22 11:51:40 @@ -842,13 +842,13 @@ lib_org_apache_xerces_la_DEPENDENCIES = mprops.o mprops_fr.o mprops_ja.o lib-javax-xml-parsers.la lib-org-w3c-dom-html.la lib-org-w3c-dom-events.la mprops.o: upstream/src/org/apache/xerces/utils/regex/message.properties - gcj -fPIC -R org/apache/xerces/utils/regex/message.properties -o $@ -c $< + $(GCJ) -fPIC -R org/apache/xerces/utils/regex/message.properties -o $@ -c $< mprops_fr.o: upstream/src/org/apache/xerces/utils/regex/message_fr.properties - gcj -fPIC -R org/apache/xerces/utils/regex/message_fr.properties -o $@ -c $< + $(GCJ) -fPIC -R org/apache/xerces/utils/regex/message_fr.properties -o $@ -c $< mprops_ja.o: upstream/src/org/apache/xerces/utils/regex/message_ja.properties - gcj -fPIC -R org/apache/xerces/utils/regex/message_ja.properties -o $@ -c $< + $(GCJ) -fPIC -R org/apache/xerces/utils/regex/message_ja.properties -o $@ -c $< lib_org_apache_xerces_la_LIBADD = mprops.o mprops_fr.o mprops_ja.o -L. -l-javax-xml-parsers -l-org-w3c-dom-html -l-org-w3c-dom-events @@ -1150,7 +1150,7 @@ CLASSFILES = $(lib_javax_xml_parsers_la_SOURCES:.java=.class) $(lib_org_apache_html_la_SOURCES:.java=.class) $(lib_org_apache_wml_la_SOURCES:.java=.class) $(lib_org_apache_xerces_la_SOURCES:.java=.class) $(lib_org_apache_xml_serialize_la_SOURCES:.java=.class) $(lib_org_w3c_dom_events_la_SOURCES:.java=.class) $(lib_org_w3c_dom_html_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/\.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) ## Install the headers. It is fairly ugly that we have to do this by Index: ./xerces/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/xerces/ChangeLog,v retrieving revision 1.11 diff -u -r1.11 ChangeLog --- ChangeLog 2001/10/23 06:46:49 1.11 +++ ChangeLog 2002/01/22 11:51:40 @@ -1,3 +1,10 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am + ($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh". + (lib_org_apache_xerces_la_DEPENDENCIES): Use $(GCJ) instead of gcj. + * Makefile.in: Rebuilt. + 2001-10-22 Alexandre Petit-Bianco * Makefile.am (CLASSFILES): Fixed typo. Index: ./gnu.regexp/Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/gnu.regexp/Makefile.am,v retrieving revision 1.8 diff -u -r1.8 Makefile.am --- Makefile.am 2001/09/14 01:04:12 1.8 +++ Makefile.am 2002/01/22 11:51:40 @@ -150,7 +150,7 @@ lib_gnu_regexp_la_DEPENDENCIES = props.o props.o: $(srcdir)/upstream/src/gnu/regexp/MessagesBundle.properties - gcj -fPIC -R gnu/regexp/MessagesBundle.properties -o props.o -c $< + $(GCJ) -fPIC -R gnu/regexp/MessagesBundle.properties -o props.o -c $< lib_gnu_regexp_la_LIBADD = props.o @@ -168,7 +168,7 @@ CLASSFILES = $(lib_gnu_regexp_la_SOURCES:.java=.class) $(JARFILE): $(CLASSFILES) - (cd upstream/src; for x in `find ./ -name \*.class`; do gcjh `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) + (cd upstream/src; for x in `find ./ -name \*.class`; do $(GCJH) `echo $$x | sed "s/\.\///g" | sed "s/.class//g"`; done;) (cd upstream/src; jar cf ../../$@ `find ./ -name \*.class`) (here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@ gnu/regexp/MessagesBundle.properties) Index: ./gnu.regexp/ChangeLog =================================================================== RCS file: /cvs/rhug/rhug/gnu.regexp/ChangeLog,v retrieving revision 1.10 diff -u -r1.10 ChangeLog --- ChangeLog 2001/10/08 21:52:40 1.10 +++ ChangeLog 2002/01/22 11:51:40 @@ -1,3 +1,10 @@ +Tue Jan 22 11:04:24 2002 Jukka Santala + + * Makefile.am + ($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh". + (lib_gnu_regexp_la_DEPENDENCIES): Use $(GCJ) instead of "gcj". + * Makefile.in: Rebuilt. + 2001-10-08 Alexandre Petit-Bianco * gnu.regexp/rhug.tests/tests.exp: Handle and report individual