Include the full version number in the directory paths installed.
Change the version string so that it does not break 'make', and so that it has no '/' (it would be a hell if installed directories would mirror the SVN branches... :-/ )
Do not use implicit rules for the Makefile.
Simplify and enc=hance the --local test to refuse (un)installing.
Double-quotes variables, they are based on user input.
Eye-candy in the 'compile' and install messages.
/trunk/configure | 26 14 12 0 ++++++++++---------
/trunk/Makefile.in | 83 45 38 0 +++++++++++++++++++++++++++++++++---------------------------
2 files changed, 59 insertions(+), 50 deletions(-)
1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch
2 diff -durN gcc-4.3.1.orig/libjava/configure gcc-4.3.1/libjava/configure
3 --- gcc-4.3.1.orig/libjava/configure 2008-06-06 16:49:11.000000000 +0200
4 +++ gcc-4.3.1/libjava/configure 2008-06-10 14:57:38.000000000 +0200
6 --enable-gconf-peer compile GConf native peers for util.preferences
7 --enable-java-maintainer-mode
8 allow rebuilding of .class and .h files
9 + --enable-libjava-multilib
10 + build libjava as multilib
11 --disable-dependency-tracking speeds up one-time build
12 --enable-dependency-tracking do not reject slow dependency extractors
13 --enable-maintainer-mode enable make rules and dependencies not useful
14 @@ -1850,6 +1852,16 @@
18 +# Check whether --enable-libjava-multilib was given.
19 +if test "${enable_libjava_multilib+set}" = set; then
20 + enableval=$enable_libjava_multilib;
23 +if test "$enable_libjava_multilib" = no; then
25 + ac_configure_args="$ac_configure_args --disable-multilib"
28 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
31 diff -durN gcc-4.3.1.orig/libjava/configure.ac gcc-4.3.1/libjava/configure.ac
32 --- gcc-4.3.1.orig/libjava/configure.ac 2007-12-22 16:48:46.000000000 +0100
33 +++ gcc-4.3.1/libjava/configure.ac 2008-06-10 14:57:38.000000000 +0200
35 [allow rebuilding of .class and .h files]))
36 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
38 +AC_ARG_ENABLE(libjava-multilib,
39 + AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
40 +if test "$enable_libjava_multilib" = no; then
42 + ac_configure_args="$ac_configure_args --disable-multilib"
45 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.