Re: Since we can't use 2.95.2 anyhow...

[Phil Edwards <pedwards at disaster dot jaj dot com>]

Four points:

+  This tests for 3.x rather than 2.95.2.

+  Also, this updates AM_INIT_AUTOMAKE to the current snapshot, just for
   sanity reasons.

+  This removes checking for the -fdiagnostics* switches; if we demand
   3.x, we know those are present.  Not included right now are the 3
   trivial patches to the 3 files (configure.in, libsupc++/Makefile.am,
   src/Makefile.am) where WFMT_FLAGS was used; I replaced it with
   -fdiagnostics* directly.

Finally, unrelated to this patch:

+  We go through several steps to set GLIBCPP_CFLAGS and GLIBCPP_CXXFLAGS
   early in GLIBCPP_CONFIGURE -- and never use them.

Thoughts on the patch and/or the _FLAGS issue?



Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.131
diff -c -3 -r1.131 acinclude.m4
*** acinclude.m4	2001/02/16 01:56:07	1.131
--- acinclude.m4	2001/02/26 21:11:35
***************
*** 17,23 ****
    glibcpp_basedir=$auxdir/$1/libstdc++-v3
    AC_SUBST(glibcpp_basedir)
  
!   AM_INIT_AUTOMAKE(libstdc++, 2.90.8)
  
    # Never versions of autoconf add an underscore to these functions.
    # Prevent future problems ...
--- 17,23 ----
    glibcpp_basedir=$auxdir/$1/libstdc++-v3
    AC_SUBST(glibcpp_basedir)
  
!   AM_INIT_AUTOMAKE(libstdc++, 2.91)
  
    # Never versions of autoconf add an underscore to these functions.
    # Prevent future problems ...
***************
*** 168,177 ****
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_EGREP_CPP(ok, [
!   #if (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
      ok
    #endif
!   ], gpp_satisfactory=yes, AC_MSG_ERROR([please upgrade to gcc-2.95 or above]))
    AC_LANG_RESTORE
    AC_MSG_RESULT($gpp_satisfactory)
    touch stamp-sanity-compiler
--- 168,177 ----
    AC_LANG_SAVE
    AC_LANG_CPLUSPLUS
    AC_EGREP_CPP(ok, [
!   #if __GNUC__ >= 3
      ok
    #endif
!   ], gpp_satisfactory=yes, AC_MSG_ERROR([please upgrade to GCC 3.0 or above]))
    AC_LANG_RESTORE
    AC_MSG_RESULT($gpp_satisfactory)
    touch stamp-sanity-compiler
***************
*** 184,191 ****
  dnl compiler version but not older compiler versions should be placed
  dnl here.
  dnl
- dnl Define WFMT_FLAGS='-fdiagnostics-show-location=once' if possible
- dnl 
  dnl Define WERROR='-Werror' if requested and possible; g++'s that lack the
  dnl new inlining code or the new system_header pragma will die on -Werror.
  dnl Leave it out by default and use maint-mode to use it.
--- 184,189 ----
***************
*** 209,230 ****
      WERROR='-Werror'
    fi
  
-   # Check for more sophisticated diagnostic control.
-   AC_MSG_CHECKING([for g++ that supports -fdiagnostics-show-location=once])
-   CXXFLAGS='-Werror -fdiagnostics-show-location=once'
-   AC_TRY_COMPILE(, [int foo;
-   ], [ac_gabydiags=yes], [ac_gabydiags=no])
-   if test "$ac_test_CXXFLAGS" = set; then
-     CXXFLAGS="$ac_save_CXXFLAGS"
-   else
-     # this is the suspicious part
-     CXXFLAGS=''
-   fi
-   if test x"$ac_gabydiags" = x"yes"; then
-     WFMT_FLAGS='-fdiagnostics-show-location=once'
-   fi
-   AC_MSG_RESULT($ac_gabydiags)
- 
    # Check for -ffunction-sections -fdata-sections
    AC_MSG_CHECKING([for g++ that supports -ffunction-sections -fdata-sections])
    CXXFLAGS='-Werror -ffunction-sections -fdata-sections'
--- 207,212 ----
***************
*** 243,249 ****
  
    AC_LANG_RESTORE
    AC_SUBST(WERROR)
-   AC_SUBST(WFMT_FLAGS)
    AC_SUBST(SECTION_FLAGS)
  ])
  
--- 225,230 ----