[Xfce4-commits] [apps/xfce4-screenshooter] 02/06: Appease autohell wrath^Wwarnings about putting m4 stuff in a m4 subdir.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/xfce4-screenshooter.

commit 4b4de96f6327dbee0756280f5e031cb0ad999d25
Author: Landry Breuil <landry at xfce.org>
Date:   Tue Dec 16 21:33:12 2014 +0100

    Appease autohell wrath^Wwarnings about putting m4 stuff in a m4 subdir.
---
 .gitignore      |    1 +
 Makefile.am     |    1 +
 autogen.sh      |    2 ++
 configure.ac.in |    2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ef71331..09b11a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Makefile.in
 /missing
 /po/Makefile.in.in
 /configure.ac
+/m4/
 
 # Autotools files generated into builddir (for in-tree builds)
 Makefile
diff --git a/Makefile.am b/Makefile.am
index 1cd576b..d6d78d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 @SET_MAKE@
 
 AUTOMAKE_OPTIONS = subdir-objects
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = po
 
diff --git a/autogen.sh b/autogen.sh
index 6bc0c8a..8104646 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,6 @@ EOF
   exit 1
 }
 
+test -d m4 || mkdir m4
+
 xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index a3dcc55..651c104 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,7 +12,7 @@ m4_define([xfce4_screenshooter_version_tag], [])
 m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [git], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])])
 
 AC_INIT([xfce4-screenshooter], [xfce4_screenshooter_version], [http://bugzilla.xfce.org/], [xfce4-screenshooter])
-
+AC_CONFIG_MACRO_DIR([m4])
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.