From cf44735628cecb0326b953c4872260f223fc8769 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Wed, 1 Jul 1998 17:26:46 +0000 Subject: [PATCH] * Changed "true" to "TRUE" in some file: "true" doesn't exist in BC++ 5 * Added wxDataStream and wxProcess * Added the asynchronous end process notification on GTK and MSW * Updated configure* and setup.h * Added extended.c: Apple code to encode/decode float in IEEE format this code is removable by disabling USE_APPLE_CODEC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/config.h | 8 +- include/wx/datstrm.h | 46 ++++ include/wx/event.h | 5 +- include/wx/msw/regconf.h | 4 +- include/wx/msw/registry.h | 4 +- include/wx/msw/setup.h | 5 + include/wx/object.h | 4 +- include/wx/process.h | 58 ++++ include/wx/utils.h | 7 +- install/gtk/configure | 563 ++++++++++++++++++++------------------ install/gtk/configure.in | 17 +- src/Makefile.in | 2 + src/common/datstrm.cpp | 172 ++++++++++++ src/common/extended.c | 179 ++++++++++++ src/gtk/data.cpp | 4 + src/gtk/setup/setup.hin | 4 + src/gtk/utilsgtk.cpp | 94 ++++--- src/gtk1/data.cpp | 4 + src/gtk1/setup/setup.hin | 4 + src/gtk1/utilsgtk.cpp | 94 ++++--- src/msw/makefile.b32 | 11 +- src/msw/makefile.dos | 14 +- src/msw/makefile.g95 | 5 +- src/msw/makefile.nt | 20 +- src/msw/regconf.cpp | 30 +- src/msw/registry.cpp | 86 +++--- src/msw/utils.cpp | 91 ------ 27 files changed, 1030 insertions(+), 505 deletions(-) create mode 100644 include/wx/datstrm.h create mode 100644 include/wx/process.h create mode 100644 src/common/datstrm.cpp create mode 100644 src/common/extended.c diff --git a/include/wx/config.h b/include/wx/config.h index 2f1a93cfe4..f9eab1d2a9 100644 --- a/include/wx/config.h +++ b/include/wx/config.h @@ -29,7 +29,7 @@ /// shall we be case sensitive in parsing variable names? #ifndef APPCONF_CASE_SENSITIVE - #define APPCONF_CASE_SENSITIVE false + #define APPCONF_CASE_SENSITIVE FALSE #endif /// separates group and entry names @@ -44,7 +44,7 @@ /// should we use registry instead of configuration files under Win32? #ifndef APPCONF_WIN32_NATIVE - #define APPCONF_WIN32_NATIVE true + #define APPCONF_WIN32_NATIVE TRUE #endif // ---------------------------------------------------------------------------- @@ -124,13 +124,13 @@ public: virtual bool Write(const char *szKey, const char *szValue) = 0; virtual bool Write(const char *szKey, long lValue) = 0; // permanently writes all changes - virtual bool Flush(bool bCurrentOnly = false) = 0; + virtual bool Flush(bool bCurrentOnly = FALSE) = 0; // delete entries/groups // deletes the specified entry and the group it belongs to if // it was the last key in it and the second parameter is true virtual bool DeleteEntry(const char *szKey, - bool bDeleteGroupIfEmpty = true) = 0; + bool bDeleteGroupIfEmpty = TRUE) = 0; // delete the group (with all subgroups) virtual bool DeleteGroup(const char *szKey) = 0; // delete the whole underlying object (disk file, registry key, ...) diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h new file mode 100644 index 0000000000..169c86b627 --- /dev/null +++ b/include/wx/datstrm.h @@ -0,0 +1,46 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: datstrm.h +// Purpose: Data stream classes +// Author: Guilhem Lavaux +// Modified by: +// Created: 28/06/1998 +// RCS-ID: $Id$ +// Copyright: (c) Guilhem Lavaux +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + +#ifndef __DATSTREAMH__ +#define __DATSTREAMH__ + +#ifdef __GNUG__ +#pragma interface "datstrm.h" +#endif + +#include "wx/wx.h" + +class wxDataStream { +public: + wxDataStream(iostream& s); + wxDataStream(istream& s); + wxDataStream(ostream& s); + + virtual ~wxDataStream(); + + unsigned long Read32(); + unsigned short Read16(); + unsigned char Read8(); + double ReadDouble(); + wxString ReadLine(); + + void Write32(unsigned long i); + void Write16(unsigned short i); + void Write8(unsigned char i); + void WriteDouble(double d); + void WriteLine(const wxString& line); +protected: + istream *m_istream; + ostream *m_ostream; +}; + +#endif + // __HELPBASEH__ diff --git a/include/wx/event.h b/include/wx/event.h index 0389138540..788a0ca22d 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -179,7 +179,10 @@ enum wxEventType { wxEVT_COMMAND_TAB_SEL_CHANGED, wxEVT_COMMAND_TAB_SEL_CHANGING, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, + + /* System misc. */ + wxEVT_END_PROCESS = wxEVT_FIRST + 300 }; // Compatibility diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h index fed7e2b50b..387456ff1e 100644 --- a/include/wx/msw/regconf.h +++ b/include/wx/msw/regconf.h @@ -43,7 +43,7 @@ public: virtual bool Read(long&, const char *, long = 0) const; virtual bool Write(const char *szKey, const char *szValue); virtual bool Write(const char *szKey, long Value); - virtual bool Flush(bool /* bCurrentOnly = FALSE */ ) { return true; } + virtual bool Flush(bool /* bCurrentOnly = FALSE */ ) { return TRUE; } // delete virtual bool DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso); @@ -59,4 +59,4 @@ private: wxString m_strPath; }; -#endif //_REGCONF_H \ No newline at end of file +#endif //_REGCONF_H diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h index 23b507744f..d7793ca0bc 100644 --- a/include/wx/msw/registry.h +++ b/include/wx/msw/registry.h @@ -111,7 +111,7 @@ public: // get infomation about the key // get the (full) key name. Abbreviate std root keys if bShortPrefix. - wxString GetName(bool bShortPrefix = true) const; + wxString GetName(bool bShortPrefix = TRUE) const; // return true if the key exists bool Exists() const; // return true if the key is opened @@ -124,7 +124,7 @@ public: // which need the key to be opened if the key is not opened yet) bool Open(); // create the key: will fail if the key already exists and bOkIfExists - bool Create(bool bOkIfExists = true); + bool Create(bool bOkIfExists = TRUE); // close the key (will be automatically done in dtor) bool Close(); diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index 2a3cf3da03..3b84824403 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -163,6 +163,11 @@ * */ +#define USE_APPLE_IEEE 1 + // if enabled, the float codec written by Apple + // will be used to write, in a portable way, + // float on the disk + /* * Motif and XView * diff --git a/include/wx/object.h b/include/wx/object.h index b11e323e69..1a787a3f71 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -130,7 +130,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \ #ifdef USE_STORABLE_CLASSES #define IMPLEMENT_STORABLE_CLASS(name, basename) \ -wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( fstream* stream, char* data )\ +wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\ { return new name( stream, data ); }\ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\ { return new name; }\ @@ -138,7 +138,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\ wxStorableConstructorFor##name ); #define IMPLEMENT_STORABLE_CLASS2(name, basename1, basename2) \ -wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( fstream* stream, char* data )\ +wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\ { return new name( stream, data ); }\ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\ { return new name; }\ diff --git a/include/wx/process.h b/include/wx/process.h new file mode 100644 index 0000000000..cd5cf5471b --- /dev/null +++ b/include/wx/process.h @@ -0,0 +1,58 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: process.h +// Purpose: wxProcess class +// Author: Guilhem Lavaux +// Modified by: +// Created: 24/06/98 +// RCS-ID: $Id$ +// Copyright: (c) 1998 Guilhem Lavaux +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + +#ifndef __PROCESSH__ +#define __PROCESSH__ + +#ifdef __GNUG__ +#pragma interface +#endif + +#include "wx/defs.h" +#include "wx/object.h" +#include "wx/event.h" + +class WXDLLEXPORT wxProcess: public wxEvtHandler +{ + DECLARE_DYNAMIC_CLASS(wxProcess) + public: + + wxProcess(wxEvtHandler *parent = NULL, int id = -1); + virtual ~wxProcess(); + + virtual void OnTerminate(int pid); + + protected: + int m_id; +}; + +// Process Event handling + +class WXDLLEXPORT wxProcessEvent: public wxEvent +{ + DECLARE_DYNAMIC_CLASS(wxProcessEvent) + public: + + wxProcessEvent(int id = 0, int pid = -1); + + inline int GetPid() { return m_pid; } + inline void SetPid(int pid) { m_pid = pid; } + + public: + int m_pid; +}; + +typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&); + +#define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL}, + +#endif + // __PROCESSH__ diff --git a/include/wx/utils.h b/include/wx/utils.h index 530e38f309..902863ce49 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -21,6 +21,7 @@ #include "wx/list.h" #include "wx/window.h" #include "wx/filefn.h" +#include "wx/process.h" #if USE_IOSTREAMH #include @@ -96,8 +97,10 @@ int WXDLLEXPORT wxHexToDec(char *buf); void WXDLLEXPORT wxDecToHex(int dec, char *buf); // Execute another program. Returns 0 if there was an error, a PID otherwise. -long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE); -long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE); +long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE, + wxProcess *process = NULL); +long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE, + wxProcess *process = NULL); #define wxSIGTERM 1 diff --git a/install/gtk/configure b/install/gtk/configure index 4aa97ebf78..5f5afb2850 100755 --- a/install/gtk/configure +++ b/install/gtk/configure @@ -28,17 +28,19 @@ ac_help="$ac_help ac_help="$ac_help **--with-profile create code with profiling information included" ac_help="$ac_help -**--with-zlib use zlib (LZW comression)" +**--with-zlib use zlib (LZW comression)" ac_help="$ac_help -**--with-gdk_imlib use Raster's gdk_imlib (Image library)" +**--with-gdk_imlib use Raster's gdk_imlib (Image library)" ac_help="$ac_help -**--with-libpng use libpng (PNG image format)" +**--with-libpng use libpng (PNG image format)" ac_help="$ac_help -**--with-opengl use opengl (OpenGL or Mesa)" +**--with-opengl use opengl (OpenGL or Mesa)" ac_help="$ac_help -**--with-storable use storable classes" +**--with-apple-ieee use the Apple IEEE codec" ac_help="$ac_help -**--with-autotrans use gettext automatic translation" +**--with-storable use storable classes" +ac_help="$ac_help +**--with-autotrans use gettext automatic translation" ac_help="$ac_help **--with-afmfonts use Adobe Font Metric Font table" ac_help="$ac_help @@ -672,7 +674,7 @@ SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:676: checking for $ac_word" >&5 +echo "configure:678: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -701,7 +703,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:705: checking for $ac_word" >&5 +echo "configure:707: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -749,7 +751,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:755: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -759,11 +761,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -783,12 +785,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:787: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:789: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:792: checking whether we are using GNU C" >&5 +echo "configure:794: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -797,7 +799,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -812,7 +814,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:816: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:818: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -844,10 +846,10 @@ CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:848: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:850: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:851: checking whether cc understands -c and -o together" >&5 +echo "configure:853: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -859,16 +861,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -895,7 +897,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:899: checking how to run the C preprocessor" >&5 +echo "configure:901: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -910,13 +912,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -927,13 +929,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -957,13 +959,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:961: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:963: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -981,7 +983,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1010,7 +1012,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1014: checking for $ac_word" >&5 +echo "configure:1016: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1041,7 +1043,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1045: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1047: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1051,11 +1053,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1081,12 +1083,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1085: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1087: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1090: checking whether we are using GNU C++" >&5 +echo "configure:1092: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1095,7 +1097,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1110,7 +1112,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1114: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1116: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1138,7 +1140,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1142: checking how to run the C++ preprocessor" >&5 +echo "configure:1144: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1151,12 +1153,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1188,7 +1190,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1192: checking for $ac_word" >&5 +echo "configure:1194: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1218,7 +1220,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1222: checking for $ac_word" >&5 +echo "configure:1224: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1275,7 +1277,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1279: checking for a BSD compatible install" >&5 +echo "configure:1281: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1326,7 +1328,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1330: checking whether ln -s works" >&5 +echo "configure:1332: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1352,7 +1354,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1356: checking for $ac_word" >&5 +echo "configure:1358: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1382,7 +1384,7 @@ done echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:1386: checking "make for VPATH support"" >&5 +echo "configure:1388: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -1412,7 +1414,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1416: checking for X" >&5 +echo "configure:1418: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1474,12 +1476,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1548,14 +1550,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1661,17 +1663,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1665: checking whether -R must be followed by a space" >&5 +echo "configure:1667: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -1687,14 +1689,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -1726,7 +1728,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1730: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1732: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1734,7 +1736,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1767,7 +1769,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1771: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1773: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1775,7 +1777,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1815,12 +1817,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1819: checking for gethostbyname" >&5 +echo "configure:1821: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1864,7 +1866,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1868: checking for gethostbyname in -lnsl" >&5 +echo "configure:1870: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1872,7 +1874,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1913,12 +1915,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1917: checking for connect" >&5 +echo "configure:1919: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1962,7 +1964,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1966: checking for connect in -lsocket" >&5 +echo "configure:1968: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1970,7 +1972,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2005,12 +2007,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2009: checking for remove" >&5 +echo "configure:2011: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2054,7 +2056,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2058: checking for remove in -lposix" >&5 +echo "configure:2060: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2062,7 +2064,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2097,12 +2099,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2101: checking for shmat" >&5 +echo "configure:2103: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2146,7 +2148,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2150: checking for shmat in -lipc" >&5 +echo "configure:2152: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2154,7 +2156,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2198,7 +2200,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2202: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2204: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2206,7 +2208,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2247,12 +2249,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2251: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2253: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -2260,7 +2262,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2285,7 +2287,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2289: checking for opendir in -ldir" >&5 +echo "configure:2291: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2293,7 +2295,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2326,7 +2328,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2330: checking for opendir in -lx" >&5 +echo "configure:2332: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2334,7 +2336,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2368,12 +2370,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2372: checking for ANSI C header files" >&5 +echo "configure:2374: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2381,7 +2383,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2398,7 +2400,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2416,7 +2418,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2437,7 +2439,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2448,7 +2450,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -2472,12 +2474,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2476: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2478: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2493,7 +2495,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2515,17 +2517,17 @@ fi ac_safe=`echo "fcntl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for fcntl.h""... $ac_c" 1>&6 -echo "configure:2519: checking for fcntl.h" >&5 +echo "configure:2521: checking for fcntl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2548,17 +2550,17 @@ fi ac_safe=`echo "limits.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for limits.h""... $ac_c" 1>&6 -echo "configure:2552: checking for limits.h" >&5 +echo "configure:2554: checking for limits.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2581,17 +2583,17 @@ fi ac_safe=`echo "sys/file.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/file.h""... $ac_c" 1>&6 -echo "configure:2585: checking for sys/file.h" >&5 +echo "configure:2587: checking for sys/file.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2614,17 +2616,17 @@ fi ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6 -echo "configure:2618: checking for sys/time.h" >&5 +echo "configure:2620: checking for sys/time.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2647,17 +2649,17 @@ fi ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unistd.h""... $ac_c" 1>&6 -echo "configure:2651: checking for unistd.h" >&5 +echo "configure:2653: checking for unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2680,17 +2682,17 @@ fi ac_safe=`echo "linux/joystick.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/joystick.h""... $ac_c" 1>&6 -echo "configure:2684: checking for linux/joystick.h" >&5 +echo "configure:2686: checking for linux/joystick.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2718,12 +2720,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2722: checking for uid_t in sys/types.h" >&5 +echo "configure:2724: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2752,7 +2754,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2756: checking type of array argument to getgroups" >&5 +echo "configure:2758: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2760,7 +2762,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2799,7 +2801,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2823,12 +2825,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2827: checking for mode_t" >&5 +echo "configure:2829: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2856,12 +2858,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2860: checking for off_t" >&5 +echo "configure:2862: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2889,12 +2891,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2893: checking for pid_t" >&5 +echo "configure:2895: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2922,12 +2924,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2926: checking return type of signal handlers" >&5 +echo "configure:2928: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2944,7 +2946,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2963,12 +2965,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2967: checking for size_t" >&5 +echo "configure:2969: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2996,12 +2998,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3000: checking for uid_t in sys/types.h" >&5 +echo "configure:3002: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3032,12 +3034,12 @@ fi echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:3036: checking whether stat file-mode macros are broken" >&5 +echo "configure:3038: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3088,12 +3090,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3092: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3094: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3102,7 +3104,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3123,12 +3125,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:3127: checking for st_blksize in struct stat" >&5 +echo "configure:3129: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3136,7 +3138,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -3157,12 +3159,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3161: checking for st_blocks in struct stat" >&5 +echo "configure:3163: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3170,7 +3172,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:3174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -3193,12 +3195,12 @@ else fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:3197: checking for st_rdev in struct stat" >&5 +echo "configure:3199: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3206,7 +3208,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:3210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -3227,12 +3229,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3231: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3233: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3240,7 +3242,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3261,12 +3263,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3265: checking for tm_zone in struct tm" >&5 +echo "configure:3267: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3274,7 +3276,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3294,12 +3296,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3298: checking for tzname" >&5 +echo "configure:3300: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3309,7 +3311,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3333,12 +3335,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3337: checking for working const" >&5 +echo "configure:3339: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3408,21 +3410,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3412: checking for inline" >&5 +echo "configure:3414: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3448,14 +3450,14 @@ EOF esac echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3452: checking whether char is unsigned" >&5 +echo "configure:3454: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3511,7 +3513,7 @@ EOF fi echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:3515: checking for long double" >&5 +echo "configure:3517: checking for long double" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3522,7 +3524,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_long_double=yes else @@ -3555,14 +3557,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3559: checking whether byte ordering is bigendian" >&5 +echo "configure:3561: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -3573,11 +3575,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3588,7 +3590,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3608,7 +3610,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3646,7 +3648,7 @@ fi echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:3650: checking size of int *" >&5 +echo "configure:3652: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3654,7 +3656,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3665,7 +3667,7 @@ main() exit(0); } EOF -if { (eval echo configure:3669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -3685,7 +3687,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3689: checking size of int" >&5 +echo "configure:3691: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3693,7 +3695,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3704,7 +3706,7 @@ main() exit(0); } EOF -if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -3724,7 +3726,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3728: checking size of long" >&5 +echo "configure:3730: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3732,7 +3734,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -3743,7 +3745,7 @@ main() exit(0); } EOF -if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -3782,7 +3784,7 @@ if test "$USE_THREADS" = "1"; then echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6 -echo "configure:3786: checking for pthread_create in -lpthread-0.7" >&5 +echo "configure:3788: checking for pthread_create in -lpthread-0.7" >&5 ac_lib_var=`echo pthread-0.7'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3790,7 +3792,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread-0.7 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3828,7 +3830,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:3832: checking for pthread_create in -lpthread" >&5 +echo "configure:3834: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3836,7 +3838,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3878,7 +3880,7 @@ fi fi echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:3882: checking for pthread_create in -lpthreads" >&5 +echo "configure:3884: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3886,7 +3888,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3926,17 +3928,17 @@ fi ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:3930: checking for sys/prctl.h" >&5 +echo "configure:3932: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3969,7 +3971,7 @@ fi echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3973: checking for long file names" >&5 +echo "configure:3975: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4020,7 +4022,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4024: checking for $ac_word" >&5 +echo "configure:4026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4053,7 +4055,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4057: checking for $ac_word" >&5 +echo "configure:4059: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4086,7 +4088,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:4090: checking for yywrap in -l$ac_lib" >&5 +echo "configure:4092: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4094,7 +4096,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4128,7 +4130,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:4132: checking lex output file root" >&5 +echo "configure:4134: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4149,7 +4151,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:4153: checking whether yytext is a pointer" >&5 +echo "configure:4155: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4161,14 +4163,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -4202,7 +4204,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:4206: checking host system type" >&5 +echo "configure:4208: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -4397,6 +4399,7 @@ DEFAULT_USE_ZLIB=1 DEFAULT_USE_GDK_IMLIB=1 DEFAULT_USE_LIBPNG=1 +DEFAULT_USE_APPLE_IEEE=1 DEFAULT_USE_STORABLE_CLASSES=1 DEFAULT_USE_AUTOTRANS=1 DEFAULT_USE_AFM_FOR_POSTSCRIPT=1 @@ -4435,7 +4438,7 @@ DEFAULT_USE_WX_RESOURCES=1 echo $ac_n "checking "for shared"""... $ac_c" 1>&6 -echo "configure:4439: checking "for shared"" >&5 +echo "configure:4442: checking "for shared"" >&5 # Check whether --with-shared or --without-shared was given. if test "${with_shared+set}" = set; then withval="$with_shared" @@ -4465,7 +4468,7 @@ fi echo $ac_n "checking "for optimise"""... $ac_c" 1>&6 -echo "configure:4469: checking "for optimise"" >&5 +echo "configure:4472: checking "for optimise"" >&5 # Check whether --with-optimise or --without-optimise was given. if test "${with_optimise+set}" = set; then withval="$with_optimise" @@ -4495,7 +4498,7 @@ fi echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6 -echo "configure:4499: checking "for debug_flag"" >&5 +echo "configure:4502: checking "for debug_flag"" >&5 # Check whether --with-debug_flag or --without-debug_flag was given. if test "${with_debug_flag+set}" = set; then withval="$with_debug_flag" @@ -4525,7 +4528,7 @@ fi echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6 -echo "configure:4529: checking "for debug_info"" >&5 +echo "configure:4532: checking "for debug_info"" >&5 # Check whether --with-debug_info or --without-debug_info was given. if test "${with_debug_info+set}" = set; then withval="$with_debug_info" @@ -4555,7 +4558,7 @@ fi echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6 -echo "configure:4559: checking "for mem_tracing"" >&5 +echo "configure:4562: checking "for mem_tracing"" >&5 # Check whether --with-mem_tracing or --without-mem_tracing was given. if test "${with_mem_tracing+set}" = set; then withval="$with_mem_tracing" @@ -4585,7 +4588,7 @@ fi echo $ac_n "checking "for profile"""... $ac_c" 1>&6 -echo "configure:4589: checking "for profile"" >&5 +echo "configure:4592: checking "for profile"" >&5 # Check whether --with-profile or --without-profile was given. if test "${with_profile+set}" = set; then withval="$with_profile" @@ -4616,7 +4619,7 @@ fi echo $ac_n "checking "for zlib"""... $ac_c" 1>&6 -echo "configure:4620: checking "for zlib"" >&5 +echo "configure:4623: checking "for zlib"" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -4646,7 +4649,7 @@ fi echo $ac_n "checking "for gdk_imlib"""... $ac_c" 1>&6 -echo "configure:4650: checking "for gdk_imlib"" >&5 +echo "configure:4653: checking "for gdk_imlib"" >&5 # Check whether --with-gdk_imlib or --without-gdk_imlib was given. if test "${with_gdk_imlib+set}" = set; then withval="$with_gdk_imlib" @@ -4676,7 +4679,7 @@ fi echo $ac_n "checking "for libpng"""... $ac_c" 1>&6 -echo "configure:4680: checking "for libpng"" >&5 +echo "configure:4683: checking "for libpng"" >&5 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then withval="$with_libpng" @@ -4706,7 +4709,7 @@ fi echo $ac_n "checking "for opengl"""... $ac_c" 1>&6 -echo "configure:4710: checking "for opengl"" >&5 +echo "configure:4713: checking "for opengl"" >&5 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" @@ -4736,8 +4739,38 @@ fi +echo $ac_n "checking "for apple-ieee"""... $ac_c" 1>&6 +echo "configure:4744: checking "for apple-ieee"" >&5 +# Check whether --with-apple-ieee or --without-apple-ieee was given. +if test "${with_apple_ieee+set}" = set; then + withval="$with_apple_ieee" + if test "x$with_apple-ieee" = xyes; then + ac_cv_use_apple-ieee='USE_APPLE_IEEE="1"' +else + ac_cv_use_apple-ieee='USE_APPLE_IEEE="0"' +fi +else + + LINE=`grep "USE_APPLE_IEEE" ${OSTYPE}.system.cache` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + fi + ac_cv_use_apple-ieee='USE_APPLE_IEEE='$DEFAULT_USE_APPLE_IEEE + +fi + +eval "$ac_cv_use_apple-ieee" +echo $ac_cv_use_apple-ieee >> ${OSTYPE}.system.cache.tmp +if test "$USE_APPLE_IEEE" = 1; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + echo $ac_n "checking "for storable"""... $ac_c" 1>&6 -echo "configure:4741: checking "for storable"" >&5 +echo "configure:4774: checking "for storable"" >&5 # Check whether --with-storable or --without-storable was given. if test "${with_storable+set}" = set; then withval="$with_storable" @@ -4767,7 +4800,7 @@ fi echo $ac_n "checking "for autotrans"""... $ac_c" 1>&6 -echo "configure:4771: checking "for autotrans"" >&5 +echo "configure:4804: checking "for autotrans"" >&5 # Check whether --with-autotrans or --without-autotrans was given. if test "${with_autotrans+set}" = set; then withval="$with_autotrans" @@ -4797,7 +4830,7 @@ fi echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6 -echo "configure:4801: checking "for afmfonts"" >&5 +echo "configure:4834: checking "for afmfonts"" >&5 # Check whether --with-afmfonts or --without-afmfonts was given. if test "${with_afmfonts+set}" = set; then withval="$with_afmfonts" @@ -4827,7 +4860,7 @@ fi echo $ac_n "checking "for normalized"""... $ac_c" 1>&6 -echo "configure:4831: checking "for normalized"" >&5 +echo "configure:4864: checking "for normalized"" >&5 # Check whether --with-normalized or --without-normalized was given. if test "${with_normalized+set}" = set; then withval="$with_normalized" @@ -4857,7 +4890,7 @@ fi echo $ac_n "checking "for RPC"""... $ac_c" 1>&6 -echo "configure:4861: checking "for RPC"" >&5 +echo "configure:4894: checking "for RPC"" >&5 # Check whether --with-rpc or --without-rpc was given. if test "${with_rpc+set}" = set; then withval="$with_rpc" @@ -4887,7 +4920,7 @@ fi echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6 -echo "configure:4891: checking "for wxresources"" >&5 +echo "configure:4924: checking "for wxresources"" >&5 # Check whether --with-wxresources or --without-wxresources was given. if test "${with_wxresources+set}" = set; then withval="$with_wxresources" @@ -4917,7 +4950,7 @@ fi echo $ac_n "checking "for prologio"""... $ac_c" 1>&6 -echo "configure:4921: checking "for prologio"" >&5 +echo "configure:4954: checking "for prologio"" >&5 # Check whether --with-prologio or --without-prologio was given. if test "${with_prologio+set}" = set; then withval="$with_prologio" @@ -4947,7 +4980,7 @@ fi echo $ac_n "checking "for postscript"""... $ac_c" 1>&6 -echo "configure:4951: checking "for postscript"" >&5 +echo "configure:4984: checking "for postscript"" >&5 # Check whether --with-postscript or --without-postscript was given. if test "${with_postscript+set}" = set; then withval="$with_postscript" @@ -4977,7 +5010,7 @@ fi echo $ac_n "checking "for wxconfig"""... $ac_c" 1>&6 -echo "configure:4981: checking "for wxconfig"" >&5 +echo "configure:5014: checking "for wxconfig"" >&5 # Check whether --with-wxconfig or --without-wxconfig was given. if test "${with_wxconfig+set}" = set; then withval="$with_wxconfig" @@ -5007,7 +5040,7 @@ fi echo $ac_n "checking "for metafile"""... $ac_c" 1>&6 -echo "configure:5011: checking "for metafile"" >&5 +echo "configure:5044: checking "for metafile"" >&5 # Check whether --with-metafile or --without-metafile was given. if test "${with_metafile+set}" = set; then withval="$with_metafile" @@ -5037,7 +5070,7 @@ fi echo $ac_n "checking "for form"""... $ac_c" 1>&6 -echo "configure:5041: checking "for form"" >&5 +echo "configure:5074: checking "for form"" >&5 # Check whether --with-form or --without-form was given. if test "${with_form+set}" = set; then withval="$with_form" @@ -5067,7 +5100,7 @@ fi echo $ac_n "checking "for help"""... $ac_c" 1>&6 -echo "configure:5071: checking "for help"" >&5 +echo "configure:5104: checking "for help"" >&5 # Check whether --with-help or --without-help was given. if test "${with_help+set}" = set; then withval="$with_help" @@ -5097,7 +5130,7 @@ fi echo $ac_n "checking "for IPC"""... $ac_c" 1>&6 -echo "configure:5101: checking "for IPC"" >&5 +echo "configure:5134: checking "for IPC"" >&5 # Check whether --with-ipc or --without-ipc was given. if test "${with_ipc+set}" = set; then withval="$with_ipc" @@ -5127,7 +5160,7 @@ fi echo $ac_n "checking "for enhanced dialog"""... $ac_c" 1>&6 -echo "configure:5131: checking "for enhanced dialog"" >&5 +echo "configure:5164: checking "for enhanced dialog"" >&5 # Check whether --with-enhanceddialog or --without-enhanceddialog was given. if test "${with_enhanceddialog+set}" = set; then withval="$with_enhanceddialog" @@ -5157,7 +5190,7 @@ fi echo $ac_n "checking "for resources"""... $ac_c" 1>&6 -echo "configure:5161: checking "for resources"" >&5 +echo "configure:5194: checking "for resources"" >&5 # Check whether --with-resources or --without-resources was given. if test "${with_resources+set}" = set; then withval="$with_resources" @@ -5187,7 +5220,7 @@ fi echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6 -echo "configure:5191: checking "for clipboard"" >&5 +echo "configure:5224: checking "for clipboard"" >&5 # Check whether --with-clipboard or --without-clipboard was given. if test "${with_clipboard+set}" = set; then withval="$with_clipboard" @@ -5217,7 +5250,7 @@ fi echo $ac_n "checking "for timedate"""... $ac_c" 1>&6 -echo "configure:5221: checking "for timedate"" >&5 +echo "configure:5254: checking "for timedate"" >&5 # Check whether --with-timedate or --without-timedate was given. if test "${with_timedate+set}" = set; then withval="$with_timedate" @@ -5247,7 +5280,7 @@ fi echo $ac_n "checking "for fraction"""... $ac_c" 1>&6 -echo "configure:5251: checking "for fraction"" >&5 +echo "configure:5284: checking "for fraction"" >&5 # Check whether --with-fraction or --without-fraction was given. if test "${with_fraction+set}" = set; then withval="$with_fraction" @@ -5277,7 +5310,7 @@ fi echo $ac_n "checking "for constrains"""... $ac_c" 1>&6 -echo "configure:5281: checking "for constrains"" >&5 +echo "configure:5314: checking "for constrains"" >&5 # Check whether --with-constraints or --without-constraints was given. if test "${with_constraints+set}" = set; then withval="$with_constraints" @@ -5307,7 +5340,7 @@ fi echo $ac_n "checking "for toolbar"""... $ac_c" 1>&6 -echo "configure:5311: checking "for toolbar"" >&5 +echo "configure:5344: checking "for toolbar"" >&5 # Check whether --with-toolbar or --without-toolbar was given. if test "${with_toolbar+set}" = set; then withval="$with_toolbar" @@ -5337,7 +5370,7 @@ fi echo $ac_n "checking "for gauge"""... $ac_c" 1>&6 -echo "configure:5341: checking "for gauge"" >&5 +echo "configure:5374: checking "for gauge"" >&5 # Check whether --with-gauge or --without-gauge was given. if test "${with_gauge+set}" = set; then withval="$with_gauge" @@ -5367,7 +5400,7 @@ fi echo $ac_n "checking "for vllist"""... $ac_c" 1>&6 -echo "configure:5371: checking "for vllist"" >&5 +echo "configure:5404: checking "for vllist"" >&5 # Check whether --with-vllist or --without-vllist was given. if test "${with_vllist+set}" = set; then withval="$with_vllist" @@ -5397,7 +5430,7 @@ fi echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6 -echo "configure:5401: checking "for scrollbar"" >&5 +echo "configure:5434: checking "for scrollbar"" >&5 # Check whether --with-scrollbar or --without-scrollbar was given. if test "${with_scrollbar+set}" = set; then withval="$with_scrollbar" @@ -5427,7 +5460,7 @@ fi echo $ac_n "checking "for docview"""... $ac_c" 1>&6 -echo "configure:5431: checking "for docview"" >&5 +echo "configure:5464: checking "for docview"" >&5 # Check whether --with-docview or --without-docview was given. if test "${with_docview+set}" = set; then withval="$with_docview" @@ -5457,7 +5490,7 @@ fi echo $ac_n "checking "for printarch"""... $ac_c" 1>&6 -echo "configure:5461: checking "for printarch"" >&5 +echo "configure:5494: checking "for printarch"" >&5 # Check whether --with-printarch or --without-printarch was given. if test "${with_printarch+set}" = set; then withval="$with_printarch" @@ -5487,7 +5520,7 @@ fi echo $ac_n "checking "for typetree"""... $ac_c" 1>&6 -echo "configure:5491: checking "for typetree"" >&5 +echo "configure:5524: checking "for typetree"" >&5 # Check whether --with-typetree or --without-typetree was given. if test "${with_typetree+set}" = set; then withval="$with_typetree" @@ -5517,7 +5550,7 @@ fi echo $ac_n "checking "for wxgraph"""... $ac_c" 1>&6 -echo "configure:5521: checking "for wxgraph"" >&5 +echo "configure:5554: checking "for wxgraph"" >&5 # Check whether --with-wxgraph or --without-wxgraph was given. if test "${with_wxgraph+set}" = set; then withval="$with_wxgraph" @@ -5547,7 +5580,7 @@ fi echo $ac_n "checking "for wxtree"""... $ac_c" 1>&6 -echo "configure:5551: checking "for wxtree"" >&5 +echo "configure:5584: checking "for wxtree"" >&5 # Check whether --with-wxtree or --without-wxtree was given. if test "${with_wxtree+set}" = set; then withval="$with_wxtree" @@ -5971,7 +6004,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5975: checking for $ac_word" >&5 +echo "configure:6008: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6002,7 +6035,7 @@ fi min_gtk_version=0.99.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6006: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6039: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6015,7 +6048,7 @@ echo "configure:6006: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6037,7 +6070,7 @@ main () } EOF -if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6088,7 +6121,7 @@ OPENGL_LINK= if test "$USE_OPENGL" = 1; then echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6 -echo "configure:6092: checking for OpenGL includes" >&5 +echo "configure:6125: checking for OpenGL includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6103,7 +6136,7 @@ for ac_dir in $SEARCH_INCLUDE; OPENGL_INCLUDE="-I$ac_find_includes" echo "$ac_t""found $ac_find_includes" 1>&6 echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6 -echo "configure:6107: checking for OpenGL library" >&5 +echo "configure:6140: checking for OpenGL library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; diff --git a/install/gtk/configure.in b/install/gtk/configure.in index 5cf7469fd5..460a2a4c86 100644 --- a/install/gtk/configure.in +++ b/install/gtk/configure.in @@ -696,6 +696,7 @@ DEFAULT_USE_ZLIB=1 DEFAULT_USE_GDK_IMLIB=1 DEFAULT_USE_LIBPNG=1 +DEFAULT_USE_APPLE_IEEE=1 DEFAULT_USE_STORABLE_CLASSES=1 DEFAULT_USE_AUTOTRANS=1 DEFAULT_USE_AFM_FOR_POSTSCRIPT=1 @@ -764,31 +765,35 @@ dnl user options for libraries (no choice yet) dnl ---------------------------------------------------------------- AC_OVERRIDES(zlib,zlib, -**--with-zlib use zlib (LZW comression), +**--with-zlib use zlib (LZW comression), USE_ZLIB) AC_OVERRIDES(gdk_imlib,gdk_imlib, -**--with-gdk_imlib use Raster's gdk_imlib (Image library), +**--with-gdk_imlib use Raster's gdk_imlib (Image library), USE_GDK_IMLIB) AC_OVERRIDES(libpng,libpng, -**--with-libpng use libpng (PNG image format), +**--with-libpng use libpng (PNG image format), USE_LIBPNG) AC_OVERRIDES(opengl,opengl, -**--with-opengl use opengl (OpenGL or Mesa), +**--with-opengl use opengl (OpenGL or Mesa), USE_OPENGL) dnl ---------------------------------------------------------------- dnl user options for code features (no choice yet) dnl ---------------------------------------------------------------- +AC_OVERRIDES(apple-ieee, apple-ieee, +**--with-apple-ieee use the Apple IEEE codec, +USE_APPLE_IEEE) + AC_OVERRIDES(storable,storable, -**--with-storable use storable classes, +**--with-storable use storable classes, USE_STORABLE_CLASSES) AC_OVERRIDES(autotrans,autotrans, -**--with-autotrans use gettext automatic translation, +**--with-autotrans use gettext automatic translation, USE_AUTOTRANS) AC_OVERRIDES(afmfonts,afmfonts, diff --git a/src/Makefile.in b/src/Makefile.in index 864bcb0249..c8d2ce3619 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -55,6 +55,7 @@ LIB_CPP_SRC=\ common/time.cpp \ common/timercmn.cpp \ common/utilscmn.cpp \ + common/datstrm.cpp \ \ gtk/app.cpp \ gtk/bitmap.cpp \ @@ -118,6 +119,7 @@ LIB_CPP_SRC=\ generic/treectrl.cpp LIB_C_SRC=\ + common/extended.c \ \ gtk/win_gtk.c \ \ diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp new file mode 100644 index 0000000000..048b3c50dc --- /dev/null +++ b/src/common/datstrm.cpp @@ -0,0 +1,172 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: datstrm.cpp +// Purpose: Data stream classes +// Author: Guilhem Lavaux +// Modified by: +// Created: 28/06/98 +// RCS-ID: $Id$ +// Copyright: (c) Guilhem Lavaux +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ +#pragma implementation "datstrm.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#include "wx/defs.h" +#endif + +#include "wx/datstrm.h" + +wxDataStream::wxDataStream(istream& s) +{ + m_istream = &s; + m_ostream = NULL; +} + +wxDataStream::wxDataStream(ostream& s) +{ + m_istream = NULL; + m_ostream = &s; +} + +wxDataStream::wxDataStream(iostream& s) +{ + m_istream = &s; + m_ostream = &s; +} + +wxDataStream::~wxDataStream() +{ +} + +unsigned long wxDataStream::Read32() +{ + char buf[4]; + + if (!m_istream) + return 0; + + m_istream->read(buf, 4); + + return (unsigned long)buf[0] | + ((unsigned long)buf[1] << 8) | + ((unsigned long)buf[2] << 16) | + ((unsigned long)buf[3] << 24); +} + +unsigned short wxDataStream::Read16() +{ + char buf[2]; + + if (!m_istream) + return 0; + + m_istream->read(buf, 2); + + return (unsigned short)buf[0] | + ((unsigned short)buf[1] << 8); +} + +unsigned char wxDataStream::Read8() +{ + char buf; + + if (!m_istream) + return 0; + + m_istream->read(&buf, 1); + return (unsigned char)buf; +} + +double wxDataStream::ReadDouble() +{ + extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes); + +#if USE_APPLE_IEEE + char buf[10]; + + if (!m_istream) + return 0.0; + + m_istream->read(buf, 10); + return ConvertFromIeeeExtended((unsigned char *)buf); +#else + return 0.0; +#endif +} + +wxString wxDataStream::ReadLine() +{ + char i_strg[255]; + + if (!m_istream) + return ""; + + m_istream->getline(i_strg, 255); + return i_strg; +} + +void wxDataStream::Write32(unsigned long i) +{ + char buf[4]; + + if (!m_ostream) + return; + + buf[0] = i & 0xff; + buf[1] = (i >> 8) & 0xff; + buf[2] = (i >> 16) & 0xff; + buf[3] = (i >> 24) & 0xff; + m_ostream->write(buf, 4); +} + +void wxDataStream::Write16(unsigned short i) +{ + char buf[2]; + + if (!m_ostream) + return; + + buf[0] = i & 0xff; + buf[1] = (i >> 8) & 0xff; + m_ostream->write(buf, 2); +} + +void wxDataStream::Write8(unsigned char i) +{ + if (!m_ostream) + return; + + m_ostream->write(&i, 1); +} + +void wxDataStream::WriteLine(const wxString& line) +{ + wxString tmp_string = line + '\n'; + + if (!m_ostream) + return; + + m_ostream->write((const char *) tmp_string, tmp_string.Length()); +} + +void wxDataStream::WriteDouble(double d) +{ + extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes) + char buf[10]; + + if (!m_ostream) + return; + + ConvertToIeeeExtended(d, (unsigned char *)buf); + m_ostream->write(buf, 10); +} diff --git a/src/common/extended.c b/src/common/extended.c new file mode 100644 index 0000000000..90bd43ec72 --- /dev/null +++ b/src/common/extended.c @@ -0,0 +1,179 @@ +#include "wx/setup.h" +#include + +#if USE_APPLE_IEEE + +/* + * C O N V E R T T O I E E E E X T E N D E D + */ + +/* Copyright (C) 1988-1991 Apple Computer, Inc. + * All rights reserved. + * + * Machine-independent I/O routines for IEEE floating-point numbers. + * + * NaN's and infinities are converted to HUGE_VAL or HUGE, which + * happens to be infinity on IEEE machines. Unfortunately, it is + * impossible to preserve NaN's in a machine-independent way. + * Infinities are, however, preserved on IEEE machines. + * + * These routines have been tested on the following machines: + * Apple Macintosh, MPW 3.1 C compiler + * Apple Macintosh, THINK C compiler + * Silicon Graphics IRIS, MIPS compiler + * Cray X/MP and Y/MP + * Digital Equipment VAX + * + * + * Implemented by Malcolm Slaney and Ken Turkowski. + * + * Malcolm Slaney contributions during 1988-1990 include big- and little- + * endian file I/O, conversion to and from Motorola's extended 80-bit + * floating-point format, and conversions to and from IEEE single- + * precision floating-point format. + * + * In 1991, Ken Turkowski implemented the conversions to and from + * IEEE double-precision format, added more precision to the extended + * conversions, and accommodated conversions involving +/- infinity, + * NaN's, and denormalized numbers. + */ + +#ifndef HUGE_VAL +#define HUGE_VAL HUGE +#endif /*HUGE_VAL*/ + +#define FloatToUnsigned(f) ((unsigned long) (((long) (f - 2147483648.0)) + 2147483647L) + 1) + +void ConvertToIeeeExtended(double num, unsigned char *bytes) +{ + int sign; + int expon; + double fMant, fsMant; + unsigned long hiMant, loMant; + + if (num < 0) { + sign = 0x8000; + num *= -1; + } else { + sign = 0; + } + + if (num == 0) { + expon = 0; hiMant = 0; loMant = 0; + } + else { + fMant = frexp(num, &expon); + if ((expon > 16384) || !(fMant < 1)) { /* Infinity or NaN */ + expon = sign|0x7FFF; hiMant = 0; loMant = 0; /* infinity */ + } + else { /* Finite */ + expon += 16382; + if (expon < 0) { /* denormalized */ + fMant = ldexp(fMant, expon); + expon = 0; + } + expon |= sign; + fMant = ldexp(fMant, 32); + fsMant = floor(fMant); + hiMant = FloatToUnsigned(fsMant); + fMant = ldexp(fMant - fsMant, 32); + fsMant = floor(fMant); + loMant = FloatToUnsigned(fsMant); + } + } + + bytes[0] = expon >> 8; + bytes[1] = expon; + bytes[2] = hiMant >> 24; + bytes[3] = hiMant >> 16; + bytes[4] = hiMant >> 8; + bytes[5] = hiMant; + bytes[6] = loMant >> 24; + bytes[7] = loMant >> 16; + bytes[8] = loMant >> 8; + bytes[9] = loMant; +} + +/* + * C O N V E R T F R O M I E E E E X T E N D E D + */ + +/* + * Copyright (C) 1988-1991 Apple Computer, Inc. + * All rights reserved. + * + * Machine-independent I/O routines for IEEE floating-point numbers. + * + * NaN's and infinities are converted to HUGE_VAL or HUGE, which + * happens to be infinity on IEEE machines. Unfortunately, it is + * impossible to preserve NaN's in a machine-independent way. + * Infinities are, however, preserved on IEEE machines. + * + * These routines have been tested on the following machines: + * Apple Macintosh, MPW 3.1 C compiler + * Apple Macintosh, THINK C compiler + * Silicon Graphics IRIS, MIPS compiler + * Cray X/MP and Y/MP + * Digital Equipment VAX + * + * + * Implemented by Malcolm Slaney and Ken Turkowski. + * + * Malcolm Slaney contributions during 1988-1990 include big- and little- + * endian file I/O, conversion to and from Motorola's extended 80-bit + * floating-point format, and conversions to and from IEEE single- + * precision floating-point format. + * + * In 1991, Ken Turkowski implemented the conversions to and from + * IEEE double-precision format, added more precision to the extended + * conversions, and accommodated conversions involving +/- infinity, + * NaN's, and denormalized numbers. + */ + +#ifndef HUGE_VAL +# define HUGE_VAL HUGE +#endif /*HUGE_VAL*/ + +# define UnsignedToFloat(u) (((double) ((long) (u - 2147483647L - 1))) + 2147483648.0) + +/**************************************************************** + * Extended precision IEEE floating-point conversion routine. + ****************************************************************/ + +double ConvertFromIeeeExtended(const unsigned char *bytes) +{ + double f; + int expon; + unsigned long hiMant, loMant; + + expon = ((bytes[0] & 0x7F) << 8) | (bytes[1] & 0xFF); + hiMant = ((unsigned long)(bytes[2] & 0xFF) << 24) + | ((unsigned long) (bytes[3] & 0xFF) << 16) + | ((unsigned long) (bytes[4] & 0xFF) << 8) + | ((unsigned long) (bytes[5] & 0xFF)); + loMant = ((unsigned long) (bytes[6] & 0xFF) << 24) + | ((unsigned long) (bytes[7] & 0xFF) << 16) + | ((unsigned long) (bytes[8] & 0xFF) << 8) + | ((unsigned long) (bytes[9] & 0xFF)); + + if (expon == 0 && hiMant == 0 && loMant == 0) { + f = 0; + } + else { + if (expon == 0x7FFF) { /* Infinity or NaN */ + f = HUGE_VAL; + } + else { + expon -= 16383; + f = ldexp(UnsignedToFloat(hiMant), expon-=31); + f += ldexp(UnsignedToFloat(loMant), expon-=32); + } + } + + if (bytes[0] & 0x80) + return -f; + else + return f; +} + +#endif USE_APPLE_IEEE diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp index cd3124b47f..88bab2cde4 100644 --- a/src/gtk/data.cpp +++ b/src/gtk/data.cpp @@ -333,12 +333,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent) +IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) #include "wx/utils.h" IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject) +#include "wx/process.h" +IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) + #if USE_TIMEDATE #include "wx/date.h" IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject) diff --git a/src/gtk/setup/setup.hin b/src/gtk/setup/setup.hin index 247d8a4c06..c32074e37f 100644 --- a/src/gtk/setup/setup.hin +++ b/src/gtk/setup/setup.hin @@ -176,6 +176,10 @@ /* * Use wxTree */ +/* + * Use Apple Ieee-double converter + */ +#undef USE_APPLE_IEEE /********************** DO NOT CHANGE BELOW THIS POINT **********************/ diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 6fb3673dd3..ccd767f3b6 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -337,10 +337,46 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) // subprocess routines //------------------------------------------------------------------------ -long wxExecute( char **argv, bool Async ) +typedef struct { + gint pid, tag; + wxProcess *process; +} wxEndProcessData; + +static void GTK_EndProcessDetector(gpointer data, gint source, + GdkInputCondition condition) +{ + wxEndProcessData *proc_data = (wxEndProcessData *)data; + int pid; + + pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); + + wait4(proc_data->pid, NULL, 0, NULL); + + close(source); + gdk_input_remove(proc_data->tag); + + if (proc_data->process) + proc_data->process->OnTerminate(proc_data->pid); + + if (proc_data->pid > 0) + delete proc_data; + else + proc_data->pid = 0; +}; + +long wxExecute( char **argv, bool Async, wxProcess *process ) { + wxEndProcessData *data = new wxEndProcessData; + int end_proc_detect[2]; + if (*argv == NULL) - return FALSE; + return 0; + + /* Create pipes */ + if (pipe(end_proc_detect) == -1) { + perror("pipe failed"); + return 0; + } /* fork the process */ #if defined(sun) || defined(__ultrix) || defined(__bsdi__) @@ -350,8 +386,11 @@ long wxExecute( char **argv, bool Async ) #endif if (pid == -1) { perror ("fork failed"); - return FALSE; + return 0; } else if (pid == 0) { + /* Close fd not useful */ + close(end_proc_detect[0]); // close reading side + /* child */ #ifdef _AIX execvp ((const char *)*argv, (const char **)argv); @@ -366,39 +405,26 @@ long wxExecute( char **argv, bool Async ) _exit (-1); } - // Code below is NOT really acceptable! - // One should NEVER use wait under X - // Ideas? A Sleep idle callback? - // WARNING: WARNING: WARNING: WARNING: - // The CODE BELOW IS BAD BAD BAD BAD! + close(end_proc_detect[1]); // close writing side + data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ, + GTK_EndProcessDetector, (gpointer)data); + data->pid = pid; if (Async) { - int status; -/* - wxSleep(2); // Give a little time -*/ -#if !defined(DG) && \ - !defined(__AIX__) && \ - !defined(__xlC__) && \ - !defined(__SVR4__) && \ - !defined(__SUN__) && \ - !defined(__ALPHA__) && \ - !defined(__SGI__) && \ - !defined(__HPUX__) && \ - !defined(__SUNPRO_CC) && \ - !defined(__FreeBSD__) - while (wait((union wait*)&status) != pid) -#else - while (wait(&status) != pid) -#endif - {}; -/* - wxSleep(3); // 3 sec? -*/ - }; - return TRUE; + data->process = process; + } else { + data->process = NULL; + data->pid = -(data->pid); + + while (data->pid != 0) + wxYield(); + + delete data; + } + + return pid; }; -long wxExecute( const wxString& command, bool Async ) +long wxExecute( const wxString& command, bool Async, wxProcess *process ) { if (command.IsNull() || command == "") return FALSE; @@ -412,6 +438,6 @@ long wxExecute( const wxString& command, bool Async ) argv[argc++] = strtok (tmp, IFS); while ((argv[argc++] = strtok(NULL, IFS)) != NULL) /* loop */ ; - return wxExecute(argv, Async); + return wxExecute(argv, Async, process); }; diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp index cd3124b47f..88bab2cde4 100644 --- a/src/gtk1/data.cpp +++ b/src/gtk1/data.cpp @@ -333,12 +333,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent) +IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) #include "wx/utils.h" IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList) IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject) +#include "wx/process.h" +IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) + #if USE_TIMEDATE #include "wx/date.h" IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject) diff --git a/src/gtk1/setup/setup.hin b/src/gtk1/setup/setup.hin index 247d8a4c06..c32074e37f 100644 --- a/src/gtk1/setup/setup.hin +++ b/src/gtk1/setup/setup.hin @@ -176,6 +176,10 @@ /* * Use wxTree */ +/* + * Use Apple Ieee-double converter + */ +#undef USE_APPLE_IEEE /********************** DO NOT CHANGE BELOW THIS POINT **********************/ diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index 6fb3673dd3..ccd767f3b6 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -337,10 +337,46 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) // subprocess routines //------------------------------------------------------------------------ -long wxExecute( char **argv, bool Async ) +typedef struct { + gint pid, tag; + wxProcess *process; +} wxEndProcessData; + +static void GTK_EndProcessDetector(gpointer data, gint source, + GdkInputCondition condition) +{ + wxEndProcessData *proc_data = (wxEndProcessData *)data; + int pid; + + pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); + + wait4(proc_data->pid, NULL, 0, NULL); + + close(source); + gdk_input_remove(proc_data->tag); + + if (proc_data->process) + proc_data->process->OnTerminate(proc_data->pid); + + if (proc_data->pid > 0) + delete proc_data; + else + proc_data->pid = 0; +}; + +long wxExecute( char **argv, bool Async, wxProcess *process ) { + wxEndProcessData *data = new wxEndProcessData; + int end_proc_detect[2]; + if (*argv == NULL) - return FALSE; + return 0; + + /* Create pipes */ + if (pipe(end_proc_detect) == -1) { + perror("pipe failed"); + return 0; + } /* fork the process */ #if defined(sun) || defined(__ultrix) || defined(__bsdi__) @@ -350,8 +386,11 @@ long wxExecute( char **argv, bool Async ) #endif if (pid == -1) { perror ("fork failed"); - return FALSE; + return 0; } else if (pid == 0) { + /* Close fd not useful */ + close(end_proc_detect[0]); // close reading side + /* child */ #ifdef _AIX execvp ((const char *)*argv, (const char **)argv); @@ -366,39 +405,26 @@ long wxExecute( char **argv, bool Async ) _exit (-1); } - // Code below is NOT really acceptable! - // One should NEVER use wait under X - // Ideas? A Sleep idle callback? - // WARNING: WARNING: WARNING: WARNING: - // The CODE BELOW IS BAD BAD BAD BAD! + close(end_proc_detect[1]); // close writing side + data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ, + GTK_EndProcessDetector, (gpointer)data); + data->pid = pid; if (Async) { - int status; -/* - wxSleep(2); // Give a little time -*/ -#if !defined(DG) && \ - !defined(__AIX__) && \ - !defined(__xlC__) && \ - !defined(__SVR4__) && \ - !defined(__SUN__) && \ - !defined(__ALPHA__) && \ - !defined(__SGI__) && \ - !defined(__HPUX__) && \ - !defined(__SUNPRO_CC) && \ - !defined(__FreeBSD__) - while (wait((union wait*)&status) != pid) -#else - while (wait(&status) != pid) -#endif - {}; -/* - wxSleep(3); // 3 sec? -*/ - }; - return TRUE; + data->process = process; + } else { + data->process = NULL; + data->pid = -(data->pid); + + while (data->pid != 0) + wxYield(); + + delete data; + } + + return pid; }; -long wxExecute( const wxString& command, bool Async ) +long wxExecute( const wxString& command, bool Async, wxProcess *process ) { if (command.IsNull() || command == "") return FALSE; @@ -412,6 +438,6 @@ long wxExecute( const wxString& command, bool Async ) argv[argc++] = strtok (tmp, IFS); while ((argv[argc++] = strtok(NULL, IFS)) != NULL) /* loop */ ; - return wxExecute(argv, Async); + return wxExecute(argv, Async, process); }; diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 5af01f3c54..623cd3687f 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -104,7 +104,9 @@ COMMONOBJS = \ $(MSWDIR)\string.obj \ $(MSWDIR)\time.obj \ $(MSWDIR)\wxexpr.obj \ - $(MSWDIR)\y_tab.obj + $(MSWDIR)\y_tab.obj \ + $(MSWDIR)\datstrm.obj \ + $(MSWDIR)\extended.obj # $(MSWDIR)\matrix.obj \ @@ -184,6 +186,7 @@ MSWOBJS = \ $(MSWDIR)\timer.obj \ $(MSWDIR)\treectrl.obj \ $(MSWDIR)\utils.obj \ + $(MSWDIR)\utilsexc.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj \ $(MSWDIR)\droptgt.obj \ @@ -369,6 +372,8 @@ $(MSWDIR)\treectrl.obj: $(MSWDIR)\treectrl.$(SRCSUFF) $(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF) +$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF) + $(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF) $(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF) @@ -456,6 +461,10 @@ $(MSWDIR)\matrix.obj: $(COMMDIR)\matrix.$(SRCSUFF) $(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF) +$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF) + +$(MSWDIR)\extended.obj: $(COMMDIR)\extended.c + ######################################################## # Generic objects (not always compiled, depending on # whether platforms have native implementations) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 495269d746..f49efaa1a7 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -104,7 +104,9 @@ COMMONOBJS = \ $(COMMDIR)\list.obj \ $(COMMDIR)\string.obj \ $(COMMDIR)\time.obj \ - $(COMMDIR)\y_tab.obj + $(COMMDIR)\y_tab.obj \ + $(COMMDIR)\datstrm.obj \ + $(COMMDIR)\extended.obj # Nested classes: won't comple # $(COMMDIR)\fileconf.obj \ @@ -806,6 +808,16 @@ $(COMMDIR)/time.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(COMMDIR)/datstrm.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + +$(COMMDIR)/extended.obj: $*.c + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.c +<< + $(COMMDIR)/y_tab.obj: $*.c $(COMMDIR)/lex_yy.c cl @<< $(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index ac7a357e2c..7d18bfb644 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -109,7 +109,9 @@ COMMONOBJS = \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/time.$(OBJSUFF) \ - $(COMMDIR)/y_tab.$(OBJSUFF) + $(COMMDIR)/y_tab.$(OBJSUFF) \ + $(COMMDIR)/datstrm.$(OBJSUFF) \ + $(COMMDIR)/extended.$(OBJSUFF) # $(COMMDIR)/wxstrgnu/wxstrgnu.$(OBJSUFF) \ # $(COMMDIR)/wxstrgnu/wxregex.$(OBJSUFF) @@ -189,6 +191,7 @@ MSWOBJS = \ timer.$(OBJSUFF) \ treectrl.$(OBJSUFF) \ utils.$(OBJSUFF) \ + utilsexc.$(OBJSUFF) \ wave.$(OBJSUFF) \ window.$(OBJSUFF) \ $(OLEDIR)/droptgt.$(OBJSUFF) \ diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index 9246301775..015e7e48b6 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.nt @@ -106,7 +106,9 @@ COMMONOBJS = \ $(COMMDIR)\string.obj \ $(COMMDIR)\time.obj \ $(COMMDIR)\wxexpr.obj \ - $(COMMDIR)\y_tab.obj + $(COMMDIR)\y_tab.obj \ + $(COMMDIR)\datstrm.obj \ + $(COMMDIR)\extended.obj # $(COMMDIR)\wxstrgnu\wxstrgnu.obj \ # $(COMMDIR)\wxstrgnu\wxregex.obj \ @@ -189,6 +191,7 @@ MSWOBJS = \ $(MSWDIR)\timer.obj \ $(MSWDIR)\treectrl.obj \ $(MSWDIR)\utils.obj \ + $(MSWDIR)\utilsexc.obj \ $(MSWDIR)\wave.obj \ $(MSWDIR)\window.obj \ $(OLEDIR)\droptgt.obj \ @@ -646,6 +649,11 @@ $(MSWDIR)/utils.obj: $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << +$(MSWDIR)/utilsexc.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + $(MSWDIR)/wave.obj: $*.$(SRCSUFF) echo $(CPPFLAGS) cl @<< @@ -879,6 +887,16 @@ $(COMMDIR)/time.obj: $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ << +$(COMMDIR)\datstrm.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@ +<< + +$(COMMDIR)/extended.obj: $*.c + cl @<< +$(CPPFLAGS) /c /Tp $*.c /Fo$@ +<< + $(COMMDIR)/y_tab.obj: $*.c $(COMMDIR)/lex_yy.c cl @<< $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp index 968053bea6..f3a8bf71a3 100644 --- a/src/msw/regconf.cpp +++ b/src/msw/regconf.cpp @@ -189,7 +189,7 @@ bool wxRegConfig::Read(wxString& str, { PathChanger path(this, szKey); - bool bQueryGlobal = true; + bool bQueryGlobal = TRUE; // if immutable key exists in global key we must check that it's not // overriden by the local key with the same name @@ -200,30 +200,30 @@ bool wxRegConfig::Read(wxString& str, path.Name().c_str()); } - return true; + return TRUE; } else { // don't waste time - it's not there anyhow - bQueryGlobal = false; + bQueryGlobal = FALSE; } } // first try local key if ( TryGetValue(m_keyLocal, path.Name(), str) || (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), str)) ) { - return true; + return TRUE; } // default value str = szDefault; - return false; + return FALSE; } bool wxRegConfig::Read(long &lValue, const char *szKey, long lDefault) const { PathChanger path(this, szKey); - bool bQueryGlobal = true; + bool bQueryGlobal = TRUE; // if immutable key exists in global key we must check that it's not // overriden by the local key with the same name @@ -234,23 +234,23 @@ bool wxRegConfig::Read(long &lValue, const char *szKey, long lDefault) const path.Name().c_str()); } - return true; + return TRUE; } else { // don't waste time - it's not there anyhow - bQueryGlobal = false; + bQueryGlobal = FALSE; } } // first try local key if ( TryGetValue(m_keyLocal, path.Name(), &lValue) || (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), &lValue)) ) { - return true; + return TRUE; } // default lValue = lDefault; - return false; + return FALSE; } bool wxRegConfig::Write(const char *szKey, const char *szValue) @@ -259,7 +259,7 @@ bool wxRegConfig::Write(const char *szKey, const char *szValue) if ( IsImmutable(path.Name()) ) { wxLogError("Can't change immutable entry '%s'.", path.Name().c_str()); - return false; + return FALSE; } return m_keyLocal.SetValue(path.Name(), szValue); @@ -271,7 +271,7 @@ bool wxRegConfig::Write(const char *szKey, long lValue) if ( IsImmutable(path.Name()) ) { wxLogError("Can't change immutable entry '%s'.", path.Name().c_str()); - return false; + return FALSE; } return m_keyLocal.SetValue(path.Name(), lValue); @@ -285,7 +285,7 @@ bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso) PathChanger path(this, szValue); if ( !m_keyLocal.DeleteValue(path.Name()) ) - return false; + return FALSE; if ( m_keyLocal.IsEmpty() ) { wxString strKey = GetPath().Right(APPCONF_PATH_SEPARATOR); @@ -293,7 +293,7 @@ bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso) return m_keyLocal.DeleteKey(strKey); } - return true; + return TRUE; } bool wxRegConfig::DeleteGroup(const char *szKey) @@ -306,7 +306,7 @@ bool wxRegConfig::DeleteGroup(const char *szKey) bool wxRegConfig::DeleteAll() { // first of all, prevent the creation of new registry entries - Config::EnableAutosave(false); + Config::EnableAutosave(FALSE); m_keyLocal.Close(); m_keyGlobal.Close(); diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index 713ca417c3..e7d698cbbd 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -100,7 +100,7 @@ aStdKeys[] = // removes the trailing backslash from the string if it has one static inline void RemoveTrailingSeparator(wxString& str); -// returns true if given registry key exists +// returns TRUE if given registry key exists static bool KeyExists(HKEY hRootKey, const char *szKey); // combines value and key name (uses static buffer!) @@ -274,11 +274,11 @@ void wxRegKey::SetHkey(HKEY hKey) // info about the key // ---------------------------------------------------------------------------- -// returns true if the key exists +// returns TRUE if the key exists bool wxRegKey::Exists() const { // opened key has to exist, try to open it if not done yet - return IsOpened() ? true : KeyExists(m_hRootKey, m_strKey); + return IsOpened() ? TRUE : KeyExists(m_hRootKey, m_strKey); } // returns the full name of the key (prefix is abbreviated if bShortPrefix) @@ -301,16 +301,16 @@ wxString wxRegKey::GetName(bool bShortPrefix) const bool wxRegKey::Open() { if ( IsOpened() ) - return true; + return TRUE; m_dwLastError = RegOpenKey(m_hRootKey, m_strKey, &m_hKey); if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, "can't open registry key '%s'", GetName().c_str()); - return false; + return FALSE; } else - return true; + return TRUE; } // creates key, failing if it exists and !bOkIfExists @@ -318,20 +318,20 @@ bool wxRegKey::Create(bool bOkIfExists) { // check for existence only if asked (i.e. order is important!) if ( !bOkIfExists && Exists() ) { - return false; + return FALSE; } if ( IsOpened() ) - return true; + return TRUE; m_dwLastError = RegCreateKey(m_hRootKey, m_strKey, &m_hKey); if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, "can't create registry key '%s'", GetName().c_str()); - return false; + return FALSE; } else - return true; + return TRUE; } // close the key, it's not an error to call it when not opened @@ -344,14 +344,14 @@ bool wxRegKey::Close() GetName().c_str()); m_hKey = 0; - return false; + return FALSE; } else { m_hKey = 0; } } - return true; + return TRUE; } // ---------------------------------------------------------------------------- @@ -402,7 +402,7 @@ bool wxRegKey::DeleteSelf() bool wxRegKey::DeleteKey(const char *szKey) { if ( !Open() ) - return false; + return FALSE; wxRegKey key(*this, szKey); return key.DeleteSelf(); @@ -411,14 +411,14 @@ bool wxRegKey::DeleteKey(const char *szKey) bool wxRegKey::DeleteValue(const char *szValue) { if ( !Open() ) - return false; + return FALSE; #ifdef __WIN32__ m_dwLastError = RegDeleteValue(m_hKey, szValue); if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, "can't delete value '%s' from key '%s'", szValue, GetName().c_str()); - return false; + return FALSE; } #else //WIN16 // named registry values don't exist in Win16 world @@ -429,18 +429,18 @@ bool wxRegKey::DeleteValue(const char *szValue) if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, "can't delete value of key '%s'", GetName().c_str()); - return false; + return FALSE; } #endif //WIN16/32 - return true; + return TRUE; } // ---------------------------------------------------------------------------- // access to values and subkeys // ---------------------------------------------------------------------------- -// return true if value exists +// return TRUE if value exists bool wxRegKey::HasValue(const char *szValue) const { #ifdef __WIN32__ @@ -449,14 +449,14 @@ bool wxRegKey::HasValue(const char *szValue) const NULL, NULL, NULL) == ERROR_SUCCESS; } else - return false; + return FALSE; #else // WIN16 // only unnamed value exists return IsEmpty(szValue); #endif // WIN16/32 } -// returns true if this key has any subkeys +// returns TRUE if this key has any subkeys bool wxRegKey::HasSubkeys() const { // just call GetFirstKey with dummy parameters @@ -465,13 +465,13 @@ bool wxRegKey::HasSubkeys() const return CONST_CAST GetFirstKey(str, l); } -// returns true if given subkey exists +// returns TRUE if given subkey exists bool wxRegKey::HasSubKey(const char *szKey) const { if ( CONST_CAST Open() ) return KeyExists(m_hKey, szKey); else - return false; + return FALSE; } wxRegKey::ValueType wxRegKey::GetValueType(const char *szValue) @@ -502,12 +502,12 @@ bool wxRegKey::SetValue(const char *szValue, long lValue) m_dwLastError = RegSetValueEx(m_hKey, szValue, RESERVED, REG_DWORD, (RegString)&lValue, sizeof(lValue)); if ( m_dwLastError == ERROR_SUCCESS ) - return true; + return TRUE; } wxLogSysError(m_dwLastError, "can't set value of '%s'", GetFullName(this, szValue)); - return false; + return FALSE; } bool wxRegKey::QueryValue(const char *szValue, long *plValue) const @@ -520,18 +520,18 @@ bool wxRegKey::QueryValue(const char *szValue, long *plValue) const if ( m_dwLastError != ERROR_SUCCESS ) { wxLogSysError(m_dwLastError, "can't read value of key '%s'", GetName().c_str()); - return false; + return FALSE; } else { // check that we read the value of right type wxASSERT_MSG( dwType == REG_DWORD, "Type mismatch in wxRegKey::QueryValue()." ); - return true; + return TRUE; } } else - return false; + return FALSE; } #endif //Win32 @@ -553,7 +553,7 @@ bool wxRegKey::QueryValue(const char *szValue, wxString& strValue) const wxASSERT_MSG( dwType == REG_SZ, "Type mismatch in wxRegKey::QueryValue()." ); - return true; + return TRUE; } } #else //WIN16 @@ -562,13 +562,13 @@ bool wxRegKey::QueryValue(const char *szValue, wxString& strValue) const m_dwLastError = RegQueryValue(m_hKey, 0, strValue.GetWriteBuf(256), &l); if ( m_dwLastError == ERROR_SUCCESS ) - return true; + return TRUE; #endif //WIN16/32 } wxLogSysError(m_dwLastError, "can't read value of '%s'", GetFullName(this, szValue)); - return false; + return FALSE; } bool wxRegKey::SetValue(const char *szValue, const wxString& strValue) @@ -579,20 +579,20 @@ bool wxRegKey::SetValue(const char *szValue, const wxString& strValue) (RegString)strValue.c_str(), strValue.Len() + 1); if ( m_dwLastError == ERROR_SUCCESS ) - return true; + return TRUE; #else //WIN16 // named registry values don't exist in Win16 wxASSERT( IsEmpty(szValue) ); m_dwLastError = RegSetValue(m_hKey, NULL, REG_SZ, strValue, NULL); if ( m_dwLastError == ERROR_SUCCESS ) - return true; + return TRUE; #endif //WIN16/32 } wxLogSysError(m_dwLastError, "can't set value of '%s'", GetFullName(this, szValue)); - return false; + return FALSE; } wxRegKey::operator wxString() const @@ -611,7 +611,7 @@ wxRegKey::operator wxString() const bool wxRegKey::GetFirstValue(wxString& strValueName, long& lIndex) { if ( !Open() ) - return false; + return FALSE; lIndex = 0; return GetNextValue(strValueName, lIndex); @@ -623,7 +623,7 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const // are we already at the end of enumeration? if ( lIndex == -1 ) - return false; + return FALSE; #ifdef __WIN32__ char szValueName[1024]; // @@ use RegQueryInfoKey... @@ -647,7 +647,7 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const GetName().c_str()); } - return false; + return FALSE; } strValueName = szValueName; @@ -659,13 +659,13 @@ bool wxRegKey::GetNextValue(wxString& strValueName, long& lIndex) const strValueName.Empty(); #endif - return true; + return TRUE; } bool wxRegKey::GetFirstKey(wxString& strKeyName, long& lIndex) { if ( !Open() ) - return false; + return FALSE; lIndex = 0; return GetNextKey(strKeyName, lIndex); @@ -677,7 +677,7 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const // are we already at the end of enumeration? if ( lIndex == -1 ) - return false; + return FALSE; char szKeyName[_MAX_PATH + 1]; m_dwLastError = RegEnumKey(m_hKey, lIndex++, szKeyName, WXSIZEOF(szKeyName)); @@ -692,11 +692,11 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const GetName().c_str()); } - return false; + return FALSE; } strKeyName = szKeyName; - return true; + return TRUE; } // ============================================================================ @@ -707,10 +707,10 @@ bool KeyExists(HKEY hRootKey, const char *szKey) HKEY hkeyDummy; if ( RegOpenKey(hRootKey, szKey, &hkeyDummy) == ERROR_SUCCESS ) { RegCloseKey(hkeyDummy); - return true; + return TRUE; } else - return false; + return FALSE; } const char *GetFullName(const wxRegKey *pKey, const char *szValue) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index 2b159bb6f1..4c4fe57837 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -207,97 +207,6 @@ bool wxGetUserName(char *buf, int maxSize) #endif } -// Execute a command (e.g. another program) in a -// system-independent manner. - -long wxExecute(char **argv, bool sync) -{ - if (*argv == NULL) - return 0; - - char command[1024]; - command[0] = '\0'; - - int argc; - for (argc = 0; argv[argc]; argc++) - { - if (argc) - strcat(command, " "); - strcat(command, argv[argc]); - } - - return wxExecute((char *)command, sync); -} - -long wxExecute(const wxString& command, bool sync) -{ - if (command == "") - return 0; - -#ifdef __WIN32__ - char * cl; - char * argp; - int clen; - HINSTANCE result; - DWORD dresult; - - // copy the command line - clen = command.Length(); - if (!clen) return -1; - cl = (char *) calloc( 1, 256); - if (!cl) return -1; - strcpy( cl, WXSTRINGCAST command); - - // isolate command and arguments - argp = strchr( cl, ' '); - if (argp) - *argp++ = '\0'; - - // execute the command -#ifdef __GNUWIN32__ - result = ShellExecute( (HWND) (wxTheApp->GetTopWindow() ? (HWND) wxTheApp->GetTopWindow()->GetHWND() : NULL), - (const wchar_t) "open", (const wchar_t) cl, (const wchar_t) argp, (const wchar_t) NULL, SW_SHOWNORMAL); -#else - result = ShellExecute( (HWND) (wxTheApp->GetTopWindow() ? wxTheApp->GetTopWindow()->GetHWND() : NULL), - "open", cl, argp, NULL, SW_SHOWNORMAL); -#endif - - if (((long)result) <= 32) { - free(cl); - return 0; - } - - if (!sync) - { - free(cl); - return dresult; - } - - // waiting until command executed - do { - wxYield(); - dresult = GetModuleFileName( result, cl, 256); - } while( dresult); - - /* long lastError = GetLastError(); */ - - free(cl); - return 0; -#else - long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW); - if (instanceID < 32) return(0); - - if (sync) { - int running; - do { - wxYield(); - running = GetModuleUsage((HANDLE)instanceID); - } while (running); - } - return(instanceID); -#endif -} - int wxKill(long pid, int sig) { return 0; -- 2.45.2