Merge branch 'master' of github.com:charybdis-ircd/charybdis

[solanum.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 1e9709c090ab1530a8eef4d10707a7eddc891f73..a317574a0ce851b4fb14611fe4e42f9036a5f1b1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,14 +10,16 @@ fi
 
 AUTOCONF=${AUTOCONF:-autoconf}
 ACLOCAL=${ACLOCAL:-aclocal}
-AUTOHEADER=${AUTOHEADER:-autoheader}
 AUTOMAKE=${AUTOMAKE:-automake}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 
 dump_help_screen ()
 {
    echo "Usage: $0 [options]"
    echo 
    echo "options:"
+   echo "  -n           skip CVS changelog creation"
    echo "  -h,--help    show this help screen"
    echo
    exit 0
@@ -30,6 +32,9 @@ parse_options ()
          -h|--help)
             dump_help_screen
             ;;
+         -n)
+            SKIP_CVS_CHANGELOG=yes
+            ;;
          *)
             echo Invalid argument - $1
             dump_help_screen
@@ -73,16 +78,17 @@ run_or_die ()
 
 parse_options "$@"
 
-cd $TOP_DIR
+echo "Building libratbox autotools files."
 
-run_or_die $AUTOHEADER
-run_or_die $AUTOCONF
-run_or_die $AUTOMAKE
+cd "$TOP_DIR"/libratbox
+bash autogen.sh
+
+echo "Building main autotools files."
 
-cd $TOP_DIR/libratbox
+cd "$LAST_DIR"
 
+run_or_die $ACLOCAL -I m4
+run_or_die $LIBTOOLIZE --force --copy
 run_or_die $AUTOHEADER
 run_or_die $AUTOCONF
-run_or_die $AUTOMAKE
-
-cd $LAST_DIR
+run_or_die $AUTOMAKE --add-missing --copy