2005-07-21 [darko] 1.9.12cvs89

	* configure.ac
		link against libresolv if necessary (patch by Paul)
	* src/msgcache.c
		use glib's portable macros to determine endianness

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 29167c204043db32f7e9d38138d8160906833607..2aa1b0ae69beee8cb1a6d991ef7e60dce904d138 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-07-21 [darko]     1.9.12cvs89
+
+       * configure.ac
+               link against libresolv if necessary (patch by Paul)
+       * src/msgcache.c
+               use glib's portable macros to determine endianness
+

 2005-07-21 [paul]      1.9.12cvs88
 
        * src/crash.c
 2005-07-21 [paul]      1.9.12cvs88
 
        * src/crash.c

diff --git a/PATCHSETS b/PATCHSETS
index ebfa42680deea1e32abbac321f4aab130ac20be6..d3e82905b6aba4b6cd2beccfd6a0185dba737eb9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -683,3 +683,4 @@
 ( cvs diff -u -r 1.395.2.96 -r 1.395.2.97 src/summaryview.c;  ) > 1.9.12cvs86.patchset
 ( cvs diff -u -r 1.213.2.41 -r 1.213.2.42 src/folder.c;  cvs diff -u -r 1.96.2.64 -r 1.96.2.65 src/textview.c;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.18.2.7 -r 1.18.2.8 src/plugins/spamassassin/spamassassin.c;  ) > 1.9.12cvs87.patchset
 ( cvs diff -u -r 1.23.2.10 -r 1.23.2.11 src/crash.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/about.c;  ) > 1.9.12cvs88.patchset
 ( cvs diff -u -r 1.395.2.96 -r 1.395.2.97 src/summaryview.c;  ) > 1.9.12cvs86.patchset
 ( cvs diff -u -r 1.213.2.41 -r 1.213.2.42 src/folder.c;  cvs diff -u -r 1.96.2.64 -r 1.96.2.65 src/textview.c;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.18.2.7 -r 1.18.2.8 src/plugins/spamassassin/spamassassin.c;  ) > 1.9.12cvs87.patchset
 ( cvs diff -u -r 1.23.2.10 -r 1.23.2.11 src/crash.c;  cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/about.c;  ) > 1.9.12cvs88.patchset

+( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 commitHelper;  cvs diff -u -r 1.654.2.723 -r 1.654.2.724 configure.ac;  cvs diff -u -r 1.16.2.22 -r 1.16.2.23 src/msgcache.c;  ) > 1.9.12cvs89.patchset

diff --git a/commitHelper b/commitHelper
index e5f527538f471d29059e4549625ef569a9d862c2..04ed44d8e21a9772f5dfa8618b1ada889959a6f0 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -51,7 +51,7 @@ fi;
 if [ "$name" == "dinh" ]; then
        name="hoa";
 fi;
 if [ "$name" == "dinh" ]; then
        name="hoa";
 fi;

-if [ "$name" == "f" ]; then
+if [ "$name" == "f" -o "$name" == "darkok" ]; then

        name="darko";
 fi;
 
        name="darko";
 fi;
 

diff --git a/configure.ac b/configure.ac
index baebb6dea2a7f7533e93b7b76b1aaaca6f559460..ebfecbb4e2760c09134e8917902905c398fe14a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=88
+EXTRA_VERSION=89

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -419,6 +419,29 @@ else
 fi
 AC_SUBST(PTHREAD_LIBS)
 
 fi
 AC_SUBST(PTHREAD_LIBS)
 

+t_oldLibs="$LIBS"
+LIBS="$LIBS"
+ac_cv_var__res_options=no
+AC_TRY_LINK([#include <sys/types.h>
+            #include <sys/socket.h>
+            #include <netinet/in.h>
+            #include <arpa/nameser.h>
+            #include <resolv.h>],
+               [_res.options = RES_INIT;],
+               ac_cv_var__res_options=yes);
+if test "$ac_cv_var__res_options" != "yes"; then
+       LIBRESOLV="-lresolv"
+fi
+LIBS="$t_oldLibs"
+
+if test "x$LIBRESOLV" = "x"; then
+       AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv])
+       LIBS="$t_oldLibs"
+fi
+AC_SUBST(LIBRESOLV)
+
+LIBS="$LIBS $LIBRESOLV"
+                

 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,

diff --git a/src/msgcache.c b/src/msgcache.c
index 18ff7ca852a93e73db6b9bd8771684ebb9dfc6b5..06eed7f23257836568300c245bcc89e90507fdf6 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -24,14 +24,12 @@
 
 #include <time.h>
 
 
 #include <time.h>
 

-#include <endian.h>
-

 #include "msgcache.h"
 #include "utils.h"
 #include "procmsg.h"
 #include "codeconv.h"
 
 #include "msgcache.h"
 #include "utils.h"
 #include "procmsg.h"
 #include "codeconv.h"
 

-#ifdef __BIG_ENDIAN__
+#if G_BYTE_ORDER == G_BIG_ENDIAN

 #define bswap_32(x) \
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 #define bswap_32(x) \
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))