Changeset b6cd9e9

Timestamp:

2008-06-09T23:29:36Z (17 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:

• .bzrignore (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• configure (modified) (6 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• storage_xml.c (modified) (3 diffs)

.bzrignore

@@ -17 +17 @@
 *.gcno
 *.o
+coverage
+bitlbee.info

bitlbee.h

@@ -95 +95 @@
 #define g_main_quit             __PLEASE_USE_B_MAIN_QUIT__
 
-#ifndef F_OK
-#define F_OK 0
-#endif
-
 #ifndef G_GNUC_MALLOC
 /* Doesn't exist in GLib <=2.4 while everything else in BitlBee should

configure

@@ -74 +74 @@
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
+
+--target=...    Cross compilation target                same as host
 EOF
                 exit;
@@ -132 +134 @@
 EOF
 
+if [ -n "$target" ]; then
+        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
+        PATH=/usr/$target/bin:$PATH
+        CC=$target-cc
+        LD=$target-ld
+fi
+
 if [ "$debug" = "1" ]; then
         [ -z "$CFLAGS" ] && CFLAGS=-g
@@ -158 +167 @@
 echo "CC=$CC" >> Makefile.settings;
 
-if [ -n "$LD" ]; then
-        echo "LD=$LD" >> Makefile.settings;
-elif type ld > /dev/null 2> /dev/null; then
-        echo "LD=ld" >> Makefile.settings;
-else
-        echo 'Cannot find ld, aborting.'
-        exit 1;
-fi
+if [ -z "$LD" ]; then
+        if type ld > /dev/null 2> /dev/null; then
+                LD=ld
+        else
+                echo 'Cannot find ld, aborting.'
+                exit 1;
+        fi
+fi
+
+echo "LD=$LD" >> Makefile.settings
 
 if [ -z "$PKG_CONFIG" ]; then
@@ -213 +224 @@
 detect_gnutls()
 {
-        if libgnutls-config --version > /dev/null 2> /dev/null; then
+        if $PKG_CONFIG --exists gnutls; then
+                cat <<EOF>>Makefile.settings
+EFLAGS+=`$PKG_CONFIG --libs gnutls`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls`
+EOF
+                ssl=gnutls
+                ret=1
+        elif libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
 EFLAGS+=`libgnutls-config --libs`
@@ -375 +393 @@
 
 if [ "$gcov" = "1" ]; then
-        echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
-        echo "EFLAGS+=-lgcov" >> Makefile.settings
+        echo "CFLAGS+=--coverage" >> Makefile.settings
+        echo "EFLAGS+=--coverage" >> Makefile.settings
 fi
 
@@ -489 +507 @@
 esac
 
+if [ -n "$target" ]; then
+        echo "Cross-compiling for: $target"
+fi
+
 echo
 echo 'Configuration done:'

debian/changelog

@@ +1 @@
+bitlbee (1.2-5) UNRELEASED; urgency=low
+
+  * Add Homepage and Vcs-Bzr fields.
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
+
 bitlbee (1.2-4) unstable; urgency=low
 

debian/control

@@ -5 +5 @@
 Standards-Version: 3.5.9
 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
+Homepage: http://www.bitlbee.org/
+Vcs-Bzr: http://code.bitlbee.org/bitlbee/
 
 Package: bitlbee

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+#include <glib/gstdio.h>
 
 typedef enum
@@ -243 +244 @@
 static void xml_init( void )
 {
-        if( access( global.conf->configdir, F_OK ) != 0 )
+        if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) )
                 log_message( LOGLVL_WARNING, "The configuration directory `%s' does not exist. Configuration won't be saved.", global.conf->configdir );
-        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
+        else if( ! g_file_test( global.conf->configdir, G_FILE_TEST_EXISTS ) || g_access( global.conf->configdir, W_OK ) != 0 )
                 log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to `%s'.", global.conf->configdir );
 }
@@ -372 +373 @@
         g_free( path2 );
         
-        if( !overwrite && access( path, F_OK ) != -1 )
+        if( !overwrite && g_file_test( path, G_FILE_TEST_EXISTS ) )
                 return STORAGE_ALREADY_EXISTS;