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'

diff --git a/ChangeLog b/ChangeLog
index 6b29b40888cc7f417757113832467ce60e7d737f..f0042801426abf475ab6950133b31a54778ebac2 100644 (file)
--- 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
index 3635fe5ed2c6dc2e45e76dbe838972a7037fc23c..1173f095cb94f91e85f976ed547cd27d95dffdaf 100644 (file)
--- 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
index 728ebcea9dc5b015d40bfc24b31bc27624c20503..0eb58261fed2610a6bcff3d42ec248da0e57cd2c 100644 (file)
--- 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
index e4b5c87a03910a9375b933d591750f79802aaf86..397d62f3b6c2c8fec19d1a716bc4d2568e4f4e21 100644 (file)
--- 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