X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fconfigure.in;h=619a5fe71ef8f7ec9966cf236746f7e05740d888;hb=6dc4e4d14a67f65f337ec1a06466e748c68dcad5;hp=d35ff32bdd2319b182886779907502f73b48e3c7;hpb=1ca7a2c01e48a2585ab7b43aa18c9c276d4a05d0;p=lilypond.git

diff --git a/flower/configure.in b/flower/configure.in
index d35ff32bdd..619a5fe71e 100644
--- a/flower/configure.in
+++ b/flower/configure.in
@@ -4,9 +4,20 @@ AC_INIT(choleski.cc)
 AC_LANG_CPLUSPLUS
 
 optimise_b=yes
-shared_b=yes
+shared_b=no
 LIB_SUFFIX=.a
 
+# if given here, these vars are initted at the checking point.
+if test x$host = xNONE; then
+    flowerbuildprefix=.
+else
+    flowerbuildprefix="../$host-build-dir/Flower"
+    mkdir $flowerbuildprefix;
+    for a in `find -type d -and -not -name '*-build-dir'`; do
+	mkdir $flowerbuildprefix/$a;
+    done
+fi
+    
 AC_ARG_ENABLE(shared,
     [  enable-shared       shared flower library],
     [shared_b=$enableval])
@@ -25,7 +36,6 @@ if test $optimise_b = yes; then
     MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED"
 fi
 
-dnl should enable flower specific compile flags.
 AC_SUBST(MODULE_CXXFLAGS)
 AC_SUBST(MODULE_LDFLAGS)
 AC_SUBST(LIB_SUFFIX)
@@ -34,8 +44,9 @@ AC_PROG_CXX
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memmem snprintf )
-AC_CONFIG_HEADER(out/config.hh:config.hh.in)
+AC_CONFIG_HEADER($flowerbuildprefix/out/config.hh:config.hh.in)
+
+CXX="$ac_cv_prog_CXX" ../bin/make-version > $flowerbuildprefix/out/version.hh
 
-CXX="$ac_cv_prog_CXX" ../bin/make_version > out/version.hh
+AC_OUTPUT($flowerbuildprefix/out/Flower-flags.make:Flower-flags.make.in)
 
-AC_OUTPUT(out/Flower-flags.make:Flower-flags.make.in)