Changeset 6e9ae72 for configure

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

• configure (modified) (13 diffs)

configure

@@ -9 +9 @@
 
 prefix='/usr/local/'
-bindir='$prefix/sbin/'
+bindir='$prefix/bin/'
+sbindir='$prefix/sbin/'
 etcdir='$prefix/etc/bitlbee/'
 mandir='$prefix/share/man/'
@@ -19 +20 @@
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee.sock'
+ipcsocket=''
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
@@ -28 +29 @@
 yahoo=1
 twitter=1
-twitter=1
 purple=0
 
@@ -36 +36 @@
 plugins=1
 otr=0
+skype=0
 
 events=glib
@@ -59 +60 @@
 --prefix=...    Directories to put files in             $prefix
 --bindir=...                                            $bindir
+--sbindir=...                                           $sbindir
 --etcdir=...                                            $etcdir
 --mandir=...                                            $mandir
@@ -66 +68 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
---ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -83 +84 @@
 --otr=0/1/auto/plugin
                 Disable/enable OTR encryption support   $otr
+--skype=0/1/plugin
+                Disable/enable Skype support            $skype
 
 --events=...    Event handler (glib, libevent)          $events
@@ -98 +101 @@
 # 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'`
@@ -110 +114 @@
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
+protocols_mods=""
+
 cat<<EOF>Makefile.settings
 ## BitlBee settings, generated by configure
 PREFIX=$prefix
 BINDIR=$bindir
+SBINDIR=$sbindir
 ETCDIR=$etcdir
 MANDIR=$mandir
@@ -323 +330 @@
 
 RESOLV_TESTCODE='
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h> 
@@ -335 +344 @@
 detect_resolv_dynamic()
 {
+        case "$arch" in
+        FreeBSD )
+                # In FreeBSD res_* routines are present in libc.so
+                LIBRESOLV=;;
+        * )
+                LIBRESOLV=-lresolv;;
+        esac
         TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         ret=1
-        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
+        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - $LIBRESOLV >/dev/null 2>/dev/null
         if [ "$?" = "0" ]; then
-                echo 'EFLAGS+=-lresolv' >> Makefile.settings
+                echo "EFLAGS+=$LIBRESOLV" >> Makefile.settings
                 ret=0
         fi
@@ -538 +554 @@
 fi
 
+if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+        echo 'SKYPE_PI=skype.so' >> Makefile.settings
+        protocols_mods="$protocol_mods skype(plugin)"
+fi
+
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
         echo
@@ -751 +772 @@
 
 if [ -n "$protocols" ]; then
-        echo '  Building with these protocols:' $protocols
+        echo '  Building with these protocols:' $protocols$protocols_mods
         case "$protocols" in
         *purple*)