Changes in configure [7b23afd:f712188]

File:

• configure (modified) (7 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
 
@@ -75 +73 @@
 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
@@ -84 +81 @@
 MANDIR=$mandir
 DATADIR=$datadir
-PLUGINDIR=$plugindir
 CONFIG=$config
 
@@ -105 +101 @@
 #define ETCDIR "$etcdir"
 #define VARDIR "$datadir"
-#define PLUGINDIR "$plugindir"
 #define ARCH "$arch"
 #define CPU "$cpu"
@@ -123 +118 @@
 
 echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
+
+echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
 
 if [ -n "$CC" ]; then
@@ -146 +143 @@
 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