Changes in configure [b5a22e3:8d6c4b1]

File:

• configure (modified) (11 diffs)

configure

@@ -14 +14 @@
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
-plugindir='$prefix/lib/bitlbee'
 
 msn=1
@@ -46 +45 @@
 --mandir=...                                            $mandir
 --datadir=...                                           $datadir
---plugindir=...                                         $plugindir
 --config=...                                            $config
 
@@ -74 +72 @@
 datadir=`eval echo "$datadir/" | sed 's/\/\{1,\}/\//g'`
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
-plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
@@ -83 +80 @@
 MANDIR=$mandir
 DATADIR=$datadir
-PLUGINDIR=$plugindir
 CONFIG=$config
 
@@ -104 +100 @@
 #define ETCDIR "$etcdir"
 #define VARDIR "$datadir"
-#define PLUGINDIR "$plugindir"
 #define ARCH "$arch"
 #define CPU "$cpu"
@@ -147 +142 @@
 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`
+CFLAGS+=`pkg-config --cflags glib-2.0`
 EOF
         echo '#define GLIB2' >> config.h
@@ -252 +247 @@
         if [ "$ret" = "0" ]; then
                 echo
-                echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
-                echo '       This is necessary for MSN and full Jabber support. To continue,'
-                echo '       install a suitable SSL library or disable MSN support (--msn=0).'
-                echo '       If you want Jabber without SSL support you can try --ssl=bogus.'
+                echo 'WARNING: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
+                echo '         This is necessary for MSN and full Jabber support. To continue,'
+                echo '         install a suitable SSL library or disable MSN support (--msn=0).'
+                echo '         If you want Jabber without SSL support you can try --ssl=bogus.'
                 
                 exit 1;
@@ -308 +303 @@
         echo '#define WITH_MSN' >> config.h
         protocols=$protocols'msn '
-        protoobjs=$protoobjs'msn_mod.o '
+        protoobjs=$protoobjs'msnn.o '
 fi
 
@@ -316 +311 @@
         echo '#define WITH_JABBER' >> config.h
         protocols=$protocols'jabber '
-        protoobjs=$protoobjs'jabber_mod.o '
+        protoobjs=$protoobjs'jabberr.o '
 fi
 
@@ -324 +319 @@
         echo '#define WITH_OSCAR' >> config.h
         protocols=$protocols'oscar '
-        protoobjs=$protoobjs'oscar_mod.o '
+        protoobjs=$protoobjs'oscarr.o '
 fi
 
@@ -332 +327 @@
         echo '#define WITH_YAHOO' >> config.h
         protocols=$protocols'yahoo '
-        protoobjs=$protoobjs'yahoo_mod.o '
+        protoobjs=$protoobjs'yahooo.o '
 fi