[Xfce4-commits] [panel-plugins/xfce4-places-plugin] 01/03: Update the build system to be compliant with other plugins

[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 panel-plugins/xfce4-places-plugin.

commit 64eadaed6017fd802cbf1671a2f81476ca98efab
Author: Romain Bouvier <skunnyk at alteroot.org>
Date:   Thu May 23 13:40:14 2019 +0200

    Update the build system to be compliant with other plugins
    
    - Bump dependencies versions
---
 .gitignore                         |  2 ++
 Makefile.am                        |  6 ++----
 configure.in.in => configure.ac.in | 36 +++++++++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8cbc34e..eb16dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /config.sub
 /configure
 /configure.in
+/configure.ac
 /depcomp
 /install-sh
 /libtool
@@ -22,6 +23,7 @@
 /mkinstalldirs
 /stamp-h1
 /xfce4-places-plugin-*.tar.*
+/m4
 
 /autom4te.cache/
 
diff --git a/Makefile.am b/Makefile.am
index 1ecae7a..d439ba0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,9 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS =								\
 	panel-plugin							\
 	po
 
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
-
 distclean-local:
 	rm -rf *.cache *~
 
diff --git a/configure.in.in b/configure.ac.in
similarity index 50%
rename from configure.in.in
rename to configure.ac.in
index 7480ef2..268ec02 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -1,24 +1,34 @@
 dnl xfce4-places-plugin
 
 dnl version info
-m4_define([places_version], [1.8.0])
+m4_define([places_version_major], [1])
+m4_define([places_version_minor], [8])
+m4_define([places_version_micro], [0])
+m4_define([places_version_nano],  []) dnl leave this empty to have no nano version
+m4_define([places_version_build], [@REVISION@])
+m4_define([places_version_tag], [git])
+m4_define([places_version], [places_version_major().places_version_minor().places_version_micro()ifelse(places_version_nano(), [], [], [.places_version_nano()])ifelse(places_version_tag(), [git], [places_version_tag()-places_version_build()], [places_version_tag()])])
+m4_define([places_default_debug], [ifelse(places_version_tag(), [git], [yes], [minimum])])
 
 dnl initialize autoconf
-AC_COPYRIGHT([Copyright (c) 2007-2009 Diego Ongaro <ongardie at gmail.com>])
-AC_INIT([xfce4-places-plugin], [places_version], [ongardie at gmail.com])
+AC_COPYRIGHT([Copyright (c) 2007-2009 Diego Ongaro <ongardie at gmail.com>
+              2019 The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-places-plugin], [places_version], [https://bugzilla.xfce.org/], [xfce4-places-plugin])
+
 AC_PREREQ([2.50])
+AC_CONFIG_MACRO_DIRS([m4])
 
 dnl initialize automake
-AM_INIT_AUTOMAKE()
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 dnl check for basic programs
 AC_PROG_CC()
 AM_PROG_CC_C_O
 AC_PROG_INSTALL()
-AC_PROG_INTLTOOL()
+IT_PROG_INTLTOOL([0.35.0])
 
 dnl Initialize libtool
 LT_PREREQ([2.2.6])
@@ -32,10 +42,10 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
 XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.0])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
 XDT_CHECK_LIBX11()
 
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix],
@@ -48,7 +58,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications],
 dnl check for i18n support
 XDT_I18N([@LINGUAS@])
 
-XDT_FEATURE_DEBUG()
+XDT_FEATURE_DEBUG([places_default_debug])
 
 AC_OUTPUT([
 Makefile
@@ -56,3 +66,11 @@ panel-plugin/Makefile
 po/Makefile.in
 ])
 
+dnl ***************************
+dnl *** Print configuration ***
+dnl ***************************
+echo
+echo "Build Configuration:"
+echo
+echo "* Debug Support:    $enable_debug"
+echo

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