From 7a4b9130e341e8ed5192cac76574119fb6664c6c Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 4 Aug 1998 17:49:26 +0000 Subject: [PATCH] * Fixes and new features in wxObject*Stream * Fixes: wxChoice (GTK), wxCheckBox (GTK) * Fixes: wxStream * wxObject calls wx*Serialize::LoadObject/StoreObject in StoreObject/LoadObject * Added support for dynamic library (Linux only, Windows will follow) * Added serbase.h (Serialization base defines and base object) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynlib.h | 95 ++++++ include/wx/object.h | 4 +- include/wx/objstrm.h | 8 +- include/wx/serbase.h | 57 ++++ include/wx/stream.h | 7 +- install/gtk/configure | 637 ++++++++++++++++++++------------------- install/gtk/configure.in | 43 +-- src/Makefile.in | 2 + src/common/dynlib.cpp | 228 ++++++++++++++ src/common/fstream.cpp | 7 +- src/common/object.cpp | 45 +++ src/common/objstrm.cpp | 61 +++- src/common/stream.cpp | 2 + src/gtk/checkbox.cpp | 2 + src/gtk/choice.cpp | 4 +- src/gtk1/checkbox.cpp | 2 + src/gtk1/choice.cpp | 4 +- 17 files changed, 833 insertions(+), 375 deletions(-) create mode 100644 include/wx/dynlib.h create mode 100644 include/wx/serbase.h create mode 100644 src/common/dynlib.cpp diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h new file mode 100644 index 0000000000..a1d3c79464 --- /dev/null +++ b/include/wx/dynlib.h @@ -0,0 +1,95 @@ +#ifndef __DYNLIB_H__ +#define __DYNLIB_H__ + +#ifdef __GNUG__ +#pragma interface +#endif + +#include +#include +#include + +// --------------------------------------------------------------------------- +// Some more info on a class + +typedef struct { + wxClassInfo *class_info; + wxString path; +} wxClassLibInfo; + +// --------------------------------------------------------------------------- +// Useful arrays + +WX_DEFINE_ARRAY(wxClassInfo *, wxArrayClassInfo); +WX_DEFINE_ARRAY(wxClassLibInfo *, wxArrayClassLibInfo); + +// --------------------------------------------------------------------------- +// wxClassLibrary + +class wxClassLibrary { +protected: + wxArrayClassLibInfo m_list; +public: + wxClassLibrary(void); + ~wxClassLibrary(void); + + // Dynamic (un)register a (new) class in the database + void RegisterClass(wxClassInfo *class_info, const wxString& path); + void UnregisterClass(wxClassInfo *class_info); + + // Fetch all infos whose name matches the string (wildcards allowed) + bool FetchInfos(const wxString& path, wxArrayClassLibInfo& infos); + + // Create all objects whose name matches the string (wildcards allowed) + bool CreateObjects(const wxString& path, wxArrayClassInfo& objs); + + // Create one object using the EXACT name + wxObject *CreateObject(const wxString& path); +}; + +// --------------------------------------------------------------------------- +// wxLibrary + +class wxLibrary: public wxObject { +protected: + wxClassLibrary *m_liblist; + void *m_handle; +public: + wxLibrary(void *handle); + ~wxLibrary(void); + + // Get a symbol from the dynamic library + void *GetSymbol(const wxString& symbname); + + // Create the object whose classname is "name" + wxObject *CreateObject(const wxString& name); + + wxClassLibrary *ClassLib() const; +}; + +// --------------------------------------------------------------------------- +// wxLibraries + +class wxLibraries { +protected: + wxList m_loaded; +public: + wxLibraries(void); + ~wxLibraries(void); + + wxLibrary *LoadLibrary(const wxString& name); + wxObject *CreateObject(const wxString& name); +}; + +// --------------------------------------------------------------------------- +// Global variables + +extern wxLibraries wxTheLibraries; + +// --------------------------------------------------------------------------- +// Interesting defines + +#define WXDLL_ENTRY_FUNCTION() extern "C" wxClassLibrary *GetClassList() +#define WXDLL_EXIT_FUNCTION(param) extern "C" void FreeClassList(wxClassLibrary *param) + +#endif diff --git a/include/wx/object.h b/include/wx/object.h index 50667186a6..d4752864be 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -179,8 +179,8 @@ class WXDLLEXPORT wxObject #endif #ifdef USE_STORABLE_CLASSES - virtual void StoreObject( wxObjectOutputStream &WXUNUSED(stream) ) {}; - virtual void LoadObject( wxObjectInputStream &WXUNUSED(stream) ) {}; + virtual void StoreObject( wxObjectOutputStream &stream ); + virtual void LoadObject( wxObjectInputStream &stream ); #endif // make a 'clone' of the object diff --git a/include/wx/objstrm.h b/include/wx/objstrm.h index dd6f56e710..f7e7f58d6f 100644 --- a/include/wx/objstrm.h +++ b/include/wx/objstrm.h @@ -23,9 +23,9 @@ class wxObjectStreamInfo : public wxObject { public: wxString object_name; - int n_children; + int n_children, children_removed; wxList children; - wxObject *parent; + wxObjectStreamInfo *parent; wxObject *object; }; @@ -56,7 +56,9 @@ class wxObjectInputStream : public wxFilterInputStream { wxObjectInputStream(wxInputStream& s); wxObject *GetChild(int no) const; - wxObject *GetParent() const { return m_current_info->parent; } + int NumberOfChildren() const { return m_current_info->n_children; } + void RemoveChildren(int nb); + wxObject *GetParent() const; wxObject *LoadObject(); wxObject *SolveName(const wxString& objName) const; diff --git a/include/wx/serbase.h b/include/wx/serbase.h new file mode 100644 index 0000000000..c49b61d7ce --- /dev/null +++ b/include/wx/serbase.h @@ -0,0 +1,57 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: serbase.h +// Purpose: Serialization plug-ins +// Author: Guilhem Lavaux +// Modified by: +// Created: July 1998 +// RCS-ID: $Id$ +// Copyright: (c) Guilhem Lavaux +// Licence: wxWindows license +///////////////////////////////////////////////////////////////////////////// +#ifndef __WX_SERBASEH_H__ +#define __WX_SERBASEH_H__ + +#include + +#define WXSERIAL(classname) classname##_Serialize + +class wxObject_Serialize : public wxObject { + DECLARE_DYNAMIC_CLASS(wxObject_Serialize) + public: + wxObject_Serialize() {} + virtual ~wxObject_Serialize() {} + + void SetObject(wxObject *obj) { m_object = obj; } + wxObject *Object() { return m_object; } + + protected: + wxObject *m_object; +}; + + +#define DECLARE_SERIAL_CLASS(classname, parent) \ +class WXSERIAL(classname) : public WXSERIAL(parent) { \ + DECLARE_DYNAMIC_CLASS(classname##_Serialize) \ + public: \ + WXSERIAL(classname)() { } \ + virtual ~WXSERIAL(classname)() { } \ +\ + virtual void StoreObject(wxObjectOutputStream& stream); \ + virtual void LoadObject(wxObjectInputStream& stream); \ +}; + +#define DECLARE_ALIAS_SERIAL_CLASS(classname, parent) \ +class WXSERIAL(classname) : public WXSERIAL(parent) { \ + DECLARE_DYNAMIC_CLASS(classname##_Serialize) \ + public: \ + WXSERIAL(classname)() { } \ + virtual ~WXSERIAL(classname)() { } \ +}; + +#define IMPLEMENT_SERIAL_CLASS(classname, parent) \ +IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize) + +#define IMPLEMENT_ALIAS_SERIAL_CLASS(classname, parent) \ +IMPLEMENT_DYNAMIC_CLASS(classname##_Serialize, parent##_Serialize) + +#endif diff --git a/include/wx/stream.h b/include/wx/stream.h index 2eeb48126e..13ee1dce42 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -78,8 +78,8 @@ class WXDLLEXPORT wxInputStream { wxInputStream& Read(wxOutputStream& stream_out); // Position functions - off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart); - off_t TellI() const; + virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart); + virtual off_t TellI() const; // State functions bool Eof() const { return m_eof; } @@ -174,6 +174,7 @@ class WXDLLEXPORT wxFilterInputStream: public wxInputStream { virtual bool Eof() const { return m_parent_i_stream->Eof(); } virtual size_t LastRead() const { return m_parent_i_stream->LastRead(); } + virtual off_t TellI() const { return m_parent_i_stream->TellI(); } protected: virtual size_t DoRead(void *buffer, size_t size); @@ -191,9 +192,9 @@ class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream { virtual bool Bad() const { return m_parent_o_stream->Bad(); } virtual size_t LastWrite() const { return m_parent_o_stream->LastWrite(); } + virtual off_t TellO() const { return m_parent_o_stream->TellO(); } protected: - // The forward is implicitely done by wxStreamBuffer. virtual size_t DoWrite(const void *buffer, size_t size); diff --git a/install/gtk/configure b/install/gtk/configure index 49914c49f9..9f094a0f57 100755 --- a/install/gtk/configure +++ b/install/gtk/configure @@ -34,8 +34,6 @@ ac_help="$ac_help ac_help="$ac_help **--with-libpng use libpng (PNG image format)" ac_help="$ac_help -**--with-odbc use iODBC" -ac_help="$ac_help **--with-opengl use opengl (OpenGL or Mesa)" ac_help="$ac_help **--with_apple_ieee use the Apple IEEE codec" @@ -676,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:680: 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 @@ -705,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:709: 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 @@ -753,7 +751,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:757: 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. @@ -763,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 @@ -787,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:791: 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:796: 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 @@ -801,7 +799,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:805: \"$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 @@ -816,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:820: 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 @@ -848,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:852: 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:855: 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]/_/'`" @@ -863,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:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:868: \"$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:873: \"$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:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:876: \"$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. : @@ -899,7 +897,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:903: 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= @@ -914,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:924: \"$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 : @@ -931,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:941: \"$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 : @@ -961,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:965: 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 @@ -985,7 +983,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1014,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:1018: 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 @@ -1045,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:1049: 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. @@ -1055,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 @@ -1085,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:1089: 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:1094: 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 @@ -1099,7 +1097,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1103: \"$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 @@ -1114,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:1118: 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 @@ -1142,7 +1140,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1146: 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 @@ -1155,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:1164: \"$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 : @@ -1192,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:1196: 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 @@ -1222,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:1226: 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 @@ -1279,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:1283: 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 @@ -1330,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:1334: 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 @@ -1356,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:1360: 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 @@ -1386,7 +1384,7 @@ done echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:1390: checking "make for VPATH support"" >&5 +echo "configure:1388: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -1416,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:1420: 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 @@ -1478,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:1487: \"$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* @@ -1552,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. @@ -1665,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:1669: 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 @@ -1691,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 @@ -1730,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:1734: 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 @@ -1738,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 @@ -1771,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:1775: 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 @@ -1779,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 @@ -1819,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:1823: 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 @@ -1868,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:1872: 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 @@ -1876,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 @@ -1917,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:1921: 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 @@ -1966,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:1970: 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 @@ -1974,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 @@ -2009,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:2013: 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 @@ -2058,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:2062: 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 @@ -2066,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 @@ -2101,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:2105: 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 @@ -2150,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:2154: 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 @@ -2158,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 @@ -2202,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:2206: 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 @@ -2210,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 @@ -2251,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:2255: 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> @@ -2264,7 +2262,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2268: \"$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 @@ -2289,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:2293: 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 @@ -2297,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 @@ -2330,7 +2328,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2334: 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 @@ -2338,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 @@ -2372,12 +2370,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2376: 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 @@ -2385,7 +2383,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2389: \"$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* @@ -2402,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 @@ -2420,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 @@ -2441,7 +2439,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2452,7 +2450,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2456: \"$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 @@ -2476,12 +2474,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2480: 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 @@ -2497,7 +2495,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2501: \"$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 @@ -2519,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:2523: 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:2533: \"$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* @@ -2552,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:2556: 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:2566: \"$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* @@ -2585,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:2589: 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:2599: \"$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* @@ -2618,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:2622: 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:2632: \"$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* @@ -2651,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:2655: 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:2665: \"$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* @@ -2684,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:2688: 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:2698: \"$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* @@ -2722,12 +2720,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2726: 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 @@ -2756,7 +2754,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2760: 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 @@ -2764,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 @@ -2803,7 +2801,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2827,12 +2825,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2831: 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 @@ -2860,12 +2858,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2864: 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 @@ -2893,12 +2891,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2897: 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 @@ -2926,12 +2924,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2930: 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 @@ -2948,7 +2946,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2952: \"$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 @@ -2967,12 +2965,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2971: 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 @@ -3000,12 +2998,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3004: 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 @@ -3036,12 +3034,12 @@ fi echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:3040: 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 @@ -3092,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:3096: 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 @@ -3106,7 +3104,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3110: \"$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 @@ -3127,12 +3125,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:3131: 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 @@ -3140,7 +3138,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:3144: \"$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 @@ -3161,12 +3159,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3165: 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 @@ -3174,7 +3172,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:3178: \"$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 @@ -3197,12 +3195,12 @@ else fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:3201: 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 @@ -3210,7 +3208,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:3214: \"$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 @@ -3231,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:3235: 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 @@ -3244,7 +3242,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3248: \"$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 @@ -3265,12 +3263,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3269: 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> @@ -3278,7 +3276,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3282: \"$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 @@ -3298,12 +3296,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3302: 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. */ @@ -3313,7 +3311,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3317: \"$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 @@ -3337,12 +3335,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3341: 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 @@ -3412,21 +3410,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3416: 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 @@ -3452,14 +3450,14 @@ EOF esac echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3456: 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 @@ -3515,7 +3513,7 @@ EOF fi echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:3519: 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 @@ -3526,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 @@ -3559,14 +3557,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3563: 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 @@ -3577,11 +3575,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3581: \"$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 @@ -3592,7 +3590,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3596: \"$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 @@ -3612,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 @@ -3650,7 +3648,7 @@ fi echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:3654: 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 @@ -3658,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() @@ -3669,7 +3667,7 @@ main() exit(0); } EOF -if { (eval echo configure:3673: \"$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 @@ -3689,7 +3687,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3693: 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 @@ -3697,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() @@ -3708,7 +3706,7 @@ main() exit(0); } EOF -if { (eval echo configure:3712: \"$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 @@ -3728,7 +3726,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3732: 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 @@ -3736,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() @@ -3747,7 +3745,7 @@ main() exit(0); } EOF -if { (eval echo configure:3751: \"$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 @@ -3772,7 +3770,7 @@ EOF USE_THREADS=1 THREADS_LINK="" -UNIX_THREAD="" +UNIX_THREAD="gtk/threadno.cpp" # Check whether --with-threads or --without-threads was given. if test "${with_threads+set}" = set; then @@ -3782,11 +3780,9 @@ fi if test "$USE_THREADS" = "1"; then - UNIX_THREAD="gtk/threadno.cpp" - echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6 -echo "configure:3790: checking for pthread_create in -lpthread-0.7" >&5 +echo "configure:3786: 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 @@ -3794,7 +3790,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:3805: \"$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 @@ -3832,7 +3828,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:3836: checking for pthread_create in -lpthread" >&5 +echo "configure:3832: 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 @@ -3840,7 +3836,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:3851: \"$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 @@ -3882,7 +3878,7 @@ fi fi echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:3886: checking for pthread_create in -lpthreads" >&5 +echo "configure:3882: 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 @@ -3890,7 +3886,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:3901: \"$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 @@ -3928,19 +3924,63 @@ else echo "$ac_t""no" 1>&6 fi - ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sproc""... $ac_c" 1>&6 +echo "configure:3929: checking for sproc" >&5 +if eval "test \"`echo '$''{'ac_cv_func_sproc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sproc(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_sproc) || defined (__stub___sproc) +choke me +#else +sproc(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_sproc=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_sproc=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'sproc`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:3934: checking for sys/prctl.h" >&5 +echo "configure:3974: 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:3944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3957,11 +3997,16 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - UNIX_THREAD="gtk/threadsgi.cpp" - cat >> confdefs.h <<\EOF + UNIX_THREAD="gtk/threadsgi.cpp" + cat >> confdefs.h <<\EOF #define USE_THREADS 1 EOF + +else + echo "$ac_t""no" 1>&6 +fi + else echo "$ac_t""no" 1>&6 @@ -3973,7 +4018,7 @@ fi echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3977: checking for long file names" >&5 +echo "configure:4022: 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 @@ -4024,7 +4069,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:4028: checking for $ac_word" >&5 +echo "configure:4073: 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 @@ -4057,7 +4102,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:4061: checking for $ac_word" >&5 +echo "configure:4106: 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 @@ -4090,7 +4135,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:4094: checking for yywrap in -l$ac_lib" >&5 +echo "configure:4139: 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 @@ -4098,7 +4143,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:4158: \"$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 @@ -4132,7 +4177,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:4136: checking lex output file root" >&5 +echo "configure:4181: 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 @@ -4153,7 +4198,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:4157: checking whether yytext is a pointer" >&5 +echo "configure:4202: 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 @@ -4165,14 +4210,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:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -4206,7 +4251,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:4210: checking host system type" >&5 +echo "configure:4255: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -4400,7 +4445,6 @@ DEFAULT_USE_MEM_TRACING=0 DEFAULT_USE_ZLIB=1 DEFAULT_USE_GDK_IMLIB=1 DEFAULT_USE_LIBPNG=1 -DEFAULT_USE_ODBC=1 DEFAULT_USE_APPLE_IEEE=1 DEFAULT_USE_STORABLE_CLASSES=1 @@ -4441,7 +4485,7 @@ DEFAULT_USE_WX_RESOURCES=1 echo $ac_n "checking "for shared"""... $ac_c" 1>&6 -echo "configure:4445: checking "for shared"" >&5 +echo "configure:4489: checking "for shared"" >&5 # Check whether --with-shared or --without-shared was given. if test "${with_shared+set}" = set; then withval="$with_shared" @@ -4471,7 +4515,7 @@ fi echo $ac_n "checking "for optimise"""... $ac_c" 1>&6 -echo "configure:4475: checking "for optimise"" >&5 +echo "configure:4519: checking "for optimise"" >&5 # Check whether --with-optimise or --without-optimise was given. if test "${with_optimise+set}" = set; then withval="$with_optimise" @@ -4501,7 +4545,7 @@ fi echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6 -echo "configure:4505: checking "for debug_flag"" >&5 +echo "configure:4549: 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" @@ -4531,7 +4575,7 @@ fi echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6 -echo "configure:4535: checking "for debug_info"" >&5 +echo "configure:4579: 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" @@ -4561,7 +4605,7 @@ fi echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6 -echo "configure:4565: checking "for mem_tracing"" >&5 +echo "configure:4609: 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" @@ -4591,7 +4635,7 @@ fi echo $ac_n "checking "for profile"""... $ac_c" 1>&6 -echo "configure:4595: checking "for profile"" >&5 +echo "configure:4639: checking "for profile"" >&5 # Check whether --with-profile or --without-profile was given. if test "${with_profile+set}" = set; then withval="$with_profile" @@ -4622,7 +4666,7 @@ fi echo $ac_n "checking "for zlib"""... $ac_c" 1>&6 -echo "configure:4626: checking "for zlib"" >&5 +echo "configure:4670: checking "for zlib"" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -4652,7 +4696,7 @@ fi echo $ac_n "checking "for gdk_imlib"""... $ac_c" 1>&6 -echo "configure:4656: checking "for gdk_imlib"" >&5 +echo "configure:4700: 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" @@ -4682,7 +4726,7 @@ fi echo $ac_n "checking "for libpng"""... $ac_c" 1>&6 -echo "configure:4686: checking "for libpng"" >&5 +echo "configure:4730: checking "for libpng"" >&5 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then withval="$with_libpng" @@ -4711,38 +4755,8 @@ fi -echo $ac_n "checking "for odbc"""... $ac_c" 1>&6 -echo "configure:4716: checking "for odbc"" >&5 -# Check whether --with-odbc or --without-odbc was given. -if test "${with_odbc+set}" = set; then - withval="$with_odbc" - if test "x$with_odbc" = xyes; then - ac_cv_use_odbc='USE_ODBC="1"' -else - ac_cv_use_odbc='USE_ODBC="0"' -fi -else - - LINE=`grep "USE_ODBC" ${OSTYPE}.system.cache` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - ac_cv_use_odbc='USE_ODBC='$DEFAULT_USE_ODBC - -fi - -eval "$ac_cv_use_odbc" -echo $ac_cv_use_odbc >> ${OSTYPE}.system.cache.tmp -if test "$USE_ODBC" = 1; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - echo $ac_n "checking "for opengl"""... $ac_c" 1>&6 -echo "configure:4746: checking "for opengl"" >&5 +echo "configure:4760: checking "for opengl"" >&5 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" @@ -4773,7 +4787,7 @@ fi echo $ac_n "checking "for apple_ieee"""... $ac_c" 1>&6 -echo "configure:4777: checking "for apple_ieee"" >&5 +echo "configure:4791: 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" @@ -4803,7 +4817,7 @@ fi echo $ac_n "checking "for storable"""... $ac_c" 1>&6 -echo "configure:4807: checking "for storable"" >&5 +echo "configure:4821: checking "for storable"" >&5 # Check whether --with-storable or --without-storable was given. if test "${with_storable+set}" = set; then withval="$with_storable" @@ -4833,7 +4847,7 @@ fi echo $ac_n "checking "for autotrans"""... $ac_c" 1>&6 -echo "configure:4837: checking "for autotrans"" >&5 +echo "configure:4851: checking "for autotrans"" >&5 # Check whether --with-autotrans or --without-autotrans was given. if test "${with_autotrans+set}" = set; then withval="$with_autotrans" @@ -4863,7 +4877,7 @@ fi echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6 -echo "configure:4867: checking "for afmfonts"" >&5 +echo "configure:4881: checking "for afmfonts"" >&5 # Check whether --with-afmfonts or --without-afmfonts was given. if test "${with_afmfonts+set}" = set; then withval="$with_afmfonts" @@ -4893,7 +4907,7 @@ fi echo $ac_n "checking "for normalized"""... $ac_c" 1>&6 -echo "configure:4897: checking "for normalized"" >&5 +echo "configure:4911: checking "for normalized"" >&5 # Check whether --with-normalized or --without-normalized was given. if test "${with_normalized+set}" = set; then withval="$with_normalized" @@ -4923,7 +4937,7 @@ fi echo $ac_n "checking "for RPC"""... $ac_c" 1>&6 -echo "configure:4927: checking "for RPC"" >&5 +echo "configure:4941: checking "for RPC"" >&5 # Check whether --with-rpc or --without-rpc was given. if test "${with_rpc+set}" = set; then withval="$with_rpc" @@ -4953,7 +4967,7 @@ fi echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6 -echo "configure:4957: checking "for wxresources"" >&5 +echo "configure:4971: checking "for wxresources"" >&5 # Check whether --with-wxresources or --without-wxresources was given. if test "${with_wxresources+set}" = set; then withval="$with_wxresources" @@ -4983,7 +4997,7 @@ fi echo $ac_n "checking "for prologio"""... $ac_c" 1>&6 -echo "configure:4987: checking "for prologio"" >&5 +echo "configure:5001: checking "for prologio"" >&5 # Check whether --with-prologio or --without-prologio was given. if test "${with_prologio+set}" = set; then withval="$with_prologio" @@ -5013,7 +5027,7 @@ fi echo $ac_n "checking "for postscript"""... $ac_c" 1>&6 -echo "configure:5017: checking "for postscript"" >&5 +echo "configure:5031: checking "for postscript"" >&5 # Check whether --with-postscript or --without-postscript was given. if test "${with_postscript+set}" = set; then withval="$with_postscript" @@ -5043,7 +5057,7 @@ fi echo $ac_n "checking "for wxconfig"""... $ac_c" 1>&6 -echo "configure:5047: checking "for wxconfig"" >&5 +echo "configure:5061: checking "for wxconfig"" >&5 # Check whether --with-wxconfig or --without-wxconfig was given. if test "${with_wxconfig+set}" = set; then withval="$with_wxconfig" @@ -5073,7 +5087,7 @@ fi echo $ac_n "checking "for metafile"""... $ac_c" 1>&6 -echo "configure:5077: checking "for metafile"" >&5 +echo "configure:5091: checking "for metafile"" >&5 # Check whether --with-metafile or --without-metafile was given. if test "${with_metafile+set}" = set; then withval="$with_metafile" @@ -5103,7 +5117,7 @@ fi echo $ac_n "checking "for form"""... $ac_c" 1>&6 -echo "configure:5107: checking "for form"" >&5 +echo "configure:5121: checking "for form"" >&5 # Check whether --with-form or --without-form was given. if test "${with_form+set}" = set; then withval="$with_form" @@ -5133,7 +5147,7 @@ fi echo $ac_n "checking "for help"""... $ac_c" 1>&6 -echo "configure:5137: checking "for help"" >&5 +echo "configure:5151: checking "for help"" >&5 # Check whether --with-help or --without-help was given. if test "${with_help+set}" = set; then withval="$with_help" @@ -5163,7 +5177,7 @@ fi echo $ac_n "checking "for IPC"""... $ac_c" 1>&6 -echo "configure:5167: checking "for IPC"" >&5 +echo "configure:5181: checking "for IPC"" >&5 # Check whether --with-ipc or --without-ipc was given. if test "${with_ipc+set}" = set; then withval="$with_ipc" @@ -5193,7 +5207,7 @@ fi echo $ac_n "checking "for enhanced dialog"""... $ac_c" 1>&6 -echo "configure:5197: checking "for enhanced dialog"" >&5 +echo "configure:5211: checking "for enhanced dialog"" >&5 # Check whether --with-enhanceddialog or --without-enhanceddialog was given. if test "${with_enhanceddialog+set}" = set; then withval="$with_enhanceddialog" @@ -5223,7 +5237,7 @@ fi echo $ac_n "checking "for resources"""... $ac_c" 1>&6 -echo "configure:5227: checking "for resources"" >&5 +echo "configure:5241: checking "for resources"" >&5 # Check whether --with-resources or --without-resources was given. if test "${with_resources+set}" = set; then withval="$with_resources" @@ -5253,7 +5267,7 @@ fi echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6 -echo "configure:5257: checking "for clipboard"" >&5 +echo "configure:5271: checking "for clipboard"" >&5 # Check whether --with-clipboard or --without-clipboard was given. if test "${with_clipboard+set}" = set; then withval="$with_clipboard" @@ -5283,7 +5297,7 @@ fi echo $ac_n "checking "for timedate"""... $ac_c" 1>&6 -echo "configure:5287: checking "for timedate"" >&5 +echo "configure:5301: checking "for timedate"" >&5 # Check whether --with-timedate or --without-timedate was given. if test "${with_timedate+set}" = set; then withval="$with_timedate" @@ -5313,7 +5327,7 @@ fi echo $ac_n "checking "for fraction"""... $ac_c" 1>&6 -echo "configure:5317: checking "for fraction"" >&5 +echo "configure:5331: checking "for fraction"" >&5 # Check whether --with-fraction or --without-fraction was given. if test "${with_fraction+set}" = set; then withval="$with_fraction" @@ -5343,7 +5357,7 @@ fi echo $ac_n "checking "for constrains"""... $ac_c" 1>&6 -echo "configure:5347: checking "for constrains"" >&5 +echo "configure:5361: checking "for constrains"" >&5 # Check whether --with-constraints or --without-constraints was given. if test "${with_constraints+set}" = set; then withval="$with_constraints" @@ -5373,7 +5387,7 @@ fi echo $ac_n "checking "for toolbar"""... $ac_c" 1>&6 -echo "configure:5377: checking "for toolbar"" >&5 +echo "configure:5391: checking "for toolbar"" >&5 # Check whether --with-toolbar or --without-toolbar was given. if test "${with_toolbar+set}" = set; then withval="$with_toolbar" @@ -5403,7 +5417,7 @@ fi echo $ac_n "checking "for gauge"""... $ac_c" 1>&6 -echo "configure:5407: checking "for gauge"" >&5 +echo "configure:5421: checking "for gauge"" >&5 # Check whether --with-gauge or --without-gauge was given. if test "${with_gauge+set}" = set; then withval="$with_gauge" @@ -5433,7 +5447,7 @@ fi echo $ac_n "checking "for vllist"""... $ac_c" 1>&6 -echo "configure:5437: checking "for vllist"" >&5 +echo "configure:5451: checking "for vllist"" >&5 # Check whether --with-vllist or --without-vllist was given. if test "${with_vllist+set}" = set; then withval="$with_vllist" @@ -5463,7 +5477,7 @@ fi echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6 -echo "configure:5467: checking "for scrollbar"" >&5 +echo "configure:5481: checking "for scrollbar"" >&5 # Check whether --with-scrollbar or --without-scrollbar was given. if test "${with_scrollbar+set}" = set; then withval="$with_scrollbar" @@ -5493,7 +5507,7 @@ fi echo $ac_n "checking "for docview"""... $ac_c" 1>&6 -echo "configure:5497: checking "for docview"" >&5 +echo "configure:5511: checking "for docview"" >&5 # Check whether --with-docview or --without-docview was given. if test "${with_docview+set}" = set; then withval="$with_docview" @@ -5523,7 +5537,7 @@ fi echo $ac_n "checking "for printarch"""... $ac_c" 1>&6 -echo "configure:5527: checking "for printarch"" >&5 +echo "configure:5541: checking "for printarch"" >&5 # Check whether --with-printarch or --without-printarch was given. if test "${with_printarch+set}" = set; then withval="$with_printarch" @@ -5553,7 +5567,7 @@ fi echo $ac_n "checking "for typetree"""... $ac_c" 1>&6 -echo "configure:5557: checking "for typetree"" >&5 +echo "configure:5571: checking "for typetree"" >&5 # Check whether --with-typetree or --without-typetree was given. if test "${with_typetree+set}" = set; then withval="$with_typetree" @@ -5583,7 +5597,7 @@ fi echo $ac_n "checking "for wxgraph"""... $ac_c" 1>&6 -echo "configure:5587: checking "for wxgraph"" >&5 +echo "configure:5601: checking "for wxgraph"" >&5 # Check whether --with-wxgraph or --without-wxgraph was given. if test "${with_wxgraph+set}" = set; then withval="$with_wxgraph" @@ -5613,7 +5627,7 @@ fi echo $ac_n "checking "for wxtree"""... $ac_c" 1>&6 -echo "configure:5617: checking "for wxtree"" >&5 +echo "configure:5631: checking "for wxtree"" >&5 # Check whether --with-wxtree or --without-wxtree was given. if test "${with_wxtree+set}" = set; then withval="$with_wxtree" @@ -5658,11 +5672,6 @@ if test "$USE_LIBPNG" = 1 ; then LIBPNG="LIBPNG" fi -ODBC=NONE -if test "$USE_ODBC" = 1 ; then - ODBC="ODBC" -fi - APPLE_IEEE=NONE if test "$USE_APPLE_IEEE" = 1 ; then APPLE_IEEE="APPLE_IEEE" @@ -5692,7 +5701,7 @@ fi WXDEBUG= if test "$USE_DEBUG_INFO" = 1 ; then - WXDEBUG="-g -O0" + WXDEBUG="-g" fi @@ -5710,7 +5719,11 @@ if test "$USE_MEM_TRACING" = 1 ; then #define USE_MEMORY_TRACING $USE_MEM_TRACING EOF - fi + cat >> confdefs.h <&6 -echo "configure:6052: checking for $ac_word" >&5 +echo "configure:6065: 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 @@ -6079,7 +6092,7 @@ fi min_gtk_version=0.99.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6083: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6096: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6092,7 +6105,7 @@ echo "configure:6083: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6114,7 +6127,7 @@ main () } EOF -if { (eval echo configure:6118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6159,18 +6172,13 @@ fi -DL_LIBRARY=-ldl - - - - OPENGL_INCLUDE= OPENGL_LIBRARY= OPENGL_LINK= if test "$USE_OPENGL" = 1; then echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6 -echo "configure:6174: checking for OpenGL includes" >&5 +echo "configure:6182: checking for OpenGL includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6185,7 +6193,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:6189: checking for OpenGL library" >&5 +echo "configure:6197: checking for OpenGL library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6293,12 +6301,6 @@ EOF fi - if test "$USE_ODBC" = 1; then - cat >> confdefs.h < +#include +#include +#include + +// --------------------------------------------------------------------------- +// System dependent include +// --------------------------------------------------------------------------- + +#ifdef linux +#include +#endif + +// --------------------------------------------------------------------------- +// Global variables +// --------------------------------------------------------------------------- + +wxLibraries wxTheLibraries; + +// --------------------------------------------------------------------------- +// wxLibrary (one instance per dynamic library +// --------------------------------------------------------------------------- + +wxLibrary::wxLibrary(void *handle) +{ + typedef wxClassLibrary *(*t_get_list)(void); + t_get_list get_list; + + m_handle = handle; + + get_list = (t_get_list)GetSymbol("GetClassList"); + m_liblist = (*get_list)(); +} + +wxLibrary::~wxLibrary() +{ + if (m_handle) { + typedef void (*t_free_list)(wxClassLibrary *); + t_free_list free_list; + + free_list = (t_free_list) GetSymbol("FreeClassList"); + if (free_list != NULL) + free_list(m_liblist); + else + delete m_liblist; + + dlclose(m_handle); + } +} + +wxObject *wxLibrary::CreateObject(const wxString& name) +{ + return m_liblist->CreateObject(name); +} + +void *wxLibrary::GetSymbol(const wxString& symbname) +{ +#ifdef linux + return dlsym(m_handle, symbname.GetData()); +#endif +} + +// --------------------------------------------------------------------------- +// wxLibraries (only one instance should normally exist) +// --------------------------------------------------------------------------- + +wxLibraries::wxLibraries() +{ +} + +wxLibraries::~wxLibraries() +{ + wxNode *node = m_loaded.First(); + + while (node) { + wxLibrary *lib = (wxLibrary *)node->Data(); + delete lib; + + node = node->Next(); + } +} + +wxLibrary *wxLibraries::LoadLibrary(const wxString& name) +{ + wxString lib_name = name; + wxNode *node; + wxLibrary *lib; + + if ( (node = m_loaded.Find(name.GetData())) ) + return ((wxLibrary *)node->Data()); + +#ifdef linux + lib_name.Prepend("./lib"); + lib_name += ".so"; + + printf("lib_name = %s\n", WXSTRINGCAST lib_name); + + void *handle = dlopen(lib_name.GetData(), RTLD_LAZY); + + printf("handle = %x\n", handle); + lib = new wxLibrary(handle); + +#endif +#ifdef __WINDOWS__ + lib_name += ".dll"; + +#endif + + m_loaded.Append(name.GetData(), lib); + return lib; +} + +wxObject *wxLibraries::CreateObject(const wxString& path) +{ + wxNode *node = m_loaded.First(); + wxObject *obj; + + while (node) { + obj = ((wxLibrary *)node->Data())->CreateObject(path); + if (obj) + return obj; + + node = node->Next(); + } + return NULL; +} + +// --------------------------------------------------------------------------- +// wxClassLibrary (this class is used to access the internal class) +// --------------------------------------------------------------------------- + +wxClassLibrary::wxClassLibrary(void) +{ +} + +wxClassLibrary::~wxClassLibrary(void) +{ + uint i; + + for (i=0;iclass_info = class_info; + info->path = path; + m_list.Add(info); +} + +void wxClassLibrary::UnregisterClass(wxClassInfo *class_info) +{ + uint i = 0; + + while (i < m_list.Count()) { + if (m_list[i]->class_info == class_info) { + delete (m_list[i]); + m_list.Remove(i); + return; + } + i++; + } +} + +bool wxClassLibrary::CreateObjects(const wxString& path, + wxArrayClassInfo& objs) +{ + wxClassLibInfo *info; + uint i = 0; + + while (i < m_list.Count()) { + info = m_list[i]; + if (wxMatchWild(path, info->path)) + objs.Add(info->class_info); + i++; + } + return (i > 0); +} + +bool wxClassLibrary::FetchInfos(const wxString& path, + wxArrayClassLibInfo& infos) +{ + wxClassLibInfo *info; + uint i = 0; + + while (i < m_list.Count()) { + info = m_list[i]; + if (wxMatchWild(path, info->path)) { + wxClassLibInfo *inf = new wxClassLibInfo; + *inf = *info; + infos.Add(inf); + } + i++; + } + return (i > 0); +} + +wxObject *wxClassLibrary::CreateObject(const wxString& path) +{ + wxClassLibInfo *info; + uint i = 0; + + while (i < m_list.Count()) { + info = m_list[i]; + if (wxMatchWild(path, info->path)) + return info->class_info->CreateObject(); + i++; + } + return NULL; +} diff --git a/src/common/fstream.cpp b/src/common/fstream.cpp index 4014d31031..3d0468bbb9 100644 --- a/src/common/fstream.cpp +++ b/src/common/fstream.cpp @@ -23,8 +23,6 @@ #pragma hdrstop #endif -#define BUF_TEMP_SIZE 10000 - // ---------------------------------------------------------------------------- // wxFileInputStream // ---------------------------------------------------------------------------- @@ -46,7 +44,10 @@ char wxFileInputStream::Peek() size_t wxFileInputStream::DoRead(void *buffer, size_t size) { - return wxFile::Read(buffer, size); + size_t ret = wxFile::Read(buffer, size); + m_eof = wxFile::Eof(); + + return ret; } off_t wxFileInputStream::DoSeekInput(off_t pos, wxSeekMode mode) diff --git a/src/common/object.cpp b/src/common/object.cpp index 272e88a21f..ed1c78b1a7 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -221,12 +221,57 @@ wxObject *wxCreateDynamicObject(char *name) #ifdef USE_STORABLE_CLASSES +#include "wx/serbase.h" +#include "wx/dynlib.h" +#include "wx/msgdlg.h" + wxObject* wxCreateStoredObject( wxInputStream &stream ) { wxObjectInputStream obj_s(stream); return obj_s.LoadObject(); }; +void wxObject::StoreObject( wxObjectOutputStream& stream ) +{ + wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize"; + wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial"); + WXSERIAL(wxObject) *serial = + (WXSERIAL(wxObject) *)lib->CreateObject( obj_name ); + + if (!serial) { + wxString message; + + message.Printf("Can't find the serialization object (%s) for the object %s", + WXSTRINGCAST obj_name, WXSTRINGCAST GetClassInfo()->GetClassName()); + wxMessageBox(message, "Alert !"); + return; + } + + serial->SetObject(this); + serial->StoreObject(stream); +} + +void wxObject::LoadObject( wxObjectInputStream& stream ) +{ + wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize"; + wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial"); + WXSERIAL(wxObject) *serial = + (WXSERIAL(wxObject) *)lib->CreateObject( obj_name ); + + if (!serial) { + wxString message; + + message.Printf("Can't find the serialization object (%s) for the object %s", + WXSTRINGCAST obj_name, + WXSTRINGCAST GetClassInfo()->GetClassName()); + wxMessageBox(message, "Alert !"); + return; + } + + serial->SetObject(this); + serial->LoadObject(stream); +} + #endif /* diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp index 935d6fe08c..dda2e77591 100644 --- a/src/common/objstrm.cpp +++ b/src/common/objstrm.cpp @@ -19,6 +19,8 @@ #define WXOBJ_BEGIN "OBEGIN" #define WXOBJ_BEG_LEN 6 +#define TAG_EMPTY_OBJECT "NULL" + // ---------------------------------------------------------------------------- // wxObjectOutputStream // ---------------------------------------------------------------------------- @@ -42,8 +44,15 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info) wxDataOutputStream data_s(*this); Write(WXOBJ_BEGIN, WXOBJ_BEG_LEN); - data_s.WriteString(info.object->GetClassInfo()->GetClassName()); + + if (info.object) { + data_s.WriteString(info.object->GetClassInfo()->GetClassName()); + } else { + data_s.WriteString(TAG_EMPTY_OBJECT); + } + data_s.WriteString(GetObjectName(info.object)); + // I assume an object will not have millions of children data_s.Write8(info.children.Number()); } @@ -58,7 +67,7 @@ void wxObjectOutputStream::AddChild(wxObject *obj) info = new wxObjectStreamInfo; info->n_children = 0; info->object = obj; - info->parent = m_current_info->object; // Not useful here. + info->parent = m_current_info; // Not useful here. m_current_info->n_children++; m_current_info->children.Append(info); } @@ -69,7 +78,8 @@ void wxObjectOutputStream::ProcessObjectDef(wxObjectStreamInfo *info) m_current_info = info; // First stage: get children of obj - info->object->StoreObject(*this); + if (info->object) + info->object->StoreObject(*this); // Prepare and write the sub-entry about the child obj. WriteObjectDef(*info); @@ -88,7 +98,8 @@ void wxObjectOutputStream::ProcessObjectData(wxObjectStreamInfo *info) m_current_info = info; - info->object->StoreObject(*this); + if (info->object) + info->object->StoreObject(*this); while (node) { ProcessObjectData((wxObjectStreamInfo *)node->Data()); @@ -145,24 +156,54 @@ wxObject *wxObjectInputStream::SolveName(const wxString& name) const return NULL; } +wxObject *wxObjectInputStream::GetParent() const +{ + if (!m_current_info->parent) + return NULL; + + return m_current_info->parent->object; +} + wxObject *wxObjectInputStream::GetChild(int no) const { - return m_current_info->children.Nth(no); + wxNode *node = m_current_info->children.Nth(m_current_info->children_removed+no); + wxObjectStreamInfo *info; + + if (!node) + return NULL; + + info = (wxObjectStreamInfo *)node->Data(); + + return info->object; +} + +void wxObjectInputStream::RemoveChildren(int nb) +{ + m_current_info->children_removed += nb; } bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info) { wxDataInputStream data_s(*this); char sig[WXOBJ_BEG_LEN+1]; + wxString class_name; Read(sig, WXOBJ_BEG_LEN); sig[WXOBJ_BEG_LEN] = 0; if (wxString(sig) != WXOBJ_BEGIN) return FALSE; - info->object = wxCreateDynamicObject( WXSTRINGCAST data_s.ReadString()); + + class_name = data_s.ReadString(); + printf("class_name = %s\n", WXSTRINGCAST class_name); + if (class_name == TAG_EMPTY_OBJECT) + info->object = NULL; + else + info->object = wxCreateDynamicObject( WXSTRINGCAST class_name); info->object_name = data_s.ReadString(); + printf("object_name = %s\n", WXSTRINGCAST info->object_name); info->n_children = data_s.Read8(); - info->children = wxList(); + info->children_removed = 0; + printf("n_children = %d\n", info->n_children); return TRUE; } @@ -198,10 +239,10 @@ void wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo *info) m_current_info = info; - info->object->LoadObject(*this); + if (info->object) + info->object->LoadObject(*this); while (node) { - c_info = (wxObjectStreamInfo *)node->Data(); - c_info->object->LoadObject(*this); + ProcessObjectData((wxObjectStreamInfo *)node->Data()); node = node->Next(); } } diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 0186a9548c..66538c9ddd 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -202,12 +202,14 @@ wxInputStream::wxInputStream() { m_i_destroybuf = TRUE; m_i_streambuf = new wxStreamBuffer(*this); + m_eof = FALSE; } wxInputStream::wxInputStream(wxStreamBuffer *buffer) { m_i_destroybuf = FALSE; m_i_streambuf = buffer; + m_eof = FALSE; } wxInputStream::~wxInputStream() diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 42c8b4167a..dd7ef5f9e1 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -59,6 +59,8 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label PreCreation( parent, id, pos, size, style, name ); + SetLabel( label ); + m_widget = gtk_check_button_new_with_label( label ); wxSize newSize = size; diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index ef374c13ad..09af84d007 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -179,9 +179,9 @@ wxString wxChoice::GetStringSelection(void) const int wxChoice::Number(void) const { - GtkMenu *menu = GTK_MENU( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); + GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; - GList *child = menu->children; + GList *child = menu_shell->children; while (child) { count++; diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index 42c8b4167a..dd7ef5f9e1 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -59,6 +59,8 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label PreCreation( parent, id, pos, size, style, name ); + SetLabel( label ); + m_widget = gtk_check_button_new_with_label( label ); wxSize newSize = size; diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index ef374c13ad..09af84d007 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -179,9 +179,9 @@ wxString wxChoice::GetStringSelection(void) const int wxChoice::Number(void) const { - GtkMenu *menu = GTK_MENU( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); + GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; - GList *child = menu->children; + GList *child = menu_shell->children; while (child) { count++; -- 2.45.2