Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
explicitly allow libiconv flags
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- configure.in 24 Oct 2004 10:49:05 -0000 1.59
+++ configure.in 8 Nov 2004 02:48:12 -0000 1.60
@@ -127,59 +127,74 @@
]
)
+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)
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
