From 08d56c7841799eee4d5f7ac21d1c059bc3988636 Mon Sep 17 00:00:00 2001
From: John Lindgren <john.lindgren@aol.com>
Date: Mon, 22 Apr 2013 18:59:33 -0400
Subject: [PATCH] Use AC_CONFIG_MACRO_DIR.  This allows using autoreconf
 instead of our own autogen.sh.  Closes: #282.

---
 autogen.sh   | 86 ----------------------------------------------------
 configure.ac |  1 +
 2 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100755 autogen.sh

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 95bc89620d..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-
-TOP_DIR=$(dirname $0)
-LAST_DIR=$PWD
-
-if test ! -f $TOP_DIR/configure.ac ; then
-    echo "You must execute this script from the top level directory."
-    exit 1
-fi
-
-AUTOCONF=${AUTOCONF:-autoconf}
-ACLOCAL=${ACLOCAL:-aclocal}
-AUTOHEADER=${AUTOHEADER:-autoheader}
-
-dump_help_screen ()
-{
-    echo "Usage: gen-auto-scripts.sh [options]"
-    echo 
-    echo "options:"
-    echo "  -n           skip CVS changelog creation"
-    echo "  -h,--help    show this help screen"
-    echo
-    exit 0
-}
-
-parse_options ()
-{
-    while test "$1" != "" ; do
-        case $1 in
-            -h|--help)
-                dump_help_screen
-                ;;
-            -n)
-                SKIP_CVS_CHANGELOG=yes
-                ;;
-            *)
-                echo Invalid argument - $1
-                dump_help_screen
-                ;;
-        esac
-        shift
-    done
-}
-
-run_or_die ()
-{
-    COMMAND=$1
-
-    # check for empty commands
-    if test -z "$COMMAND" ; then
-        echo "*warning* no command specified"
-        return 1
-    fi
-
-    shift;
-
-    OPTIONS="$@"
-
-    # print a message
-    printf "%s" "*info* running $COMMAND"
-    if test -n "$OPTIONS" ; then
-        echo " ($OPTIONS)"
-    else
-        echo
-    fi
-
-    # run or die
-    $COMMAND $OPTIONS ; RESULT=$?
-    if test $RESULT -ne 0 ; then
-        echo "*error* $COMMAND failed. (exit code = $RESULT)"
-        exit 1
-    fi
-
-    return 0
-}
-
-parse_options "$@"
-
-cd $TOP_DIR
-
-run_or_die $ACLOCAL -I m4
-run_or_die $AUTOHEADER
-run_or_die $AUTOCONF
-
-cd $LAST_DIR
-
diff --git a/configure.ac b/configure.ac
index 10a8f574e5..00f0521062 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [Version number of package])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AUD_COMMON_PROGS