diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-16 08:33:10 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-16 08:33:10 +0000 |
| commit | d7e52ac92ed645bd46f17e825fc48044e8e33cf0 (patch) | |
| tree | 6e066c2cfa4ca80015b011442cf5a920b489b3e5 /configure | |
| parent | cf797b5e23a26039497346da079319716eeadc2b (diff) | |
| download | gcc-d7e52ac92ed645bd46f17e825fc48044e8e33cf0.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@176351 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/configure b/configure index f4bb2555609..988bff7cdb8 100755 --- 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 |