X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=f19b156e364cd12323e6e48500fa3824e86937e2;hb=dcfa22970cd4949748039835b38ed3f508472327;hp=4e48c76e27d2c76dac2f7f85b207994255747bd2;hpb=aab40d2ccb8fe480eb5c85dcbbdcfbda2b304fd7;p=lilypond.git

diff --git a/configure.in b/configure.in
index 4e48c76e27..f19b156e36 100644
--- a/configure.in
+++ b/configure.in
@@ -1,173 +1,64 @@
-dnl Process this file with autoconf to produce a configure script. -*-shell-script-*-
+dnl configure.in   -*-shell-script-*-
+dnl Process this file with autoconf to produce a configure script. 
 
-dnl should cache result.
-dnl should  look in $prefix first.
+# Bootstrap the init proces.  List a file identifies your package.
+AC_INIT(make/lilypond.lsm.in)
+AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in)
 
-AC_DEFUN(AC_TEX_SUBDIR, [
+# Bootstrap StepMake configure
+AC_STEPMAKE_INIT
 
-    # do something sensible if root hasn't specced dir yet attempts install
+# For all packages except the StepMake package itself
+AC_CONFIG_SUBDIRS(stepmake)
 
-    AC_MSG_CHECKING(TeX installation directory)
-
-    ac_tmp_prefix=$prefix
-    test "x$ac_tmp_prefix" = xNONE && ac_tmp_prefix=$ac_default_prefix
-
-    for texdir in $ac_tmp_prefix $ac_tmp_prefix/lib; do
-	if test -d $texdir/texmf; then
-	    TEXTOP=$texdir/texmf
-	    break
-	else	
-	if test -d $texdir/tex; then 
-	    TEXTOP=$texdir/tex
-	    break
-	fi
-	fi
-    done
-    $1=$ac_tmp_prefix/lib/texmf/tex
-    if test x = "x$TEXTOP"; then
-	AC_MSG_WARN(Cannot determine a tex-directory. Please use --enable-texprefix)
-    else
-	$1=`$FIND $TEXTOP -type d -a -name tex -print |sort|head -1`
-    fi
-    fi
-
-    AC_MSG_RESULT($$1)
-])
-
-
-AC_INIT(flower/lib/choleski.cc)
-AC_LANG_CPLUSPLUS
+# Uncomment the configuration options your package needs.
+AC_STEPMAKE_COMPILE
+# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
+AC_HAVE_HEADERS(assert.h)
 
+printing_b=no
 AC_ARG_ENABLE(printing,
-	[  printing       set debug printing],
-	[],
-	[DEFINES="$DEFINES -DNPRINT=1"])
-AC_ARG_ENABLE(checking,
-	[  checking       set runtime checks],
-	[],
-	[DEFINES="$DEFINES -DNDEBUG=1"])
-AC_ARG_ENABLE(debug,
-	[  debug          set debug info],
-	[DEFINES="$DEFINES -g"])
-AC_ARG_ENABLE(optimise,
-	[  optimise       use maximal speed optimisations],
-	[DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"])
-AC_ARG_ENABLE(profiling,
-	[  profiling      compile with gprof support],
-	[DEFINES="$DEFINES -pg"])
-AC_ARG_ENABLE(texprefix,
-	[  texprefix=DIR  set the tex-directory to put the lilypond subdir in.],
-	[TEXPREFIX=$enableval],
-	[TEXPREFIX=auto] )
-
-dnl COMPILEINFO="$HOST $host $TARGET $target"
-AUTOHEADER="This file was automatically generated by configure"
-CXXFLAGS=${CXXFLAGS:-""}	# we don't want -g -O junk
-AC_PROG_CXX
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_CHECK_PROGS(FIND, find, error)
-
-dnl should check out -print
-if test FIND = error; then
-   AC_MSG_WARN(Couldn't find \`find'.  Please use --enable-texprefix)
-else 
-    
-
-AC_SUBST(DEFINES)
-AC_SUBST(COMPILEINFO)
-AC_SUBST(AUTOHEADER)
-AC_SUBST(BISON)
-AC_SUBST(FLEX)
-AC_SUBST(TEXPREFIX)
-
-
-AC_CHECK_PROGS(BISON, bison, error)
-AC_CHECK_PROGS(FLEX, flex, error)
-AC_CHECK_PROGS(MAKE, make, error)
-AC_CHECK_PROGS(PODMAN, pod2man, error)
-
-if test $TEXPREFIX = auto ; then
-    AC_TEX_SUBDIR(TEXPREFIX)
-fi
-
-if test $MAKE = "error" 
-then
-	AC_MSG_ERROR(Please install GNU make)
-else
-	$MAKE -v| grep -q GNU
-	if test "$?" = 1
-	then
-		AC_MSG_WARN(Please install *GNU* make)
-	fi
-fi
+    [  enable-printing         turn on debug printing. Default: off],
+    [printing_b=$enableval])
 
-
-if test $BISON = "error" 
-then
-	AC_MSG_WARN(can't find bison. Please install Bison (1.24 or better))
-fi
-
-if test $PODMAN = "error" 
-then
-	AC_MSG_WARN(can't find pod. You should install Perl (version 5 or better))
-fi
-
-if test $FLEX = "error" 
-then
-	AC_MSG_WARN(can't find flex. Please install Flex (2.5 or better))
+if test "$optimise_b" = yes; then
+    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
+    AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
-if $CXX --version | grep -q '2\.7'
-then
-	true
-else
-	AC_MSG_WARN(can't find g++ 2.7)
+if test "$printing_b" = no; then
+    # ugh
+    AC_DEFINE(NPRINT)
+    DEFINES="$DEFINES -DNPRINT"
 fi
 
-AC_CHECK_HEADER(FlexLexer.h, true,
-	AC_MSG_ERROR(can't find flex header. Please install Flex headers correctly))
-AC_CONFIG_SUBDIRS(flower)
-AC_OUTPUT(make/out/Configure_variables.make:make/Configure_variables.make.in)
-
-
-
-dnl URG!!!!!!
-eval "DIR_DATADIR=$datadir"
-DIR_DATADIR="$DIR_DATADIR/lilypond"
-AC_MSG_CHECKING
+AC_STEPMAKE_CXX
+AC_STEPMAKE_GXX
+AC_STEPMAKE_CXXTEMPLATE
+AC_STEPMAKE_LEXYACC
+AC_STEPMAKE_LIB
+# AC_STEPMAKE_LIBTOOL
+AC_STEPMAKE_LOCALE
+AC_STEPMAKE_GETTEXT
+AC_STEPMAKE_MSGFMT
+AC_STEPMAKE_TEXMF
+AC_STEPMAKE_TEXMF_DIRS
+AC_STEPMAKE_GUILE
+AC_STEPMAKE_KPATHSEA
 
-cat << EOF > lib/out/config.hh
-
-/* automatically generated by configure */
-/* include this file only once! */
-
-#define  DIR_DATADIR "$DIR_DATADIR"
-
-EOF
-
-CXX="$ac_cv_prog_CXX" bin/make_version >> lib/out/config.hh
-
-touch make/out/Site.make
-
-# ugr
-(cd mi2mu; CXX="$ac_cv_prog_CXX" ../bin/make_version > out/version.hh
-dnl    echo 0 > out/.build
-)
-(cd lily; CXX="$ac_cv_prog_CXX" ../bin/make_version > out/version.hh
-dnl    echo 0 > out/.build
-)
- (cd flower;
-dnl    echo 0 > out/.build
-)
-cat << END
+dnl should check out -print
+dnl huh?
+dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)
 
-Finished configuring. For making everything, do:
+AC_FUNC_MEMCMP
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf)
 
-	make all
+AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
-If you only want help on the make targets, do a
+AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
+AC_PATH_PROG(PERL, perl, error)
 
-	make help
+AC_STEPMAKE_END
 
-END