Fix building with MSYS and MinGW(-w64); Improve Makefile.lite build system

[platform/upstream/flac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1c936b3..75561cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,10 +19,11 @@
 # instead of FLAC__ since autoconf triggers off 'AC_' in strings
 
 AC_PREREQ(2.60)
-AC_INIT([flac], [1.2.1])
+AC_INIT([flac], [1.2.1], [flac-dev@xiph.org], [flac], [http://flac.sourceforge.net/])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/flac/main.c])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign 1.7 -Wall tar-pax no-dist-gzip dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall tar-pax no-dist-gzip dist-xz subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 user_cflags=$CFLAGS
@@ -39,18 +40,16 @@ AC_PROG_MAKE_SET
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
-AC_CHECK_SIZEOF(void*,0)
+AC_CHECK_SIZEOF([void*])
 AC_SEARCH_LIBS([lround],[m], [AC_DEFINE(HAVE_LROUND,1,lround support)])
-#@@@ new name is AC_CONFIG_HEADERS
-AM_CONFIG_HEADER(config.h)
 
-AC_LANG_PUSH(C++)
+AC_LANG_PUSH([C++])
 # c++ flavor first
 AC_C_VARARRAYS
 if test $ac_cv_c_vararrays = yes; then
        AC_DEFINE([HAVE_CXX_VARARRAYS], 1, [Define to 1 if C++ supports variable-length arrays.])
 fi
-AC_LANG_POP(C++)
+AC_LANG_POP([C++])
 
 # c flavor
 AC_HEADER_STDC
@@ -59,14 +58,7 @@ AC_C_INLINE
 AC_C_VARARRAYS
 AC_C_TYPEOF
 
-AC_CHECK_HEADERS(stdint.h)
-AC_SUBST(HAVE_STDINT_H)
-AC_CHECK_HEADERS(inttypes.h)
-AC_SUBST(HAVE_INTTYPES_H)
-AC_CHECK_HEADERS(byteswap.h)
-AC_SUBST(HAVE_BYTESWAP_H)
-
-AC_CHECK_HEADERS([sys/param.h])
+AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h])
 
 XIPH_C_BSWAP32
 
@@ -99,7 +91,7 @@ case "$host_cpu" in
                AC_DEFINE(FLAC__CPU_IA32)
                AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
                ;;
-       powerpc)
+       powerpc|powerpc64)
                cpu_ppc=true
                AC_DEFINE(FLAC__CPU_PPC)
                AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
@@ -452,13 +444,13 @@ AC_CONFIG_FILES([ \
        test/metaflac-test-files/Makefile \
        test/pictures/Makefile \
        build/Makefile \
-       obj/Makefile \
-       obj/debug/Makefile \
-       obj/debug/bin/Makefile \
-       obj/debug/lib/Makefile \
-       obj/release/Makefile \
-       obj/release/bin/Makefile \
-       obj/release/lib/Makefile \
+       objs/Makefile \
+       objs/debug/Makefile \
+       objs/debug/bin/Makefile \
+       objs/debug/lib/Makefile \
+       objs/release/Makefile \
+       objs/release/bin/Makefile \
+       objs/release/lib/Makefile \
 ])
 AC_OUTPUT
 
@@ -474,7 +466,8 @@ AC_MSG_RESULT([
     Host OS : ............................. ${host_os}
 ])
 
-if test x$ac_cv_c_compiler_gnu = xyes ; then
        echo "    Compiler is GCC : ..................... ${ac_cv_c_compiler_gnu}"
+if test x$ac_cv_c_compiler_gnu = xyes ; then
        echo "    GCC version : ......................... ${GCC_VERSION}"
-       fi
+fi
+echo