LOGCXX-433: Moved our m4 files into some subdir as (partly) suggested by libtoolize to clean up the root folder a bit.

git-svn-id: http://svn.apache.org/repos/asf/incubator/log4cxx/trunk@1736491 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 35 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index 31c6d10..a307d68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,15 +14,15 @@
 # limitations under the License.
 #
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS  = -I .
+ACLOCAL_AMFLAGS  = -I src/m4
 
 SUBDIRS = src
 EXTRA_DIST = \
     aclocal.m4 \
     autogen.sh \
     build.xml \
-    find_apr.m4 \
-    find_apu.m4 \
+    src/m4/find_apr.m4 \
+    src/m4/find_apu.m4 \
     INSTALL \
     KEYS \
     LICENSE \
diff --git a/configure.ac b/configure.ac
index 07938be..6ec857e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 AC_INIT([log4cxx], [0.11.0])
+AC_CONFIG_MACRO_DIR([src/m4])
 AC_CONFIG_SRCDIR(src/main/cpp/logger.cpp)
 
 # autoconf 2.50 or higher to rebuild aclocal.m4, because the
@@ -469,6 +470,7 @@ src/main/include/log4cxx/db/Makefile
 src/main/include/log4cxx/rolling/Makefile
 src/main/include/log4cxx/pattern/Makefile
 src/main/include/log4cxx/filter/Makefile
+src/m4/Makefile
 src/site/Makefile
 src/site/doxy/Makefile
 src/site/doxy/Doxyfile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a68a45..4c94395 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-SUBDIRS = main examples site test
+SUBDIRS      = main examples site test
+DIST_SUBDIRS = ${SUBDIRS} m4
diff --git a/src/assembly/source.xml b/src/assembly/source.xml
index bc1188e..bdc7e94 100644
--- a/src/assembly/source.xml
+++ b/src/assembly/source.xml
@@ -47,8 +47,6 @@
 				<include>NOTICE</include>
  				<include>build.xml</include>
 				<include>configure.in</include>
-				<include>find_apr.m4</include>
-				<include>find_apu.m4</include>
 				<include>liblog4cxx.pc.in</include>
 				<include>pom.xml</include>
 				<include>Makefile.in</include>
@@ -65,6 +63,11 @@
 				<exclude>src/examples/cpp/delayedloop</exclude>
 				<exclude>src/examples/cpp/stream</exclude>
 				<exclude>src/examples/cpp/trivial</exclude>
+				<exclude>src/m4/libtool.m4</exclude>
+				<exclude>src/m4/ltoptions.m4</exclude>
+				<exclude>src/m4/ltsugar.m4</exclude>
+				<exclude>src/m4/ltversion.m4</exclude>
+				<exclude>src/m4/lt~obsolete.m4</exclude>
 				<exclude>**/Makefile</exclude>
 				<exclude>**/*.o</exclude>
 				<exclude>**/*.Po</exclude>
diff --git a/src/m4/Makefile.am b/src/m4/Makefile.am
new file mode 100644
index 0000000..b678c61
--- /dev/null
+++ b/src/m4/Makefile.am
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#DISTCLEANFILES = libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
+
+dist-hook:
+	-rm -f	"$(distdir)/libtool.m4"		\
+		"$(distdir)/ltoptions.m4"	\
+		"$(distdir)/ltsugar.m4"		\
+		"$(distdir)/ltversion.m4"	\
+		"$(distdir)/lt~obsolete.m4"
diff --git a/find_apr.m4 b/src/m4/find_apr.m4
index 88f64a7..88f64a7 100644
--- a/find_apr.m4
+++ b/src/m4/find_apr.m4
diff --git a/find_apu.m4 b/src/m4/find_apu.m4
index 6654162..6654162 100644
--- a/find_apu.m4
+++ b/src/m4/find_apu.m4