Changeset 27ac72d for configure


Ignore:
Timestamp:
2006-03-03T10:32:53Z (19 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r5e713f6 r27ac72d  
    1515config='/var/lib/bitlbee/'
    1616pidfile='/var/run/bitlbee.pid'
     17ipcsocket='/var/run/bitlbee'
    1718plugindir='$prefix/lib/bitlbee'
     19pcdir='$prefix/lib/pkgconfig'
     20includedir='$prefix/include/bitlbee'
    1821
    1922msn=1
     
    4952--pidfile=...                                           $pidfile
    5053--config=...                                            $config
     54--ipcsocket=...                                         $ipcsocket
    5155
    5256--msn=0/1       Disable/enable MSN part                 $msn
     
    7680config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    7781plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
    78 pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
     82pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
     83ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
     84includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
     85pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
    7986
    8087cat<<EOF>Makefile.settings
     
    8693DATADIR=$datadir
    8794PLUGINDIR=$plugindir
    88 PIDFILE=$pidfile
    8995CONFIG=$config
     96IPCSOCKET=$ipcsocket
     97INCLUDEDIR=$includedir
     98PCDIR=$pcdir
    9099
    91100ARCH=$arch
     
    109118#define PLUGINDIR "$plugindir"
    110119#define PIDFILE "$pidfile"
     120#define IPCSOCKET "$ipcsocket"
    111121#define ARCH "$arch"
    112122#define CPU "$cpu"
     
    307317fi
    308318
     319cat <<EOF>bitlbee.pc
     320prefix=$prefix
     321includedir=$includedir
     322
     323Name: bitlbee
     324Description: IRC to IM gateway
     325Requires: glib-2.0
     326Version: $BITLBEE_VERSION
     327Libs:
     328Cflags: -I\${includedir}
     329
     330EOF
     331
    309332protocols=''
    310333protoobjs=''
Note: See TracChangeset for help on using the changeset viewer.