michael@97: Index: xbase-2.0.0/tv/tvbrowse.cpp
michael@97: --- xbase-2.0.0/tv/tvbrowse.cpp.orig	2000-09-20 22:34:02 +0200
michael@97: +++ xbase-2.0.0/tv/tvbrowse.cpp	2006-01-15 00:23:04 +0100
michael@97: @@ -28,8 +28,8 @@
michael@97:  #include <stdlib.h>
michael@97:  #include <stdio.h>
michael@97:  #include <string.h>
michael@97: -#include <iomanip.h>
michael@97: -#include <strstream.h>
michael@97: +#include <sstream>
michael@97: +#include <iomanip>
michael@97:  
michael@97:  #define Uses_TEvent
michael@97:  #include <tvision/tv.h>
michael@97: Index: xbase-2.0.0/tv/tvxbase.cpp
michael@97: --- xbase-2.0.0/tv/tvxbase.cpp.orig	2000-09-20 22:34:02 +0200
michael@97: +++ xbase-2.0.0/tv/tvxbase.cpp	2006-01-15 00:23:04 +0100
michael@97: @@ -23,7 +23,7 @@
michael@97:      Foundation, Inc., or see http://www.gnu.org/.
michael@97:  */
michael@97:  
michael@97: -#include <iostream.h>
michael@97: +#include <iostream>
michael@97:  
michael@97:  #define Uses_TApplication
michael@97:  #define Uses_TButton
michael@97: Index: xbase-2.0.0/xbase/dbf.h
michael@97: --- xbase-2.0.0/xbase/dbf.h.orig	2001-01-13 21:20:53 +0100
michael@97: +++ xbase-2.0.0/xbase/dbf.h	2006-01-15 00:23:04 +0100
michael@97: @@ -65,7 +65,7 @@
michael@97:  #include <xbase/xtypes.h>
michael@97:  #include <xbase/xdate.h>
michael@97:  
michael@97: -#include <iostream.h>
michael@97: +#include <iostream>
michael@97:  #include <stdio.h>
michael@97:  
michael@97:  /*! \file dbf.h
michael@97: Index: xbase-2.0.0/xbase/ndx.cpp
michael@97: --- xbase-2.0.0/xbase/ndx.cpp.orig	2001-03-21 01:28:53 +0100
michael@97: +++ xbase-2.0.0/xbase/ndx.cpp	2006-01-15 00:23:04 +0100
michael@97: @@ -66,7 +66,8 @@
michael@97:  #endif
michael@97:  
michael@97:  #include <xbase/xbase.h>
michael@97: -#include <iostream.h>
michael@97: +#include <iostream>
michael@97: +using std::cout;
michael@97:  
michael@97:  #ifdef XB_INDEX_NDX
michael@97:  
michael@97: Index: xbase-2.0.0/xbase/stack.cpp
michael@97: --- xbase-2.0.0/xbase/stack.cpp.orig	2000-11-10 20:04:17 +0100
michael@97: +++ xbase-2.0.0/xbase/stack.cpp	2006-01-15 00:23:04 +0100
michael@97: @@ -59,7 +59,8 @@
michael@97:  
michael@97:  #include <string.h>
michael@97:  #include <stdlib.h>
michael@97: -#include <iostream.h>
michael@97: +#include <iostream>
michael@97: +using std::cout;
michael@97:  
michael@97:  #include <xbase/xstack.h>
michael@97:  
michael@97: Index: xbase-2.0.0/xbase/xbstring.cpp
michael@97: --- xbase-2.0.0/xbase/xbstring.cpp.orig	2001-02-20 18:53:26 +0100
michael@97: +++ xbase-2.0.0/xbase/xbstring.cpp	2006-01-15 00:23:04 +0100
michael@97: @@ -582,7 +582,7 @@
michael@97:  //! Short description.
michael@97:  /*!
michael@97:  */
michael@97: -XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
michael@97: +XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
michael@97:    return os << xbs.data;
michael@97:  }
michael@97:  
michael@97: Index: xbase-2.0.0/xbase/xbstring.h
michael@97: --- xbase-2.0.0/xbase/xbstring.h.orig	2001-01-27 06:00:32 +0100
michael@97: +++ xbase-2.0.0/xbase/xbstring.h	2006-01-15 00:23:04 +0100
michael@97: @@ -56,7 +56,11 @@
michael@97:  #endif
michael@97:  
michael@97:  #include <stdlib.h>
michael@97: -#include <iostream.h>
michael@97: +#include <iostream>
michael@97: +
michael@97: +using std::endl;
michael@97: +using std::cin;
michael@97: +using std::cout;
michael@97:  
michael@97:  /*! \file xbstring.h
michael@97:  */
michael@97: @@ -119,7 +123,7 @@
michael@97:    bool operator <= ( const xbString& ) const;
michael@97:    bool operator >= ( const xbString& ) const;
michael@97:  
michael@97: -  friend ostream& operator << ( ostream&, const xbString& );
michael@97: +  friend std::ostream& operator << ( std::ostream&, const xbString& );
michael@97:  
michael@97:    xbString &remove(size_t pos = 0, int n = npos);
michael@97:    xbString mid(size_t pos = 0, int n = npos) const;
michael@97: Index: xbsql-0.11/xbsql/Makefile.in
michael@97: --- xbsql-0.11/xbsql/Makefile.in.orig	2003-03-28 21:03:25 +0100
michael@97: +++ xbsql-0.11/xbsql/Makefile.in	2006-01-15 10:01:51 +0100
michael@97: @@ -108,10 +108,10 @@
michael@97:  			  xbsql.tab.c xb_datetime.cpp
michael@97:  
michael@97:  
michael@97: -libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
michael@97: +libxbsql_la_LDFLAGS = @LDFLAGS@ -lxbase $(DEBUG)
michael@97:  
michael@97:  xql_SOURCES = xql.cpp
michael@97: -xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
michael@97: +xql_LDADD = @LDFLAGS@ -lxbase -lreadline -l$(CURSES) ./libxbsql.la
michael@97:  
michael@97:  
michael@97:  #install-data-hook:
michael@97: Index: xbase-2.0.0/ltmain.sh
michael@97: --- xbase-2.0.0/ltmain.sh.orig	2000-06-01 08:03:18 +0200
michael@97: +++ xbase-2.0.0/ltmain.sh	2006-01-15 10:05:44 +0100
michael@97: @@ -728,7 +728,7 @@
michael@97:            ;;
michael@97:          esac
michael@97:          deplibs="$deplibs $arg"
michael@97: -        lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
michael@97: +        lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`"
michael@97:          ;;
michael@97:  
michael@97:        -l*) deplibs="$deplibs $arg" ;;