Re: Use GtkHTML: no?

[Paweł Sałek <pawsa0 gmail com>]

On 01/25/2010 12:15:36 AM, Geoffrey Leach wrote:
> On 01/24/2010 07:43:17 AM, Peter Bloomfield wrote:
> > On 01/23/2010 05:28:43 PM Sat, Geoffrey Leach wrote:
> > > On 01/23/2010 10:56:03 AM, Paweł Sałek wrote:
> > > > On 01/23/2010 07:32:39 PM, Geoffrey Leach wrote:
> > > > >
> > > > > Buillding 2.4.3, neither --with-gtkhtml nor --with-gtkhtml=3
> > gets
> > > > > around Use GtkHTML: no. So what am I missing?
> > > >
> > > > Have you got gtkhtml3-devel - or similar - installed? Does
> > config.log
> > >
> > > Yes and no. I checked /usr/lib/pkgconfig/libgtkhtml-3.14.pc and it
> > > appears that I have all of the prerequisites.
> > >
> > > I was unable to figure out how to get configure to save/not delete
> > the
> > > test file at the point where the GtkHTML test fails. If you could
> > help
> > > with that ...
> >
> > Are you configuring --with-webkit?  That causes configure to ignore
> > any other HTML options.  It should probably issue a warning that  
> it's
> > doing that...
>
> Sigh. Why me? Indeed, it was --with-webkit that was the problem. I've
> attached the config.log.  Thanks.

What do you think about an option conflict-checking patch, like the one  
attached?

Pawel

diff --git a/configure.in b/configure.in
index add2091..2c52637 100644
--- a/configure.in
+++ b/configure.in
@@ -383,7 +383,6 @@ if test x"$use_webkit" != xno ; then
     BALSA_CFLAGS="$BALSA_CFLAGS $WEBKIT_CFLAGS"
     BALSA_LIBS="$BALSA_LIBS $WEBKIT_LIBS"
     BALSA_AB_LIBS="$BALSA_AB_LIBS $WEBKIT_LIBS"
-    use_gtkhtml=no
 else
     AC_MSG_RESULT([no])
 fi
@@ -391,6 +390,9 @@ fi
 # GtkHtml library.
 #
 if test x"$use_gtkhtml" != xno ; then
+    if test x"$use_webkit" != xno ; then
+        AC_MSG_ERROR([--with-webkit and --with-gtkhtml are mutually exclusive.])
+    fi
     case "$use_gtkhtml" in
      2) check_pkgs="2.0 3.14 3.8 3.6 3.1 3.0";;
      *) check_pkgs="3.14 3.8 3.6 3.1 3.0 2.0";;
@@ -886,7 +888,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
         unset option
 fi
 
-# extra warnings for Subversion.
+# extra warnings for GIT.
 #
 
 if test -d "${srcdir}/.git" ; then
@@ -912,7 +914,7 @@ else
 	BALSA_FROM_GIT=no
 fi
 
-AC_MSG_CHECKING([for Subversion information])
+AC_MSG_CHECKING([for GIT information])
 AC_MSG_RESULT($BALSA_FROM_GIT)
 
 dnl #####################################################################