diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 18 |
3 files changed, 22 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2004-11-15 Michael Koch <konqueror@gmx.de> + + * acinclude.m4 (CLASSPATH_WITH_GLIBJ): Added support to not build the + class files/glibj.zip. Handle --disable-examples argument. + * Makefile.am: Build examples subdir conditionally. + 2004-11-15 Craig Black <craig.black@aonix.com> * gnu/java/beans/BeanInfoEmbryo.java: Use TreeMap for proper sorting. diff --git a/Makefile.am b/Makefile.am index 6d09cca6a..63eb5d048 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,8 @@ ## Input file for automake to generate the Makefile.in used by configure # lib first, to compile .class files before native code, last examples -SUBDIRS = lib doc include native resource examples +SUBDIRS = lib doc include native resource $(EXAMPLESDIR) +DIST_SUBDIRS = lib doc include native resource examples native: lib diff --git a/acinclude.m4 b/acinclude.m4 index f58a98703..ea7854e85 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -251,7 +251,7 @@ dnl ----------------------------------------------------------- AC_DEFUN([CLASSPATH_WITH_GLIBJ], [ AC_ARG_WITH([glibj], - [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both) [default=zip]])], + [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both|none) [default=zip]])], [ if test "x${withval}" = xyes || test "x${withval}" = xzip; then AC_PATH_PROG(ZIP, zip) @@ -273,11 +273,21 @@ AC_DEFUN([CLASSPATH_WITH_GLIBJ], AC_PATH_PROG(ZIP, zip) install_class_files=no ]) - if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then - AC_MSG_ERROR([you need to either install class files or glibj.zip]) - fi AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x) AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes) + + AC_ARG_ENABLE([examples], + [AS_HELP_STRING(--enable-examples,enable build of the examples [default=yes])], + [case "${enableval}" in + yes) EXAMPLESDIR="examples" ;; + no) EXAMPLESDIR="" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-examples) ;; + esac], + [EXAMPLESDIR="examples"]) + if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then + EXAMPLESDIR="" + fi + AC_SUBST(EXAMPLESDIR) ]) dnl ----------------------------------------------------------- |