diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-07-07 01:27:47 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-07-07 01:27:47 +1000 |
| commit | 5791f5b8647e9d8623ace70b92f5af196cf43bc2 (patch) | |
| tree | c873b2989d23116a19ec8cecacc6458cad34005b /build_posix | |
| parent | 1fb879844911a83588db25a2ce23a7b7cd104e28 (diff) | |
| download | mongo-5791f5b8647e9d8623ace70b92f5af196cf43bc2.tar.gz | |
imported patch java-api
--HG--
rename : lang/python/Makefile.am => lang/java/Makefile.am
rename : lang/python/wiredtiger.i => lang/java/wiredtiger.i
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/Make.subdirs | 1 | ||||
| -rw-r--r-- | build_posix/aclocal/options.m4 | 16 | ||||
| -rw-r--r-- | build_posix/configure.ac.in | 5 |
3 files changed, 20 insertions, 2 deletions
diff --git a/build_posix/Make.subdirs b/build_posix/Make.subdirs index cd60340426f..a993569fcc2 100644 --- a/build_posix/Make.subdirs +++ b/build_posix/Make.subdirs @@ -11,6 +11,7 @@ ext/collators/reverse ext/compressors/bzip2_compress BZIP2 ext/compressors/nop_compress ext/compressors/snappy_compress SNAPPY +lang/java JAVA lang/python PYTHON test/checkpoint test/fops diff --git a/build_posix/aclocal/options.m4 b/build_posix/aclocal/options.m4 index 64f0f0bacb3..f235b5024e8 100644 --- a/build_posix/aclocal/options.m4 +++ b/build_posix/aclocal/options.m4 @@ -46,10 +46,24 @@ no) wt_cv_enable_diagnostic=no;; esac AC_MSG_RESULT($wt_cv_enable_diagnostic) +AC_MSG_CHECKING(if --enable-java option specified) +AC_ARG_ENABLE(java, + [AC_HELP_STRING([--enable-java], + [Configure the Java API.])], r=$enableval, r=no) +case "$r" in +no) wt_cv_enable_java=no;; +*) if test "$enable_shared" = "no"; then + AC_MSG_ERROR([--enable-java requires shared libraries]) + fi + wt_cv_enable_java=yes;; +esac +AC_MSG_RESULT($wt_cv_enable_java) +AM_CONDITIONAL([JAVA], [test x$wt_cv_enable_java = xyes]) + AC_MSG_CHECKING(if --enable-python option specified) AC_ARG_ENABLE(python, [AC_HELP_STRING([--enable-python], - [Configure for python symbols.])], r=$enableval, r=no) + [Configure the python API.])], r=$enableval, r=no) case "$r" in no) wt_cv_enable_python=no;; *) if test "$enable_shared" = "no"; then diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in index 2255e8f2329..3f12afe4c04 100644 --- a/build_posix/configure.ac.in +++ b/build_posix/configure.ac.in @@ -50,9 +50,12 @@ fi AM_CONDITIONAL([DEBUG], [test "$wt_cv_enable_debug" = "yes"]) -# Python API +# Java and Python APIs if test "$wt_cv_enable_python" = "yes"; then AM_PATH_PYTHON([2.6]) +fi + +if test "$wt_cv_enable_java" = "yes" -o "$wt_cv_enable_python" = "yes"; then AC_PATH_PROG([SWIG], [swig], [swig]) fi |