From: Ron F. <ro...@us...> - 2004-12-21 17:52:38
|
Update of /cvsroot/nsclspectcl/SpecTcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692 Modified Files: Tag: SpecTcl-3-0_developmentreally CHANGELOG config.h.in configure.in Log Message: Port to gcc 3.x compilers. Index: CHANGELOG =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/CHANGELOG,v retrieving revision 5.1 retrieving revision 5.1.2.1 diff -C2 -d -r5.1 -r5.1.2.1 *** CHANGELOG 29 Nov 2004 16:55:29 -0000 5.1 --- CHANGELOG 21 Dec 2004 17:51:11 -0000 5.1.2.1 *************** *** 120,122 **** spectrum if slot # > 999 ! Edit level 2.2-001 \ No newline at end of file --- 120,139 ---- spectrum if slot # > 999 ! SpecTcl 3.0: ! Port to gcc/g++ 3.x: ! o Lots of gruntwork with config.h etc. in all sources. ! o Added Tcl Channel inquiry functions to CTCLInterpreter to ! allow the location of Tcl_Channel given it's name. ! GetChannel ! GetChannelNames ! o Added CTCLChannel object that can do simple channel operations. ! Read ! Write ! atEof ! Flush ! Close ! o In {Write,Read}Command.cpp use tcl[io]streams to connect ! swrite/sread to Tcl channel parameters rather than decoding the ! filename. ! Propagate fix for defect 151 from 2.1 -> 2.2-> 3.0 ! \ No newline at end of file Index: config.h.in =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/config.h.in,v retrieving revision 5.1 retrieving revision 5.1.2.1 diff -C2 -d -r5.1 -r5.1.2.1 *** config.h.in 29 Nov 2004 16:55:29 -0000 5.1 --- config.h.in 21 Dec 2004 17:51:11 -0000 5.1.2.1 *************** *** 22,25 **** --- 22,28 ---- #undef HAVE_CONVERT + /* Define to 1 if you have the <cppunit/Test.h> header file. */ + #undef HAVE_CPPUNIT_TEST_H + /* True if INT_MAX defined in limits.h */ #undef HAVE_DECL_INT_MAX *************** *** 82,85 **** --- 85,112 ---- #undef HAVE_GRI + /* <fstream> exists */ + #undef HAVE_HLESS_FSTREAM + + /* <iomanip> exists */ + #undef HAVE_HLESS_IOMANIP + + /* <iostream> exists */ + #undef HAVE_HLESS_IOSTREAM + + /* <istream> exists */ + #undef HAVE_HLESS_ISTREAM + + /* <ostream> exists */ + #undef HAVE_HLESS_OSTREAM + + /* <sstream> exists */ + #undef HAVE_HLESS_SSTREAM + + /* <streambuf> exists */ + #undef HAVE_HLESS_STREAMBUF + + /* <typeinfo> exists */ + #undef HAVE_HLESS_TYPEINFO + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H *************** *** 160,163 **** --- 187,193 ---- #undef HAVE_STDLIB_H + /* 1 if std namespace defined */ + #undef HAVE_STD_NAMESPACE + /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR *************** *** 310,313 **** --- 340,351 ---- #undef VERSION + + /* Define STD macro according to HAVE_STD_NAMESPACE value */ + #ifdef HAVE_STD_NAMESPACE + #define STD(name) std::name + #else + #define STD(name) name + #endif + /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING *************** *** 320,326 **** #undef const ! /* Define as `__inline' if that's what the C compiler calls it, or to nothing ! if it is not supported. */ #undef inline /* Define to `long' if <sys/types.h> does not define. */ --- 358,366 ---- #undef const ! /* Define to `__inline__' or `__inline' if that's what the C compiler ! calls it, or to nothing if 'inline' is not supported under any name. */ ! #ifndef __cplusplus #undef inline + #endif /* Define to `long' if <sys/types.h> does not define. */ Index: configure.in =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/configure.in,v retrieving revision 5.1 retrieving revision 5.1.2.1 diff -C2 -d -r5.1 -r5.1.2.1 *** configure.in 29 Nov 2004 16:55:29 -0000 5.1 --- configure.in 21 Dec 2004 17:51:11 -0000 5.1.2.1 *************** *** 5,9 **** AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST ! AM_INIT_AUTOMAKE(SpecTcl, 2.2-001) --- 5,9 ---- AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST ! AM_INIT_AUTOMAKE(SpecTcl, 3.0) *************** *** 16,20 **** # images. ! SOVERSION="2:2" # # This symbol describes where the bundled Gri graphics package lives. --- 16,20 ---- # images. ! SOVERSION="3:0" # # This symbol describes where the bundled Gri graphics package lives. *************** *** 78,81 **** --- 78,117 ---- AC_CHECK_FUNCS([strdup strstr strtol tzset mktime strtod timezone]) + + # The following are needed for strict ANSI c++ compilers The major features + # are whether or not there are .h -less headers and if there's an std + # namespace we'll need to import. + + # See if the C runtime libs have .h's on them or + # if h-less versions can be used for what we need: + # + + AC_LANG_PUSH(C++) + AC_CHECK_HEADER(iostream, [AC_DEFINE([HAVE_HLESS_IOSTREAM],1,[<iostream> exists])],[]) + AC_CHECK_HEADER(istream, [AC_DEFINE([HAVE_HLESS_ISTREAM],1,[<istream> exists])],[]) + AC_CHECK_HEADER(ostream, [AC_DEFINE([HAVE_HLESS_OSTREAM],1,[<ostream> exists])],[]) + AC_CHECK_HEADER(streambuf,[AC_DEFINE([HAVE_HLESS_STREAMBUF],1,[<streambuf> exists])],[]) + AC_CHECK_HEADER(fstream, [AC_DEFINE([HAVE_HLESS_FSTREAM],1,[<fstream> exists])],[]) + AC_CHECK_HEADER(iomanip, [AC_DEFINE([HAVE_HLESS_IOMANIP],1,[<iomanip> exists])],[]) + AC_CHECK_HEADER(sstream, [AC_DEFINE([HAVE_HLESS_SSTREAM],1,[<sstream> exists])],[]) + AC_CHECK_HEADER(typeinfo, [AC_DEFINE([HAVE_HLESS_TYPEINFO],1,[<typeinfo> exists])],[]) + + + + # Is there an std namespace to import from? + + AC_COMPILE_IFELSE([using namespace std;], [AC_DEFINE([HAVE_STD_NAMESPACE],[1],[1 if std namespace defined])]) + AH_VERBATIM([VHAVE_STD_NAMESPACE],[ + /* Define STD macro according to HAVE_STD_NAMESPACE value */ + #ifdef HAVE_STD_NAMESPACE + #define STD(name) std::name + #else + #define STD(name) name + #endif]) + + + + AC_LANG_POP(C++) + # -------------------- X11 tests *************** *** 668,671 **** --- 704,738 ---- fi + + + + # If cppunit is available we can try to bundle some tests. + # CPPUNIT will be defined to makefiles and CPPUNIT_INCLUDES + # CPPUNIT_LDFLAGS will be about what you'd expect them to be. + + + AC_ARG_ENABLE(cppunit, + AS_HELP_STRING([--enable-cppunit],[build cppunit based tests]), + [havecppunit="check"], [havecppunit="no"]) + + if test "$havecppunit" != "no" + then + AC_LANG_PUSH(C++) + AC_MSG_CHECKING([for cppunit unit testing framework]) + + AC_CHECK_HEADERS([cppunit/Test.h], [havecppunit="yes"], [havecppunit="no"]) + AC_MSG_RESULT([$havecppunit]) + if test "$havecppunit" == "yes" + then + CPPUNIT_INCLUDES="" + CPPUNIT_LDFLAGS="-lcppunit" + AC_SUBST(CPPUNIT_INCLUDES) + AC_SUBST(CPPUNIT_LDFLAGS) + fi + AC_LANG_POP(C++) + fi + + AM_CONDITIONAL(CPPUNIT, test $havecppunit == "yes") + # tcl/tk AC_SUBST(TCL_FLAGS) |