talons

commit 857abfa7c035d930dfda746fdbb3e546e0eba202
parent 3873c20dd4595ca0d790fd04711edd122ccfa8f8
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun, 26 Apr 2009 10:31:28 +0000

2009-04-26 [paul]	3.7.1cvs48

	* configure.ac
	* src/gtk/gtkaspell.h
		fix bug 1904, 'build mechanism looks for
		'enchant.h' in a wrong place'

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
3
++-
M
src/gtk/gtkaspell.h
 | 
2
+-

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-26 [paul]	3.7.1cvs48
+
+	* configure.ac
+	* src/gtk/gtkaspell.h
+		fix bug 1904, 'build mechanism looks for
+		'enchant.h' in a wrong place'
+
 2009-04-25 [paul]	3.7.1cvs47
 
 	* src/printing.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3787,3 +3787,4 @@
 ( cvs diff -u -r 1.382.2.506 -r 1.382.2.507 src/compose.c;  ) > 3.7.1cvs45.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/printing.c;  cvs diff -u -r 1.43.2.108 -r 1.43.2.109 src/toolbar.c;  ) > 3.7.1cvs46.patchset
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/printing.c;  ) > 3.7.1cvs47.patchset
+( cvs diff -u -r 1.654.2.3855 -r 1.654.2.3856 configure.ac;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/gtkaspell.h;  ) > 3.7.1cvs48.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -484,6 +484,7 @@ if test $ac_cv_enable_enchant = yes; then
 		AC_DEFINE(USE_ENCHANT, 1, enchant)
 		echo "Building with enchant"
 		ac_cv_enable_enchant=yes
+		CFLAGS="$CFLAGS `$PKG_CONFIG --cflags enchant`"
 	],
 	[
 		echo "Building without enchant-notification"
diff --git a/src/gtk/gtkaspell.h b/src/gtk/gtkaspell.h
@@ -38,7 +38,7 @@
 #ifdef USE_ENCHANT
 
 #include <gtk/gtk.h>
-#include <enchant/enchant.h>
+#include <enchant.h>
 
 #define GTKASPELLWORDSIZE 1024