]> git.donarmstrong.com Git - lilypond.git/blobdiff - aclocal.m4
(get_control_points): also avoid staff lines on the
[lilypond.git] / aclocal.m4
index 60b024c15a51419a678a1eb0e1b1361b09273133..65a10815fc8fc65d6512cc8862cf3fb5ae28a12c 100644 (file)
@@ -1,5 +1,6 @@
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+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 aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -8,23 +9,39 @@ dnl StepMake subroutines for configure.in
 
 # Get full path of executable ($1)
 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
-    type -p "$1" 2>&1 | awk '{print $NF}'
+    ## which doesn't work in ash, if /usr/bin/which isn't installed
+    ## type -p doesn't work in ash
+    ## command -v doesn't work in zsh
+    ## command -v "$1" 2>&1
+    ## this test should work in ash, bash, pdksh (ksh), zsh
+    type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}'
 ])
 
 
 # Get version string from executable ($1)
 AC_DEFUN(STEPMAKE_GET_VERSION, [
-    "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+    ## "$1" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+    ##
+    ## ARG.
+    ## Workaround for broken Debian gcc version string:
+    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
+    ##
+    ## Assume, and hunt for, dotted version multiplet.
+    changequote(<<, >>)dnl
+    "$1" --version 2>&1 | grep '[0-9]\.[0-9]' | head -1 | \
+       sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/'
+    changequote([, ])dnl
 ])
 
-# Calculate numeric version from version string ($1)
+# Calculate simplistic numeric version from version string ($1)
+# As yet, we have no need for something more elaborate.
 AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [
     echo "$1" | awk -F. '
     {
-      if ([$]3) {last = [$]3}
-      else {last =0}
+      if ([$]3) {three = [$]3}
+      else {three = 0}
     }
-    {printf "%s%s%s\n",[$]1*100, [$]2*10,last}'
+    {printf "%d\n", [$]1*1000000 + [$]2*1000 + three}'
 ])
 
 
@@ -57,11 +74,11 @@ AC_DEFUN(STEPMAKE_OPTIONAL_REQUIRED, [
 # Return if tested proram ($1) was found (true) or not (false).
 AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
     r="`eval echo '$'"$1"`"
-    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then
+    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then
+       true
+    else
        ##STEPMAKE_WARN(cannot find $2. $3)
        false
-    else
-       true
     fi
 ])
 
@@ -72,6 +89,7 @@ AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
 AC_DEFUN(STEPMAKE_CHECK_VERSION, [
     r="`eval echo '$'"$1"`"
     AC_MSG_CHECKING("$r version")
+    #exe=`STEPMAKE_GET_EXECUTABLE($r)`
     exe=`STEPMAKE_GET_EXECUTABLE($r)`
     ver=`STEPMAKE_GET_VERSION($exe)`
     num=`STEPMAKE_NUMERIC_VERSION($ver)`
@@ -108,7 +126,6 @@ AC_DEFUN(STEPMAKE_BISON, [
        STEPMAKE_CHECK_VERSION(BISON, $1, $2)
     fi
 ])
-    
 
 
 AC_DEFUN(STEPMAKE_COMPILE, [
@@ -130,7 +147,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     [debug_b=$enableval])
 
     AC_ARG_ENABLE(optimising,
-    [  --enable-optimising      compile with optimising.  Default: on],
+    [  --enable-optimising     compile with optimising.  Default: on],
     [optimise_b=$enableval])
 
     AC_ARG_ENABLE(profiling, 
@@ -194,9 +211,6 @@ AC_DEFUN(STEPMAKE_CXX, [
     AC_PROG_CXX
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
-    AC_CHECK_HEADER(FlexLexer.h, true,
-       STEPMAKE_WARN(cannot find flex header.  Please install Flex headers correctly))
-
     CPPFLAGS="$CPPFLAGS $DEFINES"
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
     LDFLAGS="$LDFLAGS $EXTRA_LIBES"
@@ -225,25 +239,30 @@ AC_DEFUN(STEPMAKE_CXXTEMPLATE, [
 
 AC_DEFUN(STEPMAKE_DATADIR, [
     if test "$datadir" = "\${prefix}/share"; then
-           datadir='${prefix}/share/'$package
+           datadir='${prefix}/share'
     fi
-    DIR_DATADIR=${datadir}
     presome=${prefix}
     if test "$prefix" = "NONE"; then
-           presome=${ac_default_prefix}
+       presome=${ac_default_prefix}
     fi
-    DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"`
-
-    AC_SUBST(datadir)
-    AC_SUBST(DIR_DATADIR)
     
-    dnl yeah, so fuck me gently with a cactus: this doesnt belong here
-    dnl Please take the person responsible for inventing shell-scripts out
-    dnl and shoot him. On behalf of the sane world, thank you.
-    dnl DIR_SHAREDSTATEDIR="foobar"
-    dnl AC_SUBST(DIR_SHAREDSTATEDIR)
+    package_datadir=$datadir/$package
+    local_package_datadir=$package_datadir/$FULL_VERSION
+    build_package_datadir=$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_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
+    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}")
 ])
 
 
@@ -277,7 +296,7 @@ AC_DEFUN(STEPMAKE_END, [
 
     # regular in-place build
     # test for srcdir_build = yes ?
-    if test "$builddir" = "."; then
+    if test "$srcdir_build" = "yes"; then
        rm -f $srcdir/GNUmakefile
        cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
        chmod 444 $srcdir/GNUmakefile
@@ -301,18 +320,34 @@ AC_DEFUN(STEPMAKE_FLEX, [
 ])
 
 
+AC_DEFUN(STEPMAKE_FLEXLEXER, [
+    AC_HAVE_HEADERS(FlexLexer.h, true, false)
+    if test $? -ne 0; then
+       warn='FlexLexer.h (flex package)'
+       STEPMAKE_ADD_ENTRY($1, $warn)
+    fi
+])
+
+
+AC_DEFUN(STEPMAKE_GCC, [
+    if test "$GCC" = "yes"; then
+        STEPMAKE_CHECK_VERSION(CC, $1, $2)
+    else
+       warn="$CC (Please install *GNU* cc)"
+       STEPMAKE_ADD_ENTRY($1, $warn)
+    fi
+])
+
 
 AC_DEFUN(STEPMAKE_GETTEXT, [
-    DIR_LOCALEDIR=${localedir}
     presome=${prefix}
     if test "$prefix" = "NONE"; then
            presome=${ac_default_prefix}
     fi
-    DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"`
+    LOCALEDIR=$(echo ${localedir} | sed "s!\\\${prefix}!$presome!")
+    
     AC_SUBST(localedir)
-    AC_SUBST(DIR_LOCALEDIR)
-    AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}")
-
+    AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}")
     AC_CHECK_LIB(intl, gettext)
     AC_CHECK_FUNCS(gettext)
 ])
@@ -371,7 +406,6 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
        fi
     done
     STEPMAKE_OPTIONAL_REQUIRED(GUILE_CONFIG, $guile_config, $1)
-    #if expr "$GUILE_CONFIG" : '.*\(echo\)' >/dev/null; then
     if test $? -ne 0; then
         STEPMAKE_ADD_ENTRY($1, 'guile-config (guile-devel, guile-dev or libguile-dev package)')
     fi 
@@ -388,33 +422,25 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     changequote(<<, >>)dnl
     GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'`
     GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'`
+    GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
     changequote([, ])dnl
     STEPMAKE_GUILE_FLAGS
     AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION)
     AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION)
+    AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL)
 ])
 
 
 AC_DEFUN(STEPMAKE_GXX, [
-    AC_MSG_CHECKING("g++ version")
-    cxx_version=`$CXX --version`
-    AC_MSG_RESULT("$cxx_version")
-    changequote(<<, >>)dnl
-    # urg, egcs: how to check for egcs >= 1.1?
-    if expr "$cxx_version" : '.*2\.[89]' > /dev/null ||
-       expr "$cxx_version" : '.*egcs' > /dev/null ||
-       expr "$cxx_version" : '3\.[0-9]' > /dev/null
-    changequote([, ])dnl
-    then
-           true
+    if test "$GXX" = "yes"; then
+        STEPMAKE_CHECK_VERSION(CXX, $1, $2)
     else
-       STEPMAKE_WARN(cannot find g++ 2.8, 2.9, 3.x or egcs 1.1)
-        STEPMAKE_ADD_ENTRY($1, 'g++ >= 2.95 (gcc package)')
+       warn="$CXX (Please install *GNU* c++)"
+       STEPMAKE_ADD_ENTRY($1, $warn)
     fi
 ])
 
 
-
 AC_DEFUN(STEPMAKE_INIT, [
 
     . $srcdir/VERSION
@@ -447,17 +473,19 @@ AC_DEFUN(STEPMAKE_INIT, [
     fi
 
     AC_MSG_CHECKING(Package)
-    if test "x$PACKAGE" = "xSTEPMAKE"; then
+    if test "$PACKAGE" = "STEPMAKE"; then
        AC_MSG_RESULT(Stepmake package!)
 
        AC_MSG_CHECKING(builddir)
+
+       builddir="`pwd`"
+
        if test "$srcdir" = "."; then
-           builddir=.
+           srcdir_build=yes
        else
-           absolute_builddir="`pwd`"
-           package_absolute_builddir="`dirname $absolute_builddir`"
+           srcdir_build=no
+           package_builddir="`dirname $builddir`"
            package_srcdir="`dirname  $srcdir`"
-           builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
        fi
        AC_MSG_RESULT($builddir)
 
@@ -469,31 +497,20 @@ AC_DEFUN(STEPMAKE_INIT, [
         AC_MSG_RESULT($PACKAGE)
 
        AC_MSG_CHECKING(builddir)
+       builddir="`pwd`"
        if test "$srcdir" = "."; then
-           builddir=.
-           srcdir_build=no
-       else
-           absolute_builddir="`pwd`"
-#          builddir="`dirname  $srcdir`/`basename $absolute_builddir`"
-           builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`"
            srcdir_build=yes
+       else
+           srcdir_build=no
        fi
        AC_MSG_RESULT($builddir)
-       if expr "$srcdir" : '/' > /dev/null 2>&1; then
-           absolute_srcdir=yes
-           STEPMAKE_WARN(Absolute --srcdir specified: $srcdir)
-       fi
 
        AC_MSG_CHECKING(for stepmake)
        # Check for installed stepmake
        if test -d $stepmake; then
            AC_MSG_RESULT($stepmake)
        else
-           if test "$absolute_srcdir" != "yes"; then
-               stepmake='$(depth)'/$srcdir/stepmake
-           else
-               stepmake=$srcdir/stepmake
-           fi
+           stepmake="`cd $srcdir/stepmake; pwd`"
            AC_MSG_RESULT($srcdir/stepmake  ($datadir/stepmake not found))
        fi
 
@@ -519,7 +536,7 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}")
     AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 
-    if test "$package_depth" = "" ; then
+    if test -z "$package_depth"; then
        package_depth="."
     else
        package_depth="../$package_depth"
@@ -564,7 +581,7 @@ AC_DEFUN(STEPMAKE_INIT, [
        $MAKE -v 2> /dev/null | grep GNU > /dev/null
        if test "$?" = 1; then
            warn='make (Please install *GNU* make)'
-           STEPMAKE_WARN($warn)
+           STEPMAKE_WARN($warn)
            STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
         fi
     fi 
@@ -595,15 +612,35 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
-    AC_SUBST(PATHSEP)
     AC_SUBST(DIRSEP)
+    AC_SUBST(PATHSEP)
+    AC_SUBST(ROOTSEP)
   
     STEPMAKE_DATADIR
 ])
 
-
+    
 AC_DEFUN(STEPMAKE_KPATHSEA, [
-
+       
+    AC_ARG_WITH(kpathsea-include,
+       [  --with-kpathsea-include=DIR
+                         location of the kpathsea include dir],[
+           if test "$withval" = "yes" -o "$withval" = "no"; then
+               AC_MSG_WARN(Usage: --with-kpathsea-include=includedir)
+           else
+               CPPFLAGS="$CPPFLAGS -I${withval}"
+           fi
+           ])
+    
+    AC_ARG_WITH(kpathsea-lib,
+       [  --with-kpathsea-lib=DIR location of the kpathsea lib dir],[
+           if test "$withval" = "yes" -o "$withval" = "no"; then
+               AC_MSG_WARN(Usage: --with-kpathsea-lib=libdir)
+           else
+               LDFLAGS="$LDFLAGS -L${withval}"
+           fi
+           ])
+    
     kpathsea_b=yes
     #FIXME --with-xxx is meant for specifying a PATH too,
     # so this should read: --enable-kpathsea,
@@ -615,7 +652,16 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     if test "$kpathsea_b" != "no"; then        
        AC_HAVE_HEADERS(kpathsea/kpathsea.h)
        AC_CHECK_LIB(kpathsea, kpse_find_file)
-       AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions.  You should install kpathsea; see INSTALL.txt.  Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.))
+       AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no)
+       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
+   install kpathsea; see INSTALL.txt.  Rerun ./configure
+   --without-kpathsea only if kpathsea is not available for your
+   platform.'
+           STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
+       fi
     fi
     AC_MSG_CHECKING(whether to use kpathsea)
     if test "$kpathsea_b" != no; then
@@ -765,9 +811,10 @@ AC_DEFUN(STEPMAKE_PERL, [
 
 
 AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
-    AC_HAVE_HEADERS(python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h)
-    if test $? -ne 0; then
-       STEPMAKE_ADD_ENTRY($1, 'python.h (python-devel, python-dev or libpython-dev package)')
+    AC_HAVE_HEADERS(python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h, PYTHON_HEADER=yes)
+    if test -z "$PYTHON_HEADER"; then
+       warn='python.h (python-devel, python-dev or libpython-dev package)'
+       STEPMAKE_ADD_ENTRY($1, $warn)
     fi
 ])