From dcb4e7b6d849cb04cee7be7de37440f12bd305c7 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Wed, 20 Aug 2014 13:46:35 +0200
Subject: [PATCH] rename 'common' directory to 'm4' (because really, forget
 doxygen.mk)

---
 Makefile.am                         | 6 +++---
 configure.ac                        | 4 ++--
 {common => m4}/.gitignore           | 0
 {common => m4}/Makefile.am          | 0
 {common => m4}/acx_pthread.m4       | 0
 {common => m4}/doxygen.m4           | 0
 {common => m4}/doxygen.mk           | 0
 {common => m4}/gcc_stack_protect.m4 | 0
 {common => m4}/gcc_visibility.m4    | 0
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename {common => m4}/.gitignore (100%)
 rename {common => m4}/Makefile.am (100%)
 rename {common => m4}/acx_pthread.m4 (100%)
 rename {common => m4}/doxygen.m4 (100%)
 rename {common => m4}/doxygen.mk (100%)
 rename {common => m4}/gcc_stack_protect.m4 (100%)
 rename {common => m4}/gcc_visibility.m4 (100%)

diff --git a/Makefile.am b/Makefile.am
index 792e43a..116bb5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-ACLOCAL_AMFLAGS = -I common
+ACLOCAL_AMFLAGS = -I m4
 
-include $(srcdir)/common/doxygen.mk
+include $(srcdir)/m4/doxygen.mk
 
 EXTRA_DIST = \
 	LICENSE \
@@ -39,7 +39,7 @@ EXTRA_DIST = \
 	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
-	common \
+	m4 \
 	avahi \
 	tests \
 	examples
diff --git a/configure.ac b/configure.ac
index f931dd1..3849cf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 AC_PREREQ(2.63)
 AC_INIT([avahi],[0.6.31],[avahi (at) lists (dot) freedesktop (dot) org])
 AC_CONFIG_SRCDIR([avahi/server.c])
-AC_CONFIG_MACRO_DIR([common])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
 
@@ -326,7 +326,7 @@ Makefile
 avahi/Makefile
 tests/Makefile
 examples/Makefile
-common/Makefile
+m4/Makefile
 ])
 AC_OUTPUT
 
diff --git a/common/.gitignore b/m4/.gitignore
similarity index 100%
rename from common/.gitignore
rename to m4/.gitignore
diff --git a/common/Makefile.am b/m4/Makefile.am
similarity index 100%
rename from common/Makefile.am
rename to m4/Makefile.am
diff --git a/common/acx_pthread.m4 b/m4/acx_pthread.m4
similarity index 100%
rename from common/acx_pthread.m4
rename to m4/acx_pthread.m4
diff --git a/common/doxygen.m4 b/m4/doxygen.m4
similarity index 100%
rename from common/doxygen.m4
rename to m4/doxygen.m4
diff --git a/common/doxygen.mk b/m4/doxygen.mk
similarity index 100%
rename from common/doxygen.mk
rename to m4/doxygen.mk
diff --git a/common/gcc_stack_protect.m4 b/m4/gcc_stack_protect.m4
similarity index 100%
rename from common/gcc_stack_protect.m4
rename to m4/gcc_stack_protect.m4
diff --git a/common/gcc_visibility.m4 b/m4/gcc_visibility.m4
similarity index 100%
rename from common/gcc_visibility.m4
rename to m4/gcc_visibility.m4
-- 
2.39.5