release: 0.1.58

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index b6a41c2f66963ee56075fc728815ea77e13ef5e7..13bf8fd95f400577ca38320837518054d8692c75 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,17 @@ dnl  Process this file with autoconf to produce a configure script.
 
 
 AC_INIT(flower/choleski.cc)
+AC_CONFIG_HEADER(config.hh:config.hh.in) #ugh flower/out/
+AC_CONFIG_AUX_DIR(bin)
+AC_CANONICAL_HOST
 
+OUTDIR_NAME=out
 . $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
-AM_INIT_AUTOMAKE(lilypond, $FULL_VERSION)
+
 
 . $srcdir/flower/VERSION
 FULL_FLOWER_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
@@ -29,16 +33,17 @@ AC_SUBST(REVISION)
 AC_SUBST(AGE)
 
 # turn off shared libraries by default (may be enabled using --enable-shared)
-AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
+#AM_DISABLE_SHARED
+#AM_PROG_LIBTOOL
 
 # ugh, automake: we want (and check for) bison
 AC_PROG_YACC
 
 # ugh, automake: we want (and check for) flex
-AC_PROG_LEX
+# AC_PROG_LEX
+# urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack...
 
-AC_DECL_YYTEXT
+# AC_DECL_YYTEXT
 # ugh, ugh
 ac_cv_prog_lex_root=lex.yy
 
@@ -135,7 +140,7 @@ CXXFLAGS=$DEFINES
 LDFLAGS=$EXTRA_LIBES
 
 AC_PROG_CXX
-# AC_PROG_RANLIB
+AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CHECK_PROGS(TAR, tar, error)
 AC_CHECK_PROGS(FIND, find, error)
@@ -143,6 +148,9 @@ AC_CHECK_PROGS(FIND, find, error)
 dnl should check out -print
 AC_CHECK_SEARCH_RESULT($FIND, \`find\'. Please use --enable-tex-dir)
 
+AC_FUNC_MEMCMP
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(memmem snprintf )
 
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
@@ -165,7 +173,8 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(CXX)
 AC_SUBST(ICFLAGS)
 AC_SUBST(ILDFLAGS)
-# AC_SUBST(DEFINES)
+AC_SUBST(DEFINES)
+AC_SUBST(RANLIB)
 AC_SUBST(COMPILEINFO)
 AC_SUBST(AUTOGENERATE)
 AC_SUBST(BISON)
@@ -180,7 +189,7 @@ AC_SUBST(MFDIR)
 AC_SUBST(DIR_DATADIR)
 AC_SUBST(absolute_builddir)
 AC_SUBST(EXTRA_LIBES)
-
+AC_SUBST(OUTDIR_NAME)
 AC_CHECK_PROGS(BISON, bison, error)
 AC_CHECK_PROGS(FLEX, flex, error)
 AC_CHECK_PROGS(MAKE, make, error)
@@ -236,35 +245,26 @@ fi
 
 # ugh autoconf
 changequote(<<, >>)dnl
-if $CXX --version | grep '2\.[78]' > /dev/null
+if $CXX --version | grep '2\.[78]' > /dev/null ||
+    $CXX --version | grep 'egcs' > /dev/null
 changequote([, ])dnl
 then
        true
 else
-       AC_LILY_WARN(can't find g++ 2.7 or 2.8)
+       AC_LILY_WARN(can't find g++ 2.7, 2.8 or egcs)
 fi
 
 AC_CHECK_HEADER(FlexLexer.h, true,
        AC_LILY_WARN(can't find flex header. Please install Flex headers correctly))
 
 touch stamp-h.in
-AM_CONFIG_HEADER(flower/config.hh:config.hh.in)
+
+
 
 # first do Foobar/Makefile then Foobar/include/Makefile
-AC_OUTPUT(bin/Makefile flower/Makefile flower/include/Makefile
-       flowertest/Makefile lib/Makefile lib/include/Makefile 
-       lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
-       mi2mu/include/Makefile debian/Makefile Documentation/Makefile
-       init/Makefile input/Makefile tex/Makefile make/Makefile
-       mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile
-       test/Makefile Makefile 
-       bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
-       bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
-       bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
-       bin/make-patch bin/make-version bin/make-website bin/mf-deps 
-       bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release 
-       bin/show-latest)
-
-# ugh
-chmod 755 bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch bin/make-version bin/make-website bin/mf-deps bin/mf-to-table bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest
+AC_OUTPUT(config.make)
+
+rm -f Makefile
+cp make/Toplevel.make.in ./Makefile
+chmod 444 Makefile