From: fred <fred>
Date: Sun, 24 Mar 2002 20:13:19 +0000 (+0000)
Subject: lilypond-1.0.1
X-Git-Tag: release/1.5.59~3007
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f30eec974547c4c12f9b1a47059ae349f35e9de6;p=lilypond.git

lilypond-1.0.1
---

diff --git a/aclocal.m4 b/aclocal.m4
index d1ec16c75e..0f54b68df8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,30 +1,431 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4   -*-shell-script-*-
+dnl StepMake subroutines for configure.in
+
+AC_DEFUN(AC_STEPMAKE_COMPILE, [
+    # -O is necessary to get inlining
+    OPTIMIZE="-O"
+    checking_b=yes
+    optimise_b=tja
+    profile_b=no
+    debug_b=yes
+
+    AC_ARG_ENABLE(checking,
+    [  enable-checking         set runtime checks (assert calls). Default: on],
+    [checking_b=$enableval] )
+
+    # actually, the default is: tja='-O' to get inlining...
+    # off=''
+    AC_ARG_ENABLE(optimise,
+    [  enable-optimise         use maximal speed optimisations. Default: off],
+    [optimise_b=$enableval])
+    
+    AC_ARG_ENABLE(profiling, 
+    [  enable-profiling        compile with gprof support. Default: off],
+    [profile_b=$enableval])
+    
+    AC_ARG_ENABLE(debugging,
+    [  enable-debugging        set debug info. Default: on],
+    [debug_b=$enableval])
+
+    AC_ARG_ENABLE(mingw-prefix,
+    [  enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)],
+    [MINGWPREFIX=$enableval],
+    [MINGWPREFIX=no])
+
+    if test "$printing_b" = no; then
+	# ugh
+	AC_DEFINE(NPRINT)
+	DEFINES="$DEFINES -DNPRINT"
+    fi
+	
+    if test "$checking_b" = no; then
+	# ugh
+	AC_DEFINE(NDEBUG)
+	DEFINES="$DEFINES -DNDEBUG"
+    fi
+
+    if test "$optimise_b" = yes; then
+	DEFINES="$DEFINES -finline-functions"
+	OPTIMIZE="-O2"
+    fi
+
+    if test "$optimise_b" = no; then
+	OPTIMIZE=""
+    fi
+
+    if test $profile_b = yes; then
+	EXTRA_LIBES="-pg"
+	DEFINES="$DEFINES -pg"
+    fi
+
+    if test $debug_b = yes; then	
+	DEFINES="$DEFINES -g"
+    fi
+
+    # however, C++ support in mingw32 v 0.1.4 is still flaky
+    if test x$MINGWPREFIX != xno; then 
+	ICFLAGS="-I$MINGWPREFIX/include"
+	ILDFLAGS="-$MINGWPREFIX/lib"
+    fi
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+    AC_PROG_CC
+    LD='$(CC)'
+    AC_SUBST(LD)
+
+    CPPFLAGS=${CPPFLAGS:-""}
+    AC_SUBST(CPPFLAGS)
+    AC_SUBST(LDFLAGS)
+    AC_SUBST(ICFLAGS)
+    AC_SUBST(ILDFLAGS)
+    AC_SUBST(DEFINES)
+    AC_SUBST(EXTRA_LIBES)
+])
+
+AC_DEFUN(AC_STEPMAKE_CXX, [
+    AC_LANG_CPLUSPLUS
+    AC_PROG_CXX
+
+    AC_CHECK_HEADER(FlexLexer.h, true,
+	AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly))
+
+    CXXFLAGS="$DEFINES $OPTIMIZE"
+    LDFLAGS=$EXTRA_LIBES
+
+    AC_SUBST(CXXFLAGS)
+    AC_SUBST(CXX)
+    LD='$(CXX)'
+    AC_SUBST(LD)
+])
+
+AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [
+    AC_CACHE_CHECK([whether explicit instantiation is needed],
+	lily_cv_need_explicit_instantiation,
+	AC_TRY_LINK([
+    template <class T> struct foo { static int baz; };
+    template <class T> int foo<T>::baz = 1;
+    ], [ return foo<int>::baz; ],
+	    lily_cv_need_explicit_instantiation=no,
+	    lily_cv_need_explicit_instantiation=yes))
+    if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then
+	AC_DEFINE(NEED_EXPLICIT_INSTANTIATION)
+    fi
+])
 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+AC_DEFUN(AC_STEPMAKE_DATADIR, [
+    if test "$datadir" = "\${prefix}/share"; then
+	    datadir='${prefix}/share/'$package
+    fi
+    DIR_DATADIR=${datadir}
+    presome=${prefix}
+    if test "$prefix" = "NONE"; then
+	    presome=${ac_default_prefix}
+    fi
+    DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"`
+    AC_SUBST(datadir)
+    AC_SUBST(DIR_DATADIR)
+    AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
+])
+
+AC_DEFUN(AC_STEPMAKE_END, [
+    AC_OUTPUT($CONFIGFILE.make:config.make.in)
 
+    rm -f Makefile
+    cp make/Toplevel.make.in ./Makefile
+    chmod 444 Makefile
+])
+
+AC_DEFUN(AC_STEPMAKE_GXX, [
+    # ugh autoconf
+    changequote(<<, >>)dnl
+    if $CXX --version | grep '2\.[78]' > /dev/null ||
+	$CXX --version | grep 'egcs' > /dev/null
+    changequote([, ])dnl
+    then
+	    true
+    else
+	    AC_STEPMAKE_WARN(can't find g++ 2.7, 2.8 or egcs)
+    fi
+])
+
+AC_DEFUN(AC_STEPMAKE_INIT, [
+
+    . $srcdir/VERSION
+    FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+    if test x$MY_PATCH_LEVEL != x; then
+	FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
+    fi
+
+    # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
+    changequote(<<, >>)dnl
+    PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'`
+    package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+    changequote([, ])dnl
+
+    if test "x$PACKAGE" = "xSTEPMAKE"; then
+        echo Stepmake package!
+	(cd stepmake; rm -f stepmake; ln -s ../stepmake .)
+	(cd stepmake; rm -f bin; ln -s ../bin .)
+	AC_CONFIG_AUX_DIR(bin)
+    else
+        echo Package: $PACKAGE
+	AC_CONFIG_AUX_DIR(stepmake/bin)
+    fi
+
+    AC_SUBST(package)
+    AC_SUBST(PACKAGE)
+    AC_SUBST(PACKAGE_NAME)
+    AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}")
+    AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+
+    package_depth=`dirname $cache_file`
+    AC_SUBST(package_depth)
+
+    AUTOGENERATE="This file was automatically generated by configure"
+    AC_SUBST(AUTOGENERATE)
+    absolute_builddir="`pwd`"
+    AC_SUBST(absolute_builddir)
+
+    # No versioning on directory names of sub-packages 
+    stepmake=stepmake
+    AC_SUBST(stepmake)
+
+    CONFIGSUFFIX=
+    AC_ARG_ENABLE(config,
+    [  enable-config=FILE      put configure settings in config-FILE.make],
+    [CONFIGSUFFIX=$enableval])
+
+    if test "$CONFIGSUFFIX" != "" ; then
+	CONFIGFILE=config-$CONFIGSUFFIX
+    else
+	CONFIGFILE=config
+    fi
+    AC_SUBST(CONFIGSUFFIX)
+     
+    AC_CANONICAL_HOST
+    AC_CHECK_PROGS(MAKE, make, error)
+    AC_CHECK_PROGS(FIND, find, error)
+
+
+dnl system supplied INSTALL is unsafe; use our own install.
+dnl    AC_PROG_INSTALL
+dnl    if test "$INSTALL" = "bin/install-sh"; then
+dnl	export INSTALL="\$\(depth\)/bin/install-sh"
+dnl    fi
+
+    AC_CHECK_PROGS(TAR, tar, error)
+    AC_CHECK_PROGS(BASH, bash, /bin/sh)
+
+    AC_PATH_PROG(PYTHON, python, -echo no python)
+    AC_SUBST(PYTHON)
+
+
+    AC_CHECK_SEARCH_RESULT($MAKE, GNU make,  You should install GNU make)
+    if test $MAKE != "error" ; then
+	$MAKE -v| grep GNU > /dev/null
+	if test "$?" = 1
+	then
+		AC_STEPMAKE_WARN(Please install *GNU* make) 
+	fi 
+    fi 
+
+    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?)
+	ZIP="zip -r -9" #
+	DOTEXE=.exe
+    else
+	LN=ln
+	ZIP="zip -r -9"
+    fi
+    AC_SUBST(DOTEXE)
+    AC_SUBST(ZIP)
+    AC_SUBST(LN)
+
+    AC_STEPMAKE_DATADIR
+])
+
+AC_DEFUN(AC_STEPMAKE_LEXYACC, [
+    # ugh, automake: we want (and check for) bison
+    AC_PROG_YACC
+    # ugh, automake: we want (and check for) flex
+    # AC_PROG_LEX
+    # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack...
+
+    # AC_DECL_YYTEXT
+    # ugh, ugh
+    ac_cv_prog_lex_root=lex.yy
+
+    AC_CHECK_PROGS(BISON, bison, error)
+    AC_CHECK_PROGS(FLEX, flex, error)
+    AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or better)
+    AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or better)
+
+    if test $BISON != "error"; then
+	bison_version=`$BISON --version| sed 's/^.*version 1.//g' `
+	if test $bison_version -lt 25; then
+	    AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25)
+	fi	
+    fi
+
+    AC_SUBST(BISON)
+    AC_SUBST(FLEX)
+])
+
+AC_DEFUN(AC_STEPMAKE_LIB, [
+    AC_CHECK_PROGS(AR, ar, error)
+    AC_PROG_RANLIB
+
+    AC_SUBST(AR)
+    AC_SUBST(RANLIB)
+])
 
-AC_DEFUN(AC_JUNK_ARGS, [
+AC_DEFUN(AC_STEPMAKE_LIBTOOL, [
+    # libtool.info ...
+    # **Never** try to set library version numbers so that they correspond
+    # to the release number of your package.  This is an abuse that only
+    # fosters misunderstanding of the purpose of library versions.
+
+    REVISION=$PATCH_LEVEL
+    # CURRENT=$MINOR_VERSION
+    CURRENT=`expr $MINOR_VERSION + 1`
+    # AGE=$(expr $MAJOR_VERSION + 1)
+    AGE=$MAJOR_VERSION
+    AC_SUBST(CURRENT)
+    AC_SUBST(REVISION)
+    AC_SUBST(AGE)
 ])
 
-AC_DEFUN(AC_LILY_WARN, [
+AC_DEFUN(AC_STEPMAKE_LOCALE, [
+    lang=English
+    ALL_LINGUAS="en nl"
+
+    # with/enable ??
+    AC_ARG_WITH(localedir,
+    [  with-localedir=LOCALE   use LOCALE as locale dir. Default: PREFIX/share/locale ],
+    localedir=$with_localedir,
+    localedir='${prefix}/share/locale')
+
+    AC_ARG_WITH(lang,
+    [  with-lang=LANG          use LANG as language to emit messages],
+    language=$with_lang,
+    language=English)
+
+    AC_MSG_CHECKING(language)    
+    case "$language" in
+      En* | en* | Am* | am* | US* | us*)
+	    lang=English;;
+      NL | nl | Du* | du* | Ned* | ned*)
+	    lang=Dutch;;
+      "")
+	    lang=English;;
+      *)
+	    lang=unknown;;
+    esac
+    AC_MSG_RESULT($lang)
+
+    if test "$lang" = "unknown" ; then
+	AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS)
+    fi
+
+])
+
+AC_DEFUN(AC_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!"`
+    AC_SUBST(localedir)
+    AC_SUBST(DIR_LOCALEDIR)
+    AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}")
+
+    AC_CHECK_LIB(intl, gettext)
+    AC_CHECK_FUNCS(gettext)
+])
+
+AC_DEFUN(AC_STEPMAKE_MAN, [
+    AC_CHECK_PROGS(TROFF, troff, -echo no troff)
+])
+
+AC_DEFUN(AC_STEPMAKE_MSGFMT, [
+    AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    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="touch $@; echo "
+	AC_MSG_RESULT(no)
+	AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+    fi
+])
+
+AC_DEFUN(AC_STEPMAKE_TEXMF, [
+    AC_ARG_ENABLE(tex-prefix,
+    [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories. (default: PREFIX)],
+    [TEXPREFIX=$enableval],
+    [TEXPREFIX=auto] )
+    
+    AC_ARG_ENABLE(tex-dir,
+    [  enable-tex-dir=DIR      set the directory to put $PACKAGE_NAME TeX files in. ],
+    [TEXDIR=$enableval],
+    [TEXDIR=auto] )
+
+    AC_ARG_ENABLE(mf-dir,
+    [  enable-mf-dir=DIR       set the directory to put $PACKAGE_NAME MetaFont files in. ],
+    [MFDIR=$enableval],
+    [MFDIR=auto])
+
+    if test "x$TEXPREFIX" = xauto ; then
+	AC_TEX_PREFIX(TEXPREFIX)
+    else
+     find_texprefix=$TEXPREFIX
+    fi
+
+    if test "x$MFDIR" = xauto; then
+	AC_MF_SUBDIR(MFDIR)
+    fi
+	
+    if test "x$TEXDIR" = xauto ; then
+	AC_TEX_SUBDIR(TEXDIR)
+    fi
+
+    AC_SUBST(TEXPREFIX)
+    AC_SUBST(TEXDIR)
+    AC_SUBST(MFDIR)
+])
+
+AC_DEFUN(AC_STEPMAKE_WARN, [
     AC_MSG_WARN($1)
     warn_b=yes
 ])
 
+AC_DEFUN(AC_STEPMAKE_YODL, [
+    if test "x$YODL" = "x"; then 
+	AC_CHECK_PROGS(YODL, yodl, -echo no yodl)
+	AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
+	AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
+	AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl)
+	AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
+	AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
+    else
+	AC_SUBST(YODL)
+	AC_SUBST(YODL2HTML)
+	AC_SUBST(YODL2LATEX)
+	AC_SUBST(YODL2MAN)
+	AC_SUBST(YODL2TEXINFO)
+	AC_SUBST(YODL2TXT)
+	export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
+    fi
+])
+
 dnl should cache result.
 dnl should  look in $prefix first.
 dnl should probably assume TDS
 
-
-
 AC_DEFUN(AC_TEX_PREFIX, [
     
 
@@ -45,7 +446,7 @@ AC_DEFUN(AC_TEX_PREFIX, [
     
     if test "x$find_texpostfix" = x; then
 	find_texpostfix='/lib/texmf/tex'
-	AC_LILY_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix)
+	AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix)
     fi
 
     find_texprefix="$find_root_prefix/$find_texpostfix"
@@ -73,7 +474,7 @@ AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [
 
     if test "x$find_dirdir" = x; then
        find_dirdir="/$3";
-       AC_LILY_WARN(Cannot determine $4 subdirectory. Please set from command-line)
+       AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line)
 	true
     fi
     $2=$find_dirdir
@@ -117,380 +518,136 @@ dnl     AC_REQUIRE([AC_TEX_PREFIX])
 ])
 
 AC_DEFUN(AC_CHECK_SEARCH_RESULT, [
-	if test $1 = "error" 
-	then
-		AC_LILY_WARN(can't find $2. $3)
+	result="`echo \"$1\" | grep echo`"
+	if test "x$1" = "xerror" -o "x$result" != "x"; then
+		AC_STEPMAKE_WARN(can\'t find $2. $3)
 	fi
 ])
 
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
 
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-
-# serial 24 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
+AC_DEFUN(AM_PATH_GTK,
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+    AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   return !((gtk_major_version > major) ||
+   	    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ 	    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+     CFLAGS="$ac_save_CFLAGS"
+     CXXFLAGS="$ac_save_CXXFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
   fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-esac
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+  AC_SUBST(CXXFLAGS)
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
 ])
 
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared         build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT]
-changequote([, ])dnl
-[  --enable-shared=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
-
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static         build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT]
-changequote([, ])dnl
-[  --enable-static=PKGS    only build shared libraries if the current package
-                          appears as an element in the PKGS list],
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
-])
 
+# Configure paths for GTK--
+# Jan Nieuwenhuizen   98-06-3
 
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | [A-Za-z]:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AM_PROG_LD_GNU
-])
-
-AC_DEFUN(AM_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[case "$NM" in
-/* | [A-Za-z]:\\*)
-  ac_cv_path_NM="$NM" # Let the user override the test with a path.
-  ;;
-*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-  ;;
-esac])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
+dnl AM_PATH_GTK__([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK--, and define GTK___CFLAGS and GTK___LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK__,
+[dnl 
+dnl Get the cflags and libraries from the gtk__-config script
+dnl
+  min_gtk___version=ifelse([$1], ,0.9.4,$1)
+  AC_MSG_CHECKING(for GTK-- - version >= $min_gtk___version)
+  no_gtk__=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK___CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs`
+    GTK___LIBS="$GTK_LIBS -lgtkmm"
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    CFLAGS="$CFLAGS $GTK___CFLAGS"
+    CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+    LIBS="$LIBS $GTK___LIBS"
+dnl
+dnl Now check if the installed GTK__ is sufficiently new. (Also sanity
+dnl checks the results of gtk__-config to some extent
+dnl
+    AC_TRY_RUN([
+#include <gtk--.h>
+#include <stdio.h>
+
+int 
+main ()
+{
+  // urg
+  return 0;
+}
+],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+     CFLAGS="$ac_save_CFLAGS"
+     CXXFLAGS="$ac_save_CXXFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk__=yes
+  fi
+  if test "x$no_gtk__" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     GTK___CFLAGS=""
+     GTK___LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+  AC_SUBST(CXXFLAGS)
+  AC_SUBST(GTK___CFLAGS)
+  AC_SUBST(GTK___LIBS)
 ])
 
-
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
-[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
-AC_PROG_LEX
-AC_DECL_YYTEXT])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
new file mode 100644
index 0000000000..0f54b68df8
--- /dev/null
+++ b/stepmake/aclocal.m4
@@ -0,0 +1,653 @@
+dnl aclocal.m4   -*-shell-script-*-
+dnl StepMake subroutines for configure.in
+
+AC_DEFUN(AC_STEPMAKE_COMPILE, [
+    # -O is necessary to get inlining
+    OPTIMIZE="-O"
+    checking_b=yes
+    optimise_b=tja
+    profile_b=no
+    debug_b=yes
+
+    AC_ARG_ENABLE(checking,
+    [  enable-checking         set runtime checks (assert calls). Default: on],
+    [checking_b=$enableval] )
+
+    # actually, the default is: tja='-O' to get inlining...
+    # off=''
+    AC_ARG_ENABLE(optimise,
+    [  enable-optimise         use maximal speed optimisations. Default: off],
+    [optimise_b=$enableval])
+    
+    AC_ARG_ENABLE(profiling, 
+    [  enable-profiling        compile with gprof support. Default: off],
+    [profile_b=$enableval])
+    
+    AC_ARG_ENABLE(debugging,
+    [  enable-debugging        set debug info. Default: on],
+    [debug_b=$enableval])
+
+    AC_ARG_ENABLE(mingw-prefix,
+    [  enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)],
+    [MINGWPREFIX=$enableval],
+    [MINGWPREFIX=no])
+
+    if test "$printing_b" = no; then
+	# ugh
+	AC_DEFINE(NPRINT)
+	DEFINES="$DEFINES -DNPRINT"
+    fi
+	
+    if test "$checking_b" = no; then
+	# ugh
+	AC_DEFINE(NDEBUG)
+	DEFINES="$DEFINES -DNDEBUG"
+    fi
+
+    if test "$optimise_b" = yes; then
+	DEFINES="$DEFINES -finline-functions"
+	OPTIMIZE="-O2"
+    fi
+
+    if test "$optimise_b" = no; then
+	OPTIMIZE=""
+    fi
+
+    if test $profile_b = yes; then
+	EXTRA_LIBES="-pg"
+	DEFINES="$DEFINES -pg"
+    fi
+
+    if test $debug_b = yes; then	
+	DEFINES="$DEFINES -g"
+    fi
+
+    # however, C++ support in mingw32 v 0.1.4 is still flaky
+    if test x$MINGWPREFIX != xno; then 
+	ICFLAGS="-I$MINGWPREFIX/include"
+	ILDFLAGS="-$MINGWPREFIX/lib"
+    fi
+
+    AC_PROG_CC
+    LD='$(CC)'
+    AC_SUBST(LD)
+
+    CPPFLAGS=${CPPFLAGS:-""}
+    AC_SUBST(CPPFLAGS)
+    AC_SUBST(LDFLAGS)
+    AC_SUBST(ICFLAGS)
+    AC_SUBST(ILDFLAGS)
+    AC_SUBST(DEFINES)
+    AC_SUBST(EXTRA_LIBES)
+])
+
+AC_DEFUN(AC_STEPMAKE_CXX, [
+    AC_LANG_CPLUSPLUS
+    AC_PROG_CXX
+
+    AC_CHECK_HEADER(FlexLexer.h, true,
+	AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly))
+
+    CXXFLAGS="$DEFINES $OPTIMIZE"
+    LDFLAGS=$EXTRA_LIBES
+
+    AC_SUBST(CXXFLAGS)
+    AC_SUBST(CXX)
+    LD='$(CXX)'
+    AC_SUBST(LD)
+])
+
+AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [
+    AC_CACHE_CHECK([whether explicit instantiation is needed],
+	lily_cv_need_explicit_instantiation,
+	AC_TRY_LINK([
+    template <class T> struct foo { static int baz; };
+    template <class T> int foo<T>::baz = 1;
+    ], [ return foo<int>::baz; ],
+	    lily_cv_need_explicit_instantiation=no,
+	    lily_cv_need_explicit_instantiation=yes))
+    if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then
+	AC_DEFINE(NEED_EXPLICIT_INSTANTIATION)
+    fi
+])
+
+AC_DEFUN(AC_STEPMAKE_DATADIR, [
+    if test "$datadir" = "\${prefix}/share"; then
+	    datadir='${prefix}/share/'$package
+    fi
+    DIR_DATADIR=${datadir}
+    presome=${prefix}
+    if test "$prefix" = "NONE"; then
+	    presome=${ac_default_prefix}
+    fi
+    DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"`
+    AC_SUBST(datadir)
+    AC_SUBST(DIR_DATADIR)
+    AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
+])
+
+AC_DEFUN(AC_STEPMAKE_END, [
+    AC_OUTPUT($CONFIGFILE.make:config.make.in)
+
+    rm -f Makefile
+    cp make/Toplevel.make.in ./Makefile
+    chmod 444 Makefile
+])
+
+AC_DEFUN(AC_STEPMAKE_GXX, [
+    # ugh autoconf
+    changequote(<<, >>)dnl
+    if $CXX --version | grep '2\.[78]' > /dev/null ||
+	$CXX --version | grep 'egcs' > /dev/null
+    changequote([, ])dnl
+    then
+	    true
+    else
+	    AC_STEPMAKE_WARN(can't find g++ 2.7, 2.8 or egcs)
+    fi
+])
+
+AC_DEFUN(AC_STEPMAKE_INIT, [
+
+    . $srcdir/VERSION
+    FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+    if test x$MY_PATCH_LEVEL != x; then
+	FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
+    fi
+
+    # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
+    changequote(<<, >>)dnl
+    PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'`
+    package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+    changequote([, ])dnl
+
+    if test "x$PACKAGE" = "xSTEPMAKE"; then
+        echo Stepmake package!
+	(cd stepmake; rm -f stepmake; ln -s ../stepmake .)
+	(cd stepmake; rm -f bin; ln -s ../bin .)
+	AC_CONFIG_AUX_DIR(bin)
+    else
+        echo Package: $PACKAGE
+	AC_CONFIG_AUX_DIR(stepmake/bin)
+    fi
+
+    AC_SUBST(package)
+    AC_SUBST(PACKAGE)
+    AC_SUBST(PACKAGE_NAME)
+    AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}")
+    AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+
+    package_depth=`dirname $cache_file`
+    AC_SUBST(package_depth)
+
+    AUTOGENERATE="This file was automatically generated by configure"
+    AC_SUBST(AUTOGENERATE)
+    absolute_builddir="`pwd`"
+    AC_SUBST(absolute_builddir)
+
+    # No versioning on directory names of sub-packages 
+    stepmake=stepmake
+    AC_SUBST(stepmake)
+
+    CONFIGSUFFIX=
+    AC_ARG_ENABLE(config,
+    [  enable-config=FILE      put configure settings in config-FILE.make],
+    [CONFIGSUFFIX=$enableval])
+
+    if test "$CONFIGSUFFIX" != "" ; then
+	CONFIGFILE=config-$CONFIGSUFFIX
+    else
+	CONFIGFILE=config
+    fi
+    AC_SUBST(CONFIGSUFFIX)
+     
+    AC_CANONICAL_HOST
+    AC_CHECK_PROGS(MAKE, make, error)
+    AC_CHECK_PROGS(FIND, find, error)
+
+
+dnl system supplied INSTALL is unsafe; use our own install.
+dnl    AC_PROG_INSTALL
+dnl    if test "$INSTALL" = "bin/install-sh"; then
+dnl	export INSTALL="\$\(depth\)/bin/install-sh"
+dnl    fi
+
+    AC_CHECK_PROGS(TAR, tar, error)
+    AC_CHECK_PROGS(BASH, bash, /bin/sh)
+
+    AC_PATH_PROG(PYTHON, python, -echo no python)
+    AC_SUBST(PYTHON)
+
+
+    AC_CHECK_SEARCH_RESULT($MAKE, GNU make,  You should install GNU make)
+    if test $MAKE != "error" ; then
+	$MAKE -v| grep GNU > /dev/null
+	if test "$?" = 1
+	then
+		AC_STEPMAKE_WARN(Please install *GNU* make) 
+	fi 
+    fi 
+
+    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?)
+	ZIP="zip -r -9" #
+	DOTEXE=.exe
+    else
+	LN=ln
+	ZIP="zip -r -9"
+    fi
+    AC_SUBST(DOTEXE)
+    AC_SUBST(ZIP)
+    AC_SUBST(LN)
+
+    AC_STEPMAKE_DATADIR
+])
+
+AC_DEFUN(AC_STEPMAKE_LEXYACC, [
+    # ugh, automake: we want (and check for) bison
+    AC_PROG_YACC
+    # ugh, automake: we want (and check for) flex
+    # AC_PROG_LEX
+    # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack...
+
+    # AC_DECL_YYTEXT
+    # ugh, ugh
+    ac_cv_prog_lex_root=lex.yy
+
+    AC_CHECK_PROGS(BISON, bison, error)
+    AC_CHECK_PROGS(FLEX, flex, error)
+    AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or better)
+    AC_CHECK_SEARCH_RESULT($FLEX,  flex, Please install Flex, 2.5 or better)
+
+    if test $BISON != "error"; then
+	bison_version=`$BISON --version| sed 's/^.*version 1.//g' `
+	if test $bison_version -lt 25; then
+	    AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25)
+	fi	
+    fi
+
+    AC_SUBST(BISON)
+    AC_SUBST(FLEX)
+])
+
+AC_DEFUN(AC_STEPMAKE_LIB, [
+    AC_CHECK_PROGS(AR, ar, error)
+    AC_PROG_RANLIB
+
+    AC_SUBST(AR)
+    AC_SUBST(RANLIB)
+])
+
+AC_DEFUN(AC_STEPMAKE_LIBTOOL, [
+    # libtool.info ...
+    # **Never** try to set library version numbers so that they correspond
+    # to the release number of your package.  This is an abuse that only
+    # fosters misunderstanding of the purpose of library versions.
+
+    REVISION=$PATCH_LEVEL
+    # CURRENT=$MINOR_VERSION
+    CURRENT=`expr $MINOR_VERSION + 1`
+    # AGE=$(expr $MAJOR_VERSION + 1)
+    AGE=$MAJOR_VERSION
+    AC_SUBST(CURRENT)
+    AC_SUBST(REVISION)
+    AC_SUBST(AGE)
+])
+
+AC_DEFUN(AC_STEPMAKE_LOCALE, [
+    lang=English
+    ALL_LINGUAS="en nl"
+
+    # with/enable ??
+    AC_ARG_WITH(localedir,
+    [  with-localedir=LOCALE   use LOCALE as locale dir. Default: PREFIX/share/locale ],
+    localedir=$with_localedir,
+    localedir='${prefix}/share/locale')
+
+    AC_ARG_WITH(lang,
+    [  with-lang=LANG          use LANG as language to emit messages],
+    language=$with_lang,
+    language=English)
+
+    AC_MSG_CHECKING(language)    
+    case "$language" in
+      En* | en* | Am* | am* | US* | us*)
+	    lang=English;;
+      NL | nl | Du* | du* | Ned* | ned*)
+	    lang=Dutch;;
+      "")
+	    lang=English;;
+      *)
+	    lang=unknown;;
+    esac
+    AC_MSG_RESULT($lang)
+
+    if test "$lang" = "unknown" ; then
+	AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS)
+    fi
+
+])
+
+AC_DEFUN(AC_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!"`
+    AC_SUBST(localedir)
+    AC_SUBST(DIR_LOCALEDIR)
+    AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}")
+
+    AC_CHECK_LIB(intl, gettext)
+    AC_CHECK_FUNCS(gettext)
+])
+
+AC_DEFUN(AC_STEPMAKE_MAN, [
+    AC_CHECK_PROGS(TROFF, troff, -echo no troff)
+])
+
+AC_DEFUN(AC_STEPMAKE_MSGFMT, [
+    AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt)
+    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="touch $@; echo "
+	AC_MSG_RESULT(no)
+	AC_STEPMAKE_WARN(please install msgfmt from GNU gettext)
+    fi
+])
+
+AC_DEFUN(AC_STEPMAKE_TEXMF, [
+    AC_ARG_ENABLE(tex-prefix,
+    [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories. (default: PREFIX)],
+    [TEXPREFIX=$enableval],
+    [TEXPREFIX=auto] )
+    
+    AC_ARG_ENABLE(tex-dir,
+    [  enable-tex-dir=DIR      set the directory to put $PACKAGE_NAME TeX files in. ],
+    [TEXDIR=$enableval],
+    [TEXDIR=auto] )
+
+    AC_ARG_ENABLE(mf-dir,
+    [  enable-mf-dir=DIR       set the directory to put $PACKAGE_NAME MetaFont files in. ],
+    [MFDIR=$enableval],
+    [MFDIR=auto])
+
+    if test "x$TEXPREFIX" = xauto ; then
+	AC_TEX_PREFIX(TEXPREFIX)
+    else
+     find_texprefix=$TEXPREFIX
+    fi
+
+    if test "x$MFDIR" = xauto; then
+	AC_MF_SUBDIR(MFDIR)
+    fi
+	
+    if test "x$TEXDIR" = xauto ; then
+	AC_TEX_SUBDIR(TEXDIR)
+    fi
+
+    AC_SUBST(TEXPREFIX)
+    AC_SUBST(TEXDIR)
+    AC_SUBST(MFDIR)
+])
+
+AC_DEFUN(AC_STEPMAKE_WARN, [
+    AC_MSG_WARN($1)
+    warn_b=yes
+])
+
+AC_DEFUN(AC_STEPMAKE_YODL, [
+    if test "x$YODL" = "x"; then 
+	AC_CHECK_PROGS(YODL, yodl, -echo no yodl)
+	AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
+	AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
+	AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl)
+	AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
+	AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
+    else
+	AC_SUBST(YODL)
+	AC_SUBST(YODL2HTML)
+	AC_SUBST(YODL2LATEX)
+	AC_SUBST(YODL2MAN)
+	AC_SUBST(YODL2TEXINFO)
+	AC_SUBST(YODL2TXT)
+	export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
+    fi
+])
+
+dnl should cache result.
+dnl should  look in $prefix first.
+dnl should probably assume TDS
+
+AC_DEFUN(AC_TEX_PREFIX, [
+    
+
+    AC_MSG_CHECKING(TeX/MF root dir directory)    
+
+    find_root_prefix="$prefix"
+    
+
+    test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix"
+    find_texpostfix="";
+    for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do
+	find_texprefix="$find_root_prefix$postfix"
+	if test -d $find_texprefix; then
+	    find_texpostfix=$postfix
+	    break;
+	fi
+    done
+    
+    if test "x$find_texpostfix" = x; then
+	find_texpostfix='/lib/texmf/tex'
+	AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix)
+    fi
+
+    find_texprefix="$find_root_prefix/$find_texpostfix"
+
+    # only assign if variablename not empty
+    if test x != "x[$]$1"; then
+    	$1='${prefix}'/"$find_texpostfix"
+    fi
+    AC_MSG_RESULT($find_texprefix)
+
+])
+ 
+
+# find a directory inside a prefix, 
+# $1 the prefix (expanded version)
+# $2 variable to assign
+# $3 the directory name 
+# $4 description
+AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [
+    
+    AC_MSG_CHECKING($4 directory)    
+    find_dirdir=`(cd $1; 
+      $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')`
+    
+
+    if test "x$find_dirdir" = x; then
+       find_dirdir="/$3";
+       AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line)
+	true
+    fi
+    $2=$find_dirdir
+    AC_MSG_RESULT($1/$find_dirdir)
+])
+
+# ugh.  this is hopeless
+AC_DEFUN(AC_KPSE_TEX_DIR, [
+	kpse_paths=`(kpsepath -n latex tex; kpsepath -n tex tex) | sed 's/:/ /g' | tr ' ' '\012' |sort | uniq -d`
+	kpse_syspaths=`echo $kpse_paths | grep '!'| sed 's/!//g'`
+	echo $kpse_paths
+	if test -w "$kpse_syspaths";
+	then
+		dir=`echo $kpse_syspaths | head -1`
+	else
+		dir=`echo $kpse_paths | grep -v '!'| head -1`
+	fi
+	if test "$prefix" = "NONE"; then
+		local_prefix=$ac_default_prefix
+		local_prefix_quote='${prefix}'
+
+	else
+		local_prefix=$prefix
+		local_prefix_quote=$prefix
+	fi
+	echo $local_prefix_quote = $local_prefix
+	echo $dir
+	echo $dir  | sed 's!'$local_prefix'!\$local_prefix_quote!g'
+])
+
+AC_DEFUN(AC_TEX_SUBDIR, [
+dnl    AC_REQUIRE([AC_TEX_PREFIX])
+    AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input)
+    $1="$TEXPREFIX/$$1"
+])
+
+AC_DEFUN(AC_MF_SUBDIR, [
+dnl     AC_REQUIRE([AC_TEX_PREFIX])
+    AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input)
+    $1="$TEXPREFIX/$$1"
+])
+
+AC_DEFUN(AC_CHECK_SEARCH_RESULT, [
+	result="`echo \"$1\" | grep echo`"
+	if test "x$1" = "xerror" -o "x$result" != "x"; then
+		AC_STEPMAKE_WARN(can\'t find $2. $3)
+	fi
+])
+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK,
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+    AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   return !((gtk_major_version > major) ||
+   	    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ 	    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+     CFLAGS="$ac_save_CFLAGS"
+     CXXFLAGS="$ac_save_CXXFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
+  AC_SUBST(CXXFLAGS)
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+])
+
+
+# Configure paths for GTK--
+# Jan Nieuwenhuizen   98-06-3
+
+dnl AM_PATH_GTK__([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK--, and define GTK___CFLAGS and GTK___LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK__,
+[dnl 
+dnl Get the cflags and libraries from the gtk__-config script
+dnl
+  min_gtk___version=ifelse([$1], ,0.9.4,$1)
+  AC_MSG_CHECKING(for GTK-- - version >= $min_gtk___version)
+  no_gtk__=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK___CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs`
+    GTK___LIBS="$GTK_LIBS -lgtkmm"
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    CFLAGS="$CFLAGS $GTK___CFLAGS"
+    CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+    LIBS="$LIBS $GTK___LIBS"
+dnl
+dnl Now check if the installed GTK__ is sufficiently new. (Also sanity
+dnl checks the results of gtk__-config to some extent
+dnl
+    AC_TRY_RUN([
+#include <gtk--.h>
+#include <stdio.h>
+
+int 
+main ()
+{
+  // urg
+  return 0;
+}
+],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+     CFLAGS="$ac_save_CFLAGS"
+     CXXFLAGS="$ac_save_CXXFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk__=yes
+  fi
+  if test "x$no_gtk__" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     GTK___CFLAGS=""
+     GTK___LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  CXXFLAGS="$CXXFLAGS $GTK___CFLAGS"
+  AC_SUBST(CXXFLAGS)
+  AC_SUBST(GTK___CFLAGS)
+  AC_SUBST(GTK___LIBS)
+])
+