From 1c2eaa3c99a2e7fbe264b06e559f3d709b9a080d Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 17 Feb 2010 00:17:04 +0000 Subject: Also disable Yahoo! module if SSL support is missing since it also fully depends on working SSL support. --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 9d92cedf..cac1161e 100755 --- a/configure +++ b/configure @@ -359,11 +359,11 @@ elif [ "$ssl" = "bogus" ]; then echo 'Using bogus SSL code. This means some features will not work properly.' ## Yes, you, at the console! How can you authenticate if you don't have any SSL!? - if [ "$msn" = "1" ]; then + if [ "$msn" = "1" -o "$yahoo" = "1" ]; then echo - echo 'Real SSL support is necessary for MSN authentication, will build without' - echo 'MSN protocol support.' + echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.' msn=0 + yahoo=0 fi ret=1 -- cgit v1.2.3 From caceb0672b29fa49958d5f8b5338ff8e6ecb74d3 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 14 Mar 2010 16:37:46 +0000 Subject: Don't strip binaries on OS X since it causes plugin troubles. (Bug #480) --- configure | 1 + 1 file changed, 1 insertion(+) (limited to 'configure') diff --git a/configure b/configure index cac1161e..7fbaa37d 100755 --- a/configure +++ b/configure @@ -528,6 +528,7 @@ GNU/* ) *BSD ) ;; Darwin ) + echo 'STRIP=\# skip strip' >> Makefile.settings ;; IRIX ) ;; -- cgit v1.2.3 From c6ca3ee33e27feefb8cae0dc1d55a7239baf43cb Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 14 Mar 2010 17:49:24 +0000 Subject: Some const/etc cleanups submitted by domen@coderock.org back in bug #431. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index b3a98086..5be64a84 100755 --- a/configure +++ b/configure @@ -155,7 +155,7 @@ else fi echo CFLAGS=$CFLAGS >> Makefile.settings -echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings +echo CFLAGS+=-I`pwd` -iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings -- cgit v1.2.3 From ceebeb12e935e7a6fa72e1375e99d53cc91fcf45 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 14 Mar 2010 18:09:56 +0000 Subject: Warn if xmlto is missing and a prebuilt helpfile is missing. --- configure | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 1daf0a99..4fa1ee8c 100755 --- a/configure +++ b/configure @@ -443,6 +443,12 @@ else echo '#define WITH_PLUGINS' >> config.h fi +if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then + echo + echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.' + echo 'Install xmlto if you want online help to work.' +fi + echo if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then nick=`bzr nick` -- cgit v1.2.3