[Xfce4-commits] [xfce/xfconf] 03/05: Fix some autogen.sh warnings

[noreply at xfce.org]

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

a   l   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfconf.

commit 152aae152fd2083b51559eab56570525a13f4741
Author: Romain B <skunnyk at alteroot.org>
Date:   Tue May 9 18:47:51 2017 +0200

    Fix some autogen.sh warnings
    
    	- Declare m4/ folder
    	- Add subdir-objects to AM_INIT_AUTOMAKE() because we use $(top_srcdir) is xfconf/Makefile.am
---
 Makefile.am     | 2 ++
 configure.ac.in | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 6773f06..7725083 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = \
 	common \
 	xfconf \
diff --git a/configure.ac.in b/configure.ac.in
index a0f0533..8b5691a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -20,10 +20,11 @@ m4_define([xfconf_default_debug], [ifelse(xfconf_version_tag(), [git], [yes], [m
 
 dnl init autoconf
 AC_INIT([xfconf], [xfconf_version], [http://bugzilla.xfce.org/])
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ([2.50])
 
 dnl init automake
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip subdir-objects])
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

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