Changes in configure [34b17d9:b5a22e3]

File:

• configure (modified) (11 diffs)

configure

@@ -14 +14 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
-pidfile='/var/run/bitlbee.pid'
 plugindir='$prefix/lib/bitlbee'
 
@@ -24 +23 @@
 debug=0
 strip=1
+flood=0
 ipv6=1
 ssl=auto
@@ -47 +47 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
---pidfile=...                                           $pidfile
 --config=...                                            $config
 
@@ -76 +75 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
-pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -86 +84 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
-PIDFILE=$pidfile
 CONFIG=$config
 
@@ -108 +105 @@
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
-#define PIDFILE "$pidfile"
 #define ARCH "$arch"
 #define CPU "$cpu"
@@ -149 +145 @@
 fi
 
-if [ -z "$PKG_CONFIG" ]; then
-        PKG_CONFIG=pkg-config
-fi
-
-if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
+if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
         cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
-CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
+EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0`
+CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0`
 EOF
         echo '#define GLIB2' >> config.h
@@ -198 +190 @@
 detect_nss()
 {
-        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG mozilla-nss; then
+        if type pkg-config > /dev/null 2>/dev/null && pkg-config mozilla-nss; then
                 cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs mozilla-nss`
-CFLAGS+=`$PKG_CONFIG --cflags mozilla-nss`
+EFLAGS+=`pkg-config --libs mozilla-nss`
+CFLAGS+=`pkg-config --cflags mozilla-nss`
 EOF
                 
@@ -293 +285 @@
 fi
 
-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\"
+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
 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
+        echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h;
 fi
 
@@ -343 +336 @@
 
 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 +344 @@
 echo "PROTOOBJS = $protoobjs" >> Makefile.settings
 
+echo
 echo Architecture: $arch
 case "$arch" in