Flattened some of the nesting of macros for the ecore_txt check, hopefully

this will convince older autotools versions to play nice.

SVN revision: 8274

diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 02134a229987738ca98a36dbca1f22cabf94d166..2bb00d79bb8f7cbdb6a607d601b76de96232b182 100644 (file)
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -129,34 +129,49 @@ if test "x$have_ecore_txt" = "xyes"; then
       AC_DEFINE(BUILD_ECORE_TXT)
       AM_CONDITIONAL(BUILD_ECORE_TXT, true)
       ecore_txt_libs="-lecore_txt"
-    ], AC_CHECK_LIB(iconv, iconv,
-         [
-           AC_DEFINE(BUILD_ECORE_TXT)
-           AM_CONDITIONAL(BUILD_ECORE_TXT, true)
-           iconv_libs="-liconv"
-           ecore_txt_libs="-lecore_txt -liconv"
-         ], [
-           AC_CHECK_LIB(c, libiconv,
-             [
-               AC_DEFINE(BUILD_ECORE_TXT)
-               AM_CONDITIONAL(BUILD_ECORE_TXT, true)
-               ecore_txt_libs="-lecore_txt"
-             ], AC_CHECK_LIB(iconv, libiconv,
-                  [
-                    AC_DEFINE(BUILD_ECORE_TXT)
-                    AM_CONDITIONAL(BUILD_ECORE_TXT, true)
-                    iconv_libs="-liconv"
-                    ecore_txt_libs="-lecore_txt -liconv"
-                  ], [
-                    AC_MSG_RESULT("no - disabling ecore_txt")
-                    AM_CONDITIONAL(BUILD_ECORE_TXT, false)
-                    have_ecore_txt="no"
-                  ]
-                ),
-           )
-         ]
-       ),
+    ], [
+      have_ecore_txt="no"
+    ]
   )
+
+  if test "x$have_ecore_txt" != "xyes"; then
+    AC_CHECK_LIB(iconv, iconv,
+      [
+        AC_DEFINE(BUILD_ECORE_TXT)
+        AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+        iconv_libs="-liconv"
+        ecore_txt_libs="-lecore_txt -liconv"
+        have_ecore_txt="yes"
+      ]
+    )
+  fi
+
+  if test "x$have_ecore_txt" != "xyes"; then
+    AC_CHECK_LIB(c, libiconv,
+      [
+        AC_DEFINE(BUILD_ECORE_TXT)
+        AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+        ecore_txt_libs="-lecore_txt"
+        have_ecore_txt="yes"
+      ]
+    )
+  fi
+
+  if test "x$have_ecore_txt" != "xyes"; then
+    AC_CHECK_LIB(iconv, libiconv,
+      [
+        AC_DEFINE(BUILD_ECORE_TXT)
+        AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+        iconv_libs="-liconv"
+        ecore_txt_libs="-lecore_txt -liconv"
+        have_ecore_txt="yes"
+      ], [
+        AC_MSG_RESULT("no - disabling ecore_txt")
+        AM_CONDITIONAL(BUILD_ECORE_TXT, false)
+        have_ecore_txt="no"
+      ]
+    )
+  fi
 else
   AM_CONDITIONAL(BUILD_ECORE_TXT, false)
 fi