* config.make.in:

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 18ea29d3ca705489db3ec71f85da88b2b979270c..aede92655651bc637803a55764eccd8d909f4d09 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -371,14 +371,14 @@ EOF
                mkdir -p $(dirname $mf)
                cat <<EOF | $PYTHON -  > $mf
 print 'depth=' + ('../' * ( $d-1 ) )
-print 'include \$(depth)/config.make'
+print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
 print 'include \$(configure-srcdir)/$mf'
 EOF
            done
            for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do
                mkdir -p $(dirname $mf)
                cat <<EOF | $PYTHON -  > $mf
-print 'include \$(depth)/config.make'
+print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
 print 'include \$(configure-srcdir)/$mf'
 EOF
            done
@@ -387,7 +387,7 @@ EOF
        
        cat <<EOF > GNUmakefile
 depth = ./
-include config.make
+include config\$(if \$(conf),-\$(conf),).make
 include \$(configure-srcdir)/GNUmakefile.in
 EOF
        AC_SUBST(VPATH)
@@ -441,19 +441,19 @@ class yy_flex_lexer: public yyFlexLexer
 
 
 AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
-       AC_MSG_CHECKING([FlexLexer.h path])
+       AC_MSG_CHECKING([FlexLexer.h location])
 
        # ugh.
        cat <<EOF > conftest.cc
 using namespace std;
 #include <FlexLexer.h>
 EOF
-       FLEXLEXER_PATH=`$CXX -E conftest.cc | \
-         sed 's!# 1 "\(.*\)FlexLexer.h"!@FLEXLEXER@\1@@!g' | grep '@@' | \
+       FLEXLEXER_FILE=`$CXX -E conftest.cc | \
+         sed 's!# 1 "\(.*FlexLexer.h\)"!@FLEXLEXER@\1@@!g' | grep '@@' | \
          sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null
        rm conftest.cc
-       AC_SUBST(FLEXLEXER_PATH)
-        AC_MSG_RESULT($FLEXLEXER_PATH)
+       AC_SUBST(FLEXLEXER_FILE)
+        AC_MSG_RESULT($FLEXLEXER_FILE)
 ])
 
 AC_DEFUN(STEPMAKE_GCC, [
@@ -658,8 +658,6 @@ AC_DEFUN(STEPMAKE_INIT, [
 
        (cd stepmake 2>/dev/null || mkdir stepmake)
        (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .)
-# only possible with autoconf < 2.50 -- hardcoded in configure.in
-#      AC_CONFIG_AUX_DIR(bin)
        stepmake=stepmake
     else
         AC_MSG_RESULT($PACKAGE)
@@ -681,19 +679,14 @@ AC_DEFUN(STEPMAKE_INIT, [
            stepmake="`cd $srcdir/stepmake; pwd`"
            AC_MSG_RESULT([$srcdir/stepmake  ($datadir/stepmake not found)])
        fi
-
-# only possible with autoconf < 2.50 -- hardcoded in configure.in
-#      AC_CONFIG_AUX_DIR(\
-#        stepmake/bin\
-#        $srcdir/stepmake/bin\
-#      )
     fi
 
     AC_SUBST(ugh_ugh_autoconf250_builddir)
 
-    # use absolute path.
-    if test "$srcdir" != "." ;  then 
-       srcdir=$(cd $srcdir;  pwd)
+    # Use absolute directory for non-srcdir builds, so that build
+    # dir can be moved.
+    if test "$srcdir_build" = "no" ;  then 
+       srcdir="`cd $srcdir; pwd`"
     fi
     
     AC_SUBST(srcdir)
@@ -732,7 +725,7 @@ AC_DEFUN(STEPMAKE_INIT, [
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
     [  --enable-config=CONF    put settings in config-CONF.make and config-CONF.h;
-                            do \`make conf=CONF' to get output in ./out-CONF],
+                            do `make conf=CONF' to get output in ./out-CONF],
     [CONFIGURATION=$enableval])
 
     ##'
@@ -776,14 +769,12 @@ AC_DEFUN(STEPMAKE_INIT, [
     LN=ln
     LN_S='ln -s'
     ZIP="zip -r -9"
-    INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c"
 
     AC_SUBST(program_prefix)
     AC_SUBST(program_suffix)
     AC_SUBST(ZIP)
     AC_SUBST(LN)
     AC_SUBST(LN_S)
-    AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
     AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
     AC_SUBST(DIRSEP)
@@ -817,12 +808,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
            ])
     
     kpathsea_b=yes
-    #FIXME --with-xxx is meant for specifying a PATH too,
-    # so this should read: --enable-kpathsea,
-    # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH
-    AC_ARG_WITH(kpathsea,
-    [  --with-kpathsea         use kpathsea lib.  Default: on],
-    [kpathsea_b=$with_kpathsea])
+    AC_ARG_ENABLE(kpathsea,
+    [  --enable-kpathsea         use kpathsea lib.  Default: on],
+    [kpathsea_b=$enableval])
 
     save_LIBS="$LIBS"
     if test "$kpathsea_b" != "no"; then        
@@ -835,7 +823,7 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     fi
 
     save_CFLAGS="$CFLAGS"
-    CFLAGS=$(echo "-shared $CFLAGS" | sed -e 's/ -g//')
+    CFLAGS=`echo "-shared $CFLAGS" | sed -e 's/ -g//'`
     AC_MSG_CHECKING([for shared libkpathsea])
     AC_TRY_LINK([#include <kpathsea/kpathsea.h>],
                  [kpse_var_expand ("\$TEXMF");],
@@ -1150,7 +1138,7 @@ AC_DEFUN(STEPMAKE_FREETYPE2, [
        # UGR
        #r="lib$1-dev or $1-devel"
        r="libfreetype6-dev or freetype?-devel"
-       ver="$(pkg-config --modversion $1)"
+       ver="`pkg-config --modversion $1`"
        STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1172,7 +1160,7 @@ AC_DEFUN(STEPMAKE_GTK2, [
        # UGR
        # r="lib$1-dev or $1-devel"
        r="libgtk2.0-dev or gtk2-devel"
-       ver="$(pkg-config --modversion $1)"
+       ver="`pkg-config --modversion $1`"
        STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1196,7 +1184,7 @@ AC_DEFUN(STEPMAKE_PANGO, [
        # UGR
        #r="lib$1-dev or $1-devel"
        r="libpango1.0-dev or pango1.0-devel"
-       ver="$(pkg-config --modversion $1)"
+       ver="`pkg-config --modversion $1`"
        STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1221,7 +1209,7 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [
        # UGR
        #r="lib$1-dev or $1-devel"e
        r="libpango1.0-dev or pango?-devel"
-       ver="$(pkg-config --modversion $1)"
+       ver="`pkg-config --modversion $1`"
        STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1241,7 +1229,7 @@ AC_DEFUN(STEPMAKE_FONTCONFIG, [
        LIBS="$save_LIBS"
     else
        r="lib$1-dev or $1-devel"
-       ver="$(pkg-config --modversion $1)"
+       ver="`pkg-config --modversion $1`"
        STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1264,7 +1252,6 @@ AC_DEFUN(STEPMAKE_WINDOWS, [
 
     AC_SUBST(LN)
     AC_SUBST(LN_S)
-    AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
     AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
     AC_SUBST(DIRSEP)