forked from enlightenment/efl
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:
parent
6bae1f82b5
commit
df231df3b6
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue