From 0a8d5217d9facb06c6a1461329dcbde68aff6446 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:52:47 +0000 Subject: [PATCH] lilypond-0.1.1 --- configure.in | 209 ++++++++++++++++----------------------------------- 1 file changed, 63 insertions(+), 146 deletions(-) diff --git a/configure.in b/configure.in index 4df3d11ff7..ffe79f3e4a 100644 --- a/configure.in +++ b/configure.in @@ -1,99 +1,30 @@ dnl -*-shell-script-*- dnl Process this file with autoconf to produce a configure script. -dnl should cache result. -dnl should look in $prefix first. - -AC_DEFUN(AC_LILY_WARN, [ - AC_MSG_WARN($1) - warn_b=yes -]) -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_LILY_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) +AC_INIT(flower/choleski.cc) -]) - -# 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$srcdir != x.; then + echo Please look in the INSTALL instructions for + echo directions for multi-architecture building - - if test "x$find_dirdir" = x; then - find_dirdir="/$3"; - AC_LILY_WARN(Cannot determine $4 subdirectory. Please set from command-line) - true - fi - $2=$find_dirdir - AC_MSG_RESULT($1/$find_dirdir) -]) - -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_INIT(flower/choleski.cc) - + AC_MSG_ERROR(This package does not support --srcdir.) +fi # if given here, these vars are initted at the checking point. if test x$host = xNONE; then - buildprefix=. + OUTDIR_NAME=${OUTDIR_NAME-"out"} else - buildprefix="$host-build-dir" - mkdir $buildprefix; - for a in `find -type d -and -not -name '*-build-dir'`; do - mkdir $buildprefix/$a; - done + OUTDIR_NAME=${OUTDIR_NAME-"out-$host"} fi + printing_b=no checking_b=yes debug_b=yes optimise_b=no profile_b=no warn_b=no + AC_LANG_CPLUSPLUS AC_ARG_ENABLE(printing, @@ -102,11 +33,11 @@ AC_ARG_ENABLE(printing, AC_ARG_ENABLE(checking, - [ enable-checking set runtime checks (assert calls). Default: on], + [ enable-checking set runtime checks (assert calls). Default: on], [checking_b=$enableval] ) AC_ARG_ENABLE(debugging, - [ enable-debugging set debug info. Default: on], + [ enable-debugging set debug info. Default: on], [debug_b=$enableval]) AC_ARG_ENABLE(optimise, @@ -132,10 +63,15 @@ AC_ARG_ENABLE(tex-dir, [TEXDIR=$enableval], [TEXDIR=auto] ) -AC_ARG_ENABLE(mf-dir, - [ mf-dir=DIR set the directory to put LilyPond MetaFont files in.], - [MFDIR=$enableval], - [MFDIR=auto] ) +AC_JUNK_ARGS( AC_ARG_ENABLE(mf-dir, + [ mf-dir=DIR set the directory to put LilyPond MetaFont files in. (obsolete)], + [MFDIR=$enableval], + [MFDIR=auto] )) + +AC_ARG_ENABLE(out-dir, + [ out-dir set the directory for machine generated files. Default out or out-HOST], + [OUTDIR_NAME=$enableval] + []) if test $profile_b = yes; then EXTRA_LIBES="-pg" @@ -163,6 +99,14 @@ if test $optimise_b = yes; then DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED" fi +if test "x$OSTYPE" = "xWindows_NT"; then + LN=cp # hard link does not work under cygnus-nt (yet?) + ZIP="zip -r -9" # +else + LN=ln + ZIP="zip -r -9" +fi + dnl COMPILEINFO="$HOST $host $TARGET $target" AUTOHEADER="This file was automatically generated by configure" CPPFLAGS=${CPPFLAGS:-""} # we don't want -g -O junk @@ -178,7 +122,8 @@ dnl should check out -print if test FIND = error; then AC_LILY_WARN(Couldn't find \`find'. Please use --enable-tex-dir) fi - + +AC_SUBST(OUTDIR_NAME) AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(CXX) @@ -189,10 +134,13 @@ AC_SUBST(COMPILEINFO) AC_SUBST(AUTOHEADER) AC_SUBST(BISON) AC_SUBST(FLEX) +AC_SUBST(LN) AC_SUBST(PERL) +AC_SUBST(ZIP) AC_SUBST(TEXPREFIX) AC_SUBST(TEXDIR) AC_SUBST(MFDIR) +AC_SUBST(DIR_DATADIR) AC_SUBST(EXTRA_LIBES) AC_CHECK_PROGS(BISON, bison, error) @@ -216,43 +164,29 @@ dnl if test "x$MFDIR" = xauto; then dnl AC_MF_SUBDIR(MFDIR) dnl fi -if test $MAKE = "error" -then - AC_MSG_ERROR(Please install GNU make) -else - $MAKE -v| grep GNU > /dev/null - if test "$?" = 1 - then + +AC_CHECK_SEARCH_RESULT($MAKE, GNU make, You should install GNU make) +AC_CHECK_SEARCH_RESULT( $BISON, bison, Please install Bison, 1.25 or better) +AC_CHECK_SEARCH_RESULT($PERL, perl, You should install Perl, version 5 or better) +AC_CHECK_SEARCH_RESULT($PODMAN, pod, You should install Perl, version 5 or better) +AC_CHECK_SEARCH_RESULT( $FLEX, flex, Please install Flex, 2.5 or better) + + +if test $MAKE != "error" ; then + $MAKE -v| grep GNU > /dev/null + if test "$?" = 1 + then AC_LILY_WARN(Please install *GNU* make) fi fi -if test $BISON = "error" -then - AC_LILY_WARN(can't find bison. Please install Bison (1.25 or better)) -else +if test $BISON != "error"; then bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` if test $bison_version -lt 25; then AC_LILY_WARN(Your bison is too old (1.$bison_version). Please install 1.25) fi fi -if test $PERL = "error" -then - AC_LILY_WARN(can't find perl. You should install Perl (version 5 or better)) - PERL=/usr/bin/perl -fi - -if test $PODMAN = "error" -then - AC_LILY_WARN(can't find pod. You should install Perl (version 5 or better)) -fi - -if test $FLEX = "error" -then - AC_LILY_WARN(can't find flex. Please install Flex (2.5 or better)) -fi - if $CXX --version | grep '2\.7' > /dev/null then true @@ -263,52 +197,35 @@ fi AC_CHECK_HEADER(FlexLexer.h, true, AC_LILY_WARN(can't find flex header. Please install Flex headers correctly)) -AC_CONFIG_SUBDIRS(flower) -AC_OUTPUT($buildprefix/make/out/Configure_variables.make:make/Configure_variables.make.in) - - - -dnl URG!!!!!! -eval "DIR_DATADIR=$datadir" -DIR_DATADIR="$DIR_DATADIR/lilypond" -AC_MSG_CHECKING - -cat << EOF > $buildprefix/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 >> $buildprefix/lib/out/config.hh - -touch $buildprefix/make/out/Site.make - -# ugr -(cd mi2mu; CXX="$ac_cv_prog_CXX" ../bin/make-version > ../$buildprefix/mi2mu/out/version.hh +for a in `find -type d -and -not -name 'out*'`; do + if test ! -d $a/$OUTDIR_NAME; then + mkdir $a/$OUTDIR_NAME + fi +done -) -(cd lily; CXX="$ac_cv_prog_CXX" ../bin/make-version > ../$buildprefix/lily/out/version.hh -) +AC_CONFIG_SUBDIRS(flower) -echo '# WARNING : Automatically generated from make/Toplevel.make.in' \ - | cat - make/Toplevel.make.in > Makefile +# ugh +eval "DIR_DATADIR=$datadir/lilypond" + +AC_OUTPUT(make/$OUTDIR_NAME/Configure_variables.make:make/Configure_variables.make.in + lib/$OUTDIR_NAME/config.hh:lib/config.hh.in + Makefile:make/Toplevel.make.in) +touch make/$OUTDIR_NAME/Site.make cat << END For making everything, do: make # GNU make -or if you used --host=SunUltraWitteReus +or if you used --outdir=blabla - make buildprefix=SunUltraWitteReus-build-dir + make OUTDIR_NAME=blabla If you want to make site-wide extensions to the makefiles, please use - make/out/Site.make + make/$OUTDIR_NAME/Site.make END -- 2.39.5