more tweak on configure.ac and Makefile.am (take care of getopt_long)

diff --git a/Makefile.am b/Makefile.am
index 980c7512cc0bebd57bbe1a5da276ec6fb5beef26..c7feae8aa6c03b271b18da66004215a06134c684 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,12 @@ if FDK_PLATFORM_WIN32
        src/compat_win32.c
 endif
 
+if FDK_NO_GETOPT_LONG
+    fdkaac_SOURCES += \
+       missings/getopt.c
+    AM_CPPFLAGS = -Imissings
+endif
+
 EXTRA_DIST = \
     src/*.h      \
     missings/*.c \

diff --git a/configure.ac b/configure.ac
index a901b8e79cb48ce56a31382720675421d77b37a4..cd8626d078b5eb3a8e259f8f4729ddd5a3966541 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-AC_CHECK_HEADERS([getopt.h sys/time.h])
+AC_CHECK_HEADERS([sys/time.h])
 AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
 AC_CHECK_HEADERS([fdk-aac/aacenc_lib.h], ,
                  AC_MSG_ERROR([libfdk-aac is required]))
@@ -33,6 +33,8 @@ AC_CHECK_TYPES([ptrdiff_t])
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS([gettimeofday nl_langinfo strdup])
+AC_CHECK_FUNC(getopt_long)
+AM_CONDITIONAL([FDK_NO_GETOPT_LONG],[test "$ac_cv_func_getopt_long" != "yes"])
 AC_SEARCH_LIBS([aacEncOpen],[fdk-aac])
 
 AC_CANONICAL_HOST

diff --git a/version.h b/version.h
index e10f46adaab5e23c22250d374ea4de9c17135b6c..8e6593ba3627bff32440974c885ee591da643aa0 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #ifndef VERSION_H
 #define VERSION_H
-const char *fdkaac_version = "0.0.3";
+const char *fdkaac_version = "0.0.4";
 #endif