[Xfce4-commits] [xfce/xfdesktop] 01/02: Fix some autotools warnings, and bump dependencies

[noreply at xfce.org]

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

s   k   u   n   n   y   k       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/xfdesktop.

commit 68c8eb259532aacb9d73858aa627241612b95bc8
Author: Romain B <skunnyk at alteroot.org>
Date:   Sun Jun 17 00:32:34 2018 +0200

    Fix some autotools warnings, and bump dependencies
---
 .gitignore      | 1 +
 Makefile.am     | 2 ++
 configure.ac.in | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d8b495..d880d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ libtool
 xfdesktop.spec
 Makefile.in
 aclocal.m4
+m4/
 compile
 config.guess
 config.h.in
diff --git a/Makefile.am b/Makefile.am
index 7ea2a60..249e87f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 @SET_MAKE@
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = \
 	backgrounds \
 	common \
diff --git a/configure.ac.in b/configure.ac.in
index fe64be5..c466783 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -15,15 +15,14 @@ m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_mino
 dnl minimum required versions
 m4_define([glib_minimum_version], [2.42.0])
 m4_define([gtk_minimum_version], [3.20.0])
-m4_define([libxfce4util_minimum_version], [4.12.0])
+m4_define([libxfce4util_minimum_version], [4.13.0])
 m4_define([libxfce4ui_minimum_version], [4.13.0])
-m4_define([xfce_minimum_version], [4.12.0])
 m4_define([garcon_minimum_version], [0.6.0])
 m4_define([exo_minimum_version], [0.11.0])
-m4_define([thunar_minimum_version], [1.2.0])
+m4_define([thunar_minimum_version], [1.7.0])
 m4_define([wnck_minimum_version], [3.14])
 m4_define([intltool_minimum_version], [0.31])
-m4_define([xfconf_minimum_version], [4.12.1])
+m4_define([xfconf_minimum_version], [4.12.0])
 m4_define([cairo_minimum_version], [1.12])
 
 dnl define a short version string for xfdesktop
@@ -40,6 +39,7 @@ AC_PREREQ([2.60])
 dnl init automake
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 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.