diff options
| author | Brian Jones <cbj@gnu.org> | 2002-05-02 23:00:14 +0000 |
|---|---|---|
| committer | Brian Jones <cbj@gnu.org> | 2002-05-02 23:00:14 +0000 |
| commit | 07227f64993e98187bec0649642d4fd1dfca6277 (patch) | |
| tree | 3d42910f377e21d71fcd7e48c2fae136e413378a | |
| parent | fb21ce12a8be375d9f90cdeee3d62b3bbbf1688f (diff) | |
| download | classpath-07227f64993e98187bec0649642d4fd1dfca6277.tar.gz | |
* configure.in: move check for ZIP to --with-zip
* acinclude.m4: define CLASSPATH_WITH_ZIP, allow user to specify
--without-zip to avoid creating or installing glibj.zip
* java/util/TreeMap.java (SubMap.values): return this.values instead
of this.keys
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | acinclude.m4 | 21 | ||||
| -rw-r--r-- | configure.in | 9 |
3 files changed, 35 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2002-05-02 C. Brian Jones <cbj@gnu.org> + + * configure.in: move check for ZIP to --with-zip + * acinclude.m4: define CLASSPATH_WITH_ZIP, allow user to specify + --without-zip to avoid creating or installing glibj.zip + +2002-05-02 Xuan Baldauf <entwicklung--classpath--gnu.org@medium.net> + + * java/util/TreeMap.java (SubMap.values): return this.values instead + of this.keys + 2002-04-30 Eric Blake <ebb9@email.byu.edu> * configure.in: Configure the swing directories. diff --git a/acinclude.m4 b/acinclude.m4 index 057e1a283..4ce19fa41 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -536,3 +536,24 @@ AC_DEFUN(CLASSPATH_WITH_INCLUDEDIR, fi ]) ]) + +dnl CLASSPATH_WITH_ZIP - allow user to specify without zip +AC_DEFUN(CLASSPATH_WITH_ZIP, +[ + AC_ARG_WITH(zip, + [ --with-zip create glibj.zip [default=yes]], + [ + if test "x${withval}" = xyes || test "x${withval}" = x; then + AC_PATH_PROG(ZIP, zip) + elif test "x${withval}" = xno || test "x${withval}" = xfalse; then + ZIP= + else + ZIP="${withval}" + fi + ], + [ + AC_PATH_PROG(ZIP, zip) + ]) + AC_SUBST(ZIP) + AM_CONDITIONAL(HAVE_ZIP, test "x${ZIP}" != x) +]) diff --git a/configure.in b/configure.in index 5852f91db..a96fefb1a 100644 --- a/configure.in +++ b/configure.in @@ -220,14 +220,11 @@ dnl This is probably useless. AC_PATH_PROG(SH, sh) dnl According to the GNU coding guide, we shouldn't require find, -dnl zip, and perl, however it should be okay since it is only used -dnl in maintainer mode. +dnl and zip, however GNU provides both so it should be okay AC_PATH_PROG(FIND, find) -AC_PATH_PROG(ZIP, zip) -dnl AC_PATH_PROG(UNZIP, unzip) -dnl AC_PATH_PROG(PERL, perl) -AM_CONDITIONAL(HAVE_ZIP, test "x${ZIP}" != x) +dnl Useful for disabling zip even if you have it +CLASSPATH_WITH_ZIP AC_OUTPUT(Makefile com/Makefile |