[sylpheed-jp:11132] Re: sylpheed のビルド中意図しないヘッダファイルがインクルードされてコンパイルが失敗する

[KISHIMOTO, Makoto]

> ファイル自体は $(top_builddir)/libsylph/base64.h にあるので、
> src/*.c のインクルードする側を
> 
> #include "libsylph/base64.h"
> 
> と書き換えてしまうのが確実ではないでしょうか。
> 
> 手元の Ubuntu 環境で /usr/local/include/base64.h を置いてもなぜか
> 優先してくれず確認できていないので、上記修正で回避できるか
> ご確認いただけますでしょうか。

そのような修正で、うまくいくことを確認しました。
（他のファイルについても気になりますが）
動作確認に使用したパッチを付けます。

diff -ur ../work/sylpheed-3.1.1/libsylph/base64.c ./libsylph/base64.c
--- ../work/sylpheed-3.1.1/libsylph/base64.c	2006-08-31 17:21:16.000000000 +0900
+++ ./libsylph/base64.c	2011-08-23 17:06:44.000000000 +0900
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "base64.h"
+#include "libsylph/base64.h"
 
 static const gchar base64char[64] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff -ur ../work/sylpheed-3.1.1/libsylph/codeconv.c ./libsylph/codeconv.c
--- ../work/sylpheed-3.1.1/libsylph/codeconv.c	2011-02-10 15:12:01.000000000 +0900
+++ ./libsylph/codeconv.c	2011-08-23 17:06:44.000000000 +0900
@@ -39,7 +39,7 @@
 #include "codeconv.h"
 #include "prefs_common.h"
 #include "unmime.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "quoted-printable.h"
 #include "utils.h"
 
diff -ur ../work/sylpheed-3.1.1/libsylph/imap.c ./libsylph/imap.c
--- ../work/sylpheed-3.1.1/libsylph/imap.c	2010-12-07 17:13:44.000000000 +0900
+++ ./libsylph/imap.c	2011-08-23 17:06:44.000000000 +0900
@@ -47,7 +47,7 @@
 #include "prefs_account.h"
 #include "codeconv.h"
 #include "md5_hmac.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "utils.h"
 #include "prefs_common.h"
 #include "virtual.h"
diff -ur ../work/sylpheed-3.1.1/libsylph/procmime.c ./libsylph/procmime.c
--- ../work/sylpheed-3.1.1/libsylph/procmime.c	2011-01-24 18:21:54.000000000 +0900
+++ ./libsylph/procmime.c	2011-08-23 17:06:44.000000000 +0900
@@ -32,7 +32,7 @@
 
 #include "procmime.h"
 #include "procheader.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "quoted-printable.h"
 #include "uuencode.h"
 #include "html.h"
diff -ur ../work/sylpheed-3.1.1/libsylph/smtp.c ./libsylph/smtp.c
--- ../work/sylpheed-3.1.1/libsylph/smtp.c	2008-12-11 13:30:21.000000000 +0900
+++ ./libsylph/smtp.c	2011-08-23 17:06:44.000000000 +0900
@@ -28,7 +28,7 @@
 
 #include "smtp.h"
 #include "md5_hmac.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "utils.h"
 
 static void smtp_session_destroy(Session *session);
diff -ur ../work/sylpheed-3.1.1/libsylph/unmime.c ./libsylph/unmime.c
--- ../work/sylpheed-3.1.1/libsylph/unmime.c	2006-08-31 17:21:16.000000000 +0900
+++ ./libsylph/unmime.c	2011-08-23 17:06:44.000000000 +0900
@@ -26,7 +26,7 @@
 #include <ctype.h>
 
 #include "codeconv.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "quoted-printable.h"
 
 #define ENCODED_WORD_BEGIN	"=?"
diff -ur ../work/sylpheed-3.1.1/src/compose.c ./src/compose.c
--- ../work/sylpheed-3.1.1/src/compose.c	2011-03-16 13:04:50.000000000 +0900
+++ ./src/compose.c	2011-08-23 17:06:44.000000000 +0900
@@ -118,7 +118,7 @@
 #include "procmime.h"
 #include "statusbar.h"
 #include "about.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "quoted-printable.h"
 #include "codeconv.h"
 #include "utils.h"
diff -ur ../work/sylpheed-3.1.1/src/ldif.c ./src/ldif.c
--- ../work/sylpheed-3.1.1/src/ldif.c	2010-08-12 17:52:12.000000000 +0900
+++ ./src/ldif.c	2011-08-23 17:06:44.000000000 +0900
@@ -31,7 +31,7 @@
 #include "addritem.h"
 #include "addrcache.h"
 
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "codeconv.h"
 #include "utils.h"
 
diff -ur ../work/sylpheed-3.1.1/src/rfc2015.c ./src/rfc2015.c
--- ../work/sylpheed-3.1.1/src/rfc2015.c	2010-02-04 13:15:51.000000000 +0900
+++ ./src/rfc2015.c	2011-08-23 17:06:44.000000000 +0900
@@ -38,7 +38,7 @@
 #include "procmsg.h"
 #include "procmime.h"
 #include "procheader.h"
-#include "base64.h"
+#include "libsylph/base64.h"
 #include "uuencode.h"
 #include "unmime.h"
 #include "codeconv.h"