diff --git a/ChangeLog b/ChangeLog index 1c207f907..ecbab7e98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-09-12 [colin] 3.8.1cvs50 + + * claws-mail.pc.in + Put Claws-Mail CFLAGS first; fixes build on Fink/OS X + where the included menu.h could come from Ncurses. + Thanks to 'Stainless Steel Rat' + 2012-09-11 [colin] 3.8.1cvs49 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 84eb8639f..b5e84c4de 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4424,3 +4424,4 @@ ( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/bogofilter/bogofilter.c; ) > 3.8.1cvs47.patchset ( cvs diff -u -r 1.115.2.254 -r 1.115.2.255 src/main.c; ) > 3.8.1cvs48.patchset ( cvs diff -u -r 1.115.2.255 -r 1.115.2.256 src/main.c; ) > 3.8.1cvs49.patchset +( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 claws-mail.pc.in; ) > 3.8.1cvs50.patchset diff --git a/claws-mail.pc.in b/claws-mail.pc.in index ed824ec4f..c0c9572ac 100644 --- a/claws-mail.pc.in +++ b/claws-mail.pc.in @@ -11,4 +11,4 @@ Name: Claws Mail Description: Claws Mail Version: @MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@.@EXTRA_VERSION@ -Cflags: @ENCHANT_CFLAGS@ @GPGME_CFLAGS@ -I${pkgincludedir} -I${pkgincludedir}/common -I${pkgincludedir}/gtk +Cflags: -I${pkgincludedir}/common -I${pkgincludedir}/gtk @ENCHANT_CFLAGS@ @GPGME_CFLAGS@ -I${pkgincludedir} diff --git a/configure.ac b/configure.ac index 0134d5103..6bcd31f82 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=49 +EXTRA_VERSION=50 EXTRA_RELEASE= EXTRA_GTK2_VERSION=