explicitly allow libiconv flags

SVN revision: 12147

diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 12beb8e..13d1c10 100644 (file)
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -127,59 +127,74 @@ AC_ARG_ENABLE(ecore-txt,
 ]
 )
 
+AC_ARG_WITH(iconv-link,
+[  --with-iconv-link=ICONV_LINK     explicitly specify an iconv link option],
+[
+  v=$withval;
+  iconv_libs=$v;
+  echo "  Ecore iconv link flags explicitly set to: "$iconv_libs;
+])
+
 if test "x$have_ecore_txt" = "xyes"; then
+  if test -z "$iconv_libs"; then 
     AC_CHECK_LIB(iconv, libiconv,
       [
         AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
         AM_CONDITIONAL(BUILD_ECORE_TXT, true)
         iconv_libs="-liconv"
-        ecore_txt_libs="-lecore_txt -liconv"
+        ecore_txt_libs="-lecore_txt "$iconv_libs
         have_ecore_txt="yes"
       ], [
         have_ecore_txt="no"
       ]
     )
   
-  if test "x$have_ecore_txt" != "xyes"; then
-    AC_CHECK_LIB(iconv, iconv,
-      [
-        AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
-        AM_CONDITIONAL(BUILD_ECORE_TXT, true)
-        iconv_libs="-liconv"
-        ecore_txt_libs="-lecore_txt -liconv"
-        have_ecore_txt="yes"
-      ], [
-        have_ecore_txt="no"
-      ]
-    )
-  fi
+    if test "x$have_ecore_txt" != "xyes"; then
+      AC_CHECK_LIB(iconv, iconv,
+        [
+          AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
+          AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+          iconv_libs="-liconv"
+          ecore_txt_libs="-lecore_txt "$iconv_libs
+          have_ecore_txt="yes"
+        ], [
+          have_ecore_txt="no"
+        ]
+      )
+    fi
 
-  if test "x$have_ecore_txt" != "xyes"; then
-    AC_CHECK_LIB(c, libiconv,
-      [
-        AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
-        AM_CONDITIONAL(BUILD_ECORE_TXT, true)
-        ecore_txt_libs="-lecore_txt"
-        have_ecore_txt="yes"
-       ], [
-        have_ecore_txt="no"
-      ]
-    )
-  fi
+    if test "x$have_ecore_txt" != "xyes"; then
+      AC_CHECK_LIB(c, libiconv,
+        [
+          AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
+          AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+          ecore_txt_libs="-lecore_txt "$iconv_libs
+          have_ecore_txt="yes"
+         ], [
+          have_ecore_txt="no"
+        ]
+      )
+    fi
 
-  if test "x$have_ecore_txt" != "xyes"; then
-    AC_CHECK_LIB(c, iconv,
-      [
-        AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
-        AM_CONDITIONAL(BUILD_ECORE_TXT, true)
-        ecore_txt_libs="-lecore_txt"
-        have_ecore_txt="yes"
-      ], [
-        AC_MSG_RESULT("no - disabling ecore_txt")
-        AM_CONDITIONAL(BUILD_ECORE_TXT, false)
-        have_ecore_txt="no"
-      ]
-    )
+    if test "x$have_ecore_txt" != "xyes"; then
+      AC_CHECK_LIB(c, iconv,
+        [
+          AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
+          AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+          ecore_txt_libs="-lecore_txt "$iconv_libs
+          have_ecore_txt="yes"
+        ], [
+          AC_MSG_RESULT("no - disabling ecore_txt")
+          AM_CONDITIONAL(BUILD_ECORE_TXT, false)
+          have_ecore_txt="no"
+        ]
+      )
+    fi
+  else
+    AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
+    AM_CONDITIONAL(BUILD_ECORE_TXT, true)
+    ecore_txt_libs="-lecore_txt "$iconv_libs
+    have_ecore_txt="yes"
   fi
 else
   AM_CONDITIONAL(BUILD_ECORE_TXT, false)