summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2015-05-03 12:17:04 +0000
committerAndrew Dunstan2015-05-03 12:17:04 +0000
commitb6b2149e48aa61981ae0199c963d5145a37c258c (patch)
tree5b5b2a3bcfe9b55b8f0e260ddcda380fa031fc2d
parent1a629c1b161a2b43a2f81241a8f4c5f79e5b8ecf (diff)
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.
-rw-r--r--config/python.m43
-rwxr-xr-xconfigure3
-rw-r--r--src/pl/plpython/Makefile6
3 files changed, 8 insertions, 4 deletions
diff --git a/config/python.m4 b/config/python.m4
index c8f784ed47..de346fb53a 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -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
diff --git a/configure b/configure
index 6691d7382c..191e8f0326 100755
--- a/configure
+++ b/configure
@@ -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; }
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 4c9d146147..39cfb654fb 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -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)