libtool woes

public inbox for rhug-rhats@sourceware.org
 help / color / mirror / Atom feed

* libtool woes
@ 2002-01-21  4:13 Jukka Santala
  2002-01-21  4:26 ` Jukka Santala
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Jukka Santala @ 2002-01-21  4:13 UTC (permalink / raw)
  To: rhug-rhats

I was trying to cross-compile the rhug source-tree using the latest gcc
HEAD build. Unfortunately, the build runs into trouble with the Java
resource-files, to wit:

libtool: link: cannot build libtool library `lib-org-mozilla.la' from
non-libtool objects on this host:
upstream/src/org/mozilla/javascript/resources/Messages.o
upstream/src/org/mozilla/javascript/resources/Security.o

The problem is that the .properties files have a hard-coded build-rule
using a plain compile to .o instead of using the libtool. This naturally
leaves me wondering what's the intended purpose/behaviour.

Ps. some of the Makefile.am's even call "gcj" straight instead of
$(GCJ)...

 -Jukka Santala

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  4:13 libtool woes Jukka Santala
@ 2002-01-21  4:26 ` Jukka Santala
  2002-01-21  9:14   ` Alexandre Petit-Bianco
  2002-01-21  9:12 ` Alexandre Petit-Bianco
  2002-01-31 10:16 ` Tom Tromey
  2 siblings, 1 reply; 17+ messages in thread
From: Jukka Santala @ 2002-01-21  4:26 UTC (permalink / raw)
  To: rhug-rhats

[-- Attachment #1: Type: TEXT/PLAIN, Size: 507 bytes --]

On Mon, 21 Jan 2002, Jukka Santala wrote:
> Ps. some of the Makefile.am's even call "gcj" straight instead of
> $(GCJ)...

Attached (if attachments go through) a patch to fix up the problems
inhered to above, altough I loathe to do this since I can't build the
thing to verify the patch works. It's rather trivial, though. The fix in
gnu.readline is neccessary because otherwise the build will break horribly
on any systems with a sensible jar-tool that actually requires
source-filenames.

 -Jukka Santala

[-- Attachment #2: Type: TEXT/PLAIN, Size: 2600 bytes --]

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/21 12:23:19
@@ -71,7 +71,7 @@
 $(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; jar cf ../../$@ `find ./ -name \*.class`)
-	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@)
+##	(here=`pwd`; cd $(srcdir)/upstream/src; jar uf $$here/$@)
 
 MOSTLYCLEANFILES = $(JARFILE)
 
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/21 12:23:19
@@ -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
 
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/21 12:23:19
@@ -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
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  4:26 ` Jukka Santala
@ 2002-01-21  9:14   ` Alexandre Petit-Bianco
  2002-01-22  1:39     ` Jukka Santala
  2002-01-22  4:10     ` Jukka Santala
  0 siblings, 2 replies; 17+ messages in thread
From: Alexandre Petit-Bianco @ 2002-01-21  9:14 UTC (permalink / raw)
  To: Jukka Santala; +Cc: rhug-rhats


Jukka Santala writes:

> The fix in gnu.readline is neccessary because otherwise the build
> will break horribly on any systems with a sensible jar-tool that
> actually requires source-filenames.

What are you seeing going wrong with the original actions?

> Index: gnu.regexp/Makefile.am
> Index: xerces/Makefile.am

This is fine. Could you please write ChangeLog entries?

./A

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  9:14   ` Alexandre Petit-Bianco
@ 2002-01-22  1:39     ` Jukka Santala
  2002-01-22  4:10     ` Jukka Santala
  1 sibling, 0 replies; 17+ messages in thread
From: Jukka Santala @ 2002-01-22  1:39 UTC (permalink / raw)
  Cc: rhug-rhats

On Mon, 21 Jan 2002, Alexandre Petit-Bianco wrote:
> Jukka Santala writes:
> > The fix in gnu.readline is neccessary because otherwise the build
> > will break horribly on any systems with a sensible jar-tool that
> > actually requires source-filenames.
> What are you seeing going wrong with the original actions?

First, a funny, using GCC 3.1/HEAD jar:

(here=`pwd`; cd ./upstream/src; jar uf $here/org-gnu-readline-0.6.jar)
jar: `-u' mode unimplemented.
make: *** [org-gnu-readline-0.6.jar] Error 1

In other words, the jar utility provided with GCC doesn't support -u at
all, hence some rewording might be in order.

Using Sun j2sdk 1.3.1's or IBM's 2-13 jar:
(here=`pwd`; cd ./upstream/src; jar uf $here/org-gnu-readline-0.6.jar)
'u' flag requires manifest or input files be specified!
Usage: jar {ctxu}[vfm0M] [jar-file] [manifest-file] [-C dir] files ...

Kaffe's jar does work, but that's about it. The main reason is that the
line doesn't actually do anything, since there are no non-source-files to
add. To make it able to compile with the present GCC alone, the additional
resource-files need to be added to the above "jar cf" line ofcourse.

> > Index: gnu.regexp/Makefile.am
> > Index: xerces/Makefile.am
> This is fine. Could you please write ChangeLog entries?

Sure. These do not allow a cross-compile yet, by the way, but they're
likely to bite even people who're just trying out alternative compiles of
GCC, and given rhug doesn't yet compile with the stable/release version,
that's quite a large portion of them :) Same problem goes with gcjh etc.
though, so I guess I'll look if I can bundle more things into that patch
at once.

 -Jukka Santala

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  9:14   ` Alexandre Petit-Bianco
  2002-01-22  1:39     ` Jukka Santala
@ 2002-01-22  4:10     ` Jukka Santala
  2002-01-25  9:05       ` Anthony Green
  1 sibling, 1 reply; 17+ messages in thread
From: Jukka Santala @ 2002-01-22  4:10 UTC (permalink / raw)
  To: Alexandre Petit-Bianco; +Cc: rhug-rhats

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1450 bytes --]

On Mon, 21 Jan 2002, Alexandre Petit-Bianco wrote:
> This is fine. Could you please write ChangeLog entries?

Attached patch tries to include portability, in particular for
cross-compiling and alternate toolchains, by having both gcj and gcjh
calls support defining their paths manually or by host/build-type prefix.
There's also the removal of the inefficient "jar uf" line in gnu.readline
(*).

The ChangeLog entries lie a bit; I did re-build the build-scripts, however
I haven't included the diffs in this patch as I'm using slightly different
versions of the build-tools, and want to avoid cluttering the CVS
repository with generated files fluctuating back and forth. It's quite
undesirable to have to add ChangeLog entries with just "Rebuilt" for every
generated file, so I took the liberty to leave the generated files out of
the patch. Just remember to re-build them when applying the patch.

(*) bsf/Makefile.am, jakarta-servletapi/Makefile.am, jython/Makefile.am,
rhino/Makefile.am and gnu.regexp/Makefile.am still use "jar uf", and hence
cannot be built with the GCC build-tools alone. Several other
source-directories apparently just ignore including the resource-files in
the $(JARFILE) target. Until GCC's jar supports update, I think the proper
solution would be to just add these resource-files on the original "jar
cf" line, but I haven't touched these yet due to various questions about
the resource-file handling.

 -Jukka Santala

[-- Attachment #2: Type: TEXT/PLAIN, Size: 20001 bytes --]

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  <jsantala@tml.hut.fi>
+
+	* 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  <tromey@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+
+	* Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:46:27 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Sun Oct  7 16:41:50 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 2001-10-19  Tom Tromey  <tromey@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Thu Sep 13 17:35:47 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * 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  <apbianco@redhat.com>
 	
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Thu Sep 13 17:49:05 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Sun Sep  9 18:39:20 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Tue Oct  9 23:10:52 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Tue Oct  9 23:26:19 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+        * Makefile.in: Rebuilt.
+
 Sun Oct  7 16:30:42 2001  Anthony Green  <green@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * 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  <apbianco@redhat.com>
 
 	* 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  <jsantala@tml.hut.fi>
+ 
+        * 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  <apbianco@redhat.com>
 
 	* gnu.regexp/rhug.tests/tests.exp: Handle and report individual

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-22  4:10     ` Jukka Santala
@ 2002-01-25  9:05       ` Anthony Green
  2002-01-28  3:34         ` Jukka Santala
  0 siblings, 1 reply; 17+ messages in thread
From: Anthony Green @ 2002-01-25  9:05 UTC (permalink / raw)
  To: Jukka Santala; +Cc: Alexandre Petit-Bianco, rhug-rhats

On Tue, 2002-01-22 at 04:10, Jukka Santala wrote:
> Attached patch tries to include portability, in particular for
> cross-compiling and alternate toolchains, by having both gcj and gcjh
> calls support defining their paths manually or by host/build-type prefix.
> There's also the removal of the inefficient "jar uf" line in gnu.readline
> (*).

This looks good to me.  Thanks!  I can check this in over the weekend,
or we can set up write access for you.

BTW - I'm curious about the cross compiler you're using.  What's your
target?

Thanks,

AG


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-25  9:05       ` Anthony Green
@ 2002-01-28  3:34         ` Jukka Santala
  0 siblings, 0 replies; 17+ messages in thread
From: Jukka Santala @ 2002-01-28  3:34 UTC (permalink / raw)
  To: Anthony Green; +Cc: Alexandre Petit-Bianco, rhug-rhats

On 25 Jan 2002, Anthony Green wrote:
> On Tue, 2002-01-22 at 04:10, Jukka Santala wrote:
> > Attached patch tries to include portability, in particular for
> > cross-compiling and alternate toolchains, by having both gcj and gcjh
> This looks good to me.  Thanks!  I can check this in over the weekend,
> or we can set up write access for you.

Seems like it wasn't applied in yet, I guess in the end it's the same to
me, but since I doubt I'll become an active contributor to this project at
this time, it's probably easier if somebody else applies it and does the
required auto-generated-file update as well.

> BTW - I'm curious about the cross compiler you're using.  What's your
> target?

It's more of an experiment so far, and not going too well, but then,
that's the only way to get things working eventually. Target is arm-linux
with strongarm110 cpu, specifically the Compaq iPAQ handhelds running
Linux (Familiar) distribution. Because the Java JIT compilers on that
platform aren't very advanced, ability to pre-compile the source
especially for resource-intensive parts like Xalan/Xerces parsing would be
really welcome.

 -Jukka Santala

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  4:13 libtool woes Jukka Santala
  2002-01-21  4:26 ` Jukka Santala
@ 2002-01-21  9:12 ` Alexandre Petit-Bianco
  2002-01-31 10:19   ` Tom Tromey
  2002-01-31 10:16 ` Tom Tromey
  2 siblings, 1 reply; 17+ messages in thread
From: Alexandre Petit-Bianco @ 2002-01-21  9:12 UTC (permalink / raw)
  To: Jukka Santala; +Cc: rhug-rhats


Jukka Santala writes:

> I was trying to cross-compile the rhug source-tree using the latest
> gcc HEAD build. Unfortunately, the build runs into trouble with the
> Java resource-files, to wit:

We never really worked on RHUG with cross-compilation in mind. Well, I
certainly didn't. That's probably a mistake.

> Ps. some of the Makefile.am's even call "gcj" straight instead of
> $(GCJ)...

We could at least do that.

./A

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  9:12 ` Alexandre Petit-Bianco
@ 2002-01-31 10:19   ` Tom Tromey
  0 siblings, 0 replies; 17+ messages in thread
From: Tom Tromey @ 2002-01-31 10:19 UTC (permalink / raw)
  To: apbianco; +Cc: Jukka Santala, rhug-rhats

>>>>> "Alex" == Alexandre Petit-Bianco <apbianco@cygnus.com> writes:

Alex> We never really worked on RHUG with cross-compilation in mind. Well, I
Alex> certainly didn't. That's probably a mistake.

In some places it is hard.
For instance, in Jasmin there are a couple programs we build that are
used to build other parts of the source.
Of course we could do the usual thing and require both a native and a
cross build for these programs, but that is more work.
Or I suppose we could also compile to bytecode and then run gij.
That's sort of neat.

Tom

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-21  4:13 libtool woes Jukka Santala
  2002-01-21  4:26 ` Jukka Santala
  2002-01-21  9:12 ` Alexandre Petit-Bianco
@ 2002-01-31 10:16 ` Tom Tromey
  2002-02-01  5:02   ` Jukka Santala
  2 siblings, 1 reply; 17+ messages in thread
From: Tom Tromey @ 2002-01-31 10:16 UTC (permalink / raw)
  To: Jukka Santala; +Cc: rhug-rhats

>>>>> "Jukka" == Jukka Santala <jsantala@tml.hut.fi> writes:

Jukka> Ps. some of the Makefile.am's even call "gcj" straight instead of
Jukka> $(GCJ)...

I noticed many of them set GCJFLAGS.
This is wrong; they should set AM_GCJFLAGS instead.
GCJFLAGS is a user variable.

Tom

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-01-31 10:16 ` Tom Tromey
@ 2002-02-01  5:02   ` Jukka Santala
  2002-02-01 10:45     ` Alexandre Petit-Bianco
  0 siblings, 1 reply; 17+ messages in thread
From: Jukka Santala @ 2002-02-01  5:02 UTC (permalink / raw)
  To: Tom Tromey; +Cc: rhug-rhats

On 31 Jan 2002, Tom Tromey wrote:
> >>>>> "Jukka" == Jukka Santala <jsantala@tml.hut.fi> writes:
> Jukka> Ps. some of the Makefile.am's even call "gcj" straight instead of
> Jukka> $(GCJ)...
> I noticed many of them set GCJFLAGS.
> This is wrong; they should set AM_GCJFLAGS instead.
> GCJFLAGS is a user variable.

Yeah, none appear to use AM_GCJFLAGS, and practically all use GCJFLAGS.
However, the GCC/GCJH patch still remains unapplied, and the version I
posted has already been conflicted by the CVS changes. Which is becoming a
pain. What's the recommended course of action? I can post updated version
of the patch, somebody else can merge it, or I suppose I could take CVS
write access.

 -Jukka Santala

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-02-01  5:02   ` Jukka Santala
@ 2002-02-01 10:45     ` Alexandre Petit-Bianco
  2002-02-04  6:03       ` Jukka Santala
  2002-02-09 11:26       ` Tom Tromey
  0 siblings, 2 replies; 17+ messages in thread
From: Alexandre Petit-Bianco @ 2002-02-01 10:45 UTC (permalink / raw)
  To: Jukka Santala; +Cc: Tom Tromey, rhug-rhats

Jukka Santala writes:

> However, the GCC/GCJH patch still remains unapplied, and the version
> I posted has already been conflicted by the CVS changes. Which is
> becoming a pain.

It is. All hunks are failing on a freshly updated tree.

> I can post updated version of the patch, somebody else can merge it,

Yes please. Don't include the ChangeLog entries as they often don't
apply cleanly. Listing the ChangeLog entry and then the relevant hunks
is the preferred form of patch submission (this is not the reason the
patch wasn't applied in a timely fashion, BTW. We're all just really
busy. Sorry about that.)

./A.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-02-01 10:45     ` Alexandre Petit-Bianco
@ 2002-02-04  6:03       ` Jukka Santala
  2002-02-09 11:21         ` Tom Tromey
  2002-02-09 11:26       ` Tom Tromey
  1 sibling, 1 reply; 17+ messages in thread
From: Jukka Santala @ 2002-02-04  6:03 UTC (permalink / raw)
  To: Alexandre Petit-Bianco; +Cc: Tom Tromey, rhug-rhats

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2352 bytes --]

On Fri, 1 Feb 2002, Alexandre Petit-Bianco wrote:
> Yes please. Don't include the ChangeLog entries as they often don't
> apply cleanly. Listing the ChangeLog entry and then the relevant hunks
> is the preferred form of patch submission (this is not the reason the
> patch wasn't applied in a timely fashion, BTW. We're all just really
> busy. Sorry about that.)

Yeah, I'm familiar with that convention, but consider it rather silly.
Especially with projects like rhug with literally dozens of ChangeLog's to
maintain, the duplicated effort both on the patch-author and and
patch-applier to deal with separate ChangeLog entries is quite a lot. And
if the patch to a ChangeLog fails to apply cleanly, you're basically left
with the separate entry to paste in anyway.

Ofcourse, the reason all the chunks failed, and not just the ChangeLog
entries, probably has more to do with the CVS diff format than any
ChangeLog changes itself. Some patch utilities apply them cleanly, others
are led to try to apply it to a wrong file if one with the same name
exists in the root directory where it's ran. And remember, this change
involves the Makefile.in file in every one of the 16 directories, each one
with their invidual ChangeLog entries ;) So it's getting to be quite a
drag to do this by diffs.

So anyway, here's the patch again, in plain patch format, which applies
cleanly with -p1 or from the directory with "rhug" tree in it. For what it
is worth, I separated the patches to all the 17 ChangeLog's into a
separate patch, but didn't feel like providing alternate text-copy of each
to go with the chunks they apply to. (Most directories have slightly
different ChangeLog entries or at least different timestamp format(!))

I added the fix for the AM_GCJFLAGS problem (Makefile's using the
user-flag GCJFLAGS instead, preventing the user from giving alternative
flags) as well to avoid the need for a separate patch to apply for that. I
also participated in little historical revisionism, since I didn't feel
like updating the ChangeLog entry timestamp in each affected directory,
since it's practically same anyway. The normal caveats apply; I did
rebuild the build-scripts, but since my tools are different version, that
would generate some ten megabytes of diffs, hence hopefully whoever
applies the patches will re-generate them ;)

 -Jukka Santala

[-- Attachment #2: Type: TEXT/PLAIN, Size: 9266 bytes --]

diff -u -r rhug-clean/BCEL/ChangeLog rhug/BCEL/ChangeLog
--- rhug-clean/BCEL/ChangeLog	Fri Sep 14 04:02:46 2001
+++ rhug/BCEL/ChangeLog	Mon Feb  4 14:20:00 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:46:27 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Replace VERSION with info.rml.
diff -u -r rhug-clean/BouncyCastle/ChangeLog rhug/BouncyCastle/ChangeLog
--- rhug-clean/BouncyCastle/ChangeLog	Sat Oct 20 00:20:02 2001
+++ rhug/BouncyCastle/ChangeLog	Mon Feb  4 14:56:06 2002
@@ -1,3 +1,8 @@
+2002-01-22  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 2001-10-19  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff -u -r rhug-clean/ChangeLog rhug/ChangeLog
--- rhug-clean/ChangeLog	Wed Jan 30 22:37:55 2002
+++ rhug/ChangeLog	Thu Jan 31 15:28:06 2002
@@ -5,6 +5,12 @@
 	* configure: Rebuilt.
 	* configure.in: Generate jasmin/Makefile.
 
+2002-01-22  Jukka Santala  <jsantala@tml.hut.fi>
+
+	* 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  <tromey@redhat.com>
 
 	* configure: Rebuilt.
diff -u -r rhug-clean/bsf/ChangeLog rhug/bsf/ChangeLog
--- rhug-clean/bsf/ChangeLog	Fri Oct 12 10:31:19 2001
+++ rhug/bsf/ChangeLog	Mon Feb  4 14:56:29 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Sun Oct  7 16:41:50 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: New file.
diff -u -r rhug-clean/cup/ChangeLog rhug/cup/ChangeLog
--- rhug-clean/cup/ChangeLog	Fri Sep 14 03:40:32 2001
+++ rhug/cup/ChangeLog	Mon Feb  4 14:56:44 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:35:47 2001  Anthony Green  <green@redhat.com>
 
 	* info.rml: New file.
diff -u -r rhug-clean/gnu.readline/ChangeLog rhug/gnu.readline/ChangeLog
--- rhug-clean/gnu.readline/ChangeLog	Sat Oct 20 02:40:03 2001
+++ rhug/gnu.readline/ChangeLog	Mon Feb  4 14:54:04 2002
@@ -1,3 +1,12 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	(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  <apbianco@redhat.com>
 	
 	* upstream/src/native/org_gnu_readline_Readline.c (stdio.h): Include.
diff -u -r rhug-clean/gnu.regexp/ChangeLog rhug/gnu.regexp/ChangeLog
--- rhug-clean/gnu.regexp/ChangeLog	Tue Oct  9 00:52:40 2001
+++ rhug/gnu.regexp/ChangeLog	Mon Feb  4 14:57:19 2002
@@ -1,3 +1,11 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(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  <apbianco@redhat.com>
 
 	* gnu.regexp/rhug.tests/tests.exp: Handle and report individual
diff -u -r rhug-clean/jakarta-log4j/ChangeLog rhug/jakarta-log4j/ChangeLog
--- rhug-clean/jakarta-log4j/ChangeLog	Fri Sep 14 04:04:12 2001
+++ rhug/jakarta-log4j/ChangeLog	Mon Feb  4 14:58:38 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:49:19 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Replace VERSION with info.rml.
diff -u -r rhug-clean/jakarta-oro/ChangeLog rhug/jakarta-oro/ChangeLog
--- rhug-clean/jakarta-oro/ChangeLog	Fri Oct 12 23:26:58 2001
+++ rhug/jakarta-oro/ChangeLog	Mon Feb  4 14:58:46 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 2001-10-12  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* rhug.tests: New directory.
diff -u -r rhug-clean/jakarta-regexp/ChangeLog rhug/jakarta-regexp/ChangeLog
--- rhug-clean/jakarta-regexp/ChangeLog	Fri Sep 14 04:04:12 2001
+++ rhug/jakarta-regexp/ChangeLog	Mon Feb  4 14:58:57 2002
@@ -1,3 +1,11 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(nobase_include_HEADERS) rule): Use $(GCJH) instead of 
+	hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Thu Sep 13 17:49:05 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Replace VERSION with info.rml.
diff -u -r rhug-clean/jakarta-servletapi/ChangeLog rhug/jakarta-servletapi/ChangeLog
--- rhug-clean/jakarta-servletapi/ChangeLog	Mon Sep 10 04:44:10 2001
+++ rhug/jakarta-servletapi/ChangeLog	Mon Feb  4 14:59:08 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Sun Sep  9 18:39:20 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (install-data-local): Fix for srcdir==builddir.
diff -u -r rhug-clean/jakarta-tomcat/ChangeLog rhug/jakarta-tomcat/ChangeLog
--- rhug-clean/jakarta-tomcat/ChangeLog	Sun Sep  9 21:56:37 2001
+++ rhug/jakarta-tomcat/ChangeLog	Mon Feb  4 14:59:18 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 Sun Sep  9 11:49:15 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Define.
diff -u -r rhug-clean/jython/ChangeLog rhug/jython/ChangeLog
--- rhug-clean/jython/ChangeLog	Thu Oct 25 08:30:32 2001
+++ rhug/jython/ChangeLog	Mon Feb  4 14:58:23 2002
@@ -1,3 +1,8 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am: Use the proper flags instead of the user-flags.
+	* Makefile.in: Rebuilt.
+
 2001-10-24  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff -u -r rhug-clean/pgsql-jdbc/ChangeLog rhug/pgsql-jdbc/ChangeLog
--- rhug-clean/pgsql-jdbc/ChangeLog	Wed Oct 10 09:22:54 2001
+++ rhug/pgsql-jdbc/ChangeLog	Mon Feb  4 14:58:02 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Tue Oct  9 23:10:52 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: New file.
diff -u -r rhug-clean/rhino/ChangeLog rhug/rhino/ChangeLog
--- rhug-clean/rhino/ChangeLog	Wed Oct 10 09:27:33 2001
+++ rhug/rhino/ChangeLog	Mon Feb  4 14:58:14 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Tue Oct  9 23:26:19 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: Remove hack work-around for bug fixed by
diff -u -r rhug-clean/xalan/ChangeLog rhug/xalan/ChangeLog
--- rhug-clean/xalan/ChangeLog	Mon Oct  8 02:52:32 2001
+++ rhug/xalan/ChangeLog	Mon Feb  4 14:54:52 2002
@@ -1,3 +1,10 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(JARFILE) rule): Use $(GCJH) instead of hard-coded "gcjh".
+	* Makefile.in: Rebuilt.
+
 Sun Oct  7 16:30:42 2001  Anthony Green  <green@redhat.com>
 
 	* Makefile.am: Fix bug in how core properties are named.
diff -u -r rhug-clean/xerces/ChangeLog rhug/xerces/ChangeLog
--- rhug-clean/xerces/ChangeLog	Tue Oct 23 09:46:49 2001
+++ rhug/xerces/ChangeLog	Mon Feb  4 14:55:23 2002
@@ -1,3 +1,11 @@
+Tue Jan 22 11:04:24 2002  Jukka Santala  <jsantala@tml.hut.fi>
+ 
+	* Makefile.am
+	(AM_GCJFLAGS): Use the proper flags instead of the user-flags.
+	($(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  <apbianco@redhat.com>
 
 	* Makefile.am (CLASSFILES): Fixed typo.

[-- Attachment #3: Type: TEXT/PLAIN, Size: 17757 bytes --]

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

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-02-04  6:03       ` Jukka Santala
@ 2002-02-09 11:21         ` Tom Tromey
  0 siblings, 0 replies; 17+ messages in thread
From: Tom Tromey @ 2002-02-09 11:21 UTC (permalink / raw)
  To: Jukka Santala; +Cc: Alexandre Petit-Bianco, rhug-rhats

>>>>> "Jukka" == Jukka Santala <jsantala@tml.hut.fi> writes:

Jukka> So anyway, here's the patch again, in plain patch format, which
Jukka> applies cleanly with -p1 or from the directory with "rhug" tree
Jukka> in it.

Thanks.  Based on Alex's earlier approval I checked this in.
I haven't tested it; my set up is a bit weird today.

If there are problems tell me and I'll try to resolve them.

If you plan to make more patches I think we should just get you an
account.  It is easy and hopefully addictive...

Tom

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-02-01 10:45     ` Alexandre Petit-Bianco
  2002-02-04  6:03       ` Jukka Santala
@ 2002-02-09 11:26       ` Tom Tromey
  2002-02-09 15:29         ` Alexandre Petit-Bianco
  1 sibling, 1 reply; 17+ messages in thread
From: Tom Tromey @ 2002-02-09 11:26 UTC (permalink / raw)
  To: apbianco; +Cc: Jukka Santala, rhug-rhats

>>>>> "Alex" == Alexandre Petit-Bianco <apbianco@cygnus.com> writes:

Alex> Yes please. Don't include the ChangeLog entries as they often
Alex> don't apply cleanly. Listing the ChangeLog entry and then the
Alex> relevant hunks is the preferred form of patch submission (this
Alex> is not the reason the patch wasn't applied in a timely fashion,
Alex> BTW. We're all just really busy. Sorry about that.)

FWIW, I use a couple of programs from Alexandre Oliva that make it so
that I can handle patches that include the ChangeLog.  His programs
are so useful that now I prefer patches with the ChangeLog included,
since it is less work for me.

Tom

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-02-09 11:26       ` Tom Tromey
@ 2002-02-09 15:29         ` Alexandre Petit-Bianco
  2002-02-10 10:19           ` Tom Tromey
  0 siblings, 1 reply; 17+ messages in thread
From: Alexandre Petit-Bianco @ 2002-02-09 15:29 UTC (permalink / raw)
  To: rhug-rhats


Tom Tromey writes:

> FWIW, I use a couple of programs from Alexandre Oliva that make it
> so that I can handle patches that include the ChangeLog.  His
> programs are so useful that now I prefer patches with the ChangeLog
> included, since it is less work for me.

It this available publicly (we could modify the RHUG web site to point
to them.)

./A

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: libtool woes
  2002-02-09 15:29         ` Alexandre Petit-Bianco
@ 2002-02-10 10:19           ` Tom Tromey
  0 siblings, 0 replies; 17+ messages in thread
From: Tom Tromey @ 2002-02-10 10:19 UTC (permalink / raw)
  To: apbianco; +Cc: rhug-rhats

Alex> It this available publicly (we could modify the RHUG web
Alex> site to point to them.)

Alexandre Oliva's cvs-utils are in cvs at subversions.gnu.org, root
/cvs, module cvs-utils.

More useful cvs utilities are here:

    http://www.red-bean.com/cvsutils/

Tom

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2002-02-10 18:19 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-01-21  4:13 libtool woes Jukka Santala
2002-01-21  4:26 ` Jukka Santala
2002-01-21  9:14   ` Alexandre Petit-Bianco
2002-01-22  1:39     ` Jukka Santala
2002-01-22  4:10     ` Jukka Santala
2002-01-25  9:05       ` Anthony Green
2002-01-28  3:34         ` Jukka Santala
2002-01-21  9:12 ` Alexandre Petit-Bianco
2002-01-31 10:19   ` Tom Tromey
2002-01-31 10:16 ` Tom Tromey
2002-02-01  5:02   ` Jukka Santala
2002-02-01 10:45     ` Alexandre Petit-Bianco
2002-02-04  6:03       ` Jukka Santala
2002-02-09 11:21         ` Tom Tromey
2002-02-09 11:26       ` Tom Tromey
2002-02-09 15:29         ` Alexandre Petit-Bianco
2002-02-10 10:19           ` Tom Tromey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).