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 /acinclude.m4 | |
| 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
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 21 |
1 files changed, 21 insertions, 0 deletions
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) +]) |