Version 1.3.0pre4.

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

diff --git a/configure.ac b/configure.ac
index 84b33fc..88e0995 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 # instead of FLAC__ since autoconf triggers off 'AC_' in strings
 
 AC_PREREQ(2.60)
-AC_INIT([flac], [1.3.0pre2], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/])
+AC_INIT([flac], [1.3.0pre4], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/flac/main.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -40,6 +40,7 @@ AC_PROG_MAKE_SET
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
+AC_CHECK_SIZEOF(off_t,1)       # Fake default value.
 AC_CHECK_SIZEOF([void*])
 AC_SEARCH_LIBS([lround],[m], [AC_DEFINE(HAVE_LROUND,1,lround support)])
 
@@ -123,16 +124,20 @@ case "$host" in
 esac
 AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue)
 
+os_is_windows=no
 case "$host" in
        *-*-cygwin|*mingw*|*emx*)
                # define this variable for enabling strict exports with libtool; for now, it's supported by Win32 and OS/2
                LT_NO_UNDEFINED="-no-undefined"
+               CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS"
+               os_is_windows=yes
                ;;
        *)
                LT_NO_UNDEFINED=
                ;;
 esac
 AC_SUBST(LT_NO_UNDEFINED)
+AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes)
 
 case "$host" in
        *-pc-linux-gnu)
@@ -303,9 +308,11 @@ fi
 AM_CONDITIONAL(FLaC__HAS_OGG, [test "x$have_ogg" = xyes])
 if test "x$have_ogg" = xyes ; then
        AC_DEFINE_UNQUOTED([FLAC__HAS_OGG],1,[define if you have the ogg library])
+       OGG_PACKAGE="ogg"
 else
        AC_DEFINE_UNQUOTED([FLAC__HAS_OGG],0)
 fi
+AC_SUBST(OGG_PACKAGE)
 
 dnl check for i18n(internationalization); these are from libiconv/gettext
 AM_ICONV
@@ -416,13 +423,6 @@ AC_CONFIG_FILES([ \
        src/plugin_common/Makefile \
        src/plugin_xmms/Makefile \
        src/share/Makefile \
-       src/share/getopt/Makefile \
-       src/share/grabbag/Makefile \
-       src/share/replaygain_analysis/Makefile \
-       src/share/replaygain_synthesis/Makefile \
-       src/share/replaygain_synthesis/include/Makefile \
-       src/share/replaygain_synthesis/include/private/Makefile \
-       src/share/utf8/Makefile \
        src/test_grabbag/Makefile \
        src/test_grabbag/cuesheet/Makefile \
        src/test_grabbag/picture/Makefile \