Changeset 9fae35c for configure

Timestamp:

2006-01-23T23:28:13Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ec3e411

Parents:

7308b63 (diff), 68c7c14 (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 from Wilmer

File:

• configure (modified) (4 diffs)

configure

@@ -23 +23 @@
 debug=0
 strip=1
-flood=0
 ipv6=1
 ssl=auto
@@ -289 +288 @@
 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
 
@@ -340 +338 @@
 
 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!"
@@ -348 +345 @@
 echo "PROTOOBJS = $protoobjs" >> Makefile.settings
 
-echo
 echo Architecture: $arch
 case "$arch" in