complete largefile support
diff --git a/configure.in b/configure.in
index fddfb87..ffe07ac 100644
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,9 @@
AC_SYS_LARGEFILE
AC_FUNC_FSEEKO
+#@@@ new name is AC_CONFIG_HEADERS
+AM_CONFIG_HEADER(config.h)
+
AC_CHECK_TYPES(socklen_t, [], [])
dnl check for getopt in standard library
@@ -49,13 +52,25 @@
AC_CHECK_FUNCS(getopt_long, [], [])
case "$host_cpu" in
- i*86) cpu_ia32=true ; AC_DEFINE(FLAC__CPU_IA32) ;;
- powerpc) cpu_ppc=true ; AC_DEFINE(FLAC__CPU_PPC) ;;
- sparc) cpu_sparc=true ; AC_DEFINE(FLAC__CPU_SPARC) ;;
+ i*86)
+ cpu_ia32=true
+ AC_DEFINE(FLAC__CPU_IA32)
+ AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
+ ;;
+ powerpc)
+ cpu_ppc=true
+ AC_DEFINE(FLAC__CPU_PPC)
+ AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
+ ;;
+ sparc)
+ cpu_sparc=true
+ AC_DEFINE(FLAC__CPU_SPARC)
+ AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC])
+ ;;
esac
-AM_CONDITIONAL(FLaC__CPU_IA32, test x$cpu_ia32 = xtrue)
-AM_CONDITIONAL(FLaC__CPU_PPC, test x$cpu_ppc = xtrue)
-AM_CONDITIONAL(FLaC__CPU_SPARC, test x$cpu_sparc = xtrue)
+AM_CONDITIONAL(FLaC__CPU_IA32, test "x$cpu_ia32" = xtrue)
+AM_CONDITIONAL(FLaC__CPU_PPC, test "x$cpu_ppc" = xtrue)
+AM_CONDITIONAL(FLaC__CPU_SPARC, test "x$cpu_sparc" = xtrue)
case "$host" in
i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;;
*-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;;
@@ -63,20 +78,30 @@
esac
AC_SUBST(OBJ_FORMAT)
case "$host" in
- *-pc-linux-gnu) sys_linux=true ; AC_DEFINE(FLAC__SYS_LINUX) ;;
- *-*-darwin*) sys_darwin=true ; AC_DEFINE(FLAC__SYS_DARWIN) ;;
+ *-pc-linux-gnu)
+ sys_linux=true
+ AC_DEFINE(FLAC__SYS_LINUX)
+ AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux])
+ ;;
+ *-*-darwin*)
+ sys_darwin=true
+ AC_DEFINE(FLAC__SYS_DARWIN)
+ AH_TEMPLATE(FLAC__SYS_DARWIN, [define if building for Darwin / MacOS X])
+ ;;
esac
-AM_CONDITIONAL(FLaC__SYS_DARWIN, test x$sys_darwin = xtrue)
-AM_CONDITIONAL(FLaC__SYS_LINUX, test x$sys_linux = xtrue)
+AM_CONDITIONAL(FLaC__SYS_DARWIN, test "x$sys_darwin" = xtrue)
+AM_CONDITIONAL(FLaC__SYS_LINUX, test "x$sys_linux" = xtrue)
-if test x$cpu_ia32 = xtrue ; then
+if test "x$cpu_ia32" = xtrue ; then
AC_DEFINE(FLAC__ALIGN_MALLOC_DATA)
+AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries])
fi
-AC_ARG_ENABLE(asm-optimizations, [ --disable-asm-optimizations Don't use any assembly optimization routines], asm_opt=no, asm_opt=yes)
-AM_CONDITIONAL(FLaC__NO_ASM, test x$asm_opt = xno)
-if test x$asm_opt = xno ; then
+AC_ARG_ENABLE(asm-optimizations, AC_HELP_STRING([--disable-asm-optimizations], [Don't use any assembly optimization routines]), asm_opt=no, asm_opt=yes)
+AM_CONDITIONAL(FLaC__NO_ASM, test "x$asm_opt" = xno)
+if test "x$asm_opt" = xno ; then
AC_DEFINE(FLAC__NO_ASM)
+AH_TEMPLATE(FLAC__NO_ASM, [define to disable use of assembly code])
fi
AC_ARG_ENABLE(debug,
@@ -86,7 +111,7 @@
no) debug=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
esac],[debug=false])
-AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
+AM_CONDITIONAL(DEBUG, test "x$debug" = xtrue)
AC_ARG_ENABLE(sse,
[ --enable-sse Enable SSE support by asserting that the OS supports SSE instructions],
@@ -95,9 +120,10 @@
no) sse_os=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-sse) ;;
esac],[sse_os=false])
-AM_CONDITIONAL(FLaC__SSE_OS, test x$sse_os = xtrue)
-if test x$sse_os = xtrue ; then
+AM_CONDITIONAL(FLaC__SSE_OS, test "x$sse_os" = xtrue)
+if test "x$sse_os" = xtrue ; then
AC_DEFINE(FLAC__SSE_OS)
+AH_TEMPLATE(FLAC__SSE_OS, [define if your operating system supports SSE instructions])
fi
AC_ARG_ENABLE(3dnow,
@@ -107,9 +133,10 @@
no) use_3dnow=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-3dnow) ;;
esac],[use_3dnow=true])
-AM_CONDITIONAL(FLaC__USE_3DNOW, test x$use_3dnow = xtrue)
-if test x$use_3dnow = xtrue ; then
+AM_CONDITIONAL(FLaC__USE_3DNOW, test "x$use_3dnow" = xtrue)
+if test "x$use_3dnow" = xtrue ; then
AC_DEFINE(FLAC__USE_3DNOW)
+AH_TEMPLATE(FLAC__USE_3DNOW, [define to enable use of 3Dnow! instructions])
fi
AC_ARG_ENABLE(altivec,
@@ -119,9 +146,10 @@
no) use_altivec=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-altivec) ;;
esac],[use_altivec=true])
-AM_CONDITIONAL(FLaC__USE_ALTIVEC, test x$use_altivec = xtrue)
-if test x$use_altivec = xtrue ; then
+AM_CONDITIONAL(FLaC__USE_ALTIVEC, test "x$use_altivec" = xtrue)
+if test "x$use_altivec" = xtrue ; then
AC_DEFINE(FLAC__USE_ALTIVEC)
+AH_TEMPLATE(FLAC__USE_ALTIVEC, [define to enable use of Altivec instructions])
fi
AC_ARG_ENABLE(local-xmms-plugin,
@@ -131,7 +159,7 @@
no) install_xmms_plugin_locally=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-local-xmms-plugin) ;;
esac],[install_xmms_plugin_locally=false])
-AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test x$install_xmms_plugin_locally = xtrue)
+AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test "x$install_xmms_plugin_locally" = xtrue)
AC_ARG_ENABLE(exhaustive-tests,
[ --enable-exhaustive-tests Enable exhaustive testing],
@@ -140,50 +168,57 @@
no) exhaustive_tests=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-exhaustive-tests) ;;
esac],[exhaustive_tests=false])
-AM_CONDITIONAL(FLaC__EXHAUSTIVE_TESTS, test x$exhaustive_tests = xtrue)
-if test x$exhaustive_tests = xtrue ; then
+AM_CONDITIONAL(FLaC__EXHAUSTIVE_TESTS, test "x$exhaustive_tests" = xtrue)
+if test "x$exhaustive_tests" = xtrue ; then
AC_DEFINE(FLAC__EXHAUSTIVE_TESTS)
+AH_TEMPLATE(FLAC__EXHAUSTIVE_TESTS, [define to run even more tests])
fi
AC_ARG_ENABLE(valgrind-testing,
-[ --enable-valgrind-testing Run all tests inside Valgrind],
+AC_HELP_STRING([--enable-valgrind-testing], [Run all tests inside Valgrind]),
[case "${enableval}" in
yes) valgrind_testing=true ;;
no) valgrind_testing=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind-testing) ;;
esac],[valgrind_testing=false])
-AM_CONDITIONAL(FLaC__VALGRIND_TESTING, test x$valgrind_testing = xtrue)
-if test x$valgrind_testing = xtrue ; then
+AM_CONDITIONAL(FLaC__VALGRIND_TESTING, test "x$valgrind_testing" = xtrue)
+if test "x$valgrind_testing" = xtrue ; then
AC_DEFINE(FLAC__VALGRIND_TESTING)
+AH_TEMPLATE(FLAC__VALGRIND_TESTING, [define to enable use of Valgrind in testers])
fi
+AC_ARG_ENABLE(doxygen-docs,
+AC_HELP_STRING([--disable-doxygen-docs], [Disable API documentation building via Doxygen]),
+[case "${enableval}" in
+ yes) enable_doxygen_docs=true ;;
+ no) enable_doxygen_docs=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-doxygen-docs) ;;
+esac],[enable_doxygen_docs=true])
+if test "x$enable_doxygen_docs" != xno ; then
+ AC_CHECK_PROGS(DOXYGEN, doxygen)
+fi
+AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
+
dnl check for ogg library
XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
-AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
-if test x$have_ogg = xyes ; then
+AM_CONDITIONAL(FLaC__HAS_OGG, [test "x$have_ogg" = xyes])
+if test "x$have_ogg" = xyes ; then
AC_DEFINE(FLAC__HAS_OGG)
+AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
fi
AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built]))
-AM_CONDITIONAL(FLaC__HAS_XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x)
+AM_CONDITIONAL(FLaC__HAS_XMMS, test -n "$XMMS_INPUT_PLUGIN_DIR")
dnl check for i18n(internationalization); these are from libiconv/gettext
AM_ICONV
AM_LANGINFO_CODESET
-AC_ARG_ENABLE(doxygen_docs, AC_HELP_STRING([--disable-doxygen-docs], [Disable API documentation building via Doxygen]))
-if test "x$enable_doxygen_docs" != "xno" ; then
- AC_CHECK_PROGS(DOXYGEN, doxygen)
-fi
-AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
-if test -n "$DOXYGEN" ; then
-AC_DEFINE(FLAC__HAS_DOXYGEN)
-fi
-
AC_CHECK_PROGS(DOCBOOK_TO_MAN, docbook-to-man docbook2man)
AM_CONDITIONAL(FLaC__HAS_DOCBOOK_TO_MAN, test -n "$DOCBOOK_TO_MAN")
if test -n "$DOCBOOK_TO_MAN" ; then
AC_DEFINE(FLAC__HAS_DOCBOOK_TO_MAN)
+AH_TEMPLATE(FLAC__HAS_DOCBOOK_TO_MAN, [define if you have docbook-to-man or docbook2man])
fi
# only matters for x86
@@ -191,6 +226,7 @@
AM_CONDITIONAL(FLaC__HAS_NASM, test -n "$NASM")
if test -n "$NASM" ; then
AC_DEFINE(FLAC__HAS_NASM)
+AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler])
fi
# only matters for PowerPC
@@ -203,18 +239,20 @@
AM_CONDITIONAL(FLaC__HAS_GAS, test "$AS" = "gas")
if test "$AS" = "as" ; then
AC_DEFINE(FLAC__HAS_AS)
+AH_TEMPLATE(FLAC__HAS_AS, [define if you are compiling for PowerPC and have the 'as' assembler])
fi
if test "$AS" = "gas" ; then
# funniest. macro. ever.
AC_DEFINE(FLAC__HAS_GAS)
+AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler])
fi
OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'
-if test x$debug = xtrue; then
+if test "x$debug" = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
else
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
- if test x$GCC = xyes; then
+ if test "x$GCC" = xyes; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
fi
fi
@@ -225,27 +263,7 @@
AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")
AM_CONDITIONAL(FLaC__HAS_GAS__TEMPORARILY_DISABLED, test "yes" = "no")
-AM_CONFIG_HEADER(config.h)
-AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries])
-AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
-AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
-AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC])
-AH_TEMPLATE(FLAC__SYS_DARWIN, [define if building for Darwin / MacOS X])
-AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux])
-AH_TEMPLATE(FLAC__EXHAUSTIVE_TESTS, [define to run even more tests])
-AH_TEMPLATE(FLAC__VALGRIND_TESTING, [define to enable use of Valgrind in testers])
-AH_TEMPLATE(FLAC__HAS_DOXYGEN, [define if you have Doxygen])
-AH_TEMPLATE(FLAC__HAS_DOCBOOK_TO_MAN, [define if you have docbook-to-man or docbook2man])
-AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler])
-AH_TEMPLATE(FLAC__HAS_AS, [define if you are compiling for PowerPC and have the 'as' assembler])
-AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler])
-AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
-AH_TEMPLATE(FLAC__NO_ASM, [define to disable use of assembly code])
-AH_TEMPLATE(FLAC__SSE_OS, [define if your operating system supports SSE instructions])
-AH_TEMPLATE(FLAC__USE_3DNOW, [define to enable use of 3Dnow! instructions])
-AH_TEMPLATE(FLAC__USE_ALTIVEC, [define to enable use of Altivec instructions])
-
-AC_OUTPUT( \
+AC_CONFIG_FILES([ \
Makefile \
src/Makefile \
src/libFLAC/Makefile \
@@ -311,4 +329,5 @@
obj/release/bin/Makefile \
obj/release/lib/Makefile \
flac.pbproj/Makefile \
-)
+])
+AC_OUTPUT