enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
rbdpngn 2004-01-04 20:23:36 +00:00 committed by rbdpngn
parent 6bae1f82b5
commit df231df3b6
1 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
legacy/ecore/configure.in
View File

@ -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