Permalink
Browse files

Smarter autogen.sh script.

  • Loading branch information...
1 parent d140427 commit 0aa0a0667f22a1993c9724fec6cdd32f7d419e59 @ckolivas committed Jul 29, 2012
Showing with 17 additions and 12 deletions.
  1. +15 −10 autogen.sh
  2. +2 −2 mkinstalldirs
View
@@ -1,12 +1,17 @@
#!/bin/sh
+cwd="$PWD"
+bs_dir="$(dirname $(readlink -f $0))"
+rm -rf "${bs_dir}"/autom4te.cache
+rm -f "${bs_dir}"/aclocal.m4 "${bs_dir}"/ltmain.sh
-# You need autoconf 2.5x, preferably 2.57 or later
-# You need automake 1.7 or later. 1.6 might work.
-
-set -e
-
-aclocal -I m4
-autoheader
-automake --add-missing --copy
-autoconf
-
+echo 'Running autoreconf -if...'
+autoreconf -if || exit 1
+if test -z "$NOCONFIGURE" ; then
+ echo 'Configuring...'
+ cd "${bs_dir}" &> /dev/null
+ test "$?" = "0" || e=1
+ test "$cwd" != "$bs_dir" && cd "$bs_dir" &> /dev/null
+ ./configure $@
+ test "$e" = "1" && exit 1
+ cd "$cwd"
+fi
View
@@ -81,9 +81,9 @@ case $dirmode in
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
- # On NextStep and OpenStep, the `mkdir' command does not
+ # On NextStep and OpenStep, the 'mkdir' command does not
# recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
+ # directories to create, and then abort because '.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version

0 comments on commit 0aa0a06

Please sign in to comment.