- config.*: updated from FSF.

- Removed cint subdir for good because the new separate package seems to
  work properly now (after some longish argument with makecint).

diff --git a/INSTALL b/INSTALL
index d11413917c0de0bf6654c133b6b382bd7b548f28..06357cfe3f339e01a053afbc3f65b8d7dc811a9e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -12,13 +12,6 @@ different compiler you are on your own.  Note that you may have to use
 the same compiler you compiled CLN with because of differing
 name-mangling schemes.
 
 the same compiler you compiled CLN with because of differing
 name-mangling schemes.
 

-Optionally, GiNaC may work together with Masaharu Goto's free C++
-interpreter Cint.  You may obtain it from
-  * <ftp://root.cern.ch/root/>.
-Install it by following the instructions included in Cint's
-distribution before trying to compile GiNaC-cint.  (See section
-`Working with the Cint C++ interpreter' below.)
-

 
 INSTALLATION
 ============
 
 INSTALLATION
 ============


@@ -87,28 +80,3 @@ libreadline and maybe libreadline-dev.  If your system's vendor
 doesn't supply such packages, go to <ftp://ftp.gnu.org/gnu/readline/>
 and compile it yourself.
 
 doesn't supply such packages, go to <ftp://ftp.gnu.org/gnu/readline/>
 and compile it yourself.
 

-
-Working with the Cint C++ interpreter
-=====================================
-
-Please see <http://root.cern.ch/root/Cint.html> to learn about Cint
-and install it prior to installing ginaccint.  For the interpreter-
-compiler `makecint' to work properly, the Makefiles need to know where
-Cint has its system directory.  This is usually done by exporting
-$CINTSYSDIR to point to the proper place.  With GiNaC you may either
-try to export that variable and type
- $ ./configure --with-cint
-or specify it directly on the command line by saying
- $ ./configure --with-cint=/my/path/to/cintsysdir
-This variable does not have to be exported for running the installed
-binary: since the actual program is started by a launcher that sets it.
-Enjoy!
-
-Here is an overview to gives you an idea if you can expect GiNaC-cint
-to compile, install and work properly:
-
- Cint version | how it works
---------------+----------------------------------------------------------
- < 5.14.39    | `VERBOTEN' by license (please bite your favorite lawyer)
- < 5.14.62    | since GiNaC version 0.7, these do not compile any more
-   5.14.64-86 | compiles fine, works well with GCC 2.95.x.  GCC3 no go.

diff --git a/Makefile.am b/Makefile.am
index a728e31717b4f062b928d606161554f481067239..54fb5868b25fea36e38298f52f266f1bdb82068d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 ## Process this file with automake to produce Makefile.in

-SUBDIRS = ginac check ginsh tools @GINACCINTDIR@ doc
-DIST_SUBDIRS = cint ginac check ginsh tools doc
+SUBDIRS = ginac check ginsh tools doc
+DIST_SUBDIRS = ginac check ginsh tools doc

 
 # Requires automake 1.4
 AUTOMAKE_OPTIONS = 1.4
 
 # Requires automake 1.4
 AUTOMAKE_OPTIONS = 1.4

diff --git a/NEWS b/NEWS
index af7ec2202cb0764b49703ca437aea3fa6b13e996..544721fc0fcfba67a9571c50f8669a2b3ae44db0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ This file records noteworthy changes.
   products.
 * Positive integer powers of non-commutative expressions are automatically
   expanded.
   products.
 * Positive integer powers of non-commutative expressions are automatically
   expanded.

+* Removed cint subdirectory, ginaccint is a separate package now due to 
+  packaging considerations.

 * Several little bugfixes.
 
 0.8.3 (11 May 2001)
 * Several little bugfixes.
 
 0.8.3 (11 May 2001)

diff --git a/config.guess b/config.guess
index ba661651615d361468d6b54633a37f57662f8bbe..31ec915609e0edc72a4f8babca17b73116c86e9d 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 

-timestamp='2001-04-20'
+timestamp='2001-06-05'

 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by


@@ -52,7 +52,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.

-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO


@@ -883,38 +883,27 @@ EOF
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
        # problems with other programs or directories called `ld' in the path.
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
        # problems with other programs or directories called `ld' in the path.

-       ld_supported_emulations=`cd /; ld --help 2>&1 \
-                        | sed -ne '/supported emulations:/!d
+       ld_supported_targets=`cd /; ld --help 2>&1 \
+                        | sed -ne '/supported targets:/!d

                                    s/[         ][      ]*/ /g
                                    s/[         ][      ]*/ /g

-                                   s/.*supported emulations: *//
+                                   s/.*supported targets: *//

                                    s/ .*//
                                    p'`
                                    s/ .*//
                                    p'`

-        case "$ld_supported_emulations" in
-         i*86linux)
-               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-               exit 0
-               ;;
-         elf_i*86)
+        case "$ld_supported_targets" in
+         elf32-i386)

                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                ;;
                TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                ;;

-         i*86coff)
+         a.out-i386-linux)
+               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+               exit 0 ;;               
+         coff-i386)

                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"

-               exit 0
-               ;;
-       esac
-       # Either a pre-BFD a.out linker (linux-gnuoldld)
-       # or one that does not give us useful --help.
-       # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-       # If ld does not provide *any* "supported emulations:"
-       # that means it is gnuoldld.
-       test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-       case "${UNAME_MACHINE}" in
-       i*86)
-         VENDOR=pc;
-         ;;
-       *)
-         VENDOR=unknown;
-         ;;
+               exit 0 ;;
+         "")
+               # Either a pre-BFD a.out linker (linux-gnuoldld) or
+               # one that does not give us useful --help.
+               echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+               exit 0 ;;

        esac
        # Determine whether the default compiler is a.out or elf
        cat >$dummy.c <<EOF
        esac
        # Determine whether the default compiler is a.out or elf
        cat >$dummy.c <<EOF


@@ -928,15 +917,15 @@ EOF
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2

-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+    printf ("%s-pc-linux-gnu\n", argv[1]);

 #  else
 #  else

-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);

 #  endif
 # else
 #  endif
 # else

-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);

 # endif
 #else
 # endif
 #else

-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);

 #endif
   return 0;
 }
 #endif
   return 0;
 }

diff --git a/config.sub b/config.sub
index a06a480adafdfbe81925988759b3e29088d6d2e0..c00604f943005c204db29029ab2223c891add5e5 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 

-timestamp='2001-04-20'
+timestamp='2001-05-30'

 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software


@@ -117,7 +117,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in

-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)

     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;


@@ -234,7 +234,7 @@ case $basic_machine in
                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
                | v850 | c4x \
                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
                | v850 | c4x \
                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \

-               | pj | pjl | h8500)
+               | pj | pjl | h8500 | z8k)

                basic_machine=$basic_machine-unknown
                ;;
        m6811 | m68hc11 | m6812 | m68hc12)
                basic_machine=$basic_machine-unknown
                ;;
        m6811 | m68hc11 | m6812 | m68hc12)


@@ -242,7 +242,7 @@ case $basic_machine in
                basic_machine=$basic_machine-unknown
                os=-none
                ;;
                basic_machine=$basic_machine-unknown
                os=-none
                ;;

-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)

                ;;
 
        # We use `pc' rather than `unknown'
                ;;
 
        # We use `pc' rather than `unknown'


@@ -271,8 +271,8 @@ case $basic_machine in
              | alphaev6[78]-* \
              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
              | clipper-* | orion-* \
              | alphaev6[78]-* \
              | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
              | clipper-* | orion-* \

-             | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-             | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+             | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
+             | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \

              | mips16-* | mips64-* | mipsel-* \
              | mips64el-* | mips64orion-* | mips64orionel-* \
              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
              | mips16-* | mips64-* | mipsel-* \
              | mips64el-* | mips64orion-* | mips64orionel-* \
              | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \


@@ -881,6 +881,10 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;

+       windows32)
+               basic_machine=i386-pc
+               os=-windows32-msvcrt
+               ;;

        xmp)
                basic_machine=xmp-cray
                os=-unicos
        xmp)
                basic_machine=xmp-cray
                os=-unicos

diff --git a/configure.in b/configure.in
index 0bf0cc21f1c0f5704dee6e20e3525a85a1ea7d16..76dd5d4ea59dd885f56b07b449d8f4b4916f217f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -151,60 +151,6 @@ fi
 AC_SUBST(TUTORIAL_TARGETS)
 AC_SUBST(REFERENCE_TARGETS)
 
 AC_SUBST(TUTORIAL_TARGETS)
 AC_SUBST(REFERENCE_TARGETS)
 

-dnl Configure GiNaC-cint
-AC_ARG_WITH(cint, [  --with-cint=CINTSYSDIR  build GiNaC-cint C++ interpreter [default=no]], , with_cint=no)
-dnl The variable GINACCINTDIR controls whether the subdirectory cint is entered
-dnl from the top-level Makefile or not.
-GINACCINTDIR=
-if test "x$with_cint" != "xno"; then
-  dnl Maybe CINTSYSDIR was passed as an argument.  In this case it should 
-  dnl override any CINTSYSDIR variable already set.
-  if test "x$with_cint" != "xyes"; then
-    CINTSYSDIR=$with_cint
-    export CINTSYSDIR
-  fi
-  dnl Now have to handle two possbile cases, one with CINTSYSDIR set and one 
-  dnl without.  In the first one we search for cint and makecint in CINTSYSDIR
-  dnl and PATH, in the second there is only the PATH to search in.
-  if test "x$CINTSYSDIR" != "x"; then
-    AC_PATH_PROG(CINT, cint, , $CINTSYSDIR:$PATH)
-    AC_PATH_PROG(MAKECINT, makecint, , $CINTSYSDIR:$PATH)
-    if [[ "$CINT" -a "$MAKECINT" ]]; then
-      AC_MSG_RESULT([creating cint/Makefile])
-      (cd cint && \
-      $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
-        -D OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \
-        -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h \
-        -C++ ginaccint.bin.cpp \
-        -l -L../ginac/.libs -lginac -lcln \
-        -cint -M0x110; \
-      cd ..)
-      GINACCINTDIR="cint"
-      AC_SUBST(CINTSYSDIR)
-    else
-      GINAC_WARNING([I could not find cint and makecint (needed for building GiNaC-cint).])
-    fi
-  else
-    AC_PATH_PROG(CINT, cint)
-    AC_PATH_PROG(MAKECINT, makecint)
-    if [[ "$CINT" -a "$MAKECINT" ]]; then
-      AC_MSG_RESULT([creating cint/Makefile])
-      (cd cint && \
-      $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
-        -D OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \
-        -I .. -m -H ../ginac/ginac.h \
-        -C++ ginaccint.bin.cpp \
-        -l -L../ginac/.libs -lginac -lcln \
-        -cint -M0x110; \
-      cd ..)
-      GINACCINTDIR="cint"
-    else
-      GINAC_WARNING([I could not find cint and makecint (needed for building GiNaC-cint).])
-    fi
-  fi
-fi
-AC_SUBST(GINACCINTDIR)
-

 dnl Output makefiles etc.
 AC_OUTPUT([
 Makefile
 dnl Output makefiles etc.
 AC_OUTPUT([
 Makefile


@@ -221,8 +167,6 @@ tools/viewgar.1
 doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile
 doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile

-cint/Makefile
-cint/launch.h

 ], [chmod +x ginac-config])
 dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
 GINAC_CHECK_ERRORS
 ], [chmod +x ginac-config])
 dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
 GINAC_CHECK_ERRORS