New upstream version 1.0.0

[fdkaac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6fbe8c0cfc837d697d9c6c636ffbaa7f0de50917..40673d0c26c7e3dc5321849ecdbd6d3f9679646e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 
 AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
+AC_CHECK_HEADERS([libcharset.h langinfo.h endian.h byteswap.h])
 AC_CHECK_HEADERS([fdk-aac/aacenc_lib.h], ,
                  AC_MSG_ERROR([libfdk-aac is required]))
 
@@ -38,6 +38,12 @@ AC_CHECK_FUNC(getopt_long)
 AM_CONDITIONAL([FDK_NO_GETOPT_LONG],[test "$ac_cv_func_getopt_long" != "yes"])
 AC_SEARCH_LIBS([aacEncOpen],[fdk-aac],[],[],[])
 
+CHARSET_LIB=
+AC_CHECK_LIB([iconv], [locale_charset],
+       [CHARSET_LIB=-liconv],
+       [AC_CHECK_LIB([charset], [locale_charset], [CHARSET_LIB=-lcharset])])
+AC_SUBST([CHARSET_LIB])
+
 AC_CANONICAL_HOST
 
 X_PLATFORM=posix