Updates, rpm now tests the install locations.

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
index 598b930e8db98e5d19bcab4c2b61c9cea502c64a,3199aa8a1eac106ae2756bb984df559592bea878..5a8f17081b0ea651005589f2b61f07204ee1b562
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -51,7 -51,8 +51,7 @@@ AS_IF([test "x$ac_cv_header_atomic_h" 
  AC_CONFIG_FILES([
    Makefile
    docs/Makefile
--  libmemcached/memcached_configure.h
 -  libhashkit/Makefile
++  libmemcached/configure.h
    support/libmemcached.pc
    support/libmemcached.spec
    support/libmemcached-fc.spec

diff --cc libhashkit/include.am
index 43f8ee164a617644a74501308784bde5e06c7312,0000000000000000000000000000000000000000..dd941f9672533f0894fad3885ae4ba92f15f8a8a
mode 100644,000000..100644
--- 1/libhashkit/include.am
--- /dev/null
+++ b/libhashkit/include.am
@@@ -1,47 -1,0 +1,47 @@@
- nobase_pkginclude_HEADERS+= \
 +# vim:ft=automake
 +# included from Top Level Makefile.am
 +# All paths should be given relative to the root
 +#
 +# HashKit
 +# Copyright (C) 2009 Brian Aker
 +# All rights reserved.
 +#
 +# Use and distribution licensed under the BSD license.  See
 +# the COPYING file in the parent directory for full text.
 +
 +lib_LTLIBRARIES+= libhashkit/libhashkit.la
 +
++nobase_include_HEADERS+= \
 +                          libhashkit/algorithm.h \
 +                          libhashkit/behavior.h \
 +                          libhashkit/hashkit.h \
 +                          libhashkit/strerror.h \
 +                          libhashkit/types.h \
 +                          libhashkit/visibility.h
 +
 +noinst_HEADERS+= \
 +               libhashkit/common.h
 +
 +libhashkit_libhashkit_la_SOURCES= \
 +                                libhashkit/crc32.c \
 +                                libhashkit/behavior.c \
 +                                libhashkit/default.c \
 +                                libhashkit/fnv.c \
 +                                libhashkit/hashkit.c \
 +                                libhashkit/jenkins.c \
 +                                libhashkit/ketama.c \
 +                                libhashkit/md5.c \
 +                                libhashkit/murmur.c \
 +                                libhashkit/strerror.c
 +
 +if INCLUDE_HSIEH_SRC
 +libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.c
 +endif
 +
 +libhashkit_libhashkit_la_CFLAGS= \
 +                    ${AM_CFLAGS} \
 +                    -DBUILDING_HASHKIT
 +
 +libhashkit_libhashkit_la_LDFLAGS= \
 +                                $(LIBM) \
 +                                -version-info $(HASHKIT_LIBRARY_VERSION)

diff --cc libmemcached/configure.h.in
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c4301df931ef61e646a29b9f346cb5fa5dd0e67c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/libmemcached/configure.h.in
@@@ -1,0 -1,0 +1,28 @@@
++/* LibMemcached
++ * Copyright (C) 2006-2009 Brian Aker, Trond Norbye
++ * All rights reserved.
++ *
++ * Use and distribution licensed under the BSD license.  See
++ * the COPYING file in the parent directory for full text.
++ *
++ * Summary: Change the behavior of the memcached connection.
++ *
++ */
++
++#ifndef MEMCACHED_CONFIGURE_H
++#define MEMCACHED_CONFIGURE_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++@DEPRECATED@
++
++#define LIBMEMCACHED_VERSION_STRING "@VERSION@"
++#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* MEMCACHED_CONFIGURE_H */

diff --cc libmemcached/include.am
index 29a77538fc8421bca888ef86e1b8649e4fe7ee04,d94a6b2ebc66c76e3edc2e310e130e1899b78f3f..8adde9f033fefcd6ddfd1edf6ccfe566e4ea9699
--- 1/libmemcached/include.am
--- 2/libmemcached/include.am
+++ b/libmemcached/include.am
@@@ -3,10 -3,10 +3,9 @@@
  # All paths should be given relative to the root
  
  EXTRA_DIST+= \
++           libmemcached/configure.h.in \
             libmemcached/libmemcached_probes.d \
--           libmemcached/memcached/README.txt \
--           libmemcached/memcached_configure.h.in
--
++           libmemcached/memcached/README.txt
  
  noinst_HEADERS+= \
                 libmemcached/byteorder.h \
@@@ -19,31 -19,31 +18,29 @@@
                 libmemcached/protocol/ascii_handler.h \
                 libmemcached/protocol/binary_handler.h
  
- nobase_pkginclude_HEADERS+= \
-                           libmemcached/analyze.h \
-                           libmemcached/auto.h \
-                           libmemcached/behavior.h \
-                           libmemcached/callback.h \
-                           libmemcached/constants.h \
-                           libmemcached/dump.h \
-                           libmemcached/exception.hpp \
-                           libmemcached/get.h \
-                           libmemcached/memcached.h \
-                           libmemcached/memcached.hpp \
-                           libmemcached/memcached_configure.h \
-                           libmemcached/protocol/cache.h \
-                           libmemcached/protocol/callback.h \
-                           libmemcached/protocol_handler.h \
-                           libmemcached/result.h \
-                           libmemcached/server.h \
-                           libmemcached/stats.h \
-                           libmemcached/storage.h \
-                           libmemcached/string.h \
-                           libmemcached/types.h \
-                           libmemcached/visibility.h \
-                           libmemcached/watchpoint.h
- 
- 
+ nobase_include_HEADERS+= \
 -                          libmemcached/analyze.h \
 -                          libmemcached/auto.h \
 -                          libmemcached/behavior.h \
 -                          libmemcached/callback.h \
 -                          libmemcached/constants.h \
 -                          libmemcached/dump.h \
 -                          libmemcached/exception.hpp \
 -                          libmemcached/get.h \
 -                          libmemcached/memcached.h \
 -                          libmemcached/memcached.hpp \
 -                          libmemcached/memcached_configure.h \
 -                          libmemcached/protocol/cache.h \
 -                          libmemcached/protocol/callback.h \
 -                          libmemcached/protocol_handler.h \
 -                          libmemcached/result.h \
 -                          libmemcached/server.h \
 -                          libmemcached/stats.h \
 -                          libmemcached/storage.h \
 -                          libmemcached/string.h \
 -                          libmemcached/types.h \
 -                          libmemcached/visibility.h \
 -                          libmemcached/watchpoint.h
 -
 -
++                       libmemcached/analyze.h \
++                       libmemcached/auto.h \
++                       libmemcached/behavior.h \
++                       libmemcached/callback.h \
++                       libmemcached/configure.h \
++                       libmemcached/constants.h \
++                       libmemcached/dump.h \
++                       libmemcached/exception.hpp \
++                       libmemcached/get.h \
++                       libmemcached/memcached.h \
++                       libmemcached/memcached.hpp \
++                       libmemcached/protocol/cache.h \
++                       libmemcached/protocol/callback.h \
++                       libmemcached/protocol_handler.h \
++                       libmemcached/result.h \
++                       libmemcached/server.h \
++                       libmemcached/stats.h \
++                       libmemcached/storage.h \
++                       libmemcached/string.h \
++                       libmemcached/types.h \
++                       libmemcached/visibility.h \
++                       libmemcached/watchpoint.h
  
  lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
  libmemcached_libmemcachedprotocol_la_SOURCES =  \
@@@ -114,7 -114,7 +111,9 @@@ libmemcached_libmemcached_la_LIBADD= $(
  libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
  
  if BUILD_LIBMEMCACHEDUTIL
- pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
 -nobase_include_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
++nobase_include_HEADERS+= \
++                       libmemcached/memcached_util.h \
++                       libmemcached/util/pool.h
  lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
  endif
  

diff --cc libmemcached/memcached.h
index 95592a487490d85a7531123adb716a48a016c98c,95592a487490d85a7531123adb716a48a016c98c..4ea5ded211f0850c8099560c97fc384fd434bdd9
--- 1/libmemcached/memcached.h
--- 2/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@@ -24,7 -24,7 +24,7 @@@
  #include <netinet/in.h>
  
  #include <libmemcached/visibility.h>
--#include <libmemcached/memcached_configure.h>
++#include <libmemcached/configure.h>
  #include <libmemcached/constants.h>
  #include <libmemcached/types.h>
  #include <libmemcached/string.h>

diff --cc libmemcached/memcached_configure.h.in
index 5d4e60e984b8db69d3cf70db7d45a7606eb2fafd,5d4e60e984b8db69d3cf70db7d45a7606eb2fafd..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/libmemcached/memcached_configure.h.in
--- 2/libmemcached/memcached_configure.h.in
+++ /dev/null
@@@ -1,25 -1,25 +1,0 @@@
--/*
-- * Summary: Preprocessor symbols set from configure we need install-time
-- *
-- * Copy: See Copyright for the status of this software.
-- *
-- * Author: Trond Norbye
-- */
--
--#ifndef MEMCACHED_CONFIGURE_H
--#define MEMCACHED_CONFIGURE_H
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--@DEPRECATED@
--
--#define LIBMEMCACHED_VERSION_STRING "@VERSION@"
--#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* MEMCACHED_CONFIGURE_H */

diff --cc support/libmemcached.spec.in
index 998a2f2ff288d50603876e7dade0acd6c62938f8,ceeb36fb6a83b92345e1a8e6bac81ec22a6a9620..53c4715c2dd6dff7fbddf681bd3f1592ea5dfadc
--- 1/support/libmemcached.spec.in
--- 2/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@@ -92,42 -94,16 +92,51 @@@ you will need to install %{name}-devel
  %files devel
  %defattr (-,root,root,-) 
  %doc examples
- %{_includedir}/libmemcached/memcached_pool.h
- %{_includedir}/libmemcached/memcached_watchpoint.h
- %{_includedir}/libmemcached/memcached_get.h
- %{_includedir}/libmemcached/memcached_configure.h
- %{_includedir}/libmemcached/memcached_types.h
- %{_includedir}/libmemcached/memcached_constants.h
- %{_includedir}/libmemcached/protocol
- %{_includedir}/libmemcached/protocol/cache.h
- %{_includedir}/libmemcached/protocol/callback.h
- %{_includedir}/libmemcached/memcached_result.h
- %{_includedir}/libmemcached/memcached_server.h
- %{_includedir}/libmemcached/memcached_storage.h
- %{_includedir}/libmemcached/memcached_string.h
- %{_includedir}/libmemcached/memcached_util.h
- %{_includedir}/libmemcached/exception.hpp
- %{_includedir}/libmemcached/memcached.h
- %{_includedir}/libmemcached/protocol_handler.h
- %{_includedir}/libmemcached/memcached.hpp
- %{_includedir}/libmemcached/visibility.h
 -%{_includedir}/libmemcached
 +%{_includedir}/libhashkit/algorithm.h
 +%{_includedir}/libhashkit/behavior.h
 +%{_includedir}/libhashkit/hashkit.h
 +%{_includedir}/libhashkit/strerror.h
 +%{_includedir}/libhashkit/types.h
 +%{_includedir}/libhashkit/visibility.h
++%{_includedir}/libmemcached/analyze.h
++%{_includedir}/libmemcached/auto.h
++%{_includedir}/libmemcached/behavior.h
++%{_includedir}/libmemcached/callback.h
++%{_includedir}/libmemcached/configure.h
++%{_includedir}/libmemcached/constants.h
++%{_includedir}/libmemcached/dump.h
++%{_includedir}/libmemcached/exception.hpp
++%{_includedir}/libmemcached/get.h
++%{_includedir}/libmemcached/memcached.h
++%{_includedir}/libmemcached/memcached.hpp
++%{_includedir}/libmemcached/memcached_util.h
++%{_includedir}/libmemcached/protocol
++%{_includedir}/libmemcached/protocol/cache.h
++%{_includedir}/libmemcached/protocol/callback.h
++%{_includedir}/libmemcached/protocol_handler.h
++%{_includedir}/libmemcached/result.h
++%{_includedir}/libmemcached/server.h
++%{_includedir}/libmemcached/stats.h
++%{_includedir}/libmemcached/storage.h
++%{_includedir}/libmemcached/string.h
++%{_includedir}/libmemcached/types.h
++%{_includedir}/libmemcached/util/pool.h
++%{_includedir}/libmemcached/visibility.h
++%{_includedir}/libmemcached/watchpoint.h
 +%{_libdir}/libhashkit.so
  %{_libdir}/libmemcached.so
--%{_libdir}/libmemcachedutil.so
  %{_libdir}/libmemcachedprotocol.so
++%{_libdir}/libmemcachedutil.so
  %{_libdir}/pkgconfig/libmemcached.pc
++%{_mandir}/man3/hashkit*.3.gz
  %{_mandir}/man3/libmemcached*.3.gz
  %{_mandir}/man3/memcached_*.3.gz
- %{_mandir}/man3/hashkit*.3.gz
  
  
  %changelog
++* Fri Jan  8 2010
++- Modified to be explicit in install include files. 
++
  * Sat Apr 25 2009 Remi Collet <rpms@famillecollet.com> - 0.28-1
  - Initial RPM from Brian Aker spec
  - create -devel subpackage