Commit b6b2149e authored by Andrew Dunstan's avatar Andrew Dunstan

Fix python_includespec on Windows at configure time

By converting to using forward slashes at configure time we avoid
having to repeat the logic anywhere that this is needed, such as
in transforms modules for plpython.
parent 1a629c1b
...@@ -44,6 +44,9 @@ if a == b: ...@@ -44,6 +44,9 @@ if a == b:
print(a) print(a)
else: else:
print(a + ' ' + b)"` print(a + ' ' + b)"`
if test "$PORTNAME" = win32 ; then
python_includespec=`echo $python_includespec | sed 's,[\],/,g'`
fi
AC_MSG_RESULT([$python_includespec]) AC_MSG_RESULT([$python_includespec])
AC_SUBST(python_majorversion)[]dnl AC_SUBST(python_majorversion)[]dnl
......
...@@ -7487,6 +7487,9 @@ if a == b: ...@@ -7487,6 +7487,9 @@ if a == b:
print(a) print(a)
else: else:
print(a + ' ' + b)"` print(a + ' ' + b)"`
if test "$PORTNAME" = win32 ; then
python_includespec=`echo $python_includespec | sed 's,\,/,g'`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_includespec" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_includespec" >&5
$as_echo "$python_includespec" >&6; } $as_echo "$python_includespec" >&6; }
......
...@@ -5,14 +5,12 @@ top_builddir = ../../.. ...@@ -5,14 +5,12 @@ top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
# Windows needs to convert backslashed paths to normal slashes, # On Windows we have to remove -lpython from the link since we are
# and we have to remove -lpython from the link since we are building our own # building our own
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
python_includespec := $(subst \,/,$(python_includespec))
override python_libspec = override python_libspec =
endif endif
override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS) override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)
rpathdir = $(python_libdir) rpathdir = $(python_libdir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment