[Xfce4-commits] [xfce/xfce4-dev-tools] 02/08: Fix autotools m4 warning

[noreply at xfce.org]

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

hjudt pushed a commit to branch master
in repository xfce/xfce4-dev-tools.

commit 55b8148aacb05346b8c85954d41d360ae8cbd38e
Author: Harald Judt <h.judt at gmx.at>
Date:   Mon Feb 16 21:34:08 2015 +0100

    Fix autotools m4 warning
---
 .gitignore      |    3 ++-
 Makefile.am     |    2 ++
 autogen.sh      |    2 ++
 configure.ac.in |    1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 284267d..53af060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ ChangeLog
 xfce4-dev-tools-*.tar.bz2
 xdt-csource/*
 !xdt-csource/Makefile.am
-!xdt-csource/main.c
\ No newline at end of file
+!xdt-csource/main.c
+m4
diff --git a/Makefile.am b/Makefile.am
index 3296076..f7fb5d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@
 # Written for Xfce by Benedikt Meurer <benny at xfce.org>.
 #
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = 								\
 	m4macros							\
 	scripts								\
diff --git a/autogen.sh b/autogen.sh
index 290cdf2..eec9302 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,6 +34,8 @@ sed -e "s/@REVISION@/${revision}/g" < "configure.ac.in" > "configure.ac"
  automake --add-missing --copy --gnu &&
  autoconf) || exit 1
 
+test -d m4 || mkdir m4
+
 if test x"${NOCONFIGURE}" = x""; then
   (./configure --enable-maintainer-mode "$@" &&
    echo "Now type \"make\" to build.") || exit 1
diff --git a/configure.ac.in b/configure.ac.in
index a1b4790..79c8952 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -27,6 +27,7 @@ dnl ***************************
 AC_INIT([xfce4-dev-tools], [xdt_version],
         [http://bugzilla.xfce.org/enter_bug.cgi?product=Xfce4-dev-tools])
 AC_COPYRIGHT([Copyright (c) 2002-2015 The Xfce development team. All rights reserved.])
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl substitute version info
 AC_SUBST([VERSION_MAJOR], [xdt_version_major])

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