New upstream version 1.0.0

[fdkaac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 58bc4225ea75d1dd40b228dcc1ebe4615fd93e7a..40673d0c26c7e3dc5321849ecdbd6d3f9679646e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,10 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 
-AC_CHECK_HEADERS([getopt.h sys/time.h])
-AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
+AC_CHECK_HEADERS([sys/time.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]))
 
@@ -30,9 +31,18 @@ AC_TYPE_UINT8_T
 AC_CHECK_TYPES([ptrdiff_t])
 
 AC_SYS_LARGEFILE
+AC_CHECK_TYPES([struct __timeb64],[],[],[[#include <sys/timeb.h>]])
 AC_FUNC_FSEEKO
-AC_CHECK_FUNCS([gettimeofday nl_langinfo strdup])
-AC_SEARCH_LIBS([aacEncOpen],[fdk-aac])
+AC_CHECK_FUNCS([sigaction gettimeofday nl_langinfo _vscprintf fseeko64])
+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