mkdir -p $(dirname $mf)
cat <<EOF | $PYTHON - > $mf
print 'depth=' + ('../' * ( $d-1 ) )
-print 'include \$(depth)/$CONFIGFILE.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)/$CONFIGFILE.make'
+print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
print 'include \$(configure-srcdir)/$mf'
EOF
done
cat <<EOF > GNUmakefile
depth = ./
-include config.make
+include config\$(if \$(conf),-\$(conf),).make
include \$(configure-srcdir)/GNUmakefile.in
EOF
AC_SUBST(VPATH)
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])
##'
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)
])
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
AC_SUBST(LN)
AC_SUBST(LN_S)
- AC_SUBST(INSTALL)
AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
AC_SUBST(DIRSEP)