[cp-patches] [release] FYI: Allow native-only build #02: Add --enable/disable-tools

[Andrew John Hughes]

This enables the building of the tools to be disabled.

ChangeLog:

2008-06-01  Andrew John Hughes  <[EMAIL PROTECTED]>

        * Makefile.am: Replace tools with
        $(TOOLSDIR).
        * m4/acinclude.m4: Include option
        to disable building the tools.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

Index: Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/Makefile.am,v
retrieving revision 1.47.2.1
diff -u -u -r1.47.2.1 Makefile.am
--- Makefile.am 1 Jun 2008 17:16:50 -0000       1.47.2.1
+++ Makefile.am 1 Jun 2008 18:42:53 -0000
@@ -1,7 +1,7 @@
 ## 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 external include native resource scripts tools $(EXAMPLESDIR)
+SUBDIRS = lib doc external include native resource scripts $(TOOLSDIR) 
$(EXAMPLESDIR)
 DIST_SUBDIRS = lib doc external include native resource scripts tools examples
 
 # Allow users to pass site-specific flags to autoreconf via an env var. 
Index: m4/acinclude.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.35
diff -u -u -r1.35 acinclude.m4
--- m4/acinclude.m4     21 Feb 2008 21:07:19 -0000      1.35
+++ m4/acinclude.m4     1 Jun 2008 18:43:07 -0000
@@ -115,6 +115,19 @@
     EXAMPLESDIR=""
   fi
   AC_SUBST(EXAMPLESDIR)
+
+  AC_ARG_ENABLE([tools],
+               [AS_HELP_STRING(--enable-tools,enable build of the tools 
[default=yes])],
+               [case "${enableval}" in
+                 yes) TOOLSDIR="tools" ;;
+                 no) TOOLSDIR="" ;;
+                 *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
+               esac],
+               [TOOLSDIR="tools"])
+  if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then
+    TOOLSDIR=""
+  fi
+  AC_SUBST(TOOLSDIR)
 ])
 
 dnl -----------------------------------------------------------