    else
      CXXFLAGS=
    fi
-@@ -25189,7 +25189,7 @@ done
+@@ -25189,7 +25189,7 @@
  
  
  

   else
     CFLAGS=
   fi
@@ -3674,13 +3674,13 @@ if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then

            ])
 
          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
diff -r --unified a/m4/libtool.m4 b/m4/libtool.m4
--- a/m4/libtool.m4	2014-02-09 03:52:42.000000000 -0800
+++ b/m4/libtool.m4	2014-02-09 03:52:42.000000000 -0800
@@ -7633,7 +7633,7 @@
 [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
   [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
     [AC_CHECK_TOOL(GCJ, gcj,)
