* lily/lexer.ll (avoid_silly_flex_induced_gcc_warnings): Disable.

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index bb3c44d689ac92682195d991828eb9d63addfadb..f72cb501a7b503f7cc70f3bfe55163614ba1ec95 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 dnl aclocal.m4   -*-shell-script-*-
 dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /home/janneke/lily/stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -243,51 +243,32 @@ AC_DEFUN(STEPMAKE_DATADIR, [
        presome=${ac_default_prefix}
     fi
     
-    package_datadir=$datadir/$package
-    local_package_datadir=$package_datadir/$FULL_VERSION
     build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package
     
     DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
-    PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"`
-    LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
-    AC_SUBST(package_datadir)
-    AC_SUBST(local_package_datadir)
     AC_SUBST(build_package_datadir)
     AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
-    AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"])
-    AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"])
     AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
 ])
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
+
     if test "$libdir" = "\${exec_prefix}/lib"; then
-           libdir='${exec_prefix}/lib'
-    fi
-    presome=${exec_prefix}
-    if test "$exec_prefix" = "NONE"; then
-       presome=${ac_default_prefix}
+       libdir='${exec_prefix}/lib'
     fi
-    
-    package_libdir=$libdir/$package
-    local_package_libdir=$package_libdir/$FULL_VERSION
+    presome=$exec_prefix
     build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package
     
-    DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"`
-    PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"`
-    LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"`
-    BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+    LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
+    BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix}!$presome!"`
     
     AC_SUBST(libdir)
-    AC_SUBST(package_libdir)
-    AC_SUBST(local_package_libdir)
     AC_SUBST(build_package_libdir)
     AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
-    AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"])
-    AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"])
     AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
 ])
 
@@ -353,6 +334,28 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [
        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_LANG_PUSH(C++)
+    AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer],
+       [stepmake_flexlexer_yy_current_buffer],
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <FlexLexer.h>
+class yy_flex_lexer: public yyFlexLexer
+{
+  public:
+    yy_flex_lexer ()
+    {
+      yy_current_buffer = 0;
+    }
+};
+]])],
+           [stepmake_flexlexer_yy_current_buffer=yes],
+           [stepmake_flexlexer_yy_current_buffer=no]))
+    if test $stepmake_flexlexer_yy_current_buffer = yes; then
+       AC_DEFINE(HAVE_FLEXLEXER_YY_CURRENT_BUFFER, 1, [Define to 1 if yyFlexLexer has yy_current_buffer.])
+    fi
+    AC_LANG_POP(C++)
 ])
 
 
@@ -555,7 +558,12 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(package)
     AC_SUBST(PACKAGE)
     AC_SUBST(PACKAGE_NAME)
-    AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"])
+    # We don't need the upper case variant,
+    # so stick to macros are uppercase convention.
+    # AC_DEFINE_UNQUOTED(package, ["${package}"])
+    # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
+    AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
+    AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
     AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
 
     if test -z "$package_depth"; then
@@ -681,7 +689,7 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
        if test "$kpathsea_b" = "no"; then
            warn='kpathsea (libkpathsea-dev or kpathsea-devel package)
    Else, please specify the location of your kpathsea using
-   --with-kpathea-include and --with-kpathsea-lib options.  You should
+   --with-kpathsea-include and --with-kpathsea-lib options.  You should
    install kpathsea; see INSTALL.txt.  Rerun ./configure
    --without-kpathsea only if kpathsea is not available for your
    platform.'