Changeset e8c8d00 for configure

Timestamp:

2010-03-17T15:15:19Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

60e4df3

Parents:

1c3008a (diff), f9928cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• configure (modified) (4 diffs)

configure

@@ -156 +156 @@
 
 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
@@ -360 +360 @@
         
         ## 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
         
@@ -444 +444 @@
 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
@@ -529 +535 @@
 ;;
 Darwin )
+        echo 'STRIP=\# skip strip' >> Makefile.settings
 ;;
 IRIX )