X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/db0b158ab9e273361be55c01a7f3e16d64628e33..e902e16974aaf703514c5e5c7b06ab5e19bc821b:/autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 9830475b..6348810b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,14 +9,18 @@ if test ! -f $TOP_DIR/configure.ac ; then
 fi
 
 AUTOCONF=${AUTOCONF:-autoconf}
-AUTOHEADER=${AUTOHEADER:-autoheader}
+ACLOCAL=${ACLOCAL:-aclocal}
 AUTOMAKE=${AUTOMAKE:-automake}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+#SHTOOLIZE=${SHTOOLIZE:-shtoolize}
 
 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
@@ -29,6 +33,9 @@ parse_options ()
          -h|--help)
             dump_help_screen
             ;;
+         -n)
+            SKIP_CVS_CHANGELOG=yes
+            ;;
          *)
             echo Invalid argument - $1
             dump_help_screen
@@ -72,16 +79,18 @@ run_or_die ()
 
 parse_options "$@"
 
-cd $TOP_DIR
+echo "Building librb autotools files."
 
-run_or_die $AUTOHEADER
-run_or_die $AUTOCONF
-run_or_die $AUTOMAKE
+cd "$TOP_DIR"/librb
+sh 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
+#run_or_die $SHTOOLIZE all