Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
Flattened some of the nesting of macros for the ecore_txt check, hopefully
this will convince older autotools versions to play nice.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- configure.in 4 Jan 2004 00:31:29 -0000 1.36
+++ configure.in 4 Jan 2004 20:23:36 -0000 1.37
@@ -129,34 +129,49 @@
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
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
