Missing M4 files in dist + fixed iconv detection.
This commit is contained in:
parent
66bbba08bd
commit
9e1c1e0923
19
SConstruct
19
SConstruct
@ -269,6 +269,8 @@ libvmime_extra = [
|
|||||||
'INSTALL',
|
'INSTALL',
|
||||||
'NEWS',
|
'NEWS',
|
||||||
'README',
|
'README',
|
||||||
|
'README.msvc',
|
||||||
|
'README.refcounting',
|
||||||
'SConstruct',
|
'SConstruct',
|
||||||
'vmime.doxygen'
|
'vmime.doxygen'
|
||||||
]
|
]
|
||||||
@ -319,6 +321,10 @@ libvmimetest_sources = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
libvmime_autotools = [
|
libvmime_autotools = [
|
||||||
|
'm4/iconv.m4',
|
||||||
|
'm4/lib-ld.m4',
|
||||||
|
'm4/lib-link.m4',
|
||||||
|
'm4/lib-prefix.m4',
|
||||||
'autotools/install-sh',
|
'autotools/install-sh',
|
||||||
# 'autotools/mkinstalldirs',
|
# 'autotools/mkinstalldirs',
|
||||||
'autotools/missing',
|
'autotools/missing',
|
||||||
@ -1173,18 +1179,13 @@ AM_ICONV
|
|||||||
|
|
||||||
# -- iconv
|
# -- iconv
|
||||||
AC_MSG_CHECKING([if an usable version of iconv exists (required)])
|
AC_MSG_CHECKING([if an usable version of iconv exists (required)])
|
||||||
AC_TRY_LINK(
|
|
||||||
[
|
if test "x$am_cv_func_iconv" = "xyes"; then
|
||||||
#include <iconv.h>
|
|
||||||
],[
|
|
||||||
iconv_t x = iconv_open("", "");
|
|
||||||
return 0;
|
|
||||||
],[
|
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
],[
|
else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
AC_ERROR(no usable version of iconv has been found)
|
AC_ERROR(no usable version of iconv has been found)
|
||||||
])
|
fi
|
||||||
|
|
||||||
# -- global constructors (stolen from 'configure.in' in libsigc++)
|
# -- global constructors (stolen from 'configure.in' in libsigc++)
|
||||||
AC_MSG_CHECKING([if linker supports global constructors])
|
AC_MSG_CHECKING([if linker supports global constructors])
|
||||||
|
Loading…
Reference in New Issue
Block a user