3 files changed, 56 insertions, 14 deletions
diff --git a/pow/pywrap/Makefile b/pow/pywrap/Makefile
new file mode 100644
index 00000000..e065bbe6
--- /dev/null
+++ b/pow/pywrap/Makefile
@@ -0,0 +1,9 @@
+# $Id$
+
+all: python
+
+python: python.c
+	python build.py
+
+clean:
+	rm -f *.o python
diff --git a/pow/pywrap/Makefile.in b/pow/pywrap/Makefile.in
deleted file mode 100644
index b1969a05..00000000
--- a/pow/pywrap/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OPENSSL_BUILD_DIRECTORY = @abs_top_builddir@/openssl/openssl
-
-CC=gcc
-CFLAGS=`python-config --cflags`
-LDFLAGS=-Wl,-rpath,$(OPENSSL_BUILD_DIRECTORY) -L$(OPENSSL_BUILD_DIRECTORY)
-LIBS=-lcrypto -lssl `python-config --ldflags`
-
-all: python
-
-python: python.o
-	$(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
-clean:
-	rm -f *.o python
diff --git a/pow/pywrap/build.py b/pow/pywrap/build.py
new file mode 100644
index 00000000..83ce9360
--- /dev/null
+++ b/pow/pywrap/build.py
@@ -0,0 +1,47 @@
+"""
+Hack to build our Python wrapper.  Basic problem here is that we need
+a bunch of arguments that were given to ./configure when Python itself
+was built, and there appears to be no real consistancy about how
+different unix-like distributions use the various parameters, so even
+the standard python-config script is not smart enough to figure out
+which arguments we need on every platform.  Feh.
+
+This script is an attempt to pull the relevant information out of the
+distutils.sysconfig module.  If I understood distutils better, I could
+probably figure out some way to wrap this whole thing up nicely in the
+distutils framework; if you understand how to do this, please do so
+and send me the code.
+
+As it is, this is a minimal hack to get the job done, and probably a
+bit fragile.  Much of the code is taken from python-config.  If
+there's any real documentation on how to do this sort of thing, I have
+not found it yet.  YMMV.  Beware Of Dog.
+
+$Id$
+"""
+
+import os, subprocess, sys
+
+from distutils.sysconfig import (get_config_var as getvar,
+                                 get_python_inc as getinc)
+
+openssl_dir = os.path.realpath(os.path.join(os.getcwd(), "../../openssl/openssl"))
+
+cmd = [getvar("CC"), "-o", "python", "python.c",
+       "-Wl,-rpath,%s" % openssl_dir,
+       "-L%s" % openssl_dir,
+       "-lcrypto", "-lssl",
+       "-I%s" % getinc(plat_specific = False),
+       "-I%s" % getinc(plat_specific = True)]
+
+if not getvar("Py_ENABLE_SHARED"):
+  cmd.append("-L%s" % getvar("LIBPL"))
+
+for var in ("CFLAGS", "LIBS", "SYSLIBS", "LDFLAGS"):
+  cmd.extend(getvar(var).split())
+
+cmd.append("-lpython%s" % getvar("VERSION"))
+
+print " ".join(cmd)
+
+sys.exit(subprocess.call(cmd))