diff -u -r rhug-clean/BCEL/Makefile.am rhug/BCEL/Makefile.am --- rhug-clean/BCEL/Makefile.am Fri Sep 14 04:02:46 2001 +++ rhug/BCEL/Makefile.am Mon Feb 4 15:24:57 2002 @@ -659,7 +659,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=8859_1 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream:../gnu.regexp/upstream/src -O2 +AM_GCJFLAGS = --encoding=8859_1 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream:../gnu.regexp/upstream/src -O2 ## ################################################################ @@ -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 diff -u -r rhug-clean/BouncyCastle/Makefile.am rhug/BouncyCastle/Makefile.am --- rhug-clean/BouncyCastle/Makefile.am Sat Oct 20 00:20:02 2001 +++ rhug/BouncyCastle/Makefile.am Tue Jan 22 16:13:45 2002 @@ -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 diff -u -r rhug-clean/bsf/Makefile.am rhug/bsf/Makefile.am --- rhug-clean/bsf/Makefile.am Fri Oct 12 10:31:19 2001 +++ rhug/bsf/Makefile.am Mon Feb 4 15:25:13 2002 @@ -36,7 +36,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:../rhino/rhino-1.5R2.jar:../xalan/xalan-1.4.2.jar -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:../rhino/rhino-1.5R2.jar:../xalan/xalan-1.4.2.jar -O2 ## ################################################################ @@ -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) diff -u -r rhug-clean/configure.in rhug/configure.in --- rhug-clean/configure.in Wed Jan 30 22:37:55 2002 +++ rhug/configure.in Thu Jan 31 15:51:11 2002 @@ -4,10 +4,21 @@ AM_INIT_AUTOMAKE(rhug,1.0) +AM_PROG_LIBTOOL + +# 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]) + _AM_DEPENDENCIES(GCJ) -AC_PROG_LIBTOOL -AM_PROG_GCJ AC_PROG_INSTALL AC_PROG_LN_S diff -u -r rhug-clean/cup/Makefile.am rhug/cup/Makefile.am --- rhug-clean/cup/Makefile.am Sun Sep 2 11:08:20 2001 +++ rhug/cup/Makefile.am Mon Feb 4 15:25:26 2002 @@ -87,7 +87,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream:$(srcdir)/upstream -O2 ## ################################################################ @@ -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 diff -u -r rhug-clean/gnu.readline/Makefile.am rhug/gnu.readline/Makefile.am --- rhug-clean/gnu.readline/Makefile.am Fri Nov 9 07:29:55 2001 +++ rhug/gnu.readline/Makefile.am Mon Feb 4 15:34:20 2002 @@ -27,7 +27,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = -fjni --encoding=8859_1 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src -O2 +AM_GCJFLAGS = -fjni --encoding=8859_1 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src -O2 # The flags are preparing the native file to be compiled properly # JavaReadLine and JavaEditLine should be set according to what @@ -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) diff -u -r rhug-clean/gnu.regexp/Makefile.am rhug/gnu.regexp/Makefile.am --- rhug-clean/gnu.regexp/Makefile.am Fri Sep 14 04:04:12 2001 +++ rhug/gnu.regexp/Makefile.am Mon Feb 4 15:26:32 2002 @@ -111,7 +111,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src -O2 ## ################################################################ @@ -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) diff -u -r rhug-clean/jakarta-log4j/Makefile.am rhug/jakarta-log4j/Makefile.am --- rhug-clean/jakarta-log4j/Makefile.am Fri Sep 14 04:04:12 2001 +++ rhug/jakarta-log4j/Makefile.am Mon Feb 4 15:27:03 2002 @@ -995,7 +995,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java:$(srcdir)/../xerces/upstream/src -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java:$(srcdir)/../xerces/upstream/src -O2 ## ################################################################ diff -u -r rhug-clean/jakarta-oro/Makefile.am rhug/jakarta-oro/Makefile.am --- rhug-clean/jakarta-oro/Makefile.am Fri Oct 12 23:26:58 2001 +++ rhug/jakarta-oro/Makefile.am Mon Feb 4 13:47:13 2002 @@ -207,7 +207,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2 lib_org_apache_oro_la_SOURCES = \ upstream/src/java/org/apache/oro/io/AwkFilenameFilter.java \ diff -u -r rhug-clean/jakarta-regexp/Makefile.am rhug/jakarta-regexp/Makefile.am --- rhug-clean/jakarta-regexp/Makefile.am Fri Sep 14 04:04:12 2001 +++ rhug/jakarta-regexp/Makefile.am Mon Feb 4 15:27:14 2002 @@ -103,7 +103,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/java -O2 ## ################################################################ @@ -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 diff -u -r rhug-clean/jakarta-servletapi/Makefile.am rhug/jakarta-servletapi/Makefile.am --- rhug-clean/jakarta-servletapi/Makefile.am Mon Sep 10 04:44:10 2001 +++ rhug/jakarta-servletapi/Makefile.am Mon Feb 4 13:47:43 2002 @@ -86,7 +86,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src/share -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src/share -O2 ## ################################################################ @@ -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) diff -u -r rhug-clean/jakarta-tomcat/Makefile.am rhug/jakarta-tomcat/Makefile.am --- rhug-clean/jakarta-tomcat/Makefile.am Sun Sep 9 21:56:37 2001 +++ rhug/jakarta-tomcat/Makefile.am Mon Feb 4 15:27:37 2002 @@ -894,7 +894,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/share:../jakarta-servletapi/upstream/src/share:../xerces/xerces-1.4.2.jar -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src/share:../jakarta-servletapi/upstream/src/share:../xerces/xerces-1.4.2.jar -O2 ## ################################################################ diff -u -r rhug-clean/jython/Makefile.am rhug/jython/Makefile.am --- rhug-clean/jython/Makefile.am Thu Oct 25 08:30:32 2001 +++ rhug/jython/Makefile.am Mon Feb 4 15:25:37 2002 @@ -44,7 +44,7 @@ ## GCJFLAGS_BASIC = --encoding=8859_1 -fassume-compiled -fCLASSPATH=$(srcdir)/upstream/src:$(srcdir)/../gnu.readline/upstream/src:$(srcdir)/../jakarta-servletapi/upstream/src/share:$(srcdir)/../jakarta-oro/upstream/src/java -GCJFLAGS = $(GCJFLAGS_BASIC) -O2 +AM_GCJFLAGS = $(GCJFLAGS_BASIC) -O2 lib_org_jython_la_SOURCES = \ upstream/src/Lib/jxxload_help/DiscardHelp.java \ diff -u -r rhug-clean/pgsql-jdbc/Makefile.am rhug/pgsql-jdbc/Makefile.am --- rhug-clean/pgsql-jdbc/Makefile.am Wed Oct 10 09:22:54 2001 +++ rhug/pgsql-jdbc/Makefile.am Mon Feb 4 13:48:52 2002 @@ -30,7 +30,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream -O2 ## ################################################################ @@ -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 diff -u -r rhug-clean/rhino/Makefile.am rhug/rhino/Makefile.am --- rhug-clean/rhino/Makefile.am Sat Oct 20 20:08:19 2001 +++ rhug/rhino/Makefile.am Mon Feb 4 15:26:21 2002 @@ -32,7 +32,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:$(srcdir)/upstream/toolsrc:$(srcdir)/../gnu.readline/upstream/src -O2 +AM_GCJFLAGS = --encoding=UTF-8 -fassume-compiled -fCLASSPATH=upstream/src:$(srcdir)/upstream/toolsrc:$(srcdir)/../gnu.readline/upstream/src -O2 ## ################################################################ @@ -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) diff -u -r rhug-clean/xalan/Makefile.am rhug/xalan/Makefile.am --- rhug-clean/xalan/Makefile.am Mon Oct 8 02:52:30 2001 +++ rhug/xalan/Makefile.am Mon Feb 4 15:27:26 2002 @@ -34,7 +34,7 @@ CLASSPATH = -fCLASSPATH=upstream/src:../xerces/upstream/src:../BCEL/upstream:../cup/upstream:$(srcdir)/upstream/src -GCJFLAGS = --encoding=8859_1 -fassume-compiled $(CLASSPATH) -O2 +AM_GCJFLAGS = --encoding=8859_1 -fassume-compiled $(CLASSPATH) -O2 ## ################################################################ @@ -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 diff -u -r rhug-clean/xerces/Makefile.am rhug/xerces/Makefile.am --- rhug-clean/xerces/Makefile.am Tue Oct 23 09:46:49 2001 +++ rhug/xerces/Makefile.am Mon Feb 4 15:38:48 2002 @@ -671,7 +671,7 @@ ## Compilers and compilation flags. ## -GCJFLAGS = --encoding=8859_1 -fassume-compiled -O2 +AM_GCJFLAGS = --encoding=8859_1 -fassume-compiled -O2 LIBCLASSPATH = -fCLASSPATH=upstream/src:$(srcdir)/upstream/src -O2 @@ -681,7 +681,7 @@ lib_org_apache_xml_serialize_la_GCJFLAGS = $(LIBCLASSPATH) lib_org_w3c_dom_html_la_GCJFLAGS = $(LIBCLASSPATH) lib_org_w3c_dom_events_la_GCJFLAGS = $(LIBCLASSPATH) -lib_org_apache_xerces_la_GCJFLAGS = $(LIBCLASSPATH) +lib_org_apache_xerces_la_GCJFLAGS = $(LIBCLASSPATH) -save-temps -dp -v ## ################################################################ @@ -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