Changes in configure [f665dab:e506d6c]

File:

• configure (modified) (11 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
@@ -25 +28 @@
 strip=1
 ipv6=1
-ldb=auto
 ssl=auto
 
@@ -50 +52 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
+--ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -60 +63 @@
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
-
---ldb=0/1/auto  LDB support                             $ldb
 
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -79 +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
@@ -89 +93 @@
 DATADIR=$datadir
 PLUGINDIR=$plugindir
-PIDFILE=$pidfile
 CONFIG=$config
+IPCSOCKET=$ipcsocket
+INCLUDEDIR=$includedir
+PCDIR=$pcdir
 
 ARCH=$arch
@@ -112 +118 @@
 #define PLUGINDIR "$plugindir"
 #define PIDFILE "$pidfile"
+#define IPCSOCKET "$ipcsocket"
 #define ARCH "$arch"
 #define CPU "$cpu"
@@ -212 +219 @@
                 ret=0;
         fi;
-}
-
-detect_ldb()
-{
-        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG ldb; then
-                cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs ldb`
-CFLAGS+=`$PKG_CONFIG --cflags ldb`
-EOF
-                ldb=1
-                ret=1
-        else
-                ret=0
-        fi
 }
 
@@ -288 +281 @@
 fi
 
-if [ "$ldb" = "auto" ]; then
-        detect_ldb
-fi
-
-if [ "$ldb" = 0 ]; then
-        echo "LDB_OBJ=\# no ldb" >> Makefile.settings
-        echo "#undef LDB" >> config.h
-elif [ "$ldb" = 1 ]; then
-        echo "#define LDB 1" >> config.h
-        echo "LDB_OBJ=storage_ldb.o" >> Makefile.settings
-fi
-
 if [ "$strip" = 0 ]; then
         echo "STRIP=\# skip strip" >> Makefile.settings;
@@ -336 +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=''
@@ -437 +431 @@
         echo '  Building without IM-protocol support. We wish you a lot of fun...';
 fi
-
-if [ "$ldb" = "0" ]; then
-        echo "  LDB storage backend disabled."
-else
-        echo "  LDB storage backend enabled."
-fi