build cleanups.

aclocal.m4

 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.ac
 
 
 ### mostly internal macros
 
 # Get full path of executable ($1)
 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
     ## which doesn't work in ash, if /usr/bin/which isn't installed
     ## type -p doesn't work in ash
@@ skipping 282 matching lines @@
 ])
 
 
 AC_DEFUN(STEPMAKE_CXX, [
     AC_PROG_CXX
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
     CXXFLAGS="$CXXFLAGS $OPTIMIZE $SANITIZE"
 
     AC_SUBST(CXX)
-    AC_SUBST(CXXFLAGS)
-])
-
-
-AC_DEFUN(STEPMAKE_GXXCODEGENBUG, [
-    AC_MSG_CHECKING([options for known g++ bugs])
-    case "$GXX:$CXX_VERSION" in
-    yes:400600[[0-2]])
-        AC_MSG_RESULT([-fno-optimize-sibling-calls (tail call bug)])
-        CXXFLAGS="$CXXFLAGS -fno-optimize-sibling-calls"
-        ;;
-    yes:400700?)
-        AC_MSG_RESULT([-fno-tree-vrp (comparison bug)])
-        CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
-        ;;
-    *)
-        AC_MSG_RESULT([none])
-        ;;
-    esac
     AC_SUBST(CXXFLAGS)
 ])
 
 
 AC_DEFUN(STEPMAKE_DATADIR, [
     presome=${prefix}
     if test "$prefix" = "NONE"; then
         presome=${ac_default_prefix}
     fi
 
@@ skipping 189 matching lines @@
 AC_DEFUN(STEPMAKE_FLEXLEXER, [
     save_CPPFLAGS="$CPPFLAGS"
     if test -n "$FLEXLEXER_DIR"; then
         CPPFLAGS="-I$FLEXLEXER_DIR $CPPFLAGS"
     fi
     AC_CHECK_HEADERS([FlexLexer.h],[true],[false])
     if test $? -ne 0; then
         warn='FlexLexer.h (flex package)'
         STEPMAKE_ADD_ENTRY($1, $warn)
     fi
-    # check for yyFlexLexer.yy_current_buffer,
-    # in 2.5.4 <= flex < 2.5.29
-    AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer],
-        [stepmake_cv_flexlexer_yy_current_buffer],
+    # check for yyFlexLexer.yypop_buffer_state () since flex 2.5.29
+    AC_CACHE_CHECK([for yyFlexLexer.yypop_buffer_state ()],
+        [stepmake_cv_flexlexer_yypop_buffer_state],
         AC_COMPILE_IFELSE([
             AC_LANG_PROGRAM([[
-
-using namespace std;
 #include <FlexLexer.h>
 class yy_flex_lexer: public yyFlexLexer
 {
   public:
     yy_flex_lexer ()
     {
-      yy_current_buffer = 0;
+      yypop_buffer_state ();
     }
 };
 
             ]])],
-            [stepmake_cv_flexlexer_yy_current_buffer=yes],
-            [stepmake_cv_flexlexer_yy_current_buffer=no]))
-
-    if test $stepmake_cv_flexlexer_yy_current_buffer = yes; then
-        AC_DEFINE(HAVE_FLEXLEXER_YY_CURRENT_BUFFER, 1,
-                  [Define to 1 if yyFlexLexer has yy_current_buffer.])
+            [stepmake_cv_flexlexer_yypop_buffer_state=yes],
+            [stepmake_cv_flexlexer_yypop_buffer_state=no]))
+
+    if test $stepmake_cv_flexlexer_yypop_buffer_state = no; then
+        warn='FlexLexer.h with yypop_buffer_state (flex >= 2.5.29)'
+        STEPMAKE_ADD_ENTRY($1, $warn)
     fi
     CPPFLAGS=$save_CPPFLAGS
 ])
 
 
 AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
     AC_MSG_CHECKING([FlexLexer.h location])
 
     save_CPPFLAGS="$CPPFLAGS"
     if test -n "$FLEXLEXER_DIR"; then
@@ skipping 21 matching lines @@
             ;;
         esac
         if test "x$dir" != "x$FLEXLEXER_DIR"; then
             AC_MSG_ERROR([FlexLexer.h not located in directory given by --with-flexlexer-dir])
         fi
     fi
     CPPFLAGS=$save_CPPFLAGS
 ])
 
 
-AC_DEFUN(STEPMAKE_GCC_OR_CLANG, [
-    STEPMAKE_HAS_CLANG()
-    if test "$HAS_CLANG" = "no"; then
-        if test "$GCC" = "yes"; then
-            STEPMAKE_CHECK_VERSION(CC, $1, $2)
-        else
-            warn="$CC (Please install *GNU* cc)"
-            STEPMAKE_ADD_ENTRY($1, $warn)
-        fi
-    fi
-    # no else, we're fine with any clang
-])
-
-
 AC_DEFUN(STEPMAKE_GETTEXT, [
     presome=${prefix}
     if test "$prefix" = "NONE"; then
         presome=${ac_default_prefix}
     fi
     LOCALEDIR=`echo ${localedir} | sed "s!\\\${prefix}!$presome!"`
 
     AC_SUBST(localedir)
     AC_DEFINE_UNQUOTED(LOCALEDIR, ["${LOCALEDIR}"])
     AC_CHECK_LIB(intl, gettext)
@@ skipping 67 matching lines @@
             ;;
     esac
 ])
 
 AC_DEFUN(STEPMAKE_DLOPEN, [
     AC_CHECK_LIB(dl, dlopen)
     AC_CHECK_FUNCS(dlopen)
 ])
 
 
-AC_DEFUN(STEPMAKE_HAS_CLANG, [
-    AC_EGREP_CPP(yes,
-      [#ifdef __clang__
-       yes
-       #endif
-      ], HAS_CLANG=yes, HAS_CLANG=no)
-])
-
-
-AC_DEFUN(STEPMAKE_GXX_OR_CLANG, [
-    STEPMAKE_HAS_CLANG()
-    if test "$HAS_CLANG" = "no"; then
-        if test "$GXX" = "yes"; then
-            STEPMAKE_CHECK_VERSION(CXX, $1, $2)
-        else
-            warn="$CXX (Please install *GNU* c++)"
-            STEPMAKE_ADD_ENTRY($1, $warn)
-        fi
-    fi
-    # no else, we're fine with any clang
-])
-
-
 AC_DEFUN(STEPMAKE_INIT, [
     . $srcdir/VERSION
     FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
     TOPLEVEL_VERSION=$FULL_VERSION
     if test x$MY_PATCH_LEVEL != x; then
         FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
     fi
     VERSION=$FULL_VERSION
     export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL
 
@@ skipping 507 matching lines @@
     if test "$CYGWIN$MINGW32" = "nono"; then
         PLATFORM_WINDOWS=no
     else
         PLATFORM_WINDOWS=yes
     fi
     AC_MSG_RESULT([$PLATFORM_WINDOWS])
     AC_SUBST(PLATFORM_WINDOWS)
     STEPMAKE_PROGS(WINDRES, $target-windres windres, x)
     AC_SUBST(WINDRES)
 ])