libjava/classpath: Bump to automake 1.11.6

2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>

	 * Makefile.in: Regenerated with automake-1.11.6.
	 * aclocal.m4: Likewise.
	 * configure: Likewise.
	 * doc/Makefile.in: Likewise.
	 * doc/api/Makefile.in: Likewise.
	 * examples/Makefile.in: Likewise.
	 * external/Makefile.in: Likewise.
	 * external/jsr166/Makefile.in: Likewise.
	 * external/relaxngDatatype/Makefile.in: Likewise.
	 * external/sax/Makefile.in: Likewise.
	 * external/w3c_dom/Makefile.in: Likewise.
	 * include/Makefile.in: Likewise.
	 * lib/Makefile.in: Likewise.
	 * native/Makefile.in: Likewise.
	 * native/fdlibm/Makefile.in: Likewise.
	 * native/jawt/Makefile.in: Likewise.
	 * native/jni/Makefile.in: Likewise.
	 * native/jni/classpath/Makefile.in: Likewise.
	 * native/jni/gconf-peer/Makefile.in: Likewise.
	 * native/jni/gstreamer-peer/Makefile.in: Likewise.
	 * native/jni/gtk-peer/Makefile.in: Likewise.
	 * native/jni/java-io/Makefile.in: Likewise.
	 * native/jni/java-lang/Makefile.in: Likewise.
	 * native/jni/java-math/Makefile.in: Likewise.
	 * native/jni/java-net/Makefile.in: Likewise.
	 * native/jni/java-nio/Makefile.in: Likewise.
	 * native/jni/java-util/Makefile.in: Likewise.
	 * native/jni/midi-alsa/Makefile.in: Likewise.
	 * native/jni/midi-dssi/Makefile.in: Likewise.
	 * native/jni/native-lib/Makefile.in: Likewise.
	 * native/jni/qt-peer/Makefile.in: Likewise.
	 * native/jni/xmlj/Makefile.in: Likewise.
	 * native/plugin/Makefile.in: Likewise.
	 * resource/Makefile.in: Likewise.
	 * scripts/Makefile.in: Likewise.
	 * tools/Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223135 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 19 insertions, 15 deletions

diff --git a/libjava/classpath/configure b/libjava/classpath/configure
index 5edc1e6a487..a25317d1dd4 100755
--- a/libjava/classpath/configure
+++ b/libjava/classpath/configure
@@ -767,6 +767,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -3659,9 +3660,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
@@ -3978,6 +3979,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4795,6 +4797,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4854,7 +4857,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -11879,7 +11882,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11882 "configure"
+#line 11885 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11985,7 +11988,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11988 "configure"
+#line 11991 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12817,6 +12820,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -12876,7 +12880,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -13464,6 +13468,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -13523,7 +13528,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -25359,7 +25364,7 @@ else
 JAVA_TEST=Object.java
 CLASS_TEST=Object.class
 cat << \EOF > $JAVA_TEST
-/* #line 25362 "configure" */
+/* #line 25367 "configure" */
 package java.lang;
 
 public class Object
@@ -25452,7 +25457,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 25455: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 25460: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -25480,7 +25485,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 25483 "configure" */
+/* [#]line 25488 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
@@ -25688,7 +25693,7 @@ if test "x${use_glibj_zip}" = xfalse || \
   JAVA_TEST=Test.java
   CLASS_TEST=Test.class
   cat << \EOF > $JAVA_TEST
-  /* #line 25691 "configure" */
+  /* #line 25696 "configure" */
   public class Test
   {
     public static void main(String args)
@@ -25835,9 +25840,8 @@ fi
 ac_config_files="$ac_config_files Makefile doc/Makefile doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile external/relaxngDatatype/Makefile external/jsr166/Makefile gnu/classpath/Configuration.java gnu/java/security/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-math/Makefile native/jni/java-net/Makefile native/jni/java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile native/jni/gconf-peer/Makefile native/jni/gstreamer-peer/Makefile native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile native/jni/native-lib/Makefile native/plugin/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.PreferencesFactory resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader resource/META-INF/services/javax.sound.sampled.spi.MixerProvider scripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh scripts/check_jni_methods.sh tools/Makefile examples/Makefile examples/Makefile.jawt examples/Makefile.java2d"
 
 
-if test "x${COMPILE_WRAPPERS}" = xyes; then
-  :
-else
+if test -z "$CREATE_WRAPPERS_TRUE"; then :
+  else
   ac_config_files="$ac_config_files tools/gappletviewer tools/gjarsigner tools/gkeytool tools/gjar tools/gnative2ascii tools/gserialver tools/grmiregistry tools/gtnameserv tools/gorbd tools/grmid tools/grmic tools/gjavah"