diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile --- poco-1.3.3p1-all.orig/Data/SQLite/Makefile 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/Makefile 2008-11-23 10:27:53.000000000 +0100 @@ -9,10 +9,10 @@ include $(POCO_BASE)/build/rules/global SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS +SYSLIBS += -lsqlite3 objects = Binder Extractor SessionImpl Connector \ - SQLiteException SQLiteStatementImpl Utility \ - sqlite3 + SQLiteException SQLiteStatementImpl Utility target = PocoSQLite target_version = $(LIBVERSION) diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp --- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100 @@ -38,7 +38,7 @@ #include "Poco/Data/SQLite/Utility.h" #include "Poco/Data/BLOB.h" #include "Poco/Exception.h" -#include "sqlite3.h" +#include <sqlite3.h> #include <cstdlib> diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp --- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp 2008-11-23 10:29:32.000000000 +0100 @@ -37,7 +37,7 @@ #include "Poco/Data/SQLite/Connector.h" #include "Poco/Data/SQLite/SessionImpl.h" #include "Poco/Data/SessionFactory.h" -#include "sqlite3.h" +#include <sqlite3.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp --- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp 2008-11-23 10:29:44.000000000 +0100 @@ -39,7 +39,7 @@ #include "Poco/Data/BLOB.h" #include "Poco/Data/DataException.h" #include "Poco/Exception.h" -#include "sqlite3.h" +#include <sqlite3.h> #include <cstdlib> diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp --- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp 2008-11-23 10:30:05.000000000 +0100 @@ -37,7 +37,7 @@ #include "Poco/Data/SQLite/SessionImpl.h" #include "Poco/Data/SQLite/Utility.h" #include "Poco/Data/SQLite/SQLiteStatementImpl.h" -#include "sqlite3.h" +#include <sqlite3.h> #include <cstdlib> diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp --- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-23 10:30:34.000000000 +0100 @@ -40,7 +40,7 @@ #include "Poco/String.h" #include <cstdlib> #include <cstring> -#include "sqlite3.h" +#include <sqlite3.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp --- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp 2008-11-23 10:29:22.000000000 +0100 @@ -41,7 +41,7 @@ #include "Poco/NumberFormatter.h" #include "Poco/String.h" #include "Poco/Exception.h" -#include "sqlite3.h" +#include <sqlite3.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h --- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:50.000000000 +0100 @@ -44,7 +44,7 @@ #include "Poco/BufferedStreamBuf.h" #include <istream> #include <ostream> -#include "Poco/zlib.h" +#include <zlib.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h --- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:50.000000000 +0100 @@ -44,7 +44,7 @@ #include "Poco/BufferedStreamBuf.h" #include <istream> #include <ostream> -#include "Poco/zlib.h" +#include <zlib.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile --- poco-1.3.3p1-all.orig/Foundation/Makefile 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Foundation/Makefile 2008-11-23 10:04:10.000000000 +0100 @@ -8,6 +8,8 @@ include $(POCO_BASE)/build/rules/global +SYSLIBS += -lpcre -lz + objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ @@ -30,12 +32,7 @@ FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \ UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \ Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \ - FileStream Unicode UTF8String \ - adler32 compress crc32 deflate gzio infback inffast inflate inftrees \ - trees zutil \ - pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \ - pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \ - pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass + FileStream Unicode UTF8String ifeq ($(POCO_CONFIG),MinGW) objects += EventLogChannel WindowsConsoleChannel diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp --- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp 2008-11-22 22:13:50.000000000 +0100 @@ -35,7 +35,7 @@ #include "Poco/Checksum.h" -#include "Poco/zlib.h" +#include <zlib.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp --- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:50.000000000 +0100 @@ -37,7 +37,7 @@ #include "Poco/RegularExpression.h" #include "Poco/Exception.h" #include <sstream> -#include "pcre.h" +#include <pcre.h> namespace Poco { diff -Naur poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h --- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:50.000000000 +0100 @@ -40,7 +40,7 @@ #include "Poco/XML/XML.h" -#include "Poco/XML/expat.h" +#include <expat.h> #include "Poco/XML/XMLString.h" #include "Poco/XML/XMLStream.h" #include "Poco/SAX/Locator.h" diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile --- poco-1.3.3p1-all.orig/XML/Makefile 2008-11-22 22:13:34.000000000 +0100 +++ poco-1.3.3p1-all/XML/Makefile 2008-11-23 10:04:25.000000000 +0100 @@ -8,7 +8,9 @@ include $(POCO_BASE)/build/rules/global -COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H +COMMONFLAGS += -DXML_NS -DXML_DTD + +SYSLIBS += -lexpat objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \ AttributesImpl CDATASection CharacterData ChildNodesList Comment \ @@ -22,7 +24,7 @@ NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \ ParserEngine ProcessingInstruction SAXException SAXParser Text \ TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \ - XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok + XMLString XMLWriter NodeAppender target = PocoXML target_version = $(LIBVERSION)