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.
This commit is contained in:
Andrew Dunstan 2015-05-03 08:17:04 -04:00
parent 1a629c1b16
commit b6b2149e48
3 changed files with 8 additions and 4 deletions

View File

@ -44,6 +44,9 @@ if a == b:
print(a)
else:
print(a + ' ' + b)"`
if test "$PORTNAME" = win32 ; then
python_includespec=`echo $python_includespec | sed 's,[\],/,g'`
fi
AC_MSG_RESULT([$python_includespec])
AC_SUBST(python_majorversion)[]dnl

3
configure vendored
View File

@ -7487,6 +7487,9 @@ if a == b:
print(a)
else:
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 "$python_includespec" >&6; }

View File

@ -5,14 +5,12 @@ top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
# Windows needs to convert backslashed paths to normal slashes,
# and we have to remove -lpython from the link since we are building our own
# On Windows we have to remove -lpython from the link since we are
# building our own
ifeq ($(PORTNAME), win32)
python_includespec := $(subst \,/,$(python_includespec))
override python_libspec =
endif
override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)
rpathdir = $(python_libdir)