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

- 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

33
configure vendored
View File

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