diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 2 | ||||
| -rwxr-xr-x | tools/Makefile.am | 4 |
4 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2007-12-28 Dalibor Topic <robilad@kaffe.org> + + * m4/acinclude.m4 (CLASSPATH_WITH_GLIBJ): Use + AC_PATH_PROGS instead of AC_PATH_PROG to check + for FASTJAR as fastjar, gjar or jar. Add braces + to AC_PATH_PROGS arguments. + + * tools/Makefile.am (TOOLS_ZIP), + lib/Makefile.am (collections.jar, glibj.zip): + Quote FASTJAR in case it's in a path with + whitespace. + 2007-12-25 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/34580: diff --git a/lib/Makefile.am b/lib/Makefile.am index 390d3c34e..9bffead69 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -45,7 +45,7 @@ collections.jar: mkcollections.pl $(JCOMPILER) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print` #endif if test "$(FASTJAR)" != ""; then \ - $(FASTJAR) cf $@ $(COLLECTIONS_PREFIX); \ + "$(FASTJAR)" cf $@ $(COLLECTIONS_PREFIX); \ else \ echo "fastjar not found" > collections.jar; \ fi @@ -94,7 +94,7 @@ else glibj.zip: classes compile-classes resources if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null; fi - if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org sun META-INF; fi + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" cf glibj.zip gnu java javax org sun META-INF; fi endif # USE_PREBUILT_GLIBJ_ZIP diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index b1cad98b3..e3e609789 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -275,7 +275,7 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ], FASTJAR=${withval} AC_MSG_RESULT([${FASTJAR}]) ], - [AC_PATH_PROG(FASTJAR, fastjar)]) + [AC_PATH_PROGS([FASTJAR], [fastjar gjar jar])]) dnl We disable ZIP by default if we find fastjar. if test x"${FASTJAR}" != x; then ZIP="" diff --git a/tools/Makefile.am b/tools/Makefile.am index 6a766c84c..f63c63166 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -181,12 +181,12 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) ## First add classpath tools stuff. (cd classes; \ if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" cf ../$(TOOLS_ZIP) .; fi; \ cd ..) ## Now add ASM classes. (cd asm; \ if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \ - if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \ + if test "$(FASTJAR)" != ""; then "$(FASTJAR)" uf ../$(TOOLS_ZIP) .; fi; \ cd ..) rm -rf classes |