X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=c03e36b739a8f00f7f9ad011771555d0d8b095f9;hb=aa285f3ac18a9825e9081af87545c8406e10f2d1;hp=1c936b3f44dc57145b3739e3108ef69a5127d37c;hpb=66c0a581d2ee22e65aaf70d50b17cfefc6287f24;p=platform%2Fupstream%2Fflac.git diff --git a/configure.ac b/configure.ac index 1c936b3..c03e36b 100644 --- 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.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]) -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,17 @@ AC_PROG_MAKE_SET AC_SYS_LARGEFILE AC_FUNC_FSEEKO -AC_CHECK_SIZEOF(void*,0) +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)]) -#@@@ 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 +59,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 +92,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]) @@ -131,16 +124,23 @@ 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*) + *-*-cygwin|*mingw*) # 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 + ;; + *emx*) + LT_NO_UNDEFINED="-no-undefined" ;; *) 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) @@ -242,7 +242,10 @@ fi AC_SUBST(FLAC__TEST_LEVEL) AC_ARG_ENABLE(gcc-werror, - AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles])) + AC_HELP_STRING([--enable-gcc-werror], [Enable -Werror in all Makefiles])) + +AC_ARG_ENABLE(stack-smash-protection, + AC_HELP_STRING([--enable-stack-smash-protection], [Enable GNU GCC stack smash protection])) AC_ARG_ENABLE(valgrind-testing, AC_HELP_STRING([--enable-valgrind-testing], [Run all tests inside Valgrind]), @@ -308,9 +311,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 @@ -365,19 +370,36 @@ fi XIPH_GCC_VERSION if test x$ac_cv_c_compiler_gnu = xyes ; then + CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Winline -Wconversion + CXXFLAGS="$CXXFLAGS -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + + if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="-Wall -Wextra -Werror $CFLAGS" - CXXFLAGS="-Wall -Wextra -Werror $CXXFLAGS" - fi + CFLAGS="$CFLAGS -Wall -Wextra -Werror " + CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror " + fi if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR" CFLAGS="$CFLAGS -fvisibility=hidden" CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + fi + + if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then + XIPH_ADD_CFLAGS([-fgnu89-inline]) + fi fi -fi +XIPH_ADD_CFLAGS([-Wextra]) +XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) +XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) + +if test x$enable_stack_smash_protection = "xyes" ; then + XIPH_GCC_STACK_PROTECTOR + XIPH_GXX_STACK_PROTECTOR + fi + #@@@ AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no") AM_CONDITIONAL(FLaC__HAS_GAS__TEMPORARILY_DISABLED, test "yes" = "no") @@ -404,13 +426,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 \ @@ -439,6 +454,7 @@ AC_CONFIG_FILES([ \ include/share/Makefile \ include/share/grabbag/Makefile \ include/test_libs_common/Makefile \ + doc/Doxyfile \ doc/Makefile \ doc/html/Makefile \ doc/html/images/Makefile \ @@ -452,13 +468,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 +490,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