Fix for lp:860465

[awesomized/libmemcached] / libmemcached / configure.h.in

diff --git a/libmemcached/configure.h.in b/libmemcached/configure.h.in
index 17ec8645865cda3592e1ece3f1cd4ea9370fcd6e..7b48be2a6ed848add52d9eae3c2b59eafff1f8b1 100644 (file)
--- a/libmemcached/configure.h.in
+++ b/libmemcached/configure.h.in
@@ -1,22 +1,48 @@
-/* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker, Trond Norbye
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2006-2009 Brian Aker, Trond Norbye All rights reserved.
  *
- * Summary: Change the behavior of the memcached connection.
+ *  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.
  *
  */
 
-#ifndef __LIBMEMCACHED_CONFIGURE_H
-#define __LIBMEMCACHED_CONFIGURE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 @DEPRECATED@
+@LIBMEMCACHED_WITH_SASL_SUPPORT@
 
 #define LIBMEMCACHED_VERSION_STRING "@VERSION@"
 #define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@
@@ -24,5 +50,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __LIBMEMCACHED_CONFIGURE_H */