[PATCH 06/11] wmhdplop: Modernize autotools.

In particular, fix the following errors and warnings:

 configure.ac:2: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are
 deprecated.  For more info, see:
 configure.ac:2: http://www.gnu.org/software/automake/manual/automake.html
 #Modernize-AM_005fINIT_005fAUTOMAKE-invocation

 Makefile.am:21: error: linker flags such as '-shared' belong in
 'gkhdplop_so_LDFLAGS'

 ./configure: line 2910: syntax error near unexpected token `build_old_libs,'
 ./configure: line 2910: `    _LT_DECL(build_old_libs, enable_static, 0,'

 ./configure: line 2908: syntax error near unexpected token
 `build_libtool_libs,'
 ./configure: line 2908: `    _LT_DECL(build_libtool_libs, enable_shared, 0,

https://sources.debian.net/src/wmhdplop/0.9.9-5/debian/patches/
  modernize_autotools.patch/
---
 wmhdplop/Makefile.am  | 3 ++-
 wmhdplop/configure.ac | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wmhdplop/Makefile.am b/wmhdplop/Makefile.am
index 7870655..61e7b54 100644
--- a/wmhdplop/Makefile.am
+++ b/wmhdplop/Makefile.am
@@ -18,6 +18,7 @@ LIBTOOLSUX_GKHDPLOP_SRC=wmhdplop.c util.c util.h procstat.c procstat.h devnames.
 
 gkhdplop_so_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
 gkhdplop_so_CFLAGS=-DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
-gkhdplop_so_LDADD=-shared $(IMLIB2_LIBS) -lm
+gkhdplop_so_LDADD=$(IMLIB2_LIBS) -lm
+gkhdplop_so_LDFLAGS=-shared
 
 all: @GKHDPLOP@
diff --git a/wmhdplop/configure.ac b/wmhdplop/configure.ac
index 5f110c0..2bef359 100644
--- a/wmhdplop/configure.ac
+++ b/wmhdplop/configure.ac
@@ -1,5 +1,6 @@
-AC_INIT(wmhdplop.c)
-AM_INIT_AUTOMAKE(wmhdplop, 0.9.9)
+AC_INIT(wmhdplop, 0.9.9)
+AC_CONFIG_SRCDIR(wmhdplop.c)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 AC_SUBST(VERSION)
@@ -9,9 +10,6 @@ AC_SUBST(ISODATE)
 
 AC_CANONICAL_HOST
 
-AM_DISABLE_STATIC
-AM_ENABLE_SHARED
-
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_HEADER_STDC
-- 
2.7.4


-- 
To unsubscribe, send mail to [email protected].