lilypond-0.0.67

diff --git a/configure.in b/configure.in
index 81a99752ddf50a307233c3abec994aa9a2c0a9e6..570f8866d2d53345905f5d5901794967b561dcca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,6 @@ dnl  Process this file with autoconf to produce a configure script.
 dnl should cache result.
 dnl should  look in $prefix first.
 
-
 AC_DEFUN(AC_TEX_PREFIX, [
     
 
@@ -74,6 +73,7 @@ dnl     AC_REQUIRE([AC_TEX_PREFIX])
    
 AC_INIT(flower/choleski.cc)
 
+
 # if given here, these vars are initted at the checking point.
 printing_b=no
 checking_b=yes
@@ -84,38 +84,43 @@ profile_b=no
 AC_LANG_CPLUSPLUS
 
 AC_ARG_ENABLE(printing,
-    [  enable-printing        turn on debug printing],
+    [  enable-printing         turn on debug printing],
     [printing_b=$enableval])
 
        
 AC_ARG_ENABLE(checking,
-    [  disable-checking       set runtime checks (assert calls)],
+    [  disable-checking        set runtime checks (assert calls)],
     [checking_b=$enableval] )
 
 AC_ARG_ENABLE(debugging,
-    [  disable-debugging         set debug info ],
+    [  disable-debugging       set debug info ],
     [debug_b=$enableval])
 
 AC_ARG_ENABLE(optimise,
-    [  enable-optimise       use maximal speed optimisations],
+    [  enable-optimise         use maximal speed optimisations],
     [optimise_b=$enableval])
     
-   
 AC_ARG_ENABLE(profiling, 
-    [  enable-profiling      compile with gprof support],
+    [  enable-profiling        compile with gprof support],
     [profile_b=$enableval])
     
+AC_ARG_ENABLE(mingw32,
+    [  mingw-prefix=DIR        set the mingw32 directory (standalone windows32 exes)],
+    [MINGWPREFIX=$enableval],
+    [MINGWPREFIX=$enableval])
+    
 AC_ARG_ENABLE(tex-prefix,
-    [  tex-prefix=DIR  set the tex-directory to find TeX subdirectories. (default: PREFIX)],
+    [  tex-prefix=DIR          set the tex-directory to find TeX subdirectories. (default: PREFIX)],
     [TEXPREFIX=$enableval],
     [TEXPREFIX=auto] )
     
 AC_ARG_ENABLE(tex-dir,
-    [  tex-dir=DIR  set the directory to put LilyPond  TeX files in. ],
+    [  tex-dir=DIR             set the directory to put LilyPond  TeX files in. ],
     [TEXDIR=$enableval],
     [TEXDIR=auto] )
+
 AC_ARG_ENABLE(mf-dir,
-    [  mf-dir=DIR  set the directory to put LilyPond MetaFont files in.],
+    [  mf-dir=DIR              set the directory to put LilyPond MetaFont files in.],
     [MFDIR=$enableval],
     [MFDIR=auto] )
 
@@ -135,13 +140,21 @@ if test $checking_b = no; then
     DEFINES="$DEFINES -DNDEBUG=1"
 fi
 
+# however, C++ support in mingw32 v 0.1.4 is still flaky
+if test $MINGWPREFIX != no; then // huh?
+    ICFLAGS="-I$MINGWPREFIX/include"
+    ILDFLAGS="-$MINGWPREFIX/lib"
+fi
+
 if test $optimise_b = yes; then
     DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"
 fi
 
 dnl COMPILEINFO="$HOST $host $TARGET $target"
 AUTOHEADER="This file was automatically generated by configure"
+CPPFLAGS=${CPPFLAGS:-""}       # we don't want -g -O junk
 CXXFLAGS=${CXXFLAGS:-""}       # we don't want -g -O junk
+
 AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_INSTALL
@@ -153,6 +166,8 @@ if test FIND = error; then
 fi
     
 AC_SUBST(CXX)
+AC_SUBST(ICFLAGS)
+AC_SUBST(ILDFLAGS)
 AC_SUBST(DEFINES)
 AC_SUBST(COMPILEINFO)
 AC_SUBST(AUTOHEADER)

diff --git a/make/Configure_variables.make.in b/make/Configure_variables.make.in
index 1eb674778820c75168fe95f3bed8941743fcb124..3a4b0fe668a3384009a8bf867a371a7b850a5429 100644 (file)
--- a/make/Configure_variables.make.in
+++ b/make/Configure_variables.make.in
@@ -3,9 +3,12 @@
 # @configure_input@
 
 INSTALL = @INSTALL@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
+USER_CXXFLAGS =
+USER_LDFLAGS =
 
 CXX = @CXX@
+ICFLAGS = @ICFLAGS@
+ILDFLAGS = @ILDFLAGS@
 libdir = @libdir@
 prefix = @prefix@
 TEXPREFIX = @TEXPREFIX@

diff --git a/make/Variables.make b/make/Variables.make
index 9ddf1d56916c1641c381a58ffd0657de9092256b..fb024505012be0835252fb303bf51c5af92bd36b 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -118,7 +118,7 @@ LIBLILY = $(depth)/lib/$(outdir)/$(LIB_PREFIX)lily$(LIB_SUFFIX)
 # compile and link options:
 #
 ARFLAGS = ru
-CFLAGS = $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS)
+CFLAGS = $(ICFLAGS) $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS)
 
 # added two warnings that are treated by cygwin32's gcc 2.7.2 as errors.
 # huh, but still, no warnings even provoced with linux's gcc 2.7.2.1?
@@ -130,7 +130,7 @@ EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversio
 CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
 INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) 
 CXX_OUTPUT_OPTION = $< -o $@
-LDFLAGS = $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/out -L$(depth)/flower/out
+LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/out -L$(depth)/flower/out
 LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES) -lg++ # need lg++ for win32, really!
 #