evolution-rss r258 - trunk

[lucilanga svn gnome org]

Author: lucilanga
Date: Sun May  4 18:43:58 2008
New Revision: 258
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=258&view=rev

Log:
fix disable-gecko option to skip tests #530343

Modified:
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun May  4 18:43:58 2008
@@ -144,8 +144,15 @@
 # gecko renderer
 # *******************************
 
-GECKO_INIT([GECKO], [have_gecko=yes], [have_gecko=no])
 GECKO_DEFINES
+AC_MSG_CHECKING([whether to include Gecko support])
+AC_ARG_ENABLE([gecko],
+        AS_HELP_STRING([--disable-gecko],[Disable Gecko (gtkmozembed) support (default: enabled)]),
+        [],[enable_gecko=yes])
+AC_MSG_RESULT([$enable_gecko])
+
+if test "$enable_gecko" = "yes"; then
+GECKO_INIT([GECKO], [have_gecko=yes], [have_gecko=no])
 
 AC_SUBST([GECKO])
 AC_SUBST([GECKO_FLAVOUR])
@@ -166,23 +173,16 @@
 *) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
 esac
 
-AC_MSG_CHECKING([whether to include Gecko support])
-AC_ARG_ENABLE([gecko],
-        AS_HELP_STRING([--disable-gecko],[Disable Gecko (gtkmozembed) support (default: enabled)]),
-        [],[enable_gecko=yes])
-AC_MSG_RESULT([$enable_gecko])
-
-if test "$enable_gecko" = "yes"; then
-	if test "x$have_gecko" != "xno"; then
-		if test $GECKO = libxul-embedding; then
-			PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
-			GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
-		else
-	    		#PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
-	    		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version])
-		fi
-	AC_SUBST([GECKO_CFLAGS])
-	AC_SUBST([GECKO_LIBS])
+if test "x$have_gecko" != "xno"; then
+	if test $GECKO = libxul-embedding -o $GECKO = libxul; then
+		PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
+		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
+	else
+    		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
+    		#PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version])
+	fi
+AC_SUBST([GECKO_CFLAGS])
+AC_SUBST([GECKO_LIBS])
 		if test "x$have_gecko" != "xno"; then
 		AC_DEFINE_UNQUOTED(HAVE_RENDERKIT,1, [either webkit or gtkmozemebed render engines are present])
 		AC_DEFINE_UNQUOTED(HAVE_GTKMOZEMBED,1, [gtkmozembed render engine present])