From e506d6ce40dd357e29a7c856ab2b664df69cf015 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 2 Mar 2006 12:38:33 +0100
Subject: Install bitlbee's header files and a pkg-config file. This means that
 3rd-parties can write support for additional protocols in BitlBee.

---
 configure | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 751e5b32..ff79bb49 100755
--- a/configure
+++ b/configure
@@ -16,6 +16,8 @@ config='/var/lib/bitlbee/'
 pidfile='/var/run/bitlbee.pid'
 ipcsocket='/var/run/bitlbee'
 plugindir='$prefix/lib/bitlbee'
+pcdir='$prefix/lib/pkgconfig'
+includedir='$prefix/include/bitlbee'
 
 msn=1
 jabber=1
@@ -79,6 +81,8 @@ config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
+includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
+pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
 cat<<EOF>Makefile.settings
 ## BitlBee settings, generated by configure
@@ -90,6 +94,8 @@ DATADIR=$datadir
 PLUGINDIR=$plugindir
 CONFIG=$config
 IPCSOCKET=$ipcsocket
+INCLUDEDIR=$includedir
+PCDIR=$pcdir
 
 ARCH=$arch
 CPU=$cpu
@@ -310,6 +316,19 @@ if [ -n "$BITLBEE_VERSION" ]; then
 	echo
 fi
 
+cat <<EOF>bitlbee.pc
+prefix=$prefix
+includedir=$includedir
+
+Name: bitlbee
+Description: IRC to IM gateway
+Requires: glib-2.0
+Version: $BITLBEE_VERSION
+Libs:
+Cflags: -I\${includedir}
+
+EOF
+
 protocols=''
 protoobjs=''
 
-- 
cgit v1.2.3


From a014331db88702de88f3327a0b87f9b8258c8d43 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 30 Mar 2006 19:14:38 +0200
Subject: Made configure quiet when it can't find bzr, and added repository
 nick to generated version number.

---
 configure | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index ff79bb49..a602fe3a 100755
--- a/configure
+++ b/configure
@@ -303,10 +303,16 @@ else
 fi
 
 echo
-if [ -z "$BITLBEE_VERSION" -a -d .bzr -a -x "`which bzr`" ]; then
+if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
+	nick=`bzr nick`
+	if [ -n "$nick" -a "$nick" != "bitlbee" ]; then
+		nick="-$nick"
+	else
+		nick=""
+	fi
 	rev=`bzr revno`
 	echo 'Using bzr revision #'$rev' as version number'
-	BITLBEE_VERSION=\"bzr-$rev\"
+	BITLBEE_VERSION=\"bzr$nick-$rev\"
 fi
 
 if [ -n "$BITLBEE_VERSION" ]; then
-- 
cgit v1.2.3