Menu
▾
▴
[MICO/mt-commit] CVS: mico CHANGES,1.6,1.7 CHANGES.mt,1.37,1.38 INSTALL,1.2,1.3 MakeVars.in,1.10,1.11 MakeVars.win32,1.2,1.3 Makefile,1.10,1.11 README-WIN32,1.2,1.3 VERSION,1.2,1.3 acconfig.h,1.9,1.10 aclocal.m4,1.3,1.4 configure,1.20,1.21 configure.in,1.34,1.35
|
From: Karel G. <kg...@us...> - 2002-03-23 20:17:45
|
Update of /cvsroot/micomt/mico In directory usw-pr-cvs1:/tmp/cvs-serv31844 Modified Files: CHANGES CHANGES.mt INSTALL MakeVars.in MakeVars.win32 Makefile README-WIN32 VERSION acconfig.h aclocal.m4 configure configure.in Log Message: - merged with MICO 2.3.7 Index: CHANGES =================================================================== RCS file: /cvsroot/micomt/mico/CHANGES,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** CHANGES 26 Oct 2001 19:59:54 -0000 1.6 --- CHANGES 23 Mar 2002 20:17:09 -0000 1.7 *************** *** 1,3 **** --- 1,43 ---- + version 2.3.7 + + - plug memory leak for strings in skeletons (Jens Horstmann) + - avoid redoing completed invocations from within their completion + callback (Rob Ratcliff) + - fix problem in UnknownUserException (David Eriksson) + - fix problem with forward declarations in a different file (Uwe Maurer) + - some more support for MinGW; see INSTALL + - fix assert in the DII if an unknown exception is received + - improve const correctness (Christian Loose) + - initial implementation of ORB::destroy (Uwe Maurer) + - prefix parameter names in stub and skeleton to avoid name clashes + - fix handling native in IDL code generator + - fix problem feeding native types to an IR (Frank Bielig) + - fix StringValue problem in Windows (Eric) + - fix digraph problem in generated code (Vsevolod Novikov) + - fix negative integer constants (Sergey Volk) + - fix bug with multi-byte native character sets (Ulrich Hoffmann) + - make the Interface Repository use a persistent reference + - fix IDL problem with inheriting an interface with the same name but + in a different module + - when an implementation throws an unexpected exception, deliver + UNKNOWN + - make IDL compiler work with mutual inclusion + - fix nsadmin link error on some linux systems (Hann Wei Toh) + - implemented library activation mode for Windows (Denis Pavlina) + - work around a problem in JDK's ORB receiving wstrings from us + - fix aCC problem in the Naming Service (Andrew Marlow) + - avoid infinite recursion in DynamicAny::DynValue + - make -ORBNoCodeSets disable all codeset-related stuff, strings and + wstrings are just copied (the latter as 16-bit shorts) + - support GIOP 1.2 fragments + - some fixes for Ansi C++ (<iostream>, <sstream>, ios::noreplace) + - fix TimeService timezone for FreeBSD + - fix chunked valuetype encoding + - Update Interface Repository to ccm/01-08-01 + - Implement attribute exceptions + - Implement IDL "import" statement as a replacement for #include. + "import CosNaming" is equivalent to #include <CosNaming.idl>. + version 2.3.6 Index: CHANGES.mt =================================================================== RCS file: /cvsroot/micomt/mico/CHANGES.mt,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** CHANGES.mt 5 Jan 2002 12:54:08 -0000 1.37 --- CHANGES.mt 23 Mar 2002 20:17:09 -0000 1.38 *************** *** 1,3 **** --- 1,5 ---- + - merged with MICO 2.3.7 + version 2.3.6 Index: INSTALL =================================================================== RCS file: /cvsroot/micomt/mico/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** INSTALL 26 Oct 2001 19:59:54 -0000 1.2 --- INSTALL 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 23,28 **** ! Win32 (Windows 95/98/ME/NT/2000) ! -------------------------------- On Win32, you have several options for compiling Mico. The most common --- 23,28 ---- ! Win32 (Windows 95/98/ME/NT/2000/XP) ! ----------------------------------- On Win32, you have several options for compiling Mico. The most common *************** *** 39,47 **** to the Windows environment. Other than Cygwin, MinGW does not include a Posix emulation library but is based on the standard Win32 API ! (for more details, see http://www.mingw.org/). You will have to ! install Cygwin to get access to its shell and its command-line tools ! such as make, and then to set up your PATH so that the MinGW compiler ! and its libraries are picked up instead of Cygwin's. Read the note ! about MinGW in the CHANGES file. --- 39,59 ---- to the Windows environment. Other than Cygwin, MinGW does not include a Posix emulation library but is based on the standard Win32 API ! (for more details, see http://www.mingw.org/). Some notes about this ! configuration: ! ! - Install Cygwin for its shell and its command-line tools such as make. ! (MinGW's MSYS may be an alternative, but has not been tested yet.) ! - Install MinGW; versions tested are MinGW-1.1 and mingw-runtime-1.2 ! - Follow instructions for patching MinGW at ! http://www.geocrawler.com/archives/3/6013/2002/1/100/7606374/ ! - Set your PATH so that MinGW's gcc is picked up instead of Cygwin's ! - However, you must use Cygwin's make, because MinGW's make does not ! grok Cygwin's path names (/cygdrive/c/ instead of c:/). You can just ! delete or rename MinGW's make. ! - Configure with --disable-coss --enable-naming --enable-events; other ! services have not been updated yet. (Or edit the Makefiles yourself.) ! - Makefiles and scripts for demos have not been updated yet, so they ! might need editing. ! - "make install" is untested. Index: MakeVars.in =================================================================== RCS file: /cvsroot/micomt/mico/MakeVars.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** MakeVars.in 26 Oct 2001 19:59:54 -0000 1.10 --- MakeVars.in 23 Mar 2002 20:17:09 -0000 1.11 *************** *** 1,23 **** # -*- Makefile -*- # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # ! # This program 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 2 of the License, or ! # (at your option) any later version. # ! # This program 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, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 1,23 ---- # -*- Makefile -*- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # ! # This library is free software; you can redistribute it and/or ! # modify it under the terms of the GNU Library General Public ! # License as published by the Free Software Foundation; either ! # version 2 of the License, or (at your option) any later version. # ! # This library 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 ! # Library General Public License for more details. # ! # You should have received a copy of the GNU Library General Public ! # License along with this library; if not, write to the Free ! # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # *************** *** 28,31 **** --- 28,32 ---- SHARED_INSTDIR = @ABSSHRDDIR@ + OSTYPE = @OSTYPE@ HAVE_REPO = @HAVE_REPO@ *************** *** 71,75 **** NOPICFLAGS = EHFLAGS = @EHFLAGS@ - EHNOFLAGS = @EHNOFLAGS@ EHOPTFLAGS = @EHOPTFLAGS@ NOEHFLAGS = @NOEHFLAGS@ --- 72,75 ---- *************** *** 86,95 **** PURE_LDFLAGS = @LDFLAGS@ LDFLAGS = $(PURE_LDFLAGS) $(DLFLAGS) ! LDSO = $(SRCDIR)/admin/mico-shld @LDSOLIBSTAT@ LDSOFLAGS = @LDSOFLAGS@ SOEXT = @SOEXT@ POSTLD = @POSTLD@ ! RM = rm -f ! LN = ln -f -s MKDIR = mkdir JAVAC = javac --- 86,95 ---- PURE_LDFLAGS = @LDFLAGS@ LDFLAGS = $(PURE_LDFLAGS) $(DLFLAGS) ! LDSO = $(SRCDIR)/admin/mico-shld LDSOFLAGS = @LDSOFLAGS@ SOEXT = @SOEXT@ POSTLD = @POSTLD@ ! RM = @RMPROG@ ! LN = @LNPROG@ MKDIR = mkdir JAVAC = javac *************** *** 125,128 **** --- 125,129 ---- export LIBPATH := $(SRCDIR)/libs:$(LIBPATH) export SHLIB_PATH := $(SRCDIR)/libs:$(SHLIB_PATH) + export PATH := $(SRCDIR)/libs:$(PATH) LIBMICO = libmico$(VERSION).$(SOEXT) LIBMICOIR = libmicoir$(VERSION).$(SOEXT) *************** *** 138,141 **** --- 139,160 ---- LIBMICOCOSS = libmicocoss$(VERSION).a LIBMICOAUX = libmicoaux$(VERSION).a + endif + + LDMICO = -lmico$(VERSION) + LDMICOIR = -lmicoir$(VERSION) + LDMICOCOSS = -lmicocoss$(VERSION) + LDMICOAUX = -lmicoaux$(VERSION) + LDMICOCCM = -lmicoccm$(VERSION) + + ifeq ($(OSTYPE), windows) + ifeq ($(HAVE_SHARED), yes) + export PATH := $(SRCDIR)/libs:$(PATH) + NODOTVERSION = $(shell tr -d \. < $(SRCDIR)/VERSION) + LIBMICO := mico$(NODOTVERSION).dll + LDMICO := -lmico$(NODOTVERSION) + LIBMICOIR = libmicoir$(VERSION).a + LIBMICOAUX = libmicoaux$(VERSION).a + LIBMICOCOSS = libmicocoss$(VERSION).a + endif endif Index: MakeVars.win32 =================================================================== RCS file: /cvsroot/micomt/mico/MakeVars.win32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MakeVars.win32 26 Oct 2001 19:59:54 -0000 1.2 --- MakeVars.win32 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 1,22 **** # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997 Kay Roemer & Arno Puder # ! # This program 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 2 of the License, or ! # (at your option) any later version. # ! # This program 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, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # # Configuration --- 1,22 ---- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # ! # This library is free software; you can redistribute it and/or ! # modify it under the terms of the GNU Library General Public ! # License as published by the Free Software Foundation; either ! # version 2 of the License, or (at your option) any later version. # ! # This library 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 ! # Library General Public License for more details. # ! # You should have received a copy of the GNU Library General Public ! # License along with this library; if not, write to the Free ! # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # # Configuration Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile 4 Jan 2002 16:33:51 -0000 1.10 --- Makefile 23 Mar 2002 20:17:09 -0000 1.11 *************** *** 25,29 **** ADMDIRS = admin include LIBDIRS = orb ir idl auxdir coss ccm ! PRGDIRS = orb ir idl cpp daemon auxdir coss ccm tools EXTRADIRS = test demo ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo --- 25,29 ---- ADMDIRS = admin include LIBDIRS = orb ir idl auxdir coss ccm ! PRGDIRS = orb ir cpp idl daemon auxdir coss ccm tools EXTRADIRS = test demo ALLDIRS = admin orb ir daemon idl cpp auxdir coss ccm test tools demo Index: README-WIN32 =================================================================== RCS file: /cvsroot/micomt/mico/README-WIN32,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** README-WIN32 26 Oct 2001 19:59:54 -0000 1.2 --- README-WIN32 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- -------- + Before building MICO, please open the file MakeVars.win32 from the + MICO directory in a text editor (like Visual Studio or textpad), and + adjust the setting of SRCDIR to point to the MICO directory. + To build MICO, please open a command shell window, change to the MICO directory and type Index: VERSION =================================================================== RCS file: /cvsroot/micomt/mico/VERSION,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** VERSION 26 Oct 2001 19:59:54 -0000 1.2 --- VERSION 23 Mar 2002 20:17:09 -0000 1.3 *************** *** 1 **** ! 2.3.6 --- 1 ---- ! 2.3.7 Index: acconfig.h =================================================================== RCS file: /cvsroot/micomt/mico/acconfig.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** acconfig.h 15 Mar 2001 18:52:13 -0000 1.9 --- acconfig.h 23 Mar 2002 20:17:09 -0000 1.10 *************** *** 91,94 **** --- 91,97 ---- #undef HAVE_EXPLICIT_STRUCT_OPS + /* whether we can use the advanced memchecker */ + #undef USE_MEMTRACE + /* whether a derived class can override a typedef in the base class */ #undef HAVE_TYPEDEF_OVERLOAD *************** *** 111,112 **** --- 114,125 ---- /* whether we support dynamic_cast<> */ #undef HAVE_DYNAMIC_CAST + + /* whether to build CCM-specific parts */ + #undef USE_CCM + + /* path information */ + #undef ABSEXECDIR + #undef ABSSHRDDIR + + /* whether ANSI C++ header files are present */ + #undef HAVE_ANSI_CPLUSPLUS_HEADERS Index: aclocal.m4 =================================================================== RCS file: /cvsroot/micomt/mico/aclocal.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** aclocal.m4 15 Mar 2001 18:52:13 -0000 1.3 --- aclocal.m4 23 Mar 2002 20:17:09 -0000 1.4 *************** *** 849,879 **** rm -f conf.gtktest ]) - - dnl - dnl check for compiler flags - dnl - AC_DEFUN(MICO_CHECK_CXX_FLAG, - [ - AC_REQUIRE([AC_PROG_CXX]) - AC_MSG_CHECKING(whether $CXX supports -$1) - mico_cache=`echo $1 | sed 'y%./+-%__p_%'` - AC_CACHE_VAL(mico_cv_prog_cxx_$mico_cache, - [ - echo 'void f(){}' >conftest.cc - if test -z "`$CXX -$1 -c conftest.cc 2>&1`"; then - eval "mico_cv_prog_cxx_$mico_cache=yes" - else - eval "mico_cv_prog_cxx_$mico_cache=no" - fi - rm -f conftest* - ]) - if eval "test \"`echo '$mico_cv_prog_cxx_'$mico_cache`\" = yes"; then - AC_MSG_RESULT(yes) - : - $2 - else - AC_MSG_RESULT(no) - : - $3 - fi - ]) \ No newline at end of file --- 849,850 ---- Index: configure =================================================================== RCS file: /cvsroot/micomt/mico/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** configure 5 Jan 2002 07:32:21 -0000 1.20 --- configure 23 Mar 2002 20:17:09 -0000 1.21 *************** *** 65,68 **** --- 65,70 ---- --with-ssl=ssldir use SSLeay installed in ssldir" ac_help="$ac_help + --with-extra-dir=dir add dir(s) into extra dirs" + ac_help="$ac_help --disable-split dont split large source files" ac_help="$ac_help *************** *** 843,846 **** --- 845,857 ---- [...5136 lines suppressed...] EOF ! if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then DLRUN=ok --- 8803,8807 ---- } EOF ! if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then DLRUN=ok *************** *** 8902,8905 **** --- 9064,9070 ---- s%@CXX@%$CXX%g s%@CXXCPP@%$CXXCPP%g + s%@OSTYPE@%$OSTYPE%g + s%@RMPROG@%$RMPROG%g + s%@LNPROG@%$LNPROG%g s%@EXTRA_LIBS@%$EXTRA_LIBS%g s%@EXTRA_CXXFLAGS@%$EXTRA_CXXFLAGS%g Index: configure.in =================================================================== RCS file: /cvsroot/micomt/mico/configure.in,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** configure.in 4 Jan 2002 16:37:30 -0000 1.34 --- configure.in 23 Mar 2002 20:17:09 -0000 1.35 *************** *** 1,22 **** # ! # MICO --- a free CORBA implementation ! # Copyright (C) 1997-98 Kay Roemer & Arno Puder # ! # This program 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 2 of the License, or ! # (at your option) any later version. ! # ! # This program 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, write to the Free Software ! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # Send comments and/or bug reports to: ! # mi...@in... # --- 1,22 ---- # ! # MICO --- an Open Source CORBA implementation ! # Copyright (c) 1997-2001 by The Mico Team # ! # This library is free software; you can redistribute it and/or ! # modify it under the terms of the GNU Library General Public ! # License as published by the Free Software Foundation; either ! # version 2 of the License, or (at your option) any later version. ! # ! # This library 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 ! # Library General Public License for more details. ! # ! # You should have received a copy of the GNU Library General Public ! # License along with this library; if not, write to the Free ! # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # ! # For more information, visit the MICO Home Page at ! # http://www.mico.org/ # *************** *** 132,135 **** --- 132,139 ---- SSLDIR=$withval, SSLDIR="") + AC_ARG_WITH(extra-dir, + [ --with-extra-dir=dir add dir(s) into extra dirs], + EXTRADIR="$withval", EXTRADIR="") + AC_ARG_ENABLE(split, [ --disable-split dont split large source files], *************** *** 202,206 **** # ! wi_EXTRA_DIRS(no, /usr/local /local /user/local /usr/share /opt /opt/local $QTDIR $GTKDIR $TCLDIR $SSLDIR) # --- 206,210 ---- # ! wi_EXTRA_DIRS(no, $EXTRADIR $QTDIR $GTKDIR $TCLDIR $SSLDIR) # *************** *** 267,270 **** --- 271,296 ---- AC_LANG_CPLUSPLUS + AC_MSG_CHECKING(OS Type) + gxxversion=`$CXX -v 2>&1` + case $gxxversion in + *mingw*special*) + # + # This is the MinGW compiler in a Cygwin environment + # + OSTYPE=windows + RMPROG="rm -f" + LNPROG="cp" + ;; + *) + OSTYPE=unix + RMPROG="rm -f" + LNPROG="ln -f -s" + ;; + esac + AC_MSG_RESULT($OSTYPE) + AC_SUBST(OSTYPE) + AC_SUBST(RMPROG) + AC_SUBST(LNPROG) + # # extra libraries ... *************** *** 540,543 **** --- 566,570 ---- fi + CONF_SHARED_CC="$CXX -shared" CONF_PICFLAGS=-fPIC CONF_LDSOFLAGS=-fPIC *************** *** 546,553 **** # workaround for compiling X11 headers with gcc 2.95 - # MICO_CHECK_CXX_FLAG(fpermissive, [CXXFLAGS="$CXXFLAGS -fpermissive"]) SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$SAVE_CXXFLAGS -fpermissive" AC_TRY_COMPILE([],[],, CXXFLAGS=$SAVE_CXXFLAGS) case $target in --- 573,580 ---- # workaround for compiling X11 headers with gcc 2.95 SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$SAVE_CXXFLAGS -fpermissive" AC_TRY_COMPILE([],[],, CXXFLAGS=$SAVE_CXXFLAGS) + case $target in *************** *** 589,594 **** fi ;; ! *cygwin32*) ! have_cdk=yes; ;; *lynxos*) --- 616,638 ---- fi ;; ! *mingw*|*cygwin*) ! # check if the compiler is cygwin or mingw ! gxxversion=`$CXX -v 2>&1` ! case $gxxversion in ! *mingw*) ! CXXFLAGS="-D_WINDOWS $CXXFLAGS" ! CONF_SOEXT=dll ! CONF_PICFLAGS= ! CONF_LDSOFLAGS= ! if test "x$use_shared" = "xyes" ; then ! CXX="$CXX -mthreads" ! CONF_SHARED_CC="$CXX -shared" ! else ! CXXFLAGS="-DBUILD_MICO_DLL $CXXFLAGS" ! fi ! ;; ! *cygwin*) ! ;; ! esac ;; *lynxos*) *************** *** 639,643 **** CONF_SHARED_CC="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -G" CONF_LDFLAGS=-brtl ! CXXFLAGS="$CXXFLAGS -+ -qnotempinc -qlongdouble -qlonglong -w" CFLAGS="$CFLAGS -qlongdouble -qlonglong" ;; --- 683,687 ---- CONF_SHARED_CC="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -G" CONF_LDFLAGS=-brtl ! CXXFLAGS="$CXXFLAGS -+ -qrtti=all -qnotempinc -qlongdouble -qlonglong -w" CFLAGS="$CFLAGS -qlongdouble -qlonglong" ;; *************** *** 846,849 **** --- 890,895 ---- AC_CHECK_LIB(ld, open) + AC_CHECK_LIB(wsock32, open) + # for wide char functions ... # AC_CHECK_LIB(w, open) *************** *** 910,913 **** --- 956,968 ---- AC_CHECK_HEADERS(byteorder.h) + # Ansi C++ + have_ansi_cplusplus_headers=yes + AC_CHECK_HEADERS(iostream map string sstream,,have_ansi_cplusplus_headers=no) + AC_MSG_CHECKING(for Ansi C++ headers) + if test "x$have_ansi_cplusplus_headers" = "xyes" ; then + AC_DEFINE(HAVE_ANSI_CPLUSPLUS_HEADERS) + fi + AC_MSG_RESULT($have_ansi_cplusplus_headers) + # # Checks for typedefs, structures, and compiler characteristics. *************** *** 1070,1076 **** gethostname_pt=no AC_EGREP_HEADER(gethostname, unistd.h, gethostname_pt=yes) ! if test $gethostname_pt = no; then ! AC_EGREP_HEADER(gethostname, sys/socket.h, gethostname_pt=yes) ! fi if test $gethostname_pt = yes; then AC_DEFINE(HAVE_GETHOSTNAME_PROTO) --- 1125,1130 ---- gethostname_pt=no AC_EGREP_HEADER(gethostname, unistd.h, gethostname_pt=yes) ! AC_EGREP_HEADER(gethostname, sys/socket.h, gethostname_pt=yes) ! AC_EGREP_HEADER(gethostname, winsock.h, gethostname_pt=yes) if test $gethostname_pt = yes; then AC_DEFINE(HAVE_GETHOSTNAME_PROTO) *************** *** 1099,1110 **** AC_MSG_CHECKING([for ftime prototype]) ftime_pt=no - - changequote(<<, >>) - ac_tmp='[ \t]ftime' - changequote([, ]) - # solaris 2.5.1 mentions `ftime' it the header but doesnt have a prototype ... ! AC_EGREP_HEADER($ac_tmp, sys/timeb.h, ftime_pt=yes) ! if test $ftime_pt = yes; then AC_DEFINE(HAVE_FTIME_PROTO) --- 1153,1158 ---- AC_MSG_CHECKING([for ftime prototype]) ftime_pt=no # solaris 2.5.1 mentions `ftime' it the header but doesnt have a prototype ... ! AC_EGREP_HEADER(ftime, sys/timeb.h, ftime_pt=yes) if test $ftime_pt = yes; then AC_DEFINE(HAVE_FTIME_PROTO) *************** *** 1324,1328 **** AC_MSG_CHECKING(build of PIC object file) cat > conftest.$ac_ext <<EOF ! [#include <iostream.h> struct Global { --- 1372,1378 ---- AC_MSG_CHECKING(build of PIC object file) cat > conftest.$ac_ext <<EOF ! [#include <iostream> ! ! using namespace std; struct Global { |
