Move from --disable-[feature] to --exclude-[feature] format and address that all components included in build if configure script is not ran to change behavior. (Hopefully addressed clobbering script +x settings for *NIX)

This commit is contained in:
Chris Johnson 2008-09-25 05:03:11 +00:00
parent d67bccf359
commit 5cc5b306d3
3 changed files with 65 additions and 59 deletions

View File

@ -61,7 +61,9 @@ Foundation-tests: Foundation-libexec cppunit
Foundation-samples: Foundation-libexec Foundation-samples: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/Foundation/samples $(MAKE) -C $(POCO_BASE)/Foundation/samples
ifeq ($(POCO_XML_SUPPORT),enable) ifeq ($(POCO_XML_SUPPORT),exclude)
#no XML support
else
XML-libexec: Foundation-libexec XML-libexec: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/XML $(MAKE) -C $(POCO_BASE)/XML
@ -70,11 +72,11 @@ XML-tests: XML-libexec cppunit
XML-samples: XML-libexec XML-samples: XML-libexec
$(MAKE) -C $(POCO_BASE)/XML/samples $(MAKE) -C $(POCO_BASE)/XML/samples
else
#no XML support
endif endif
ifeq ($(POCO_UTIL_SUPPORT),enable) ifeq ($(POCO_UTIL_SUPPORT),exclude)
#no Util support
else
Util-libexec: Foundation-libexec XML-libexec Util-libexec: Foundation-libexec XML-libexec
$(MAKE) -C $(POCO_BASE)/Util $(MAKE) -C $(POCO_BASE)/Util
@ -83,11 +85,11 @@ Util-tests: Util-libexec cppunit
Util-samples: Util-libexec Util-samples: Util-libexec
$(MAKE) -C $(POCO_BASE)/Util/samples $(MAKE) -C $(POCO_BASE)/Util/samples
else
#no Util support
endif endif
ifeq ($(POCO_NET_SUPPORT),enable) ifeq ($(POCO_NET_SUPPORT),exclude)
#no Net support
else
Net-libexec: Foundation-libexec Net-libexec: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/Net $(MAKE) -C $(POCO_BASE)/Net
@ -96,11 +98,11 @@ Net-tests: Net-libexec cppunit
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
else
#no Net support
endif endif
ifeq ($(POCO_NETSSL_SUPPORT),enable) ifeq ($(POCO_NETSSL_SUPPORT),exclude)
#no NetSSL support
else
NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL
@ -109,11 +111,11 @@ NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit
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
else
#no NetSSL support
endif endif
ifeq ($(POCO_DATA_SUPPORT),enable) ifeq ($(POCO_DATA_SUPPORT),exclude)
#no Data support
else
Data-libexec: Foundation-libexec Data-libexec: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/Data $(MAKE) -C $(POCO_BASE)/Data
@ -123,37 +125,35 @@ Data-tests: Data-libexec cppunit
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
ifeq ($(POCO_DATA_SQLITE_SUPPORT), enable) ifeq ($(POCO_DATA_SQLITE_SUPPORT), exclude)
#no SQLite support
else
Data/SQLite-libexec: Foundation-libexec Data-libexec Data/SQLite-libexec: Foundation-libexec Data-libexec
$(MAKE) -C $(POCO_BASE)/Data/SQLite $(MAKE) -C $(POCO_BASE)/Data/SQLite
Data/SQLite-tests: Data/SQLite-libexec cppunit Data/SQLite-tests: Data/SQLite-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite $(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite
else
#no SQLite support
endif endif
ifeq ($(POCO_DATA_ODBC_SUPPORT), enable) ifeq ($(POCO_DATA_ODBC_SUPPORT), exclude)
#no ODBC support
else
Data/ODBC-libexec: Foundation-libexec Data-libexec Data/ODBC-libexec: Foundation-libexec Data-libexec
$(MAKE) -C $(POCO_BASE)/Data/ODBC $(MAKE) -C $(POCO_BASE)/Data/ODBC
Data/ODBC-tests: Data/ODBC-libexec cppunit Data/ODBC-tests: Data/ODBC-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite $(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite
else
#no ODBC support
endif endif
ifeq ($(POCO_DATA_MYSQL_SUPPORT), enable) ifeq ($(POCO_DATA_MYSQL_SUPPORT), exclude)
#no MySQL support
else
Data/MySQL-libexec: Foundation-libexec Data-libexec Data/MySQL-libexec: Foundation-libexec Data-libexec
$(MAKE) -C $(POCO_BASE)/Data/MySQL $(MAKE) -C $(POCO_BASE)/Data/MySQL
Data/MySQL-tests: Data/ODBC-libexec cppunit Data/MySQL-tests: Data/ODBC-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite $(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite
else
#no MySQL support
endif endif
else
#no Data support
endif endif
clean: clean:

View File

@ -72,12 +72,18 @@ SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO
# System Specific Libraries # System Specific Libraries
# #
SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lgdi32 SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lgdi32
ifeq ($(POCO_NET_SUPPORT),enable) ifeq ($(POCO_NET_SUPPORT),exclude)
#no need for winsock2
else
SYSLIBS += -lws2_32 SYSLIBS += -lws2_32
endif endif
ifeq ($(POCO_NETSSL_SUPPORT),enable) ifeq ($(POCO_NETSSL_SUPPORT),exclude)
#no need for winsock2, ssl or crypto
else
SYSLIBS += -lws2_32 -lssl -lcrypto -lws2_32 SYSLIBS += -lws2_32 -lssl -lcrypto -lws2_32
endif endif
ifeq ($(POCO_DATA_ODBC_SUPPORT),enable) ifeq ($(POCO_DATA_ODBC_SUPPORT),exclude)
#no need for odbc lib
else
SYSLIBS += -lodbc32 SYSLIBS += -lodbc32
endif endif

64
configure vendored
View File

@ -53,28 +53,28 @@ Options:
Useful if your C++ compiler has incomplete floating-point support Useful if your C++ compiler has incomplete floating-point support
(such as uclibc-based systems). (such as uclibc-based systems).
--disable-XML --exclude-XML
Disable building of Poco::XML component support Disable building of Poco::XML component support
--disable-Util --exclude-Util
Disable building of Poco::Util component support Disable building of Poco::Util component support
--disable-Net --exclude-Net
Disable building of Poco::Net component support Disable building of Poco::Net component support
--disable-NetSSL --exclude-NetSSL
Disable building of Poco::NetSSL component support Disable building of Poco::NetSSL component support
--disable-Data --exclude-Data
Disable building of Poco::Data component support Disable building of Poco::Data component support
--disable-ODBC --exclude-ODBC
Disable building of Poco::Data::ODBC component support Disable building of Poco::Data::ODBC component support
--disable-SQLite --exclude-SQLite
Disable building of Poco::Data::SQLite component support Disable building of Poco::Data::SQLite component support
--disable-MySQL --exclude-MySQL
Disable building of Poco::Data::MySQL component support Disable building of Poco::Data::MySQL component support
ENDHELP ENDHELP
@ -89,14 +89,14 @@ cd $build
tests="tests" tests="tests"
samples="samples" samples="samples"
flags="" flags=""
poco_xml_support="enable" poco_xml_support="include"
poco_util_support="enable" poco_util_support="include"
poco_net_support="enable" poco_net_support="include"
poco_netssl_support="enable" poco_netssl_support="include"
poco_data_support="enable" poco_data_support="include"
poco_data_odbc_support="enable" poco_data_odbc_support="include"
poco_data_sqlite_support="enable" poco_data_sqlite_support="include"
poco_data_mysql_support="enable" poco_data_mysql_support="include"
# parse arguments # parse arguments
while [ "$1" != "" ] ; do while [ "$1" != "" ] ; do
val=`expr $1 : '--config=\(.*\)'` val=`expr $1 : '--config=\(.*\)'`
@ -130,36 +130,36 @@ while [ "$1" != "" ] ; do
flags="$flags -DPOCO_NO_FPENVIRONMENT" flags="$flags -DPOCO_NO_FPENVIRONMENT"
fi fi
if [ "$1" = "--disable-XML" ] ; then if [ "$1" = "--exclude-XML" ] ; then
poco_xml_support="disable" poco_xml_support="exclude"
fi fi
if [ "$1" = "--disable-Util" ] ; then if [ "$1" = "--exclude-Util" ] ; then
poco_util_support="disable" poco_util_support="exclude"
fi fi
if [ "$1" = "--disable-Net" ] ; then if [ "$1" = "--exclude-Net" ] ; then
poco_net_support="disable" poco_net_support="exclude"
fi fi
if [ "$1" = "--disable-NetSSL" ] ; then if [ "$1" = "--exclude-NetSSL" ] ; then
poco_netssl_support="disable" poco_netssl_support="exclude"
fi fi
if [ "$1" = "--disable-Data" ] ; then if [ "$1" = "--exclude-Data" ] ; then
poco_data_support="disable" poco_data_support="exclude"
fi fi
if [ "$1" = "--disable-ODBC" ] ; then if [ "$1" = "--exclude-ODBC" ] ; then
poco_data_odbc_support="disable" poco_data_odbc_support="exclude"
fi fi
if [ "$1" = "--disable-SQLite" ] ; then if [ "$1" = "--exclude-SQLite" ] ; then
poco_data_sqlite_support="disable" poco_data_sqlite_support="exclude"
fi fi
if [ "$1" = "--disable-MySQL" ] ; then if [ "$1" = "--exclude-MySQL" ] ; then
poco_data_mysql_support="disable" poco_data_mysql_support="exclude"
fi fi
if [ "$1" = "--help" ] ; then if [ "$1" = "--help" ] ; then