Changeset 27ac72d for configure

Timestamp:

2006-03-03T10:32:53Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

26fdfc5, 96ace1b

Parents:

5e713f6 (diff), cdb92c5 (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:

Merge from Jelmer.

File:

• configure (modified) (6 diffs)

configure

@@ -15 +15 @@
 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
@@ -49 +52 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
+--ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -76 +80 @@
 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
-pidfile=`eval echo "$pidfile/" | 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
@@ -86 +93 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
-PIDFILE=$pidfile
 CONFIG=$config
+IPCSOCKET=$ipcsocket
+INCLUDEDIR=$includedir
+PCDIR=$pcdir
 
 ARCH=$arch
@@ -109 +118 @@
 #define PLUGINDIR "$plugindir"
 #define PIDFILE "$pidfile"
+#define IPCSOCKET "$ipcsocket"
 #define ARCH "$arch"
 #define CPU "$cpu"
@@ -307 +317 @@
 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=''