Changeset 5d9b792

Timestamp:

2006-05-25T11:31:22Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

574af7e, 7bfd574

Parents:

0602496 (diff), 0a69d7b (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:

Merging from Jelmer.

Files:

• configure (modified) (4 diffs)
• protocols/nogaim.h (modified) (1 diff)
• util.c (modified) (1 diff)

configure

@@ -163 +163 @@
 fi
 
+GLIB=0
+
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         cat<<EOF>>Makefile.settings
@@ -169 +171 @@
 EOF
         echo '#define GLIB2' >> config.h
+        GLIB=2
 elif type glib-config > /dev/null 2> /dev/null; then
         cat<<EOF>>Makefile.settings
@@ -175 +178 @@
 EOF
         echo '#define GLIB1' >> config.h
+        GLIB=1
 else
         echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
@@ -180 +184 @@
 fi
 
-if [ -r /usr/include/iconv.h ]; then
+if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
         :;
 elif [ -r /usr/local/include/iconv.h ]; then

protocols/nogaim.h

@@ -52 +52 @@
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
 
-#define WEBSITE "http://www.bitlee.org/"
+#define WEBSITE "http://www.bitlbee.org/"
 #define IM_FLAG_AWAY 0x0020
 #define OPT_CONN_HTML 0x00000001

util.c

@@ -39 +39 @@
 #include <glib.h>
 #include <time.h>
+#ifdef GLIB2
+#define iconv_t GIConv
+#define iconv_open g_iconv_open
+#define iconv_close g_iconv_close
+#define iconv g_iconv
+#else
 #include <iconv.h>
+#endif
 
 void strip_linefeed(gchar *text)