install.texi: Document --enable-static-libjava.

gcc/

2011-07-16  Matthias Klose  <doko@ubuntu.com>

        * doc/install.texi: Document --enable-static-libjava.

<toplevel>

2011-07-16  Matthias Klose  <doko@ubuntu.com>

        * Makefile.tpl (EXTRA_CONFIGARGS_LIBJAVA): Define.
        * Makefile.def (target_modules/libjava): Pass
        $(EXTRA_CONFIGARGS_LIBJAVA).
        * configure.ac: Pass --disable-static in EXTRA_CONFIGARGS_LIBJAVA,
        if not configured with --enable-static-libjava.
        * Makefile.in: Regenerate.
        * configure: Likewise.

From-SVN: r176351

diff --git a/ChangeLog b/ChangeLog
index 5794a5d1a1037c86e2a1c2caeaa598281597413b..ea7ae92c7c2e675474b2b702d48633c0375b9e81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-16  Matthias Klose  <doko@ubuntu.com>
+
+       * Makefile.tpl (EXTRA_CONFIGARGS_LIBJAVA): Define.
+       * Makefile.def (target_modules/libjava): Pass
+       $(EXTRA_CONFIGARGS_LIBJAVA).
+       * configure.ac: Pass --disable-static in EXTRA_CONFIGARGS_LIBJAVA,
+       if not configured with --enable-static-libjava.
+       * Makefile.in: Regenerate.
+       * configure: Likewise.
+
 2011-07-15  Jason Merrill  <jason@redhat.com>
 
        * Makefile.in (check-c++): Move check-gcc-c++0x after

diff --git a/Makefile.def b/Makefile.def
index b4a8464c5f8592cb16563db3b76a3715f7f91cc1..0cc6ef6cade4f380aac912d096d0bc448d9d945d 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -132,7 +132,8 @@ target_modules = { module= libtermcap; no_check=true;
 target_modules = { module= winsup; };
 target_modules = { module= libgloss; no_check=true; };
 target_modules = { module= libffi; };
-target_modules = { module= libjava; raw_cxx=true; };
+target_modules = { module= libjava; raw_cxx=true;
+                   extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
 target_modules = { module= zlib; };
 target_modules = { module= boehm-gc; };
 target_modules = { module= rda; };

diff --git a/Makefile.in b/Makefile.in
index 0d40358d209db2b763f1907005eb9a3411cf9c04..e80f0483f973ddc36fb2c654c3795ca58b447ff7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -316,6 +316,8 @@ HOST_CLOOGINC = @clooginc@
 HOST_LIBELFLIBS = @libelflibs@
 HOST_LIBELFINC = @libelfinc@
 
+EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
+
 # ----------------------------------------------
 # Programs producing files for the BUILD machine
 # ----------------------------------------------
@@ -36891,7 +36893,7 @@ configure-target-libjava:
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \
          || exit 1
 @endif target-libjava
 

diff --git a/Makefile.tpl b/Makefile.tpl
index 0b2b3d898929f38d58155d6097d3730e3ff793d1..ea3d08d67ab002f5eb28477d522a311938106d8d 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -319,6 +319,8 @@ HOST_CLOOGINC = @clooginc@
 HOST_LIBELFLIBS = @libelflibs@
 HOST_LIBELFINC = @libelfinc@
 
+EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
+
 # ----------------------------------------------
 # Programs producing files for the BUILD machine
 # ----------------------------------------------

diff --git a/configure b/configure
index f4bb255560956e23a9de81fa7d24dddba025529c..988bff7cdb8aed12ad62c87fcdebafdd9abc5873 100755 (executable)
--- a/configure
+++ b/configure
@@ -667,6 +667,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+EXTRA_CONFIGARGS_LIBJAVA
 target_subdir
 host_subdir
 build_subdir
@@ -746,6 +747,7 @@ enable_libquadmath
 enable_libquadmath_support
 enable_libada
 enable_libssp
+enable_static_libjava
 enable_build_with_cxx
 with_mpc
 with_mpc_include
@@ -1460,6 +1462,8 @@ Optional Features:
                           disable libquadmath support for Fortran
   --enable-libada         build libada directory
   --enable-libssp         build libssp directory
+  --enable-static-libjava[=ARG]
+                          build static libjava [default=no]
   --enable-build-with-cxx build with C++ compiler instead of C compiler
   --disable-ppl-version-check
                           disable check for PPL version
@@ -2997,6 +3001,22 @@ no)
   ;;
 esac
 
+# Check whether --enable-static-libjava was given.
+if test "${enable_static_libjava+set}" = set; then :
+  enableval=$enable_static_libjava; ENABLE_STATIC_LIBJAVA=$enableval
+else
+  ENABLE_STATIC_LIBJAVA=no
+fi
+
+enable_static_libjava=
+if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
+  enable_static_libjava=yes
+fi
+
+if test x$enable_static_libjava != xyes ; then
+  EXTRA_CONFIGARGS_LIBJAVA=--disable-static
+fi
+
 
 # Disable libmudflap on some systems.
 if test x$enable_libmudflap = x ; then

diff --git a/configure.ac b/configure.ac
index 31a5bdf67bdc2271b66ba60d41e3714b01955e9e..7085eeaf23583747fbdb057751c1092d21f0afc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -443,6 +443,20 @@ no)
   ;;
 esac
 
+AC_ARG_ENABLE(static-libjava,
+[AS_HELP_STRING([[--enable-static-libjava[=ARG]]],
+               [build static libjava @<:@default=no@:>@])],
+ENABLE_STATIC_LIBJAVA=$enableval,
+ENABLE_STATIC_LIBJAVA=no)
+enable_static_libjava=
+if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
+  enable_static_libjava=yes
+fi
+
+if test x$enable_static_libjava != xyes ; then
+  EXTRA_CONFIGARGS_LIBJAVA=--disable-static
+fi
+AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA)
 
 # Disable libmudflap on some systems.
 if test x$enable_libmudflap = x ; then

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46997c418b4569e00af9a24f700f896efd9f9d9a..8608e88c362dabe3da26f655ed4d5f8cc5a6c9e7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-16  Matthias Klose  <doko@ubuntu.com>
+
+       * doc/install.texi: Document --enable-static-libjava.
+
 2011-07-15  Richard Henderson  <rth@redhat.com>
 
        * bb-reorder.c (find_rarely_executed_basic_blocks_and_crossing_edges):