gtranslator r3551 - trunk

[icq svn gnome org]

Author: icq
Date: Sun Apr  6 15:02:07 2008
New Revision: 3551
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3551&view=rev

Log:
2008-04-06  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * configure.ac: Fixed open tran conditional.



Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Apr  6 15:02:07 2008
@@ -175,23 +175,22 @@
 if test "x$enable_opentran" != "xno"; then
 	PKG_CHECK_MODULES(SOUP,                            \
 		libsoup-2.2,
-		have_libsoup_2_2=yes,
-		have_libsoup_2_2=no)
-	if test x"$have_libsoup_2_2" = "xno"; then
+		have_libsoup=yes,
+		have_libsoup=no)
+	if test x"$have_libsoup" = "xno"; then
 		PKG_CHECK_MODULES(SOUP,
 			libsoup-2.4,
-			have_libsoup_2_4=yes,
-			have_libsoup_2_4=no)
-	fi
-	if test x"$have_libsoup_2_2" = "xyes"; then
+			have_libsoup=yes,
+			have_libsoup=no)
+		if test x"$have_libsoup" = "xyes"; then
+			AC_DEFINE(LIBSOUP_2_4, 1, [Define if libsoup support is enabled])
+		fi
+	else
 		AC_DEFINE(LIBSOUP_2_2, 1, [Define if libsoup support is enabled])
-	elif test x"$have_libsoup_2_4" = "xyes"; then
-                AC_DEFINE(LIBSOUP_2_4, 1, [Define if libsoup support is enabled])
 	fi
 fi
 
-AM_CONDITIONAL(USE_LIBSOUP, test x"$have_libsoup_2_2" = "xyes")
-AM_CONDITIONAL(USE_LIBSOUP, test x"$have_libsoup_2_4" = "xyes")
+AM_CONDITIONAL(USE_LIBSOUP, test x"$have_libsoup" = "xyes")
 
 # ================================================================
 # gdict