Changeset b6cd9e9


Ignore:
Timestamp:
2008-06-09T23:29:36Z (16 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
2e0f24d, 52df5df, ddd4779
Parents:
de8e584 (diff), 783e9b7 (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:

The merge from the future. 2025 is going to be awesome. :-)

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    rde8e584 rb6cd9e9  
    1717*.gcno
    1818*.o
     19coverage
     20bitlbee.info
  • bitlbee.h

    rde8e584 rb6cd9e9  
    9595#define g_main_quit             __PLEASE_USE_B_MAIN_QUIT__
    9696
    97 #ifndef F_OK
    98 #define F_OK 0
    99 #endif
    100 
    10197#ifndef G_GNUC_MALLOC
    10298/* Doesn't exist in GLib <=2.4 while everything else in BitlBee should
  • configure

    rde8e584 rb6cd9e9  
    7474--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
    7575                                                        $ssl
     76
     77--target=...    Cross compilation target                same as host
    7678EOF
    7779                exit;
     
    132134EOF
    133135
     136if [ -n "$target" ]; then
     137        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
     138        PATH=/usr/$target/bin:$PATH
     139        CC=$target-cc
     140        LD=$target-ld
     141fi
     142
    134143if [ "$debug" = "1" ]; then
    135144        [ -z "$CFLAGS" ] && CFLAGS=-g
     
    158167echo "CC=$CC" >> Makefile.settings;
    159168
    160 if [ -n "$LD" ]; then
    161         echo "LD=$LD" >> Makefile.settings;
    162 elif type ld > /dev/null 2> /dev/null; then
    163         echo "LD=ld" >> Makefile.settings;
    164 else
    165         echo 'Cannot find ld, aborting.'
    166         exit 1;
    167 fi
     169if [ -z "$LD" ]; then
     170        if type ld > /dev/null 2> /dev/null; then
     171                LD=ld
     172        else
     173                echo 'Cannot find ld, aborting.'
     174                exit 1;
     175        fi
     176fi
     177
     178echo "LD=$LD" >> Makefile.settings
    168179
    169180if [ -z "$PKG_CONFIG" ]; then
     
    213224detect_gnutls()
    214225{
    215         if libgnutls-config --version > /dev/null 2> /dev/null; then
     226        if $PKG_CONFIG --exists gnutls; then
     227                cat <<EOF>>Makefile.settings
     228EFLAGS+=`$PKG_CONFIG --libs gnutls`
     229CFLAGS+=`$PKG_CONFIG --cflags gnutls`
     230EOF
     231                ssl=gnutls
     232                ret=1
     233        elif libgnutls-config --version > /dev/null 2> /dev/null; then
    216234                cat <<EOF>>Makefile.settings
    217235EFLAGS+=`libgnutls-config --libs`
     
    375393
    376394if [ "$gcov" = "1" ]; then
    377         echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
    378         echo "EFLAGS+=-lgcov" >> Makefile.settings
     395        echo "CFLAGS+=--coverage" >> Makefile.settings
     396        echo "EFLAGS+=--coverage" >> Makefile.settings
    379397fi
    380398
     
    489507esac
    490508
     509if [ -n "$target" ]; then
     510        echo "Cross-compiling for: $target"
     511fi
     512
    491513echo
    492514echo 'Configuration done:'
  • debian/changelog

    rde8e584 rb6cd9e9  
     1bitlbee (1.2-5) UNRELEASED; urgency=low
     2
     3  * Add Homepage and Vcs-Bzr fields.
     4
     5 -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
     6
    17bitlbee (1.2-4) unstable; urgency=low
    28
  • debian/control

    rde8e584 rb6cd9e9  
    55Standards-Version: 3.5.9
    66Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
     7Homepage: http://www.bitlbee.org/
     8Vcs-Bzr: http://code.bitlbee.org/bitlbee/
    79
    810Package: bitlbee
  • storage_xml.c

    rde8e584 rb6cd9e9  
    2929#include "arc.h"
    3030#include "md5.h"
     31#include <glib/gstdio.h>
    3132
    3233typedef enum
     
    243244static void xml_init( void )
    244245{
    245         if( access( global.conf->configdir, F_OK ) != 0 )
     246        if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) )
    246247                log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
    247         else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
     248        else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 )
    248249                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
    249250}
     
    372373        g_free( path2 );
    373374       
    374         if( !overwrite && access( path, F_OK ) != -1 )
     375        if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) )
    375376                return STORAGE_ALREADY_EXISTS;
    376377       
Note: See TracChangeset for help on using the changeset viewer.