From e751508043b500af8dba6bca0fe88187d051c3c8 Mon Sep 17 00:00:00 2001
From: Mike Massonnet <m8t@gandi.net>
Date: Sun, 2 Nov 2014 16:09:37 +0100
Subject: [PATCH] Update build environment

---
 Makefile.am     |  6 ------
 autogen.sh      |  7 +------
 configure.ac.in | 13 +++++++++----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a8be6ce..edbdd67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,6 @@ SUBDIRS = panel-plugin po icons
 distclean-local:
 	rm -rf *.cache *~
 
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-
-distcheck-bz2: distcheck
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-
 .PHONY: ChangeLog
 
 ChangeLog: Makefile
diff --git a/autogen.sh b/autogen.sh
index 524cc63..050251d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,4 @@
 #!/bin/sh
-#
-# Copyright (c) 2002-2010
-#         The Xfce development team. All rights reserved.
-#
-
-export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -16,4 +10,5 @@ EOF
   exit 1
 }
 
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" \
 xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 4800e6f..135eb1c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,18 +4,23 @@ dnl xfce4-netload-plugin - Netload plugin for xfce4-panel
 dnl
 dnl Copyright 2003 Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>
 dnl Copyright 2010 Florian Rivoal <frivoal@xfce.org>
+dnl Copyright 2014 Mike Massonnet <mmassonnet@xfce.org>
 dnl
 
-m4_define([netload_version],[1.2.0])
+m4_define([netload_version],[1.2.1])
 
 AC_INIT([xfce4-netload-plugin], [netload_version],
 	[goodies-dev@xfce.org])
-
-NETLOAD_VERSION=netload_version()
-AM_INIT_AUTOMAKE([xfce4-netload-plugin], [$NETLOAD_VERSION])
 AM_CONFIG_HEADER([config.h])
+AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
 
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2])
 AM_MAINTAINER_MODE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl Check for basic programs
 AC_PROG_CC