From 9fb4fcc669e1b1cfe51f1be1b0b1d8476ac0ab87 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Thu, 18 Jul 2013 00:27:31 -0400
Subject: [PATCH] Replace custom autogen.sh script with simple autoreconf
 command

Rename config directory to build-aux to follow autotools conventions.

Use m4 directory to store macros.
---
 Makefile.am                   |  2 +-
 autogen.sh                    | 68 ++---------------------------------
 build-aux/.gitignore          |  0
 configure.ac                  |  3 +-
 {config => m4}/acx_pthread.m4 |  0
 5 files changed, 6 insertions(+), 67 deletions(-)
 create mode 100644 build-aux/.gitignore
 rename {config => m4}/acx_pthread.m4 (100%)

diff --git a/Makefile.am b/Makefile.am
index dca6411..8f53757 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = autogen.sh \
              $(ac_aux_dir)/acx_pthread.m4 \
              pixmaps
 
-ACLOCAL = aclocal -I $(ac_aux_dir)
+ACLOCAL_AMFLAGS = -I m4
 
 CLEANFILES = *~
 
diff --git a/autogen.sh b/autogen.sh
index b605cb3..01ac134 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,68 +1,6 @@
 #!/bin/sh
-# autogen.sh -- Use this script to create generated files from the SVN distribution
-# Taken from glib CVS
+# autogen.sh -- Use this script to create generated files from the git
+# distribution
 
-PROJECT=Wmnotify
-TEST_TYPE=-f
-TEST_FILE=src/wmnotify.c
+autoreconf -vi
 
-ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I config"
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd ${srcdir}
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $PROJECT."
-    echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-}
-
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have libtool installed to compile $PROJECT."
-    echo "Visit http://www.gnu.org/software/libtool/ for more information."
-    DIE=1
-}
-
-if test "${DIE}" -eq 1; then
-    exit 1
-fi
-
-test ${TEST_TYPE} ${TEST_FILE} || {
-    echo "You must run this script in the top-level $PROJECT directory"
-    exit 1
-}
-
-case ${CC} in
-    *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-aclocal ${ACLOCAL_FLAGS}
-
-#libtoolize --force --copy
-
-# Optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-
-automake --add-missing --copy ${am_opt}
-
-autoconf
-
-cd ${ORIGDIR}
-
-rm -rf autom4te.cache
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/configure.ac b/configure.ac
index 8e1789d..faff915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
 
 dnl Initialization stuff.
 AC_INIT(wmnotify, 1.0.0)
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/wmnotify.c)
 AM_CONFIG_HEADER(config.h:config-h.in)
 dnl Checking if the NEWS file has been updated to reflect the current version.
diff --git a/config/acx_pthread.m4 b/m4/acx_pthread.m4
similarity index 100%
rename from config/acx_pthread.m4
rename to m4/acx_pthread.m4
-- 
2.20.1