From 91f3bb219a6d8dfeef8539e1143f59f4f5099796 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Fri, 21 Jun 2013 20:59:55 +0000 Subject: Modernize the autogen.sh script It was failing to find the m4 macros directory with automake 1.13.2. This is exactly the same autogen.sh we are using in all the core sugar modules. --- diff --git a/Makefile.am b/Makefile.am index 1918a79..45eebc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,2 @@ +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = m4 src diff --git a/autogen.sh b/autogen.sh index dacf40e..7fd55ba 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,9 +1,7 @@ #!/bin/sh -aclocal -I m4/ $ACLOCAL_FLAGS --install || exit 1 -libtoolize --copy --force || exit 1 -autoheader || exit 1 -autoconf || exit 1 -automake -a -c || exit 1 - -[ "$NOCONFIGURE" ] || ./configure CFLAGS="$CFLAGS -Wall" --enable-maintainer-mode "$@" +srcdir=`dirname "$0"` +cd "$srcdir" +autoreconf -i -f +cd - +[ "$NOCONFIGURE" ] || "$srcdir"/configure CFLAGS="$CFLAGS -Wall" --enable-maintainer-mode "$@" -- cgit v0.9.1