diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-06-20 12:43:59 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-06-20 12:43:59 +1000 |
| commit | 424bab13a64057baf87adf8152b18ef6bfa9beff (patch) | |
| tree | 59573488b98e9b42a3452144ff587e28d6058b1c /build_posix | |
| parent | 5e66df5428491a737b92aa48617a3848bf2d73b1 (diff) | |
| download | mongo-424bab13a64057baf87adf8152b18ef6bfa9beff.tar.gz | |
More implementation of --with-builtins=
Not yet linking in the library properly.
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/aclocal/options.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build_posix/aclocal/options.m4 b/build_posix/aclocal/options.m4 index 8d1bd8f88eb..28ec1a9c8db 100644 --- a/build_posix/aclocal/options.m4 +++ b/build_posix/aclocal/options.m4 @@ -31,10 +31,8 @@ builtin_list=`echo "$with_builtins"|tr -s , ' '` for builtin_i in $builtin_list; do case "$builtin_i" in snappy) AC_DEFINE(HAVE_BUILTIN_EXTENSION_SNAPPY) - LIBBUILTINSNAPPY=-lwiredtiger_snappy wt_cv_with_builtin_extension_snappy=yes;; zlib) AC_DEFINE(HAVE_BUILTIN_EXTENSION_ZLIB) - LIBBUILTINZLIB=-lwiredtiger_zlib wt_cv_with_builtin_extension_zlib=yes;; *) AC_MSG_ERROR([Unknown builtin extension "$builtin_i"]);; esac @@ -115,7 +113,11 @@ no) if test "$wt_cv_with_builtin_extension_snappy" = "yes"; then wt_cv_enable_snappy=no fi ;; -*) wt_cv_enable_snappy=yes;; +*) if test "$wt_cv_with_builtin_extension_snappy" = "yes"; then + AC_MSG_ERROR( + [Only one of --enable-snappy --with-builtins=snappy allowed]) + fi + wt_cv_enable_snappy=yes;; esac AC_MSG_RESULT($wt_cv_enable_snappy) if test "$wt_cv_enable_snappy" = "yes"; then @@ -168,7 +170,11 @@ no) if test "$wt_cv_with_builtin_extension_zlib" = "yes"; then wt_cv_enable_zlib=no fi ;; -*) wt_cv_enable_zlib=yes;; +*) if test "$wt_cv_with_builtin_extension_zlib" = "yes"; then + AC_MSG_ERROR( + [Only one of --enable-zlib --with-builtins=zlib allowed]) + fi + wt_cv_enable_zlib=yes;; esac AC_MSG_RESULT($wt_cv_enable_zlib) if test "$wt_cv_enable_zlib" = "yes"; then |