generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-06 00:31:10 +01:00
Code Issues Projects Releases Wiki Activity

- SF #3552774: Don't hide default target in subordinate makefile

Browse Source 
- SF #3534307: Building IPv6 for Linux by default
- SF #3516844: poco missing symbols with external >=lipcre-8.13 
- fix of rev. 1952 fix (porting rev.1913 from 1.4.4 (fixed SF# 3550553))
This commit is contained in:
Aleksandar Fabijanic 2012-08-20 00:57:17 +00:00
parent 06204c4865
commit 90a8e859bf
13 changed files with 123 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -29,6 +29,9 @@ Release 1.5.0 (2012-08-??)
- fixed SF# 3012166: IPv6 patch - fixed SF# 3012166: IPv6 patch
- added SF# 3558085: Add formatter to MACAddress object - added SF# 3558085: Add formatter to MACAddress object
- fixed SF# 3535990: POCO_HAVE_IPv6 without POCO_WIN32_UTF8 conflict - fixed SF# 3535990: POCO_HAVE_IPv6 without POCO_WIN32_UTF8 conflict
- fixed SF #3552774: Don't hide default target in subordinate makefile
- fixed SF #3534307: Building IPv6 for Linux by default
- fixed SF #3516844: poco missing symbols with external >=lipcre-8.13
Release 1.4.4 (2012-08-??) Release 1.4.4 (2012-08-??)
========================== ==========================

18
Data/ODBC/Makefile
View File

@ -14,16 +14,14 @@
include $(POCO_BASE)/build/rules/global include $(POCO_BASE)/build/rules/global
# adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
ODBCLIBDIR = /usr/lib$(LIB64SUFFIX)
ifeq ($(LINKMODE),STATIC) ifeq ($(LINKMODE),STATIC)
LIBLINKEXT = $(STATICLIBLINKEXT) LIBLINKEXT = $(STATICLIBLINKEXT)
else else
LIBLINKEXT = $(SHAREDLIBLINKEXT) LIBLINKEXT = $(SHAREDLIBLINKEXT)
endif endif
INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc INCLUDE += $(POCO_ODBC_INCLUDE)
SYSLIBS += -L/usr/lib$(LIB64SUFFIX) -L/usr/local/lib$(LIB64SUFFIX) -L/usr/lib$(LIB64SUFFIX)/odbc -L/usr/local/lib$(LIB64SUFFIX)/odbc SYSLIBS += $(POCO_ODBC_LIBRARY)
ifeq ($(POCO_CONFIG),MinGW) ifeq ($(POCO_CONFIG),MinGW)
# -DODBCVER=0x0300: SQLHandle declaration issue # -DODBCVER=0x0300: SQLHandle declaration issue
@ -36,23 +34,25 @@ CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
# CYGWIN platform has its own ODBC library in /lib/w32api # CYGWIN platform has its own ODBC library in /lib/w32api
SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32 SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
else else
ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -e $(POCO_ODBC_LIBRARY)/libodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -lodbc -lodbcinst SYSLIBS += -lodbc -lodbcinst
COMMONFLAGS += -DPOCO_UNIXODBC COMMONFLAGS += -DPOCO_UNIXODBC
else else
ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -h $(POCO_ODBC_LIBRARY)/libodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -lodbc -lodbcinst SYSLIBS += -lodbc -lodbcinst
COMMONFLAGS += -DPOCO_UNIXODBC COMMONFLAGS += -DPOCO_UNIXODBC
else else
ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -e $(POCO_ODBC_LIBRARY)/libiodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst SYSLIBS += -liodbc -liodbcinst
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
else else
ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -h $(POCO_ODBC_LIBRARY)/libiodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst -I/usr/include/iodbc SYSLIBS += -liodbc -liodbcinst -I/usr/include/iodbc
COMMONFLAGS += -DPOCO_IODBC COMMONFLAGS += -DPOCO_IODBC
else else
$(error No ODBC library found. Please install unixODBC or iODBC and try again) ifndef (POCO_NO_ODBC)
$(warning No ODBC library found. Please install unixODBC or iODBC.)
endif
endif endif
endif endif
endif endif

20
Data/ODBC/testsuite/Makefile
View File

@ -14,16 +14,14 @@
include $(POCO_BASE)/build/rules/global include $(POCO_BASE)/build/rules/global
# adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
ODBCLIBDIR = /usr/lib$(LIB64SUFFIX)
ifeq ($(LINKMODE),STATIC) ifeq ($(LINKMODE),STATIC)
LIBLINKEXT = $(STATICLIBLINKEXT) LIBLINKEXT = $(STATICLIBLINKEXT)
else else
LIBLINKEXT = $(SHAREDLIBLINKEXT) LIBLINKEXT = $(SHAREDLIBLINKEXT)
endif endif
INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc INCLUDE += $(POCO_ODBC_INCLUDE)
SYSLIBS += -L/usr/lib$(LIB64SUFFIX) -L/usr/local/lib$(LIB64SUFFIX) -L/usr/lib$(LIB64SUFFIX)/odbc -L/usr/local/lib$(LIB64SUFFIX)/odbc SYSLIBS += $(POCO_ODBC_LIBRARY)
ifeq ($(POCO_CONFIG),MinGW) ifeq ($(POCO_CONFIG),MinGW)
# -DODBCVER=0x0300: SQLHandle declaration issue # -DODBCVER=0x0300: SQLHandle declaration issue
@ -33,26 +31,28 @@ else ifeq ($(POCO_CONFIG),CYGWIN)
# -DODBCVER=0x0300: SQLHandle declaration issue # -DODBCVER=0x0300: SQLHandle declaration issue
# -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++ # -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++
CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
# CYGWIN platform has its own ODBC library in /lib/w32api # CYGWIN platform has its own ODBC library in /lib/w32api
SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32 SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
else else
ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -e $(POCO_ODBC_LIBRARY)/libodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -lodbc -lodbcinst SYSLIBS += -lodbc -lodbcinst
COMMONFLAGS += -DPOCO_UNIXODBC COMMONFLAGS += -DPOCO_UNIXODBC
else else
ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -h $(POCO_ODBC_LIBRARY)/libodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -lodbc -lodbcinst SYSLIBS += -lodbc -lodbcinst
COMMONFLAGS += -DPOCO_UNIXODBC COMMONFLAGS += -DPOCO_UNIXODBC
else else
ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -e $(POCO_ODBC_LIBRARY)/libiodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst SYSLIBS += -liodbc -liodbcinst
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
else else
ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) ifeq (0, $(shell test -h $(POCO_ODBC_LIBRARY)/libiodbc$(LIBLINKEXT); echo $$?))
SYSLIBS += -liodbc -liodbcinst -I/usr/include/iodbc SYSLIBS += -liodbc -liodbcinst -I/usr/include/iodbc
COMMONFLAGS += -DPOCO_IODBC COMMONFLAGS += -DPOCO_IODBC
else else
$(error No ODBC library found. Please install unixODBC or iODBC and try again) ifndef (POCO_NO_ODBC)
$(warning No ODBC library found. Please install unixODBC or iODBC.)
endif
endif endif
endif endif
endif endif

5
Foundation/Makefile
View File

@ -43,8 +43,11 @@ pcre_objects = pcre_chartables pcre_compile pcre_globals pcre_maketables \
pcre_utf8_objects = pcre_ucd pcre_tables pcre_utf8_objects = pcre_ucd pcre_tables
ifndef POCO_UNBUNDLED
$(warning POCO_NO_ODBC NOT defined)
endif
ifdef POCO_UNBUNDLED ifdef POCO_UNBUNDLED
objects += $(pcre_utf8_objects)
SYSLIBS += -lpcre -lz SYSLIBS += -lpcre -lz
else else
objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)

5
Foundation/include/Poco/Config.h
View File

@ -121,4 +121,9 @@
// #define POCO_UTIL_NO_XMLCONFIGURATION // #define POCO_UTIL_NO_XMLCONFIGURATION
// No IPv6 support
// Define to disable IPv6
// #define POCO_NET_NO_IPv6
#endif // Foundation_Config_INCLUDED #endif // Foundation_Config_INCLUDED

27
Makefile
View File

@ -5,6 +5,7 @@
# #
sinclude config.make sinclude config.make
sinclude config.build
ifndef POCO_BASE ifndef POCO_BASE
$(warning WARNING: POCO_BASE is not defined. Assuming current directory.) $(warning WARNING: POCO_BASE is not defined. Assuming current directory.)
@ -24,7 +25,8 @@ ifeq ($(LINKMODE),BOTH)
SHAREDONLY='(' -name static -prune ')' -o SHAREDONLY='(' -name static -prune ')' -o
endif endif
.PHONY: all libexecs cppunit tests samples clean distclean install # TESTS and SAMPLES are set by confgure script in config.make
poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples)
all: libexecs tests samples all: libexecs tests samples
@ -53,6 +55,7 @@ libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec
tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests
samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples
.PHONY: poco all libexecs cppunit tests samples clean distclean install
.PHONY: $(libexecs) .PHONY: $(libexecs)
.PHONY: $(tests) .PHONY: $(tests)
.PHONY: $(samples) .PHONY: $(samples)
@ -66,7 +69,7 @@ Foundation-libexec:
Foundation-tests: Foundation-libexec cppunit Foundation-tests: Foundation-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Foundation/testsuite $(MAKE) -C $(POCO_BASE)/Foundation/testsuite
Foundation-samples: Foundation-libexec Foundation-samples: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/Foundation/samples $(MAKE) -C $(POCO_BASE)/Foundation/samples
@ -75,7 +78,7 @@ XML-libexec: Foundation-libexec
XML-tests: XML-libexec cppunit XML-tests: XML-libexec cppunit
$(MAKE) -C $(POCO_BASE)/XML/testsuite $(MAKE) -C $(POCO_BASE)/XML/testsuite
XML-samples: XML-libexec XML-samples: XML-libexec
$(MAKE) -C $(POCO_BASE)/XML/samples $(MAKE) -C $(POCO_BASE)/XML/samples
@ -84,7 +87,7 @@ JSON-libexec: Foundation-libexec
JSON-tests: JSON-libexec cppunit JSON-tests: JSON-libexec cppunit
$(MAKE) -C $(POCO_BASE)/JSON/testsuite $(MAKE) -C $(POCO_BASE)/JSON/testsuite
JSON-samples: JSON-libexec JSON-samples: JSON-libexec
$(MAKE) -C $(POCO_BASE)/JSON/samples $(MAKE) -C $(POCO_BASE)/JSON/samples
@ -93,7 +96,7 @@ Util-libexec: Foundation-libexec XML-libexec
Util-tests: Util-libexec cppunit Util-tests: Util-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Util/testsuite $(MAKE) -C $(POCO_BASE)/Util/testsuite
Util-samples: Util-libexec Util-samples: Util-libexec
$(MAKE) -C $(POCO_BASE)/Util/samples $(MAKE) -C $(POCO_BASE)/Util/samples
@ -102,7 +105,7 @@ Net-libexec: Foundation-libexec
Net-tests: Net-libexec cppunit Net-tests: Net-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Net/testsuite $(MAKE) -C $(POCO_BASE)/Net/testsuite
Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec
$(MAKE) -C $(POCO_BASE)/Net/samples $(MAKE) -C $(POCO_BASE)/Net/samples
@ -111,7 +114,7 @@ Crypto-libexec: Foundation-libexec
Crypto-tests: Crypto-libexec cppunit Crypto-tests: Crypto-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Crypto/testsuite $(MAKE) -C $(POCO_BASE)/Crypto/testsuite
Crypto-samples: Crypto-libexec Foundation-libexec Util-libexec Crypto-samples: Crypto-libexec Foundation-libexec Util-libexec
$(MAKE) -C $(POCO_BASE)/Crypto/samples $(MAKE) -C $(POCO_BASE)/Crypto/samples
@ -120,7 +123,7 @@ NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec Crypto-libe
NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite
NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples
@ -129,7 +132,7 @@ Data-libexec: Foundation-libexec
Data-tests: Data-libexec cppunit Data-tests: Data-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Data/testsuite $(MAKE) -C $(POCO_BASE)/Data/testsuite
Data-samples: Data-libexec Data-libexec Data/SQLite-libexec Data-samples: Data-libexec Data-libexec Data/SQLite-libexec
$(MAKE) -C $(POCO_BASE)/Data/samples $(MAKE) -C $(POCO_BASE)/Data/samples
@ -156,13 +159,13 @@ Zip-libexec: Foundation-libexec Net-libexec Util-libexec XML-libexec
Zip-tests: Zip-libexec cppunit Zip-tests: Zip-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Zip/testsuite $(MAKE) -C $(POCO_BASE)/Zip/testsuite
Zip-samples: Zip-libexec Zip-samples: Zip-libexec
$(MAKE) -C $(POCO_BASE)/Zip/samples $(MAKE) -C $(POCO_BASE)/Zip/samples
PageCompiler-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec PageCompiler-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec
$(MAKE) -C $(POCO_BASE)/PageCompiler $(MAKE) -C $(POCO_BASE)/PageCompiler
PageCompiler-samples: PageCompiler-libexec PageCompiler-samples: PageCompiler-libexec
$(MAKE) -C $(POCO_BASE)/PageCompiler/samples $(MAKE) -C $(POCO_BASE)/PageCompiler/samples
@ -174,7 +177,7 @@ PDF-libexec: Foundation-libexec
PDF-tests: PDF-libexec cppunit PDF-tests: PDF-libexec cppunit
$(MAKE) -C $(POCO_BASE)/PDF/testsuite $(MAKE) -C $(POCO_BASE)/PDF/testsuite
PDF-samples: PDF-libexec PDF-samples: PDF-libexec
$(MAKE) -C $(POCO_BASE)/PDF/samples $(MAKE) -C $(POCO_BASE)/PDF/samples

6
Net/include/Poco/Net/IPAddress.h
View File

@ -80,8 +80,10 @@ public:
enum Family enum Family
/// Possible address families for IP addresses. /// Possible address families for IP addresses.
{ {
IPv4, IPv4
IPv6 #ifdef POCO_HAVE_IPv6
,IPv6
#endif
}; };
IPAddress(); IPAddress();

9
Net/include/Poco/Net/Net.h
View File

@ -96,10 +96,13 @@ void Net_API uninitializeNetwork();
} } // namespace Poco::Net } } // namespace Poco::Net
// Define to enable IPv6 support // Default to enabled IPv6 support if not explicitly disabled
#if !defined (POCO_HAVE_IPv6) #if !defined(POCO_NET_NO_IPv6) && !defined (POCO_HAVE_IPv6)
#define POCO_HAVE_IPv6 #define POCO_HAVE_IPv6
#endif // POCO_HAVE_IPv6 #elif defined(POCO_NET_NO_IPv6) && defined (POCO_HAVE_IPv6)
#undef POCO_HAVE_IPv6
#endif // POCO_NET_NO_IPv6, POCO_HAVE_IPv6
#if !defined(s6_addr16) #if !defined(s6_addr16)
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS)

9
Net/src/NetworkInterface.cpp
View File

@ -280,6 +280,7 @@ bool NetworkInterfaceImpl::supportsIPv4() const
bool NetworkInterfaceImpl::supportsIPv6() const bool NetworkInterfaceImpl::supportsIPv6() const
{ {
#ifdef POCO_HAVE_IPv6
AddressList::const_iterator it = _addressList.begin(); AddressList::const_iterator it = _addressList.begin();
AddressList::const_iterator end = _addressList.end(); AddressList::const_iterator end = _addressList.end();
for (; it != end; ++it) for (; it != end; ++it)
@ -287,7 +288,7 @@ bool NetworkInterfaceImpl::supportsIPv6() const
if (IPAddress::IPv6 == it->get<NetworkInterface::IP_ADDRESS>().family()) if (IPAddress::IPv6 == it->get<NetworkInterface::IP_ADDRESS>().family())
return true; return true;
} }
#endif
return false; return false;
} }
@ -1241,7 +1242,11 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
continue; continue;
} }
if (family == AF_INET || family == AF_INET6) if (family == AF_INET
#ifdef POCO_HAVE_IPv6
|| family == AF_INET6
#endif
)
{ {
intf = NetworkInterface(std::string(currIface->ifa_name), address, subnetMask, broadcastAddress, ifIndex); intf = NetworkInterface(std::string(currIface->ifa_name), address, subnetMask, broadcastAddress, ifIndex);
if ((upOnly && intf.isUp()) || !upOnly) if ((upOnly && intf.isUp()) || !upOnly)

2
Net/src/SocketAddress.cpp
View File

@ -358,11 +358,13 @@ int SocketAddress::af() const
std::string SocketAddress::toString() const std::string SocketAddress::toString() const
{ {
std::string result; std::string result;
#if defined(POCO_HAVE_IPv6)
if (host().family() == IPAddress::IPv6) if (host().family() == IPAddress::IPv6)
result.append("["); result.append("[");
result.append(host().toString()); result.append(host().toString());
if (host().family() == IPAddress::IPv6) if (host().family() == IPAddress::IPv6)
result.append("]"); result.append("]");
#endif
result.append(":"); result.append(":");
NumberFormatter::append(result, port()); NumberFormatter::append(result, port());
return result; return result;

13
NetSSL_OpenSSL/src/SecureSocketImpl.cpp
View File

@ -140,7 +140,13 @@ void SecureSocketImpl::connect(const SocketAddress& address, const Poco::Timespa
poco_assert (!_pSSL); poco_assert (!_pSSL);
_pSocket->connect(address, timeout); _pSocket->connect(address, timeout);
Poco::Timespan receiveTimeout = _pSocket->getReceiveTimeout();
Poco::Timespan sendTimeout = _pSocket->getSendTimeout();
_pSocket->setReceiveTimeout(timeout);
_pSocket->setSendTimeout(timeout);
connectSSL(performHandshake); connectSSL(performHandshake);
_pSocket->setReceiveTimeout(receiveTimeout);
_pSocket->setSendTimeout(sendTimeout);
} }
@ -149,15 +155,8 @@ void SecureSocketImpl::connectNB(const SocketAddress& address)
if (_pSSL) reset(); if (_pSSL) reset();
poco_assert (!_pSSL); poco_assert (!_pSSL);
_pSocket->connectNB(address); _pSocket->connectNB(address);
Poco::Timespan receiveTimeout = _pSocket->getReceiveTimeout();
Poco::Timespan sendTimeout = _pSocket->getSendTimeout();
_pSocket->setReceiveTimeout(timeout);
_pSocket->setSendTimeout(timeout);
connectSSL(false); connectSSL(false);
_pSocket->setReceiveTimeout(receiveTimeout);
_pSocket->setSendTimeout(sendTimeout);
} }

32
build/rules/global
View File

@ -25,7 +25,7 @@ endif
# #
# Include some optional make configuration # Include some optional make configuration
# #
sinclude $(POCO_BASE)/config.build sinclude $(POCO_BASE)/config.make
# #
# Check for PROJECT_BASE # Check for PROJECT_BASE
@ -270,6 +270,36 @@ INCLUDE = $(foreach p,$(POCO_ADD_INCLUDE),-I$(p)) -Iinclude $(foreach p,$(COMPON
# #
LIBRARY = $(foreach p,$(POCO_ADD_LIBRARY),-L$(p)) -L$(LIBPATH) $(POCO_LIBRARY) LIBRARY = $(foreach p,$(POCO_ADD_LIBRARY),-L$(p)) -L$(LIBPATH) $(POCO_LIBRARY)
#
# Build ODBC Include directory List if not supplied from config
#
ifndef POCO_ODBC_INCLUDE
POCO_ODBC_INCLUDE = -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
endif
#
# Build ODBC library directory if not supplied from config
#
ifndef POCO_NO_ODBC
ifndef POCO_ODBC_LIBRARY
ifeq (0, $(shell test -e $/usr/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/lib$(LIB64SUFFIX)
else
ifeq (0, $(shell test -e $/usr/local/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/local/lib$(LIB64SUFFIX)
else
ifeq (0, $(shell test -e $/usr/local/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/lib$(LIB64SUFFIX)/odbc
else
ifeq (0, $(shell test -e $/usr/local/lib/libodbc$(LIBLINKEXT); echo $$?))
POCO_ODBC_LIBRARY = /usr/local/lib$(LIB64SUFFIX)/odbc
endif
endif
endif
endif
endif
endif
# #
# Strip Command definition # Strip Command definition
# #

33
configure vendored
View File

@ -59,6 +59,10 @@ Options:
Compile with -DPOCO_NO_SHAREDLIBS. Compile with -DPOCO_NO_SHAREDLIBS.
For systems that don't support shared library loading. For systems that don't support shared library loading.
--no-ipv6
Compile with -DPOCO_NET_NO_IPv6.
For systems that don't support IPv6.
--omit=<component>{,<component>} --omit=<component>{,<component>}
Do not build the specified component(s). Do not build the specified component(s).
Example: --omit=Data/MySQL,Data/ODBC,Zip Example: --omit=Data/MySQL,Data/ODBC,Zip
@ -101,8 +105,8 @@ cd `dirname $0`
base=`pwd` base=`pwd`
cd $build cd $build
tests="tests" tests=1
samples="samples" samples=1
flags="" flags=""
omit="" omit=""
includepath="" includepath=""
@ -114,25 +118,25 @@ shared=""
while [ $# -ge 1 ]; do while [ $# -ge 1 ]; do
case "$1" in case "$1" in
--config=*) --config=*)
config="${1:9}" ;; config="`echo ${1} | awk '{print substr($0,10)}'`" ;;
--prefix=*) --prefix=*)
prefix="${1:9}" ;; prefix="`echo ${1} | awk '{print substr($0,10)}'`" ;;
--stdcxx-base=*) --stdcxx-base=*)
stdcxx_base="${1:14}" ;; stdcxx_base="`echo ${1} | awk '{print substr($0,15)}'`" ;;
--omit=*) --omit=*)
omit="`echo ${1:7} | tr ',;' ' '`" ;; omit="`echo ${1} | awk '{print substr($0,8)}' | tr ',;' ' '`" ;;
--include-path=*) --include-path=*)
includepath="`echo ${1:15} | tr ',;' ' '`" ;; includepath="`echo ${1} | awk '{print substr($0,16)}' | tr ',;' ' '`" ;;
--library-path=*) --library-path=*)
librarypath="`echo ${1:15} | tr ',;' ' '`" ;; librarypath="`echo ${1} | awk '{print substr($0,16)}' | tr ',;' ' '`" ;;
--cflags=*) --cflags=*)
cflags="${1:9}" ;; cflags="`echo ${1} | awk '{print substr($0,10)}'`" ;;
--no-samples) --no-samples)
samples="" ;; samples="" ;;
@ -151,6 +155,9 @@ while [ $# -ge 1 ]; do
--no-sharedlibs) --no-sharedlibs)
flags="$flags -DPOCO_NO_SHAREDLIBS" ;; flags="$flags -DPOCO_NO_SHAREDLIBS" ;;
--no-ipv6)
flags="$flags -DPOCO_NET_NO_IPv6" ;;
--poquito) --poquito)
flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ;; flags="$flags -DPOCO_NO_FILECHANNEL -DPOCO_NO_SPLITTERCHANNEL -DPOCO_NO_SYSLOGCHANNEL -DPOCO_UTIL_NO_INIFILECONFIGURATION -DPOCO_UTIL_NO_XMLCONFIGURATION" ;;
@ -271,9 +278,11 @@ if [ -n "$linkmode" ] ; then
echo "export LINKMODE" >>$build/config.make echo "export LINKMODE" >>$build/config.make
fi fi
cat <<__EOF__ >>$build/config.make # create config.make
.PHONY: poco echo '# config.build generated by configure script' >$build/config.build
poco: libexecs $tests $samples cat <<__EOF__ >>$build/config.build
TESTS = $tests
SAMPLES = $samples
__EOF__ __EOF__
echo "Configured for $config" echo "Configured for $config"