From 5a0dc3338c04b40a5d6f335ac6504e9d3f7fd90d Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 20 May 2009 23:52:53 -0700
Subject: [PATCH] Moved m4 stuff to m4 dir to match how we're doing it in the
 other projects.

---
 Makefile.am                       |  2 +-
 config/bootstrap                  |  2 +-
 configure.ac                      | 20 ++++++++++----------
 {config => m4}/64bit.m4           |  0
 {config => m4}/byteorder.m4       |  0
 {config => m4}/debug.m4           |  0
 {config => m4}/dtrace.m4          |  0
 {config => m4}/extensions.m4      |  0
 {config => m4}/hsieh.m4           |  0
 {config => m4}/memcached.m4       |  0
 {config => m4}/pod2man.m4         |  0
 {config => m4}/protocol_binary.m4 |  0
 {config => m4}/setsockopt.m4      |  0
 {config => m4}/util.m4            |  0
 14 files changed, 12 insertions(+), 12 deletions(-)
 rename {config => m4}/64bit.m4 (100%)
 rename {config => m4}/byteorder.m4 (100%)
 rename {config => m4}/debug.m4 (100%)
 rename {config => m4}/dtrace.m4 (100%)
 rename {config => m4}/extensions.m4 (100%)
 rename {config => m4}/hsieh.m4 (100%)
 rename {config => m4}/memcached.m4 (100%)
 rename {config => m4}/pod2man.m4 (100%)
 rename {config => m4}/protocol_binary.m4 (100%)
 rename {config => m4}/setsockopt.m4 (100%)
 rename {config => m4}/util.m4 (100%)

diff --git a/Makefile.am b/Makefile.am
index 446e8ae8..33520339 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
diff --git a/config/bootstrap b/config/bootstrap
index d252837a..d62ca6ba 100755
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -7,7 +7,7 @@ die() { echo "$@"; exit 1; }
 # LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 LIBTOOLIZE_FLAGS=" --automake --copy --force"
 # ACLOCAL=${ACLOCAL:-aclocal}
-ACLOCAL_FLAGS="-I config"
+ACLOCAL_FLAGS="-I m4"
 # AUTOHEADER=${AUTOHEADER:-autoheader}
 # AUTOMAKE=${AUTOMAKE:-automake}
 AUTOMAKE_FLAGS="--add-missing --copy --force"
diff --git a/configure.ac b/configure.ac
index aa9cee55..a11f7dfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,16 +71,16 @@ LIBS="$save_LIBS"
 AC_SEARCH_LIBS(floorf, m)
 
 
-sinclude(config/pod2man.m4)
-sinclude(config/debug.m4)
-sinclude(config/dtrace.m4)
-sinclude(config/byteorder.m4)
-sinclude(config/64bit.m4)
-sinclude(config/protocol_binary.m4)
-sinclude(config/memcached.m4)
-sinclude(config/setsockopt.m4)
-sinclude(config/hsieh.m4)
-sinclude(config/util.m4)
+sinclude(m4/pod2man.m4)
+sinclude(m4/debug.m4)
+sinclude(m4/dtrace.m4)
+sinclude(m4/byteorder.m4)
+sinclude(m4/64bit.m4)
+sinclude(m4/protocol_binary.m4)
+sinclude(m4/memcached.m4)
+sinclude(m4/setsockopt.m4)
+sinclude(m4/hsieh.m4)
+sinclude(m4/util.m4)
 
 dnl This is likely subverted by vpath builds. How do we find the original
 dnl source dir in the configure step of a vpath build?
diff --git a/config/64bit.m4 b/m4/64bit.m4
similarity index 100%
rename from config/64bit.m4
rename to m4/64bit.m4
diff --git a/config/byteorder.m4 b/m4/byteorder.m4
similarity index 100%
rename from config/byteorder.m4
rename to m4/byteorder.m4
diff --git a/config/debug.m4 b/m4/debug.m4
similarity index 100%
rename from config/debug.m4
rename to m4/debug.m4
diff --git a/config/dtrace.m4 b/m4/dtrace.m4
similarity index 100%
rename from config/dtrace.m4
rename to m4/dtrace.m4
diff --git a/config/extensions.m4 b/m4/extensions.m4
similarity index 100%
rename from config/extensions.m4
rename to m4/extensions.m4
diff --git a/config/hsieh.m4 b/m4/hsieh.m4
similarity index 100%
rename from config/hsieh.m4
rename to m4/hsieh.m4
diff --git a/config/memcached.m4 b/m4/memcached.m4
similarity index 100%
rename from config/memcached.m4
rename to m4/memcached.m4
diff --git a/config/pod2man.m4 b/m4/pod2man.m4
similarity index 100%
rename from config/pod2man.m4
rename to m4/pod2man.m4
diff --git a/config/protocol_binary.m4 b/m4/protocol_binary.m4
similarity index 100%
rename from config/protocol_binary.m4
rename to m4/protocol_binary.m4
diff --git a/config/setsockopt.m4 b/m4/setsockopt.m4
similarity index 100%
rename from config/setsockopt.m4
rename to m4/setsockopt.m4
diff --git a/config/util.m4 b/m4/util.m4
similarity index 100%
rename from config/util.m4
rename to m4/util.m4
-- 
2.30.2