Changeset 8e419cb for configure

Timestamp:

2006-01-10T21:35:08Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (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:

Merge Wilmer

File:

• configure (modified) (8 diffs)

configure

@@ -23 +23 @@
 debug=0
 strip=1
-flood=0
 ipv6=1
 ssl=auto
@@ -258 +257 @@
         if [ "$ret" = "0" ]; then
                 echo
-                echo 'WARNING: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
-                echo '         This is necessary for MSN and full Jabber support. To continue,'
-                echo '         install a suitable SSL library or disable MSN support (--msn=0).'
-                echo '         If you want Jabber without SSL support you can try --ssl=bogus.'
+                echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
+                echo '       This is necessary for MSN and full Jabber support. To continue,'
+                echo '       install a suitable SSL library or disable MSN support (--msn=0).'
+                echo '       If you want Jabber without SSL support you can try --ssl=bogus.'
                 
                 exit 1;
@@ -291 +290 @@
 fi
 
-if [ "$flood" = 1 ]; then
-        # echo '#define FLOOD_SEND' >> config.h
-        echo 'Flood protection is disabled in this release because of too many bugs.' 2> /dev/stderr
-        rm config.h
-        rm Makefile.settings
-        exit 1
+echo
+if [ -z "$BITLBEE_VERSION" -a -d .bzr -a -x "`which bzr`" ]; then
+        rev=`bzr revno`
+        echo 'Using bzr revision #'$rev' as version number'
+        BITLBEE_VERSION=\"bzr-$rev\"
 fi
 
 if [ -n "$BITLBEE_VERSION" ]; then
-        echo
         echo 'Spoofing version number: '$BITLBEE_VERSION
         echo '#undef BITLBEE_VERSION' >> config.h
-        echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h;
+        echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h
+        echo
 fi
 
@@ -314 +312 @@
         echo '#define WITH_MSN' >> config.h
         protocols=$protocols'msn '
-        protoobjs=$protoobjs'msnn.o '
+        protoobjs=$protoobjs'msn_mod.o '
 fi
 
@@ -322 +320 @@
         echo '#define WITH_JABBER' >> config.h
         protocols=$protocols'jabber '
-        protoobjs=$protoobjs'jabberr.o '
+        protoobjs=$protoobjs'jabber_mod.o '
 fi
 
@@ -330 +328 @@
         echo '#define WITH_OSCAR' >> config.h
         protocols=$protocols'oscar '
-        protoobjs=$protoobjs'oscarr.o '
+        protoobjs=$protoobjs'oscar_mod.o '
 fi
 
@@ -338 +336 @@
         echo '#define WITH_YAHOO' >> config.h
         protocols=$protocols'yahoo '
-        protoobjs=$protoobjs'yahooo.o '
+        protoobjs=$protoobjs'yahoo_mod.o '
 fi
 
 if [ "$protocols" = "PROTOCOLS = " ]; then
-        echo
         echo "WARNING: You haven't selected any communication protocol to compile!"
         echo "         Bitlbee will run, but you will be unable to connect to IM servers!"
@@ -350 +347 @@
 echo "PROTOOBJS = $protoobjs" >> Makefile.settings
 
-echo
 echo Architecture: $arch
 case "$arch" in