From d5a9697e47f0c68f41576a5ace4eafbe6785b41e Mon Sep 17 00:00:00 2001 From: nu774 Date: Sun, 6 Jan 2013 14:07:01 +0900 Subject: [PATCH] more tweak on configure.ac and Makefile.am (take care of getopt_long) --- Makefile.am | 6 ++++++ configure.ac | 4 +++- version.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 980c751..c7feae8 100644 --- 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 a901b8e..cd8626d 100644 --- 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 e10f46a..8e6593b 100644 --- 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 -- 2.30.2