Merging in 1.2.5.

1 files changed, 11 insertions, 4 deletions

diff --git a/configure b/configure
index 9d92cedf..4fa1ee8c 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
 
@@ -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
@@ -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`
@@ -528,6 +534,7 @@ GNU/* )
 *BSD )
 ;;
 Darwin )
+	echo 'STRIP=\# skip strip' >> Makefile.settings
 ;;
 IRIX )
 ;;