Fixup LevelDB include paths so builds work without an installed LevelDB.

15 files changed, 22 insertions, 24 deletions

diff --git a/api/leveldb/Makefile.am b/api/leveldb/Makefile.am
index 555a443da09..0ff5d083b8d 100644
--- a/api/leveldb/Makefile.am
+++ b/api/leveldb/Makefile.am
@@ -9,19 +9,19 @@ noinst_PROGRAMS = leveldb_test
 # subdirectory, so we don't interfere with other LevelDB installs.
 leveldbincludedir = $(includedir)/wiredtiger/leveldb
 leveldbinclude_HEADERS = \
-	 include/cache.h \
-	 include/c.h \
-	 include/comparator.h\
-	 include/db.h \
-	 include/env.h \
-	 include/filter_policy.h \
-	 include/iterator.h \
-	 include/options.h \
-	 include/slice.h \
-	 include/status.h \
-	 include/table_builder.h \
-	 include/table.h \
-	 include/write_batch.h
+	 include/leveldb/cache.h \
+	 include/leveldb/c.h \
+	 include/leveldb/comparator.h\
+	 include/leveldb/db.h \
+	 include/leveldb/env.h \
+	 include/leveldb/filter_policy.h \
+	 include/leveldb/iterator.h \
+	 include/leveldb/options.h \
+	 include/leveldb/slice.h \
+	 include/leveldb/status.h \
+	 include/leveldb/table_builder.h \
+	 include/leveldb/table.h \
+	 include/leveldb/write_batch.h
 
 libwiredtiger_leveldb_la_LDFLAGS = -release @VERSION@
 libwiredtiger_leveldb_la_SOURCES = \
diff --git a/api/leveldb/include/c.h b/api/leveldb/include/leveldb/c.h
index 1048fe3b868..1048fe3b868 100644
--- a/api/leveldb/include/c.h
+++ b/api/leveldb/include/leveldb/c.h
diff --git a/api/leveldb/include/cache.h b/api/leveldb/include/leveldb/cache.h
index 5e3b47637d4..5e3b47637d4 100644
--- a/api/leveldb/include/cache.h
+++ b/api/leveldb/include/leveldb/cache.h
diff --git a/api/leveldb/include/comparator.h b/api/leveldb/include/leveldb/comparator.h
index 556b984c769..556b984c769 100644
--- a/api/leveldb/include/comparator.h
+++ b/api/leveldb/include/leveldb/comparator.h
diff --git a/api/leveldb/include/db.h b/api/leveldb/include/leveldb/db.h
index 40851b2aa83..40851b2aa83 100644
--- a/api/leveldb/include/db.h
+++ b/api/leveldb/include/leveldb/db.h
diff --git a/api/leveldb/include/env.h b/api/leveldb/include/leveldb/env.h
index b2072d02c1c..b2072d02c1c 100644
--- a/api/leveldb/include/env.h
+++ b/api/leveldb/include/leveldb/env.h
diff --git a/api/leveldb/include/filter_policy.h b/api/leveldb/include/leveldb/filter_policy.h
index 1fba08001fc..1fba08001fc 100644
--- a/api/leveldb/include/filter_policy.h
+++ b/api/leveldb/include/leveldb/filter_policy.h
diff --git a/api/leveldb/include/iterator.h b/api/leveldb/include/leveldb/iterator.h
index ad543eb46cd..ad543eb46cd 100644
--- a/api/leveldb/include/iterator.h
+++ b/api/leveldb/include/leveldb/iterator.h
diff --git a/api/leveldb/include/options.h b/api/leveldb/include/leveldb/options.h
index fdda718d309..fdda718d309 100644
--- a/api/leveldb/include/options.h
+++ b/api/leveldb/include/leveldb/options.h
diff --git a/api/leveldb/include/slice.h b/api/leveldb/include/leveldb/slice.h
index bc367986f7e..bc367986f7e 100644
--- a/api/leveldb/include/slice.h
+++ b/api/leveldb/include/leveldb/slice.h
diff --git a/api/leveldb/include/status.h b/api/leveldb/include/leveldb/status.h
index 11dbd4b47ed..11dbd4b47ed 100644
--- a/api/leveldb/include/status.h
+++ b/api/leveldb/include/leveldb/status.h
diff --git a/api/leveldb/include/table.h b/api/leveldb/include/leveldb/table.h
index a9746c3f5ea..a9746c3f5ea 100644
--- a/api/leveldb/include/table.h
+++ b/api/leveldb/include/leveldb/table.h
diff --git a/api/leveldb/include/table_builder.h b/api/leveldb/include/leveldb/table_builder.h
index 5fd1dc71f1c..5fd1dc71f1c 100644
--- a/api/leveldb/include/table_builder.h
+++ b/api/leveldb/include/leveldb/table_builder.h
diff --git a/api/leveldb/include/write_batch.h b/api/leveldb/include/leveldb/write_batch.h
index ee9aab68e0d..ee9aab68e0d 100644
--- a/api/leveldb/include/write_batch.h
+++ b/api/leveldb/include/leveldb/write_batch.h
diff --git a/api/leveldb/leveldb_wt.h b/api/leveldb/leveldb_wt.h
index 434706240a9..fa71799f290 100644
--- a/api/leveldb/leveldb_wt.h
+++ b/api/leveldb/leveldb_wt.h
@@ -7,21 +7,19 @@
 #include <hyperleveldb/env.h>
 #include <hyperleveldb/filter_policy.h>
 #include <hyperleveldb/slice.h>
-#include <hyperleveldb/slice.h>
 #include <hyperleveldb/status.h>
 #include <hyperleveldb/table_builder.h>
 #include <hyperleveldb/write_batch.h>
 #else
-#include "cache.h"
-#include "comparator.h"
-#include "db.h"
-#include "env.h"
-#include "filter_policy.h"
-#include "slice.h"
-#include "slice.h"
-#include "status.h"
-#include "table_builder.h"
-#include "write_batch.h"
+#include "leveldb/cache.h"
+#include "leveldb/comparator.h"
+#include "leveldb/db.h"
+#include "leveldb/env.h"
+#include "leveldb/filter_policy.h"
+#include "leveldb/slice.h"
+#include "leveldb/status.h"
+#include "leveldb/table_builder.h"
+#include "leveldb/write_batch.h"
 #endif
 
 #include "wiredtiger.h"