Update the docstrings in the cl emodule.

[sxemacs] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 4b2ee13..64d67c2 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Configure script bootstrap for SXEmacs
 #
-# Copyright (C) 2005, 2006, 2007 Steve Youngs.
+# Copyright (C) 2005 - 2012 Steve Youngs.
 # Copyright (C) 2006, 2007, 2008 Sebastian Freundt.
 # Copyright (C) 2007, 2010, 2011 Nelson Ferreira
 
@@ -46,20 +46,27 @@ olddir=$(pwd)
 srcdir=$(dirname $0)
 cd "$srcdir"
 
-EXPECTED_TREE_VERSION="22.1.14"
+EXPECTED_TREE_VERSION="22.1.15"
 
 emacs_is_beta=t
 if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then
        TREE_VERSION="$($GIT tag|tail -n1|tr -d v)"
        GIT_VERSION="$($GIT describe | head -n1)"
+       GIT_BRANCH="$(git branch --no-color | awk '/^\*/ { print $2 }')"
        IN_GIT="1"
 fi
 if test -z "$TREE_VERSION"; then
        TREE_VERSION="$EXPECTED_TREE_VERSION"
        if test -n "$IN_GIT"; then
-           echo "If you cloned this branch into your own you should issue:"
+           echo "If you cloned this branch into your own you could issue:"
            echo "\tgit tag -s v${TREE_VERSION}.<your branch_name>"
-           echo "\tgit push --tag"
+           echo ""
+           echo "Be careful about pushing the tags as they probably will be "
+           echo "more of a nuisance..."
+           echo ""
+           TREE_VERSION="$EXPECTED_TREE_VERSION.$GIT_BRANCH"
+           echo "For now I am assuming the tre version will be $TREE_VERSION"
+           echo ""
        fi
 fi
 if test -z "$GIT_VERSION"; then
@@ -70,7 +77,7 @@ emacs_major_version="$(echo $TREE_VERSION|cut -d. -f1)"
 emacs_minor_version="$(echo $TREE_VERSION|cut -d. -f2)"
 emacs_beta_version="$(echo $TREE_VERSION|cut -d. -f3)"
 emacs_full_version="$emacs_major_version.$emacs_minor_version.$emacs_beta_version"
-sxemacs_codename="Geo"
+sxemacs_codename="Goggomobil"
 sxemacs_git_version="$GIT_VERSION"
 
 if test "$emacs_full_version" != "$EXPECTED_TREE_VERSION"; then
@@ -129,32 +136,27 @@ m4_define([4UTOMAKE_VERSION], [$automake_ver])
 m4_define([4IBTOOL_VERSION], [$libtool_ver])
 EOF
 
-if test -z "$FORCE"; then
-    FORCE=
-else
-    rm -rf autom4te.cache aclocal.m4
-    FORCE=--force
-fi
-
 if type glibtoolize 2>/dev/null; then
     LIBTOOLIZE=glibtoolize
 else
     LIBTOOLIZE=libtoolize
 fi
 
-autoreconf $FORCE --verbose --install -Wall
+# using libtoolize as we did before doesn't work anymore, so just mkdir --Horst
+mkdir -p libltdl/m4
+autoreconf --force --verbose --install -Wall
 
 # hack-o-matic.  Using gmp's config.{guess,sub} lets us have properer
 # detected machine configurations --SY.
 guess=$(grep GMP config.guess)
 sub=$(grep GMP config.sub)
 if test -z "${guess}"; then
-    mv -vf config.guess configfsf.guess
-    cp -v configgmp.guess config.guess
+    mv -f config.guess configfsf.guess
+    cp configgmp.guess config.guess
 fi
 if test -z "${sub}"; then
-    mv -vf config.sub configfsf.sub
-    cp -v configgmp.sub config.sub
+    mv -f config.sub configfsf.sub
+    cp configgmp.sub config.sub
 fi
 
 cd $olddir