From: Brian Aker <brian@tangent.org>
Date: Thu, 13 Dec 2012 11:00:45 +0000 (-0500)
Subject: Fix header reference in libhashkit.
X-Git-Tag: 1.0.15~3^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1f296637fb7dfd66e8b86f25e35c081426afc252;hp=cdca8cca3bd30c5424793b202551c84123e7129b;p=m6w6%2Flibmemcached

Fix header reference in libhashkit.
---

diff --git a/.bzrignore b/.bzrignore
index 18ba5811..23517686 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -158,3 +158,5 @@ tests/testudp
 tests/var/
 tmp_chroot
 unittests/unittests
+libhashkit/hashkitcon.h
+libtest/yatlcon.h
diff --git a/libhashkit/common.h b/libhashkit/common.h
index 43a859fe..d32d31bc 100644
--- a/libhashkit/common.h
+++ b/libhashkit/common.h
@@ -2,7 +2,7 @@
  *
  *  HashKit library
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include <mem_config.h>
+#include "libhashkit/hashkitcon.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/libhashkit/hashkitcon.h.in b/libhashkit/hashkitcon.h.in
new file mode 100644
index 00000000..98349625
--- /dev/null
+++ b/libhashkit/hashkitcon.h.in
@@ -0,0 +1,40 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  HashKit library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#pragma once
+
+#include "@AUTOHEADER_FILE@"
diff --git a/libhashkit/include.m4 b/libhashkit/include.m4
index eb85c05b..257e5bcf 100644
--- a/libhashkit/include.m4
+++ b/libhashkit/include.m4
@@ -6,4 +6,5 @@ dnl with or without modifications, as long as this notice is preserved.
 HASHKIT_LIBRARY_VERSION=2:0:0
 AC_SUBST(HASHKIT_LIBRARY_VERSION)
 
+AC_CONFIG_FILES([libhashkit/hashkitcon.h])
 AC_CONFIG_FILES([libhashkit-1.0/configure.h])
diff --git a/libhashkit/murmur3.cc b/libhashkit/murmur3.cc
index 5a5666e7..e5f06ce2 100644
--- a/libhashkit/murmur3.cc
+++ b/libhashkit/murmur3.cc
@@ -7,7 +7,7 @@
 // compile and run any of them on any platform, but your performance with the
 // non-native version will be less than optimal.
 
-#include "mem_config.h"
+#include "libhashkit/hashkitcon.h"
 
 #include "libhashkit/murmur3.h"