diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-08-27 20:12:55 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2005-08-27 20:12:55 +0000 |
| commit | d00b8c3c72742ce8b2650c26dbd990b2ff34d00d (patch) | |
| tree | ce87c2ab90be4271ed83a515f515811080748c67 /m4 | |
| parent | f672a8b964b2d917896416404ea0768af06dbdc7 (diff) | |
| download | classpath-d00b8c3c72742ce8b2650c26dbd990b2ff34d00d.tar.gz | |
* m4/acinclude.m4 (CLASSPATH_WITH_GLIBJ): Always check for 'zip'
program. Changed zip install handling.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acinclude.m4 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e9cb21e27..e05a2f8e7 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -319,38 +319,39 @@ dnl CLASSPATH_WITH_GLIBJ - specify what to install dnl ----------------------------------------------------------- AC_DEFUN([CLASSPATH_WITH_GLIBJ], [ + AC_PATH_PROG(ZIP, zip) AC_ARG_WITH([glibj], [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none|build) [default=zip]])], [ if test "x${withval}" = xyes || test "x${withval}" = xzip; then - AC_PATH_PROG(ZIP, zip) install_class_files=no build_class_files=yes + use_zip=yes elif test "x${withval}" = xboth; then - AC_PATH_PROG(ZIP, zip) install_class_files=yes build_class_files=yes + use_zip=yes elif test "x${withval}" = xflat; then - ZIP= install_class_files=yes build_class_files=yes + use_zip=no elif test "x${withval}" = xno || test "x${withval}" = xnone; then - ZIP= install_class_files=no build_class_files=no + use_zip=no elif test "x${withval}" = xbuild; then - ZIP= install_class_files=no build_class_files=yes + use_zip=no else AC_MSG_ERROR([unknown value given to --with-glibj]) fi ], [ - AC_PATH_PROG(ZIP, zip) install_class_files=no + use_zip=yes ]) - AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x) + AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${use_zip}" = xyes) AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes) AM_CONDITIONAL(BUILD_CLASS_FILES, test "x${build_class_files}" = xyes) @@ -362,7 +363,7 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ], *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;; esac], [EXAMPLESDIR="examples"]) - if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then + if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then EXAMPLESDIR="" fi AC_SUBST(EXAMPLESDIR) |