diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-07-17 10:13:11 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-07-17 10:13:11 +1000 |
| commit | 1fb70757f2e7d5a783b389249a3bcd3149eb6fcf (patch) | |
| tree | 9c84590ae3456273596f5de205efb1df19cb1ea8 /build_posix | |
| parent | ba05f74e0d5c868b6b3b346d03c57d050305f88d (diff) | |
| download | mongo-1fb70757f2e7d5a783b389249a3bcd3149eb6fcf.tar.gz | |
Fix "make install" of Python. Remove old code and restructure the Python sources under lang/python to simplify the installation step.
--HG--
rename : lang/python/fpacking.py => lang/python/wiredtiger/fpacking.py
rename : lang/python/intpack-test.py => lang/python/wiredtiger/intpack-test.py
rename : lang/python/intpacking.py => lang/python/wiredtiger/intpacking.py
rename : lang/python/packing-test.py => lang/python/wiredtiger/packing-test.py
rename : lang/python/packing.py => lang/python/wiredtiger/packing.py
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/aclocal/options.m4 | 6 | ||||
| -rw-r--r-- | build_posix/configure.ac.in | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/build_posix/aclocal/options.m4 b/build_posix/aclocal/options.m4 index be9df269a9a..76776c50eb3 100644 --- a/build_posix/aclocal/options.m4 +++ b/build_posix/aclocal/options.m4 @@ -80,6 +80,12 @@ esac AC_MSG_RESULT($wt_cv_enable_python) AM_CONDITIONAL([PYTHON], [test x$wt_cv_enable_python = xyes]) +AC_MSG_CHECKING(if --with-python-prefix option specified) +AC_ARG_WITH(python-prefix, + [AS_HELP_STRING([--with-python-prefix=DIR], + [Installation prefix for Python module.])]) +AC_MSG_RESULT($with_python_prefix) + AC_MSG_CHECKING(if --enable-snappy option specified) AC_ARG_ENABLE(snappy, [AS_HELP_STRING([--enable-snappy], diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in index cab117b5c56..3265282358d 100644 --- a/build_posix/configure.ac.in +++ b/build_posix/configure.ac.in @@ -72,6 +72,8 @@ fi if test "$wt_cv_enable_python" = "yes"; then AM_PATH_PYTHON([2.6]) + PYTHON_PREFIX=$with_python_prefix + AC_SUBST(PYTHON_PREFIX) fi AM_TYPES |