+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/stepmake/../aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
AC_DEFUN(AC_STEPMAKE_COMPILE, [
# -O is necessary to get inlining
- OPTIMIZE="-O"
+ OPTIMIZE=""
+ CXXFLAGS=${CXXFLAGS:-""}
+ CFLAGS=${CFLAGS:-""}
checking_b=yes
- optimise_b=tja
+ optimise_b=no
profile_b=no
debug_b=yes
[checking_b=$enableval] )
# actually, the default is: tja='-O' to get inlining...
- # off=''
+ # off='' --jcn
+
+ #actually, that sucks.
+ # tja looks like a typo. Default is optimisation off. --hwn
+
AC_ARG_ENABLE(optimise,
[ enable-optimise use maximal speed optimisations. Default: off],
[optimise_b=$enableval])
fi
if test "$optimise_b" = yes; then
- DEFINES="$DEFINES -finline-functions"
- OPTIMIZE="-O2"
+ OPTIMIZE="-O2 -finline-functions"
fi
if test "$optimise_b" = no; then
if test $profile_b = yes; then
EXTRA_LIBES="-pg"
- DEFINES="$DEFINES -pg"
+ OPTIMIZE="$OPTIMIZE -pg"
fi
if test $debug_b = yes; then
- DEFINES="$DEFINES -g"
+ OPTIMIZE="$OPTIMIZE -g"
fi
# however, C++ support in mingw32 v 0.1.4 is still flaky
AC_CHECK_HEADER(FlexLexer.h, true,
AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly))
- CXXFLAGS="$DEFINES $OPTIMIZE"
+ CPPFLAGS="$CPPFLAGS $DEFINES"
+ CXXFLAGS="$CXXFLAGS $OPTIMIZE"
LDFLAGS=$EXTRA_LIBES
AC_SUBST(CXXFLAGS)
AC_DEFUN(AC_STEPMAKE_END, [
AC_OUTPUT($CONFIGFILE.make:config.make.in)
- rm -f Makefile
- cp make/Toplevel.make.in ./Makefile
- chmod 444 Makefile
+ rm -f GNUmakefile
+ cp make/toplevel.make.in ./GNUmakefile
+ chmod 444 GNUmakefile
])
AC_DEFUN(AC_STEPMAKE_GXX, [
then
true
else
- AC_STEPMAKE_WARN(can't find g++ 2.7, 2.8 or egcs)
+ AC_STEPMAKE_WARN(can\'t find g++ 2.7, 2.8 or egcs)
fi
])
stepmake=stepmake
AC_SUBST(stepmake)
+ STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
+ if test "x$STATE_VECTOR" != "x"; then
+ STATE_VECTOR="\$(depth)/$STATE_VECTOR"
+ fi
+ AC_SUBST(STATE_VECTOR)
+
CONFIGSUFFIX=
AC_ARG_ENABLE(config,
[ enable-config=FILE put configure settings in config-FILE.make],
AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then
- LN=cp # hard link does not work under cygnus-nt (yet?)
+ LN=cp # hard link does not work under cygnus-nt
+ LN_S=cp # symbolic link does not work for native nt
ZIP="zip -r -9" #
DOTEXE=.exe
- INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c"
+ DIRSEP='\\'
+ PATHSEP=';'
+ INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c"
else
+ DIRSEP='/'
+ PATHSEP=':'
LN=ln
+ LN_S='ln -s'
ZIP="zip -r -9"
INSTALL="\$(stepdir)/../bin/install-sh -c"
fi
AC_SUBST(DOTEXE)
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(PATHSEP)
+ AC_SUBST(DIRSEP)
+
+
AC_STEPMAKE_DATADIR
])
AC_DEFUN(AC_STEPMAKE_MSGFMT, [
# AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
- AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh)
+ AC_CHECK_PROGS(MSGFMT, msgfmt, \$(SHELL) \$(step-bindir)/fake-msgfmt.sh )
AC_MSG_CHECKING(whether msgfmt accepts -o)
msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
if test "$msgfmt_output" = ""; then
AC_MSG_RESULT(yes)
else
# urg
- MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh)"
+ MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh"
AC_MSG_RESULT(no)
AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
fi
AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl)
+ AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl)
AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
else
AC_SUBST(YODL2HTML)
AC_SUBST(YODL2LATEX)
AC_SUBST(YODL2MAN)
+ AC_SUBST(YODL2MSLESS)
AC_SUBST(YODL2TEXINFO)
AC_SUBST(YODL2TXT)
- export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
+ export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
fi
if test "x$YODL" = "-echo no yodl"; then
AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))