[balsa/gtk3] Clean up configure.in



commit e517627908c1fab097026a8c179acf4643581ff4
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Jan 23 21:46:50 2011 -0500

    Clean up configure.in
    
    	* configure.in: change html-widget default to "webkit", and warn
    	if it is not chosen; change gtkspell default to "no", and warn
    	if it is not chosen; clarify GtkSourceView option.

 ChangeLog    |    6 ++++++
 configure.in |   20 ++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6d21f05..92266cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-23  Peter Bloomfield
+
+	* configure.in: change html-widget default to "webkit", and warn
+	if it is not chosen; change gtkspell default to "no", and warn
+	if it is not chosen; clarify GtkSourceView option.
+
 2011-01-21  Peter Bloomfield
 
 	* libbalsa/html.c (lbh_show_info_bar), (libbalsa_html_new): use
diff --git a/configure.in b/configure.in
index 067ad6a..51c3445 100644
--- a/configure.in
+++ b/configure.in
@@ -125,19 +125,19 @@ AC_ARG_WITH(gss,
 
 AC_ARG_WITH(html-widget,
             AC_HELP_STRING([--with-html-widget=(no|gtkhtml2|gtkhtml3|webkit)],
-                           [select the HTML renderer (default gtkhtml3)]),
+                           [select the HTML renderer (default webkit)]),
             [use_html_widget=$withval],
-            [use_html_widget=gtkhtml3])
+            [use_html_widget=webkit])
 
 AC_ARG_WITH([gtksourceview],
    AC_HELP_STRING([--with-gtksourceview],
-                  [Use GtkSourceView if available (default=no, specify version 1 or 2, yes=2)]),
+                  [Use GtkSourceView-3 if available (default=no)]),
 		  [with_gtksourceview=$withval],[with_gtksourceview=no])
 
 AC_ARG_WITH([gtkspell],
    AC_HELP_STRING([--with-gtkspell],
-                  [Use GtkSpell/enchant if available (default=yes)]),
-		  [with_gtkspell=$withval],[with_gtkspell=yes])
+                  [Use GtkSpell/enchant if available (default=no)]),
+		  [with_gtkspell=$withval],[with_gtkspell=no])
 
 AC_ARG_WITH(iconv,      
    AC_HELP_STRING([--with-iconv=DIR],
@@ -754,7 +754,7 @@ fi
 #
 if test x$with_gtksourceview != xno; then
     PKG_CHECK_MODULES(GTKSOURCEVIEW, [ gtksourceview-3.0 ])
-    AC_DEFINE(HAVE_GTKSOURCEVIEW,3,[Defined when GtkSourceView can be used.])
+    AC_DEFINE(HAVE_GTKSOURCEVIEW,3,[Defined when GtkSourceView-3 can be used.])
     AC_MSG_NOTICE([Note: using GtkSourceview Version 3])
     with_gtksourceview=3
     BALSA_CFLAGS="$BALSA_CFLAGS $GTKSOURCEVIEW_CFLAGS"
@@ -886,6 +886,7 @@ if test -d "${srcdir}/.git" ; then
 -DG_DISABLE_SINGLE_INCLUDES \
 -DGDK_DISABLE_DEPRECATED \
 -DGDK_PIXBUF_DISABLE_DEPRECATED \
+-DGDK_MULTIDEVICE_SAFE \
 -DGMIME_DISABLE_DEPRECATED \
 -DGNOME_DISABLE_DEPRECATED \
 -DGNOME_DISABLE_DEPRECATED_SOURCE \
@@ -1033,3 +1034,10 @@ if test x"$BALSA_FROM_GIT" = xyes ; then
 	echo "======================================================================"
 	echo ""
 fi
+
+if test x$with_gtkspell != xno; then
+    echo "WARNING! linking with current GtkSpell may cause Balsa not to run!"
+fi
+if test x$use_html_widget != xwebkit; then
+    echo "WARNING! linking with $use_html_widget may cause Balsa not to run!"
+fi



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]