Take Keith's suggestion: rearrange `api/leveldb` by copyright to simplify maintenance of the license information. Rename the "eleveldb" flavor to "basho" in the process, so the directory name matches the option. List the choices in the configure help, and check for invalid flavors.

--HG--
rename : api/leveldb/util/perf_count.cc => api/leveldb/basho/perf_count.cc
rename : api/leveldb/include/leveldb/perf_count.h => api/leveldb/basho/perf_count.h
rename : api/leveldb/include/leveldb/replay_iterator.h => api/leveldb/hyperleveldb/replay_iterator.h
rename : api/leveldb/AUTHORS => api/leveldb/leveldb/AUTHORS
rename : api/leveldb/LICENSE => api/leveldb/leveldb/LICENSE
rename : api/leveldb/db/dbformat.h => api/leveldb/leveldb/db/dbformat.h
rename : api/leveldb/db/skiplist.h => api/leveldb/leveldb/db/skiplist.h
rename : api/leveldb/db/write_batch.cc => api/leveldb/leveldb/db/write_batch.cc
rename : api/leveldb/db/write_batch_internal.h => api/leveldb/leveldb/db/write_batch_internal.h
rename : api/leveldb/include/leveldb/cache.h => api/leveldb/leveldb/include/leveldb/cache.h
rename : api/leveldb/include/leveldb/comparator.h => api/leveldb/leveldb/include/leveldb/comparator.h
rename : api/leveldb/include/leveldb/db.h => api/leveldb/leveldb/include/leveldb/db.h
rename : api/leveldb/include/leveldb/env.h => api/leveldb/leveldb/include/leveldb/env.h
rename : api/leveldb/include/leveldb/filter_policy.h => api/leveldb/leveldb/include/leveldb/filter_policy.h
rename : api/leveldb/include/leveldb/iterator.h => api/leveldb/leveldb/include/leveldb/iterator.h
rename : api/leveldb/include/leveldb/options.h => api/leveldb/leveldb/include/leveldb/options.h
rename : api/leveldb/include/leveldb/slice.h => api/leveldb/leveldb/include/leveldb/slice.h
rename : api/leveldb/include/leveldb/status.h => api/leveldb/leveldb/include/leveldb/status.h
rename : api/leveldb/include/leveldb/write_batch.h => api/leveldb/leveldb/include/leveldb/write_batch.h
rename : api/leveldb/port/port.h => api/leveldb/leveldb/port/port.h
rename : api/leveldb/util/arena.h => api/leveldb/leveldb/util/arena.h
rename : api/leveldb/util/coding.cc => api/leveldb/leveldb/util/coding.cc
rename : api/leveldb/util/coding.h => api/leveldb/leveldb/util/coding.h
rename : api/leveldb/util/comparator.cc => api/leveldb/leveldb/util/comparator.cc
rename : api/leveldb/util/env.cc => api/leveldb/leveldb/util/env.cc
rename : api/leveldb/util/env_posix.cc => api/leveldb/leveldb/util/env_posix.cc
rename : api/leveldb/util/logging.cc => api/leveldb/leveldb/util/logging.cc
rename : api/leveldb/util/logging.h => api/leveldb/leveldb/util/logging.h
rename : api/leveldb/util/options.cc => api/leveldb/leveldb/util/options.cc
rename : api/leveldb/util/posix_logger.h => api/leveldb/leveldb/util/posix_logger.h
rename : api/leveldb/util/random.h => api/leveldb/leveldb/util/random.h
rename : api/leveldb/util/status.cc => api/leveldb/leveldb/util/status.cc

1 files changed, 9 insertions, 8 deletions

diff --git a/build_posix/aclocal/options.m4 b/build_posix/aclocal/options.m4
index 8318c16e15d..a0787c69139 100644
--- a/build_posix/aclocal/options.m4
+++ b/build_posix/aclocal/options.m4
@@ -86,23 +86,24 @@ AM_CONDITIONAL([JAVA], [test x$wt_cv_enable_java = xyes])
 
 AC_MSG_CHECKING(if --enable-leveldb option specified)
 AC_ARG_ENABLE(leveldb,
-	[AS_HELP_STRING([--enable-leveldb],
+	[AS_HELP_STRING([--enable-leveldb[[=yes|basho|hyper|rocksdb]]],
 	    [Build the LevelDB API.])], r=$enableval, r=no)
-
 wt_cv_enable_leveldb=yes
-wt_cv_enable_eleveldb=no
+wt_cv_enable_basholeveldb=no
 wt_cv_enable_hyperleveldb=no
 wt_cv_enable_rocksdb=no
 case "$r" in
+yes)		;;
 no)		wt_cv_enable_leveldb=no;;
-eleveldb)	wt_cv_enable_eleveldb=yes;;
+basho)		wt_cv_enable_basholeveldb=yes;;
 hyper)		wt_cv_enable_hyperleveldb=yes;;
 rocksdb)	wt_cv_enable_rocksdb=yes;;
+*)		AC_MSG_ERROR([Unknown LevelDB flavor \"$r\"]);;
 esac
 
-AH_TEMPLATE(HAVE_ELEVELDB, [Build the LevelDB API with ELevelDB support.])
-if test "$wt_cv_enable_eleveldb" = "yes"; then
-	AC_DEFINE(HAVE_ELEVELDB)
+AH_TEMPLATE(HAVE_BASHOLEVELDB, [Build the LevelDB API with Basho LevelDB support.])
+if test "$wt_cv_enable_basholeveldb" = "yes"; then
+	AC_DEFINE(HAVE_BASHOLEVELDB)
 fi
 AH_TEMPLATE(HAVE_HYPERLEVELDB,
     [Build the LevelDB API with HyperLevelDB support.])
@@ -115,7 +116,7 @@ if test "$wt_cv_enable_rocksdb" = "yes"; then
 fi
 AC_MSG_RESULT($wt_cv_enable_leveldb)
 AM_CONDITIONAL([LEVELDB], [test "$wt_cv_enable_leveldb" = "yes"])
-AM_CONDITIONAL([HAVE_ELEVELDB], [test "$wt_cv_enable_eleveldb" = "yes"])
+AM_CONDITIONAL([HAVE_BASHOLEVELDB], [test "$wt_cv_enable_basholeveldb" = "yes"])
 AM_CONDITIONAL([HAVE_HYPERLEVELDB], [test "$wt_cv_enable_hyperleveldb" = "yes"])
 AM_CONDITIONAL([HAVE_ROCKSDB], [test "$wt_cv_enable_rocksdb" = "yes"])