]> git.donarmstrong.com Git - lilypond.git/commitdiff
Set CFLAGS and LDFLAGS to build python modules
authorMasamichi Hosoda <trueroad@sea.plala.or.jp>
Tue, 21 Apr 2015 19:11:40 +0000 (20:11 +0100)
committerJames Lowe <pkx166h@gmail.com>
Tue, 21 Apr 2015 19:12:13 +0000 (20:12 +0100)
Issue 4347

Set CFLAGS and LDFLAGS to build python modules

cygwin and mingw need LDFLAGS for building python modules

aclocal.m4
config.make.in
python/GNUmakefile

index 74cf3bcb2c4030321bc796a313bdddd2e70805f9..7ed315124636ee063be84135d3c159e822781b61 100644 (file)
@@ -1128,6 +1128,8 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
        warn="Python.h (python-devel, python-dev or libpython-dev package)"
        STEPMAKE_ADD_ENTRY($1, $warn)
     fi
+    AC_SUBST(PYTHON_CFLAGS)
+    AC_SUBST(PYTHON_LDFLAGS)
 ])
 
 
index ee7aaf8277d09fb534869658798110ddeaf0e84d..d5bf2b87b8a7d820cc6f98587e1c48e267e07b75 100644 (file)
@@ -14,6 +14,7 @@ package-depth = @package_depth@
 FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@
+PYTHON_CFLAGS = @PYTHON_CFLAGS@
 
 CONFIG_CPPFLAGS = @CPPFLAGS@
 CONFIG_DEFINES = @DEFINES@
@@ -25,6 +26,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 GUILE_LIBS = @GUILE_LDFLAGS@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
+PYTHON_LIBS = @PYTHON_LDFLAGS@
 CXXABI_LIBS = @CXXABI_LIBS@
 
 CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
index 87fa7660893539f84d11b823ec9d56a7adc60002..19af006386168d2927bafa111d13e2848fdbd626 100644 (file)
@@ -6,7 +6,8 @@ STEPMAKE_TEMPLATES=c python-module install-out po
 
 include $(depth)/make/stepmake.make
 
-CFLAGS += -DPy_BUILD_CORE -Wall
+CFLAGS += -DPy_BUILD_CORE -Wall $(PYTHON_CFLAGS)
+LDFLAGS += $(PYTHON_LIBS)
 # unset al guile stuff from configure
 CONFIG_LDFLAGS=