Migrate my pluginable branch to use Wilmers' branch as parent

1 files changed, 7 insertions, 2 deletions

diff --git a/configure b/configure
index 985e8209..365159f7 100755
--- a/configure
+++ b/configure
@@ -13,6 +13,7 @@ etcdir='$prefix/etc/bitlbee/'
 mandir='$prefix/share/man/'
 datadir='$prefix/share/bitlbee/'
 config='/var/lib/bitlbee/'
+plugindir='$prefix/lib/bitlbee'
 
 msn=1
 jabber=1
@@ -44,6 +45,7 @@ Option		Description				Default
 --etcdir=...						$etcdir
 --mandir=...						$mandir
 --datadir=...						$datadir
+--plugindir=...						$plugindir
 --config=...						$config
 
 --msn=0/1	Disable/enable MSN part			$msn
@@ -72,6 +74,7 @@ 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'`
 
 cat<<EOF>Makefile.settings
 ## BitlBee settings, generated by configure
@@ -80,6 +83,7 @@ BINDIR=$bindir
 ETCDIR=$etcdir
 MANDIR=$mandir
 DATADIR=$datadir
+PLUGINDIR=$plugindir
 CONFIG=$config
 
 ARCH=$arch
@@ -100,6 +104,7 @@ cat<<EOF>config.h
 #define CONFIG "$config"
 #define ETCDIR "$etcdir"
 #define VARDIR "$datadir"
+#define PLUGINDIR "$plugindir"
 #define ARCH "$arch"
 #define CPU "$cpu"
 EOF
@@ -140,8 +145,8 @@ fi
 
 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`
-CFLAGS+=`pkg-config --cflags glib-2.0`
+EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0`
+CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0`
 EOF
 	echo '#define GLIB2' >> config.h
 elif type glib-config > /dev/null 2> /dev/null; then