commit - ebf2f991b58372e01e018e0f769762b85360ed3e
commit + 7eb3932d3a3d6684b4c58c357bab12c2125c1775
blob - c87085ac5cf030356cdba9b1846bf984b78795fd
blob + cca200b2a452d02478224566f135fdf0b8ca4eed
--- autogen.sh
+++ autogen.sh
#!/bin/sh
#
# ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2008 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
exit 1
}
+Run()
+{
+ [ "$VERBOSE" = "1" ] && echo " - running \"$@\" ..."
+ $@
+}
+
# Reset locale settings to suppress warning messages of Perl
unset LC_ALL
unset LANG
# specifies one:
echo "Searching tools ..."
[ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
-[ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
+[ "$VERBOSE" = "1" ] && echo " - ACLOCAL=$ACLOCAL"
[ -z "$AUTOHEADER" ] && AUTOHEADER=`Search autoheader 2`
-[ "$VERBOSE" = "1" ] && echo "AUTOHEADER=$AUTOHEADER"
+[ "$VERBOSE" = "1" ] && echo " - AUTOHEADER=$AUTOHEADER"
[ -z "$AUTOMAKE" ] && AUTOMAKE=`Search automake 1`
-[ "$VERBOSE" = "1" ] && echo "AUTOMAKE=$AUTOMAKE"
+[ "$VERBOSE" = "1" ] && echo " - AUTOMAKE=$AUTOMAKE"
[ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2`
-[ "$VERBOSE" = "1" ] && echo "AUTOCONF=$AUTOCONF"
+[ "$VERBOSE" = "1" ] && echo " - AUTOCONF=$AUTOCONF"
# Call ./configure when parameters have been passed to this script and
# GO isn't already defined.
# Generate files
echo "Generating files ..."
-$ACLOCAL && \
- $AUTOHEADER && \
- $AUTOMAKE --add-missing && \
- $AUTOCONF --force
+Run $ACLOCAL && \
+ Run $AUTOCONF && \
+ Run $AUTOHEADER && \
+ Run $AUTOMAKE --add-missing --no-force
if [ $? -eq 0 -a -x ./configure ]; then
# Success: if we got some parameters we call ./configure and pass