X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=28b0a141e32e2ea2b5963ec807b2aa93bc588a96;hb=4d963fe0b4ba3bdb45233de4b959ce2f36963f7a;hp=057dcbec36708e2403fc4e71ad1a21dbb30891ef;hpb=7d9f8459036915c3da71d5d13ce9244ad078e701;p=platform%2Fupstream%2Flibvorbis.git diff --git a/configure.ac b/configure.ac index 057dcbe..28b0a14 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,9 @@ dnl Initialization and Versioning dnl ------------------------------------------------ -AC_INIT([libvorbis],[1.3.5],[vorbis-dev@xiph.org]) +AC_INIT([libvorbis],[1.3.6],[vorbis-dev@xiph.org]) + +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([lib/mdct.c]) @@ -17,6 +19,9 @@ AM_MAINTAINER_MODE dnl Add parameters for aclocal AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") +dnl enable silent rules on automake 1.11 and later +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + dnl Library versioning dnl - library source changed -> increment REVISION dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 @@ -45,9 +50,9 @@ AC_SUBST(VE_LIB_CURRENT) AC_SUBST(VE_LIB_REVISION) AC_SUBST(VE_LIB_AGE) -dnl -------------------------------------------------- +dnl -------------------------------------------------- dnl Check for programs -dnl -------------------------------------------------- +dnl -------------------------------------------------- dnl save $CFLAGS since AC_PROG_CC likes to insert "-g -O2" dnl if $CFLAGS is blank @@ -88,10 +93,10 @@ fi AM_CONDITIONAL(BUILD_DOCS, [test "x$enable_docs" = xyes]) -AC_ARG_ENABLE(examples, - AS_HELP_STRING([--enable-examples], [build the examples])) - -AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = xyes]) +AC_ARG_ENABLE(examples, + AS_HELP_STRING([--enable-examples], [build the examples])) + +AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = xyes]) dnl -------------------------------------------------- dnl Set build flags based on environment @@ -101,14 +106,14 @@ dnl Set some target options cflags_save="$CFLAGS" if test -z "$GCC"; then - case $host in + case $host in *-*-irix*) - dnl If we're on IRIX, we wanna use cc even if gcc + dnl If we're on IRIX, we wanna use cc even if gcc dnl is there (unless the user has overriden us)... if test -z "$CC"; then CC=cc fi - DEBUG="-g -signed" + DEBUG="-g -signed" CFLAGS="-O2 -w -signed" PROFILE="-p -g3 -O2 -signed" ;; sparc-sun-solaris*) @@ -125,12 +130,12 @@ else AC_MSG_CHECKING([GCC version]) GCC_VERSION=`$CC -dumpversion` AC_MSG_RESULT([$GCC_VERSION]) - case $host in + case $host in *86-*-linux*) DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char" -# PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static" - PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline" + CFLAGS="-O3 -Wall -Wextra -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char" +# PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static" + PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline" # glibc < 2.1.3 has a serious FP bug in the math inline header # that will cripple Vorbis. Look to see if the magic FP stack @@ -171,18 +176,18 @@ else CFLAGS=${OPT}" -D__NO_MATH_INLINES" PROFILE=${PROFILE}" -D__NO_MATH_INLINES" fi;; - powerpc-*-linux*spe) - DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES" - CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -D_REENTRANT" - PROFILE="-pg -g -O3 -ffast-math -mfused-madd -D_REENTRANT";; + powerpc-*-linux*spe) + DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES" + CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -D_REENTRANT" + PROFILE="-pg -g -O3 -ffast-math -mfused-madd -D_REENTRANT";; powerpc-*-linux*) DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES" CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT" PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";; *-*-linux*) DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; + CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char" + PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";; sparc-sun-*) sparc_cpu="" AC_MSG_CHECKING([if gcc supports -mv8]) @@ -194,21 +199,21 @@ else ]) CFLAGS="$old_cflags" DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" - CFLAGS="-O20 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;; + CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" + PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;; *-*-darwin*) DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char" - CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" - PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; + CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char" + PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";; *-*-os2*) # Use -W instead of -Wextra because gcc on OS/2 is an old version. DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; + CFLAGS="-O3 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" + PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";; *) DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; + CFLAGS="-O3 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" + PROFILE="-O3 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; esac AC_ADD_CFLAGS([-Wdeclaration-after-statement])