Fix if/else scope in yow.c from Rudi

[sxemacs] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 01bf4cd..5bd7a2e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,27 @@
 #!/bin/sh
+# Configure script bootstrap for SXEmacs
+#
+# Copyright (C) 2005, 2006, 2007 Steve Youngs.
+# Copyright (C) 2006, 2007, 2008 Sebastian Freundt.
+# Copyright (C) 2007, 2010, 2011 Nelson Ferreira
+
+# This file is part of SXEmacs.
+
+# SXEmacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# SXEmacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Parts of SXEmacs are also distributed under a BSD-like licence.
+# Check file headers for more information.
 
 # BSD's m4 probably isn't gonna cut it, use gm4 if it is available
 type gm4 >/dev/null 2>&1 && M4=gm4 || M4=m4
@@ -22,21 +45,50 @@ olddir=$(pwd)
 srcdir=$(dirname $0)
 cd "$srcdir"
 
+EXPECTED_TREE_VERSION="22.1.14"
+
 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)"
-else
-       TREE_VERSION="22.1.13"
-       GIT_VERSION="no_git_version"
+       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 "\tgit tag -s v${TREE_VERSION}.<your branch_name>"
+           echo "\tgit push --tag"
+       fi
+fi
+if test -z "$GIT_VERSION"; then
+       GIT_VERSION="${TREE_VERSION}-no_git_version"
 fi
 
 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)"
-sxemacs_codename="Ford"
+emacs_full_version="$emacs_major_version.$emacs_minor_version.$emacs_beta_version"
+sxemacs_codename="Geo"
 sxemacs_git_version="$GIT_VERSION"
 
+if test "$emacs_full_version" != "$EXPECTED_TREE_VERSION"; then
+    # Note, there is no need check for git repos, because
+    # it can only happen in such a case anyway...
+    echo "*******************************************"
+    echo " WARNING: Your git tags may be out of date "
+    echo ""
+    echo " Expected tree version $EXPECTED_TREE_VERSION "
+    echo " got $emacs_full_version (from $TREE_VERSION) "
+    set -x
+    git tag
+    git describe
+    git describe --long
+    git config -l
+    set +x
+    echo "*******************************************" 
+fi
+
 autoconf_ver=$(autoconf --version 2>/dev/null | head -n1)
 autoheader_ver=$(autoheader --version 2>/dev/null | head -n1)
 automake_ver=$(automake --version 2>/dev/null | head -n1)
@@ -62,7 +114,7 @@ fi
 
 cat>sxemacs_version.m4<<EOF
 dnl autogenerated version number
-m4_define([SXEM4CS_VERSION], [$emacs_major_version.$emacs_minor_version.$emacs_beta_version])
+m4_define([SXEM4CS_VERSION], [$emacs_full_version])
 m4_define([SXEM4CS_MAJOR_VERSION], [$emacs_major_version])
 m4_define([SXEM4CS_MINOR_VERSION], [$emacs_minor_version])
 m4_define([SXEM4CS_BETA_VERSION], [$emacs_beta_version])