From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 19 Jul 2007 11:55:40 +0000 (+0000)
Subject: 2007-07-19 [paul]	2.10.0cvs44
X-Git-Tag: rel_3_0_0~152
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8e39833c0ebd95dbc99f7d7aa68800d78daf10b4

2007-07-19 [paul]	2.10.0cvs44

	* src/Makefile.am
		fix build on n800
---

diff --git a/ChangeLog b/ChangeLog
index 17a65649c..beebab0ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-19 [paul]	2.10.0cvs44
+
+	* src/Makefile.am
+		fix build on n800
+
 2007-07-19 [colin]	2.10.0cvs43
 
 	* src/wizard.c
diff --git a/PATCHSETS b/PATCHSETS
index be99880c9..a3510545f 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2697,3 +2697,4 @@
 ( cvs diff -u -r 1.149.2.75 -r 1.149.2.76 src/inc.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/statusbar.c;  ) > 2.10.0cvs41.patchset
 ( cvs diff -u -r 1.149.2.76 -r 1.149.2.77 src/inc.c;  cvs diff -u -r 1.654.2.2751 -r 1.654.2.2752 configure.ac;  ) > 2.10.0cvs42.patchset
 ( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/wizard.c;  ) > 2.10.0cvs43.patchset
+( cvs diff -u -r 1.155.2.69 -r 1.155.2.70 src/Makefile.am;  ) > 2.10.0cvs44.patchset
diff --git a/configure.ac b/configure.ac
index 9a20a3a89..14e3db398 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f313a1ca8..2e0f8f11a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -424,6 +424,7 @@ EXTRA_DIST = \
 	pixmaps/spam_btn.xpm \
 	pixmaps/claws-mail_icon.xpm \
 	pixmaps/claws-mail_logo.xpm \
+	pixmaps/claws-mail_logo-small.xpm \
 	pixmaps/claws-mail.xpm \
 	pixmaps/trash_hrm.xpm \
 	pixmaps/trash.xpm \
@@ -481,7 +482,8 @@ claws_mail_LDADD = \
 	$(LIBICONV) \
 	$(STARTUP_NOTIFICATION_LIBS) \
 	$(LIBETPAN_LIBS) \
-	$(MAEMO_LIBS)
+	$(MAEMO_LIBS) \
+	$(CONIC_LIBS)
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Claws-Mail\" \
@@ -499,6 +501,7 @@ AM_CPPFLAGS = \
 	$(LIBETPAN_CPPFLAGS) \
 	$(STARTUP_NOTIFICATION_CFLAGS) \
 	$(MAEMO_CFLAGS) \
+	$(CONIC_CFLAGS) \
 	-Wno-unused-function
 	 
 #no-unused-function is there because of bison stuff