acinclude.m4: Accept GCJ and JIKES.

2007-06-04  Matthias Klose  <doko@ubuntu.com>

        * m4/acinclude.m4: Accept GCJ and JIKES.
        * configure: Regenerate.

From-SVN: r125310

libjava/classpath/ChangeLog.gcj

@@ -1,3 +1,8 @@
+2007-06-04  Matthias Klose  <doko@ubuntu.com>
+
+	* m4/acinclude.m4: Accept GCJ and JIKES.
+	* configure: Regenerate.
+
 2007-05-31  Matthias Klose  <doko@ubuntu.com>
 
 	* javax/management/NotificationBroadcasterSupport.java

libjava/classpath/configure

@@ -5782,29 +5782,35 @@ else
     fi
     ;;
   *)
-    # Make teststring a little bigger before we do anything with it.
+    lt_cv_sys_max_cmd_len=`getconf ARG_MAX 2> /dev/null`
-    # a 1K string should be a reasonable start.
+    if test -n $lt_cv_sys_max_cmd_len; then
-    for i in 1 2 3 4 5 6 7 8 ; do
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      teststring=$teststring$teststring
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    done
+    else
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # Make teststring a little bigger before we do anything with it.
-    # If test is not a shell built-in, we'll probably end up computing a
+      # a 1K string should be a reasonable start.
-    # maximum length that is only half of the actual maximum length, but
+      for i in 1 2 3 4 5 6 7 8 ; do
-    # we can't tell.
+        teststring=$teststring$teststring
-    while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+      done
-	       = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-	    test $i != 17 # 1/2 MB should be enough
+      # If test is not a shell built-in, we'll probably end up computing a
-    do
+      # maximum length that is only half of the actual maximum length, but
-      i=`expr $i + 1`
+      # we can't tell.
-      teststring=$teststring$teststring
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-    done
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-    # Only check the string length outside the loop.
+	      test $i != 17 # 1/2 MB should be enough
-    lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      do
-    teststring=
+        i=`expr $i + 1`
-    # Add a significant safety factor because C++ compilers can tack on massive
+        teststring=$teststring$teststring
-    # amounts of additional arguments before passing them to the linker.
+      done
-    # It appears as though 1/2 is a usable value.
+      # Only check the string length outside the loop.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
@@ -6724,7 +6730,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6727 "configure"' > conftest.$ac_ext
+  echo '#line 6733 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7356,11 +7362,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7359: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7365: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7363: \$? = $ac_status" >&5
+   echo "$as_me:7369: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7678,11 +7684,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7681: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7687: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7685: \$? = $ac_status" >&5
+   echo "$as_me:7691: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7783,11 +7789,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7786: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7792: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7790: \$? = $ac_status" >&5
+   echo "$as_me:7796: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7838,11 +7844,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7841: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7845: \$? = $ac_status" >&5
+   echo "$as_me:7851: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10690,7 +10696,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10693 "configure"
+#line 10699 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10790,7 +10796,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10793 "configure"
+#line 10799 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15187,11 +15193,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15190: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15196: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15194: \$? = $ac_status" >&5
+   echo "$as_me:15200: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15286,11 +15292,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15289: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15295: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15293: \$? = $ac_status" >&5
+   echo "$as_me:15299: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15338,11 +15344,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15341: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15347: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15345: \$? = $ac_status" >&5
+   echo "$as_me:15351: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -25153,11 +25159,15 @@ else
 fi
 
 
-  if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
+  ## GCJ LOCAL
+  if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${ECJ}" = x \
+     && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xkjc
+  then
       { { echo "$as_me:$LINENO: error: cannot find javac, try --with-ecj" >&5
 echo "$as_me: error: cannot find javac, try --with-ecj" >&2;}
    { (exit 1); exit 1; }; }
   fi
+  ## END GCJ LOCAL
 
 
 

libjava/classpath/m4/acinclude.m4

@@ -24,10 +24,13 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC],
   fi
   AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
 
-dnl  if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then
+  ## GCJ LOCAL
-  if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
+  if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${ECJ}" = x \
+     && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xkjc
+  then
       AC_MSG_ERROR([cannot find javac, try --with-ecj])
   fi
+  ## END GCJ LOCAL
 ])
 
 dnl -----------------------------------------------------------