Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-06-21 20:59:55 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2013-06-27 02:04:50 (GMT)
commit91f3bb219a6d8dfeef8539e1143f59f4f5099796 (patch)
tree6002ee95fc5acd087c60ad95d3d5b38dde20bd50
parent1ee01a047d4b211ae6af29818a959e2870b88bf1 (diff)
Modernize the autogen.sh scriptHEADmaster
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.
-rw-r--r--Makefile.am1
-rwxr-xr-xautogen.sh12
2 files changed, 6 insertions, 7 deletions
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 "$@"