diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | xlators/features/glupy/src/Makefile.am | 9 | ||||
| -rw-r--r-- | xlators/features/glupy/src/glupy/Makefile.am | 5 | ||||
| -rw-r--r-- | xlators/features/glupy/src/glupy/__init__.py (renamed from xlators/features/glupy/src/glupy.py) | 0 |
4 files changed, 16 insertions, 4 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], diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am index 0354b1e9dba..2ac0d99cd5f 100644 --- a/xlators/features/glupy/src/Makefile.am +++ b/xlators/features/glupy/src/Makefile.am @@ -14,8 +14,11 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ noinst_HEADERS = glupy.h -# Install glupy.py into the Python site-packages area -pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy -pyglupy_PYTHON = glupy.py __init__.py +# Install __init__.py into the Python site-packages area +pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster +pyglupy_PYTHON = __init__.py + +# Install glupy/__init_-.py into the Python site-packages area +SUBDIRS = glupy CLEANFILES = diff --git a/xlators/features/glupy/src/glupy/Makefile.am b/xlators/features/glupy/src/glupy/Makefile.am new file mode 100644 index 00000000000..573d2da12e1 --- /dev/null +++ b/xlators/features/glupy/src/glupy/Makefile.am @@ -0,0 +1,5 @@ +# Install __init__.py into the Python site-packages area +pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy +pyglupy_PYTHON = __init__.py + +CLEANFILES = diff --git a/xlators/features/glupy/src/glupy.py b/xlators/features/glupy/src/glupy/__init__.py index b9fc3700fa6..b9fc3700fa6 100644 --- a/xlators/features/glupy/src/glupy.py +++ b/xlators/features/glupy/src/glupy/__init__.py |