diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6988629a8ee..0cd0ec940b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1904,6 +1904,7 @@ if test x$host_win32 = xno; then AC_CHECK_FUNCS(getrlimit) AC_CHECK_FUNCS(prctl) AC_CHECK_FUNCS(arc4random) + AC_CHECK_FUNCS(nl_langinfo) AC_CHECK_FUNCS(sched_getaffinity) AC_CHECK_FUNCS(sched_setaffinity) @@ -4593,8 +4594,9 @@ if test $found_export_dynamic = no; then LDFLAGS="${old_ldflags}" fi -AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h iconv.h localcharset.h sys/types.h sys/resource.h) -AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+=" -liconv -lcharset"])]) +AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h iconv.h sys/types.h sys/resource.h) +dnl giconv.c will check on HAVE_ICONV_H but we need this for link time +AC_CHECK_LIB(iconv, iconv_open) AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0]) AC_SUBST(HAVE_ALLOCA_H) |