We no longer use the GCC version, so don't fetch it.

Fix some indentation while we're at it.

diff --git a/aclocal.m4 b/aclocal.m4
index 8baf179a32e1fdc6248beac447e9ba47c624b7e8..c524d4443428e84d5155cc5beba3c5301f6799b4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -100,26 +100,13 @@ AC_DEFUN(AC_LBL_C_INIT,
     AC_BEFORE([$0], [AC_LBL_DEVEL])
     AC_BEFORE([$0], [AC_LBL_SHLIBS_INIT])
     if test "$GCC" = yes ; then
-           if test "$SHLICC2" = yes ; then
-                   ac_cv_lbl_gcc_vers=2
-           else
-                   AC_MSG_CHECKING(gcc version)
-                   AC_CACHE_VAL(ac_cv_lbl_gcc_vers,
-                       ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \
-                           sed -e '/^gcc version /!d' \
-                               -e 's/^gcc version //' \
-                               -e 's/ .*//' -e 's/^[[[^0-9]]]*//' \
-                               -e 's/\..*//'`)
-                   AC_MSG_RESULT($ac_cv_lbl_gcc_vers)
-           fi
-
            #
            # -Werror forces warnings to be errors.
            #
            ac_lbl_cc_force_warning_errors=-Werror
 
-            #
-            # Use -ffloat-store so that, on 32-bit x86, we don't
+           #
+           # Use -ffloat-store so that, on 32-bit x86, we don't
            # do 80-bit arithmetic with the FPU; that way we should
            # get the same results for floating-point calculations
            # on x86-32 and x86-64.

diff --git a/configure b/configure
index 047d64cb45f63f8903b2e69e1d657020e8760909..f985dd42860ef00ec39160edefdb4cd37d926124 100755 (executable)
--- a/configure
+++ b/configure
@@ -3329,32 +3329,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
     if test "$GCC" = yes ; then
-           if test "$SHLICC2" = yes ; then
-                   ac_cv_lbl_gcc_vers=2
-           else
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
-$as_echo_n "checking gcc version... " >&6; }
-                   if ${ac_cv_lbl_gcc_vers+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \
-                           sed -e '/^gcc version /!d' \
-                               -e 's/^gcc version //' \
-                               -e 's/ .*//' -e 's/^[^0-9]*//' \
-                               -e 's/\..*//'`
-fi
-
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lbl_gcc_vers" >&5
-$as_echo "$ac_cv_lbl_gcc_vers" >&6; }
-           fi
-
            #
            # -Werror forces warnings to be errors.
            #
            ac_lbl_cc_force_warning_errors=-Werror
 
-            #
-            # Use -ffloat-store so that, on 32-bit x86, we don't
+           #
+           # Use -ffloat-store so that, on 32-bit x86, we don't
            # do 80-bit arithmetic with the FPU; that way we should
            # get the same results for floating-point calculations
            # on x86-32 and x86-64.