* Synced to 1.0.

diff --git a/autogen.sh b/autogen.sh
index cf1f0a2e23360a104d44d5faf08dd869a36cb691..f616b792577af61f907d2fe4768b1bb4cc2a1e41 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,12 @@ DIE=0
 
 PROG=GiNaC
 
+# Check how echo works in this /bin/sh
+case `echo -n` in
+-n) _echo_n=   _echo_c='\c';;
+*)  _echo_n=-n _echo_c=;;
+esac
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
         echo
         echo "You must have autoconf installed to compile $PROG."
@@ -15,38 +21,59 @@ PROG=GiNaC
         DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
         echo
-        echo "You must have automake installed to compile $PROG."
-        echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.4.tar.gz"
+        echo "You must have libtool installed to compile $PROG."
+        echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.tar.gz"
         echo "(or a newer version if it is available)"
         DIE=1
 }
 
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+(automake --version) < /dev/null > /dev/null 2>&1 || {
         echo
-        echo "You must have libtool installed to compile $PROG."
-        echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.tar.gz"
+        echo "You must have automake installed to compile $PROG."
+        echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.4.tar.gz"
         echo "(or a newer version if it is available)"
         DIE=1
 }
 
+(aclocal --version) < /dev/null > /dev/null 2>&1 || {
+       echo
+       echo "**Error**: Missing aclocal. The version of automake"
+       echo "installed doesn't appear recent enough."
+       echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
+       echo "(or a newer version if it is available)"
+       DIE=1
+}
+
 if test "$DIE" -eq 1; then
         exit 1
 fi
 
-if test -z "$*"; then
-        echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
+aclocalinclude="$ACLOCAL_FLAGS"; \
+(echo $_echo_n " + Running aclocal: $_echo_c"; \
+    aclocal $aclocalinclude; \
+ echo "done.") && \
+(echo $_echo_n " + Running libtoolize: $_echo_c"; \
+    libtoolize --force --copy >/dev/null 2>&1; \
+ echo "done.") && \
+(echo $_echo_n " + Running autoheader: $_echo_c"; \
+    autoheader; \
+ echo "done.") && \
+(echo $_echo_n " + Running automake: $_echo_c"; \
+    automake --gnu --add-missing --copy; \
+ echo "done.") && \
+(echo $_echo_n " + Running autoconf: $_echo_c"; \
+    autoconf; \
+ echo "done.")
 
-for dir in .
-do 
-  echo processing $dir
-  (cd $dir; \
-  aclocalinclude="$ACLOCAL_FLAGS"; \
-  aclocal $aclocalinclude; \
-  autoheader; libtoolize -c; automake -a -c; autoconf)
-done
+rm -f config.cache
 
-./configure "$@"
+if [ x"$NO_CONFIGURE" = "x" ]; then
+    echo " + Running 'configure $@':"
+    if [ -z "$*" ]; then
+       echo "   ** If you wish to pass arguments to ./configure, please"
+        echo "   ** specify them on the command line."
+    fi
+    ./configure "$@"
+fi

diff --git a/doc/tutorial/ginac.texi b/doc/tutorial/ginac.texi
index ac4fd5843976562946cffa96fec73ecdbf107340..3c88ec309362479b78762aca1114a58bc19f2577 100644 (file)
--- a/doc/tutorial/ginac.texi
+++ b/doc/tutorial/ginac.texi
@@ -1878,9 +1878,9 @@ indices into a canonical order which allows for some immediate simplifications:
      // -> 2*A.j.i
     cout << indexed(B, sy_anti(), i, j)
           + indexed(B, sy_anti(), j, i) << endl;
-     // -> -B.j.i
+     // -> 0
     cout << indexed(B, sy_anti(), i, j, k)
-          + indexed(B, sy_anti(), j, i, k) << endl;
+          - indexed(B, sy_anti(), j, k, i) << endl;
      // -> 0
     ...
 @end example
@@ -1895,8 +1895,8 @@ not dummy indices are called @dfn{free indices}. Numeric indices are neither
 dummy nor free indices.
 
 To be recognized as a dummy index pair, the two indices must be of the same
-class and dimension and their value must be the same single symbol (an index
-like @samp{2*n+1} is never a dummy index). If the indices are of class
+class and their value must be the same single symbol (an index like
+@samp{2*n+1} is never a dummy index). If the indices are of class
 @code{varidx} they must also be of opposite variance; if they are of class
 @code{spinidx} they must be both dotted or both undotted.