From 309da35ab6ba9a19f9e1f75adbe90e891b7c52cc Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 7 Oct 2011 11:56:40 +0000 Subject: [PATCH 1/1] 2011-10-07 [colin] 3.7.10cvs24 * configure.ac Fix typos (thanks to Hanno) --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2beb4b0f0..6f2130699 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-07 [colin] 3.7.10cvs24 + + * configure.ac + Fix typos (thanks to Hanno) + 2011-10-07 [colin] 3.7.10cvs23 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index adaf8ae50..8e6d2887d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4227,3 +4227,4 @@ ( cvs diff -u -r 1.654.2.4301 -r 1.654.2.4302 configure.ac; cvs diff -u -r 1.12.2.68 -r 1.12.2.69 src/action.c; cvs diff -u -r 1.27.2.55 -r 1.27.2.56 src/addr_compl.c; cvs diff -u -r 1.5.10.34 -r 1.5.10.35 src/addrgather.c; cvs diff -u -r 1.382.2.582 -r 1.382.2.583 src/compose.c; cvs diff -u -r 1.50.2.62 -r 1.50.2.63 src/compose.h; cvs diff -u -r 1.8.2.41 -r 1.8.2.42 src/editldap.c; cvs diff -u -r 1.274.2.330 -r 1.274.2.331 src/mainwindow.c; cvs diff -u -r 1.3.12.40 -r 1.3.12.41 src/message_search.c; cvs diff -u -r 1.83.2.172 -r 1.83.2.173 src/mimeview.c; cvs diff -u -r 1.20.2.32 -r 1.20.2.33 src/mimeview.h; cvs diff -u -r 1.105.2.168 -r 1.105.2.169 src/prefs_account.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_compose_writing.c; cvs diff -u -r 1.1.4.71 -r 1.1.4.72 src/prefs_filtering_action.c; cvs diff -u -r 1.52.2.83 -r 1.52.2.84 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_logging.c; cvs diff -u -r 1.43.2.90 -r 1.43.2.91 src/prefs_matcher.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_message.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/prefs_other.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_receive.c; cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/prefs_summaries.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/printing.c; cvs diff -u -r 1.3.2.36 -r 1.3.2.37 src/ssl_manager.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/statusbar.c; cvs diff -u -r 1.25.2.69 -r 1.25.2.70 src/stock_pixmap.c; cvs diff -u -r 1.15.2.66 -r 1.15.2.67 src/summary_search.c; cvs diff -u -r 1.96.2.234 -r 1.96.2.235 src/textview.c; cvs diff -u -r 1.20.2.24 -r 1.20.2.25 src/gtk/Makefile.am; cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/colorlabel.c; cvs diff -u -r 1.5.2.97 -r 1.5.2.98 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.57 -r 1.4.2.58 src/gtk/gtkutils.h; cvs diff -u -r 1.1.4.39 -r 1.1.4.40 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.43 -r 1.5.2.44 src/gtk/menu.c; cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/gtk/menu.h; cvs diff -u -r 1.1.2.104 -r 1.1.2.105 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.23.2.55 -r 1.23.2.56 src/plugins/spamassassin/spamassassin_gtk.c; ) > 3.7.10cvs21.patchset ( cvs diff -u -r 1.654.2.4302 -r 1.654.2.4303 configure.ac; cvs diff -u -r 1.94.2.219 -r 1.94.2.220 src/messageview.c; cvs diff -u -r 1.20.2.25 -r 1.20.2.26 src/gtk/Makefile.am; ) > 3.7.10cvs22.patchset ( cvs diff -u -r 1.382.2.583 -r 1.382.2.584 src/compose.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtkshruler.h; ) > 3.7.10cvs23.patchset +( cvs diff -u -r 1.654.2.4304 -r 1.654.2.4305 configure.ac; ) > 3.7.10cvs24.patchset diff --git a/configure.ac b/configure.ac index 344e73a4a..0f16f3d14 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=10 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=23 +EXTRA_VERSION=24 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -157,7 +157,7 @@ fi CFLAGS="$CFLAGS -Wall" #if test $USE_MAINTAINER_MODE = yes; then -# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDESi -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE" +# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE" #fi pthread_name= @@ -466,7 +466,7 @@ dnl ************************ dnl Checks for GTK AC_ARG_ENABLE(gtk3, AS_HELP_STRING([--enable-gtk3], - [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]), + [Determines whether to use Gtk+ 3.0.]), [ac_cv_enable_gtk3=$enableval],[ac_cv_enable_gtk3=no]) AM_CONDITIONAL(GTK3, false) AM_CONDITIONAL(GTK2, true) -- 2.25.1