X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=eddd02d7b177b0ea1085096baf1cd71b133fdf7a;hb=7b0a53432c676e8ae0d2a16cadfecb99e9c174da;hp=0ca65bbfbaf1f6334daaf117020746714856da1f;hpb=21b6d565a871497c55a37afc696135331d4391a1;p=platform%2Fupstream%2Flibvorbis.git diff --git a/configure.ac b/configure.ac index 0ca65bb..eddd02d 100644 --- a/configure.ac +++ b/configure.ac @@ -5,15 +5,14 @@ dnl Initialization and Versioning dnl ------------------------------------------------ -AC_INIT([libvorbis],[1.2.3],[vorbis-dev@xiph.org]) +AC_INIT([libvorbis],[1.3.5],[vorbis-dev@xiph.org]) AC_CONFIG_SRCDIR([lib/mdct.c]) AC_CANONICAL_TARGET([]) -AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE -AM_CONFIG_HEADER([config.h]) dnl Add parameters for aclocal AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") @@ -25,15 +24,15 @@ dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 V_LIB_CURRENT=4 -V_LIB_REVISION=3 +V_LIB_REVISION=8 V_LIB_AGE=4 VF_LIB_CURRENT=6 -VF_LIB_REVISION=2 +VF_LIB_REVISION=7 VF_LIB_AGE=3 VE_LIB_CURRENT=2 -VE_LIB_REVISION=6 +VE_LIB_REVISION=11 VE_LIB_AGE=0 AC_SUBST(V_LIB_CURRENT) @@ -66,11 +65,13 @@ AM_PROG_CC_C_O dnl Check for doxygen if test "x$enable_docs" = xyes; then AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) - AM_CONDITIONAL(HAVE_DOXYGEN,$HAVE_DOXYGEN) if test $HAVE_DOXYGEN = "false"; then AC_MSG_WARN([*** doxygen not found, API documentation will not be built]) fi +else + HAVE_DOXYGEN=false fi +AM_CONDITIONAL(HAVE_DOXYGEN,$HAVE_DOXYGEN) dnl latex tools for the specification document AC_ARG_ENABLE(docs, @@ -87,6 +88,11 @@ 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]) + dnl -------------------------------------------------- dnl Set build flags based on environment dnl -------------------------------------------------- @@ -122,9 +128,9 @@ else 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 -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 @@ -153,7 +159,7 @@ else AC_MSG_WARN([* machine. Upgrading to glibc 2.1.3 is strongly urged *]) AC_MSG_WARN([* to correct the problem. Note that upgrading glibc *]) AC_MSG_WARN([* will not fix any previously built programs; this is *]) - AC_MSG_WARN([* a compile-time time bug. *]) + AC_MSG_WARN([* a compile-time bug. *]) AC_MSG_WARN([* To work around the problem for this build of Ogg, *]) AC_MSG_WARN([* autoconf is disabling all math inlining. This will *]) AC_MSG_WARN([* hurt Ogg performace but is necessary for an Ogg that *]) @@ -165,14 +171,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*) 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]) @@ -184,21 +194,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]) @@ -261,7 +271,7 @@ dnl The following line causes the libtool distributed with the source dnl to be replaced if the build system has a more recent version. AC_SUBST(LIBTOOL_DEPS) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile m4/Makefile lib/Makefile @@ -270,7 +280,7 @@ lib/books/Makefile lib/books/coupled/Makefile lib/books/uncoupled/Makefile lib/books/floor/Makefile -doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile +doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile doc/libvorbis/Makefile doc/Doxyfile include/Makefile include/vorbis/Makefile examples/Makefile @@ -284,3 +294,6 @@ vorbis-uninstalled.pc vorbisenc-uninstalled.pc vorbisfile-uninstalled.pc ]) +AC_CONFIG_HEADERS([config.h]) + +AC_OUTPUT