Changeset 4aa0f6b for configure

Timestamp:

2010-06-07T14:31:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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 killerbee stuff, bringing all the bleeding-edge stuff together.

File:

• configure (modified) (5 diffs)

configure

@@ -27 +27 @@
 yahoo=1
 twitter=1
+twitter=1
+purple=0
 
 debug=0
@@ -67 +69 @@
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
---twitter=0/1 Disable/enable Twitter part               $twitter
+--twitter=0/1   Disable/enable Twitter part             $twitter
+
+--purple=0/1    Disable/enable libpurple support        $purple
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -121 +125 @@
 EOF
 
+srcdir="$(dirname $0)"
+if [ "$srcdir" != "." ]; then
+        echo
+        echo "configure script run from a different directory. Will create some symlinks..."
+        if [ ! -e Makefile -o -L Makefile ]; then
+                COPYDIRS="doc lib protocols tests utils"
+                mkdir -p $(cd "$srcdir"; find $COPYDIRS -type d)
+                find . -name Makefile -type l -print0 | xargs -0 rm 2> /dev/null
+                dst="$PWD"
+                cd "$srcdir"
+                for i in $(find . -name Makefile -type f); do
+                        ln -s "$PWD${i#.}" "$dst/$i";
+                done
+                cd "$dst"
+                rm -rf .bzr
+        fi
+        
+        echo "SRCDIR=$srcdir/" >> Makefile.settings
+        CFLAGS="$CFLAGS -I${dst}"
+else
+        srcdir=$PWD
+fi
+
 cat<<EOF>config.h
 /* BitlBee settings, generated by configure
@@ -158 +185 @@
 
 echo CFLAGS=$CFLAGS >> Makefile.settings
-echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
@@ -508 +535 @@
 protoobjs=''
 
+if [ "$purple" = 0 ]; then
+        echo '#undef WITH_PURPLE' >> config.h
+else
+        if ! $PKG_CONFIG purple; then
+                echo
+                echo 'Cannot find libpurple development libraries, aborting. (Install libpurple-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_PURPLE' >> config.h
+        cat<<EOF>>Makefile.settings
+EFLAGS += $($PKG_CONFIG purple --libs)
+PURPLE_CFLAGS += $($PKG_CONFIG purple --cflags)
+EOF
+        protocols=$protocols'purple '
+        protoobjs=$protoobjs'purple_mod.o '
+
+        # Having both libpurple and native IM modules in one binary may
+        # do strange things. Let's not do that.
+        msn=0
+        jabber=0
+        oscar=0
+        yahoo=0
+        twitter=0
+        
+        if [ "$events" = "libevent" ]; then
+                echo
+                echo 'Warning: Some libpurple modules (including msn-pecan) do their event handling'
+                echo 'outside libpurple, talking to GLib directly. At least for now the combination'
+                echo 'libpurple + libevent is *not* recommended!'
+        fi
+fi
+
 if [ "$msn" = 0 ]; then
         echo '#undef WITH_MSN' >> config.h