From 4beb0994a1f2f1d3533bae819f5718cdcae8ce68 Mon Sep 17 00:00:00 2001
From: Harald Judt <h.judt@gmx.at>
Date: Mon, 16 Feb 2015 20:54:56 +0100
Subject: [PATCH] Properly handle m4 stuff
Fix warning about m4 directory.
---
Makefile.am | 2 ++
autogen.sh | 2 ++
configure.ac.in | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 13b991e3e..b319eafae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
SUBDIRS = \
icons \
pixmaps \
diff --git a/autogen.sh b/autogen.sh
index 2c644e938..1d5a9a7ac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,4 +29,6 @@ EOF
exit 1
}
+test -d m4 || mkdir m4
+
XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 0fb61bf8d..aef2ce4a7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -41,7 +41,8 @@ dnl *** Initialize autoconf ***
dnl ***************************
AC_COPYRIGHT([Copyright (c) 2004-2012 The Thunar development team. All rights reserved.])
AC_INIT([Thunar], [thunar_version], [http://bugzilla.xfce.org/], [Thunar])
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
+AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET()
AC_REVISION([$Id$])
--
GitLab