Re: Compile Problem: _N/TRUE/FALSE Conflict in libmutt

[Pawel Salek <pawsa TheoChem kth se>]

Dnia 2002.03.10 10:57 Steffen Klemer napisał(a):
> m 2002.03.10 08:21 schrieb(en) Pawel Salek:
>> On 2002.03.10 04:17 Julian M Catchen wrote:
>>> Hey Everyone,
> [snip]
>> There at least two other people experiencing this king of problem. 
>> Information that may help to resolve it includes:

Can you please verify whether the attached patch fixes the problem for 
you?

-pawel
Index: libbalsa/libbalsa_private.h
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/libbalsa_private.h,v
retrieving revision 1.13
diff -u -r1.13 libbalsa_private.h
--- libbalsa/libbalsa_private.h	19 Dec 2001 13:16:38 -0000	1.13
+++ libbalsa/libbalsa_private.h	10 Mar 2002 13:19:11 -0000
@@ -20,12 +20,10 @@
  * 02111-1307, USA.
  */
 
-#include <gnome.h>
-
-#include "libmutt/mutt.h"
-
 #ifndef __LIBBALSA_PRIVATE_H__
 #define __LIBBALSA_PRIVATE_H__
+
+#include "libmutt/mutt.h"
 
 LibBalsaAddress *libbalsa_address_new_from_libmutt(ADDRESS * caddr);
 /* private interfaces to avoid the libbalsa API */
Index: libbalsa/mailbox.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox.c,v
retrieving revision 1.191
diff -u -r1.191 mailbox.c
--- libbalsa/mailbox.c	23 Feb 2002 22:30:15 -0000	1.191
+++ libbalsa/mailbox.c	10 Mar 2002 13:19:12 -0000
@@ -21,15 +21,14 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <ctype.h>
 
 #ifdef BALSA_USE_THREADS
 #include <pthread.h>
 #endif
 
+
 #include "libbalsa.h"
-#include "libbalsa_private.h"
 #include "mailbackend.h"
 #include "misc.h"
 
@@ -37,9 +36,14 @@
 #include "threads.h"
 #endif
 
+#include <libgnome/gnome-defs.h> 
+#include <libgnome/gnome-config.h> 
+#include <libgnome/gnome-i18n.h> 
+
 #ifdef BALSA_SHOW_ALL
 #include "mailbox-filter.h"
 #endif
+#include "libbalsa_private.h"
 
 /* GTK_CLASS_TYPE for 1.2<->1.3/2.0 GTK+ compatibility */
 #ifndef GTK_CLASS_TYPE
Index: libbalsa/mailbox_imap.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox_imap.c,v
retrieving revision 1.55
diff -u -r1.55 mailbox_imap.c
--- libbalsa/mailbox_imap.c	23 Feb 2002 22:30:15 -0000	1.55
+++ libbalsa/mailbox_imap.c	10 Mar 2002 13:19:12 -0000
@@ -33,6 +33,8 @@
 #include <pthread.h>
 #endif
 
+#include <gnome.h> /* for gnome-i18n.h, gnome-config and gnome-util */
+
 #include "libbalsa.h"
 #include "libbalsa_private.h"
 #include "mx.h"
Index: libbalsa/mailbox_local.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox_local.c,v
retrieving revision 1.39
diff -u -r1.39 mailbox_local.c
--- libbalsa/mailbox_local.c	4 Mar 2002 22:17:48 -0000	1.39
+++ libbalsa/mailbox_local.c	10 Mar 2002 13:19:12 -0000
@@ -43,6 +43,10 @@
 #include "mailbox-filter.h"
 #endif /*BALSA_SHOW_ALL*/
 
+#include <libgnome/gnome-defs.h> 
+#include <libgnome/gnome-config.h> 
+#include <libgnome/gnome-i18n.h> 
+
 enum {
     REMOVE_FILES,
     LAST_SIGNAL
Index: libbalsa/mailbox_pop3.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox_pop3.c,v
retrieving revision 1.33
diff -u -r1.33 mailbox_pop3.c
--- libbalsa/mailbox_pop3.c	4 Mar 2002 22:17:48 -0000	1.33
+++ libbalsa/mailbox_pop3.c	10 Mar 2002 13:19:12 -0000
@@ -47,6 +47,10 @@
 #include "mailbox-filter.h"
 #endif
 
+#include <libgnome/gnome-defs.h> 
+#include <libgnome/gnome-config.h> 
+#include <libgnome/gnome-i18n.h> 
+
 static LibBalsaMailboxClass *parent_class = NULL;
 
 static void libbalsa_mailbox_pop3_destroy(GtkObject * object);
Index: libbalsa/message.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/message.c,v
retrieving revision 1.76
diff -u -r1.76 message.c
--- libbalsa/message.c	23 Feb 2002 22:30:15 -0000	1.76
+++ libbalsa/message.c	10 Mar 2002 13:19:12 -0000
@@ -33,7 +33,10 @@
 #include "config.h"
 
 #include <ctype.h>
+
 #include <glib.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-i18n.h> 
 
 #ifdef BALSA_USE_THREADS
 #include <pthread.h>
Index: libbalsa/pop3.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/pop3.c,v
retrieving revision 1.17
diff -u -r1.17 pop3.c
--- libbalsa/pop3.c	23 Feb 2002 22:30:15 -0000	1.17
+++ libbalsa/pop3.c	10 Mar 2002 13:19:12 -0000
@@ -23,7 +23,7 @@
  * Rather crude POP3 support.
  */
 
-#include "md5.h"
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -39,6 +39,8 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <gnome.h>
+
+#include "md5.h"
 #include "mutt.h"
 #include "libmutt/mailbox.h"
 #include "libbalsa.h"
Index: libbalsa/pop3.h
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/pop3.h,v
retrieving revision 1.2
diff -u -r1.2 pop3.h
--- libbalsa/pop3.h	12 Jul 2001 21:43:19 -0000	1.2
+++ libbalsa/pop3.h	10 Mar 2002 13:19:12 -0000
@@ -1,7 +1,7 @@
 /* -*-mode:c; c-style:k&r; c-basic-offset:4; -*- */
 /* Balsa E-Mail Client
  *
- * Copyright (C) 1997-2000 Stuart Parmenter and others,
+ * Copyright (C) 1997-2002 Stuart Parmenter and others,
  *                         See the file AUTHORS for a list.
  *
  * This program is free software; you can redistribute it and/or modify
Index: libbalsa/send.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/send.c,v
retrieving revision 1.146
diff -u -r1.146 send.c
--- libbalsa/send.c	2 Mar 2002 00:31:56 -0000	1.146
+++ libbalsa/send.c	10 Mar 2002 13:19:12 -0000
@@ -28,6 +28,8 @@
 #include <pthread.h>
 #endif
 
+#include <gnome.h>
+
 #include "libbalsa.h"
 #include "libbalsa_private.h"
 
Index: libbalsa/server.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/server.c,v
retrieving revision 1.18
diff -u -r1.18 server.c
--- libbalsa/server.c	23 Feb 2002 22:30:15 -0000	1.18
+++ libbalsa/server.c	10 Mar 2002 13:19:12 -0000
@@ -22,9 +22,12 @@
 
 #include "config.h"
 
+#include <gnome.h>
+
 #include "libbalsa.h"
 #include "libbalsa_private.h"
 #include "misc.h"
+
 
 /* GTK_CLASS_TYPE for 1.2<->1.3/2.0 GTK+ compatibility */
 #ifndef GTK_CLASS_TYPE
Index: libbalsa/source-viewer.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/source-viewer.c,v
retrieving revision 1.4
diff -u -r1.4 source-viewer.c
--- libbalsa/source-viewer.c	18 Oct 2001 21:10:45 -0000	1.4
+++ libbalsa/source-viewer.c	10 Mar 2002 13:19:12 -0000
@@ -22,12 +22,12 @@
    in in a GtkText widget.
 */
 
+#include "libbalsa.h"
+#include "libbalsa_private.h"
+
 #include <stdio.h>
 #include <gnome.h>
 
-#include "mutt.h"
-#include "libbalsa.h"
-#include "libbalsa_private.h"
 
 static void close_cb(GtkWidget* w, gpointer data);
 static void copy_cb(GtkWidget * w, gpointer data);
Index: libmutt/configure.in
===================================================================
RCS file: /cvs/gnome/balsa/libmutt/configure.in,v
retrieving revision 1.28
diff -u -r1.28 configure.in
--- libmutt/configure.in	25 Feb 2002 15:36:09 -0000	1.28
+++ libmutt/configure.in	10 Mar 2002 13:19:13 -0000
@@ -16,6 +16,7 @@
 AC_PROG_INSTALL
 AM_PROG_LIBTOOL
 
+AM_WITH_NLS
 AM_MAINTAINER_MODE
 
 AC_CANONICAL_HOST
Index: libmutt/lib.h
===================================================================
RCS file: /cvs/gnome/balsa/libmutt/lib.h,v
retrieving revision 1.1
diff -u -r1.1 lib.h
--- libmutt/lib.h	12 Feb 2001 10:15:49 -0000	1.1
+++ libmutt/lib.h	10 Mar 2002 13:19:13 -0000
@@ -44,22 +44,26 @@
 # endif
 
 #ifdef LIBMUTT
-# if defined(ENABLE_NLS) && 0
-#  include <libintl.h>
-char *mutt_gettext (const char *); /* gettext.c */
-# define _(a) (mutt_gettext (a))
-#  ifdef gettext_noop
-#   define N_(a) gettext_noop (a)
+# if !defined(BALSA_MAJOR) /* libbalsa includes i18h headers on its own */
+#  if defined(ENABLE_NLS)
+#   include <libintl.h>
+/* we need to define these extra function because mutt authors invented
+   own, incompatible with standard macros way of string translation */
+#   define _(String) (gettext (String))
+#   ifdef gettext_noop
+#        define N_(String) gettext_noop (String)
+#   else
+#        define N_(String) (String)
+#   endif
 #  else
-#   define N_(a) (a)
+#   define _(a) (a)
+#   define N_(a) a
 #  endif
-# else
-#  define _(a) (a)
-#  define N_(a) a
+# endif /* !defined(BALSA_MAJOR) */
+# if !defined(TRUE)
+#  define TRUE  1
+#  define FALSE 0
 # endif
-
-# define TRUE 1
-# define FALSE 0
 #endif
 
 # define HUGE_STRING	5120