Changes in configure [2f8e3ca:8e5751e]

File:

• configure (modified) (23 diffs)

configure

@@ -16 +16 @@
 config='/var/lib/bitlbee/'
 plugindir='$prefix/lib/bitlbee/'
+rpcplugindir='$plugindir/rpc/'
 includedir='$prefix/include/bitlbee/'
 systemdsystemunitdir=''
@@ -23 +24 @@
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
-sysroot=''
-
-configure_args="$@"
 
 # Set these to default-on to let it be overriden by either the user or purple
@@ -39 +37 @@
 twitter=1
 purple=0
+rpc=1
 
 doc=1
@@ -54 +53 @@
 pie=1
 
-arch=$(uname -s)
-cpu=$(uname -m)
+arch=`uname -s`
+cpu=`uname -m`
 
 GLIB_MIN_VERSION=2.16
@@ -106 +105 @@
 
 while [ -n "$1" ]; do
-        e="$(expr "X$1" : 'X--\(.*=.*\)')"
+        e="`expr "X$1" : 'X--\(.*=.*\)'`"
         if [ -z "$e" ]; then
                 cat<<EOF
@@ -121 +120 @@
 --datadir=...                                           $datadir
 --plugindir=...                                         $plugindir
+--rpcplugindir=...                                      $rpcplugindir
 --systemdsystemunitdir=...                              $systemdsystemunitdir
 --pidfile=...                                           $pidfile
@@ -133 +133 @@
 --purple=0/1    Disable/enable libpurple support        $purple
                 (automatically disables other protocol modules)
+--rpc=0/1       Disable/enable RPC plugin interface     $rpc
 
 --doc=0/1       Disable/enable help.txt generation      $doc
@@ -152 +153 @@
 
 --target=...    Cross compilation target                same as host
---sysroot=...   Cross compilation sysroot               $sysroot
 EOF
                 exit;
@@ -161 +161 @@
 
 # Expand $prefix and get rid of double slashes
-bindir=$(eval echo "$bindir/" | sed 's/\/\{1,\}/\//g')
-sbindir=$(eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g')
-etcdir=$(eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g')
-mandir=$(eval echo "$mandir/" | sed 's/\/\{1,\}/\//g')
-datadir=$(eval echo "$datadir/" | sed 's/\/\{1,\}/\//g')
-config=$(eval echo "$config/" | sed 's/\/\{1,\}/\//g')
-plugindir=$(eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g')
-includedir=$(eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g')
-libevent=$(eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g')
-
-pidfile=$(eval echo "$pidfile" | sed 's/\/\{1,\}/\//g')
-ipcsocket=$(eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g')
-pcdir=$(eval echo "$pcdir" | sed 's/\/\{1,\}/\//g')
+bindir=`eval echo "$bindir/" | sed 's/\/\{1,\}/\//g'`
+sbindir=`eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g'`
+etcdir=`eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g'`
+mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'`
+datadir=`eval echo "$datadir/" | sed 's/\/\{1,\}/\//g'`
+config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
+plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
+rpcplugindir=$(eval echo "$rpcplugindir/" | sed 's/\/\{1,\}/\//g')
+includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
+libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
+
+pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
+ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
+pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
 protocols_mods=""
@@ -179 +180 @@
 cat <<EOF >Makefile.settings
 ## BitlBee settings, generated by configure
-
-# ./configure $configure_args
-
 PREFIX=$prefix
 BINDIR=$bindir
@@ -189 +187 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
+RPCPLUGINDIR=$rpcplugindir
 CONFIG=$config
 INCLUDEDIR=$includedir
@@ -234 +233 @@
    of them can/will be overridden at run-time */
 
-#define BITLBEE_CONFIGURE_ARGS "$configure_args"
-
 #define CONFIG "$config"
 #define ETCDIR "$etcdir"
 #define VARDIR "$datadir"
 #define PLUGINDIR "$plugindir"
+#define RPCPLUGINDIR "$rpcplugindir"
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
@@ -249 +247 @@
 
 if [ -n "$target" ]; then
-        # prepend sysroot to system lib dirs
-
-        systemlibdirs_cross=''
-        for i in $systemlibdirs; do
-                systemlibdirs_cross="$systemlibdirs_cross $sysroot$i"
-        done
-        systemlibdirs=$systemlibdirs_cross
-        unset systemlibdirs_cross
-
-        # backward compatibility
-
-        if [ -z "$PKG_CONFIG_LIBDIR" ]; then
-                PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
-                export PKG_CONFIG_LIBDIR
-        fi
-
-        if [ -d /usr/$target/bin ]; then
-                PATH=/usr/$target/bin:$PATH
-        fi
-
-        if [ -d /usr/$target/lib ]; then
-                systemlibdirs="$systemlibdirs /usr/$target/lib"
-        fi
-
+        PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
+        export PKG_CONFIG_LIBDIR
+        PATH=/usr/$target/bin:$PATH
         CC=$target-cc
         LD=$target-ld
-        STRIP=$target-strip
+        systemlibdirs="/usr/$target/lib"
 fi
 
@@ -282 +259 @@
         LDFLAGS="$LDFLAGS -fsanitize=address"
         debug=1
+fi
+
+if [ "$tsan" = "1" ]; then
+        echo
+        echo "Threaded BitlBee? Have a nice tall glass of http://imgur.com/gallery/tX4qxzS"
+        echo "No need to sanitise threads in a single-threaded process!"
 fi
 
@@ -338 +321 @@
         if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; 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
         else
                 echo
-                echo 'Found glib2 '$($PKG_CONFIG glib-2.0 --modversion)', but version '$GLIB_MIN_VERSION' or newer is required.'
+                echo 'Found glib2 '`$PKG_CONFIG glib-2.0 --modversion`', but version '$GLIB_MIN_VERSION' or newer is required.'
                 exit 1
         fi
@@ -379 +362 @@
         if $PKG_CONFIG --exists gnutls; then
                 cat <<EOF >>Makefile.settings
-EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs)
-CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags)
+EFLAGS+=`$PKG_CONFIG --libs gnutls` `libgcrypt-config --libs`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls` `libgcrypt-config --cflags`
 EOF
                 ssl=gnutls
-                if ! $PKG_CONFIG gnutls --atleast-version=2.8; then
+                if ! pkg-config gnutls --atleast-version=2.8; then
                         echo
                         echo 'Warning: With GnuTLS versions <2.8, certificate expire dates are not verified.'
@@ -390 +373 @@
         elif libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF >>Makefile.settings
-EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs)
-CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags)
+EFLAGS+=`libgnutls-config --libs` `libgcrypt-config --libs`
+CFLAGS+=`libgnutls-config --cflags` `libgcrypt-config --cflags`
 EOF
                 
@@ -405 +388 @@
         if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG nss; then
                 cat<<EOF >>Makefile.settings
-EFLAGS+=$($PKG_CONFIG --libs nss)
-CFLAGS+=$($PKG_CONFIG --cflags nss)
+EFLAGS+=`$PKG_CONFIG --libs nss`
+CFLAGS+=`$PKG_CONFIG --cflags nss`
 EOF
                 
@@ -651 +634 @@
 if [ -z "$systemdsystemunitdir" ]; then
         if $PKG_CONFIG --exists systemd; then
-                systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
+                systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd`
         fi
 fi
@@ -672 +655 @@
 fi
 
+if [ "$rpc" = 0 ]; then
+        # Somewhat pointless at this stage already but at least this keeps it
+        # out of bitlbee.pc which is probably a good thing.
+        rpcplugindir=""
+fi
+
 otrprefix=""
+for i in / /usr /usr/local; do
+        if [ -f ${i}/lib/libotr.a ]; then
+                otrprefix=${i}
+                break
+        fi
+done
 if [ "$otr" = "auto" ]; then
-        ! $PKG_CONFIG --exists libotr
-        otr=$?
-fi
-
-if [ "$otr" != 0 ] && ! $PKG_CONFIG --atleast-version=4.0 --print-errors libotr; then
-        exit 1
-fi
-
+        if [ -n "$otrprefix" ]; then
+                otr=1
+        else
+                otr=0
+        fi
+fi
 if [ "$otr" = 1 ]; then
         # BI == built-in
         echo '#define OTR_BI' >> config.h
-        echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings
-        echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings
+        echo "EFLAGS+=-L${otrprefix}/lib -lotr -lgcrypt" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
         echo 'OTR_BI=otr.o' >> Makefile.settings
 elif [ "$otr" = "plugin" ]; then
-        # for some mysterious reason beyond the comprehension of my mortal mind,
-        # the libgcrypt flags aren't needed when building as plugin. add them anyway.
         echo '#define OTR_PI' >> config.h
-        echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings
-        echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings
+        echo "OTRFLAGS=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
         echo 'OTR_PI=otr.so' >> Makefile.settings
+fi
+if [ "$otr" != 0 ] && ! pkg-config libotr --atleast-version=4.0; then
+        echo
+        echo 'WARNING: Your libotr seems to be old. BitlBee now needs at least libotr 4.0.'
+        # Not hard-failing because the code above doesn't use pkg-config, so who knows
+        # what's true at this point...
 fi
 
@@ -750 +747 @@
 includedir=$includedir
 plugindir=$plugindir
+rpcplugindir=$rpcplugindir
 
 Name: bitlbee
@@ -842 +840 @@
         protocols=$protocols'twitter '
         protoobjs=$protoobjs'twitter_mod.o '
+fi
+
+if [ "$rpc" = 0 ]; then
+        echo '#undef WITH_RPC' >> config.h
+else
+        echo '#define WITH_RPC' >> config.h
+        protocols=$protocols'rpc '
+        protoobjs=$protoobjs'rpc_mod.o '
 fi
 
@@ -931 +937 @@
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl
-#echo '  Building with these storage backends: '$STORAGES
 
 if [ -n "$protocols" ]; then