diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-05-07 12:39:05 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-07 12:05:25 -0700 |
| commit | 317560cc5544f8ca8286ba5ecedd8236746e9ebf (patch) | |
| tree | 32e9d228f6b13ffc3f320058be76110b10bda3d2 /configure.ac | |
| parent | 865aa4ebdd71d39f8e8ae59b40d993edb4a62708 (diff) | |
glupy: fix tuntime search path and python module directory layout
1) The glupy.so xlator should embed the runtime search path for
the python libraries. Unfortunately, python-config does not
gives the appprioate flags, therefore we need to also use
pkg-config to obtain them
2) Fix the glupy python module directory layout so that python
can import the module without problem
That two fixes seems to let glupy.t pass on NetBSD again.
BUG: 1129939
Change-Id: I397aa726ab8bf7d91fa0d6d870a30910a5f4a5d9
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10616
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index eb72eec09fe..29e0e269b0c 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,7 @@ AC_CONFIG_FILES([Makefile xlators/features/glupy/src/Makefile xlators/features/glupy/src/setup.py xlators/features/glupy/src/__init__.py + xlators/features/glupy/src/glupy/Makefile xlators/features/locks/Makefile xlators/features/locks/src/Makefile xlators/features/quota/Makefile @@ -1128,9 +1129,12 @@ saved_CFLAGS=$CFLAGS saved_CPPFLAGS=$CPPFLAGS saved_LDFLAGS=$LDFLAGS +# Use pkg-config to get runtime search patch missing from ${PYTHON}-config +# Just do "true" on failure so that configure does not bail out +PKG_CHECK_MODULES([PYTHON], "pythonxx-$PYTHON_VERSION",,true) CFLAGS="`${PYTHON}-config --cflags`" CPPFLAGS=$CFLAGS -LDFLAGS="-L`${PYTHON}-config --prefix`/lib -L`${PYTHON}-config --prefix`/$libdir `${PYTHON}-config --ldflags`" +LDFLAGS="${PYTHON_LIBS} -L`${PYTHON}-config --prefix`/lib -L`${PYTHON}-config --prefix`/$libdir `${PYTHON}-config --ldflags`" AC_CHECK_HEADERS([python$PYTHON_VERSION/Python.h],[have_Python_h=yes],[]) AC_ARG_ENABLE([glupy], |