[balsa] Do not allow configure with both webkit and gtkhtml



commit 4780902d8eb86587007ef42918e426b3ce6c2e1a
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Sep 3 18:52:37 2009 -0400

    Do not allow configure with both webkit and gtkhtml

 ChangeLog    |    5 +++++
 configure.in |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1f9c183..21fbf3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-03  Peter Bloomfield
+
+	* configure.in: do not allow configure with both webkit and
+	gtkhtml.
+
 2009-08-29  Albrecht DreÃ?
 
 	Improve the Mac OS X integration for a native "Carbon" build
diff --git a/configure.in b/configure.in
index ecd1fd2..0798693 100644
--- a/configure.in
+++ b/configure.in
@@ -386,10 +386,13 @@ AC_SUBST(BALSA_DEFS)
 #
 AC_MSG_CHECKING(whether to use WebKit)
 if test x"$use_webkit" != xno ; then
+    AC_MSG_RESULT([yes])
     if test x"$use_threads" = xno ; then
         AC_MSG_ERROR([WebKit cannot be used with threads disabled.])
     fi
-    AC_MSG_RESULT([yes])
+    if test x"$use_gtkhtml" != xno ; then
+        AC_MSG_ERROR([Do not specify both --with-webkit and --with-gtkhtml.])
+    fi
     PKG_CHECK_MODULES(WEBKIT, [webkit-1.0])
     AC_DEFINE(HAVE_WEBKIT,1,[Defined when WebKit can be used.])
     AC_DEFINE(HAVE_GTKHTML,1,[Defined when GtkHtml can be used.])



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