X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.in;h=607e382cb6a758f0cbd2bc1014f92c7e5aaa90ca;hb=3aadd10c67602f9585df6515708a61cb388d5692;hp=42e8c03de2aa31c1bc7e78b1df1212b97f7da073;hpb=f0a8c4fc879496ab3856e41940cc7a4b7ad45e76;p=platform%2Fupstream%2Fflac.git diff --git a/configure.in b/configure.in index 42e8c03..607e382 100644 --- a/configure.in +++ b/configure.in @@ -1,25 +1,25 @@ # FLAC - Free Lossless Audio Codec -# Copyright (C) 2001,2002,2003 Josh Coalson +# Copyright (C) 2001,2002,2003,2004 Josh Coalson # -# This program is part of FLAC; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. +# This file is part the FLAC project. FLAC is comprised of several +# components distributed under difference licenses. The codec libraries +# are distributed under Xiph.Org's BSD-like license (see the file +# COPYING.Xiph in this distribution). All other programs, libraries, and +# plugins are distributed under the GPL (see COPYING.GPL). The documentation +# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the +# FLAC distribution contains at the top the terms under which it may be +# distributed. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Since this particular file is relevant to all components of FLAC, +# it may be distributed under the Xiph.Org license, which is the least +# restrictive of those mentioned above. See the file COPYING.Xiph in this +# distribution. # NOTE that for many of the AM_CONDITIONALs we use the prefix FLaC__ # instead of FLAC__ since autoconf triggers off 'AC_' in strings AC_INIT(src/flac/main.c) -AM_INIT_AUTOMAKE(flac, 1.0.5_beta2) +AM_INIT_AUTOMAKE(flac, 1.1.1-beta1) # Don't automagically regenerate autoconf/automake generated files unless # explicitly requested. Eases autobuilding -mdz @@ -32,7 +32,7 @@ AM_MAINTAINER_MODE dnl LOCAL__PATH_ID3LIB([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libid3, and define ID3LIB_CFLAGS and ID3LIB_LIBS dnl -AC_DEFUN(LOCAL__PATH_ID3LIB, +AC_DEFUN([LOCAL__PATH_ID3LIB], [dnl dnl Get the cflags and libraries dnl @@ -46,7 +46,7 @@ AC_ARG_ENABLE(id3libtest, [ --disable-id3libtest Do not try to compile an elif test "x$id3lib_prefix" != "x" ; then ID3LIB_LIBS="-L$id3lib_prefix/lib" elif test "x$prefix" != "xNONE" ; then - ID3LIB_LIBS="-L$prefix/lib" + ID3LIB_LIBS="-L$libdir" fi ID3LIB_LIBS="$ID3LIB_LIBS -lid3" @@ -160,7 +160,7 @@ 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 - i[[3-6]]86-*-openbsd*) OBJ_FORMAT=aoutb ;; + i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;; *) OBJ_FORMAT=elf ;; esac AC_SUBST(OBJ_FORMAT) @@ -208,6 +208,18 @@ if test x$use_3dnow = xtrue ; then AC_DEFINE(FLAC__USE_3DNOW) fi +AC_ARG_ENABLE(altivec, +[ --disable-altivec Disable Altivec optimizations], +[case "${enableval}" in + yes) use_altivec=true ;; + 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 +AC_DEFINE(FLAC__USE_ALTIVEC) +fi + AC_ARG_ENABLE(local-xmms-plugin, [ --enable-local-xmms-plugin Install XMMS plugin to ~/.xmms/Plugins instead of system location], [case "${enableval}" in @@ -304,63 +316,13 @@ if test -n "$NASM" ; then AC_DEFINE(FLAC__HAS_NASM) fi -dnl Check for type sizes - -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(long long) - -case 2 in - $ac_cv_sizeof_short) FLaC__SIZE16="short" ; FLaC__USIZE16="unsigned short";; - $ac_cv_sizeof_int) FLaC__SIZE16="int" ; FLaC__USIZE16="unsigned int";; -esac - -case 4 in - $ac_cv_sizeof_short) FLaC__SIZE32="short" ; FLaC__USIZE32="unsigned short";; - $ac_cv_sizeof_int) FLaC__SIZE32="int" ; FLaC__USIZE32="unsigned int";; - $ac_cv_sizeof_long) FLaC__SIZE32="long" ; FLaC__USIZE32="unsigned long";; -esac - -case 8 in - $ac_cv_sizeof_int) FLaC__SIZE64="int" ; FLaC__USIZE64="unsigned int";; - $ac_cv_sizeof_long) FLaC__SIZE64="long" ; FLaC__USIZE64="unsigned long";; - $ac_cv_sizeof_long_long) FLaC__SIZE64="long long" ; FLaC__USIZE64="unsigned long long";; -esac - -if test -z "$FLaC__SIZE16"; then - AC_MSG_ERROR(No 16 bit type found on this platform!) -fi -if test -z "$FLaC__USIZE16"; then - AC_MSG_ERROR(No unsigned 16 bit type found on this platform!) -fi -if test -z "$FLaC__SIZE32"; then - AC_MSG_ERROR(No 32 bit type found on this platform!) -fi -if test -z "$FLaC__USIZE32"; then - AC_MSG_ERROR(No unsigned 32 bit type found on this platform!) -fi -if test -z "$FLaC__SIZE64"; then - AC_MSG_WARN(No 64 bit type found on this platform!) -fi -if test -z "$FLaC__USIZE64"; then - AC_MSG_ERROR(No unsigned 64 bit type found on this platform!) -fi - -AC_SUBST(FLaC__SIZE16) -AC_SUBST(FLaC__USIZE16) -AC_SUBST(FLaC__SIZE32) -AC_SUBST(FLaC__USIZE32) -AC_SUBST(FLaC__SIZE64) -AC_SUBST(FLaC__USIZE64) - OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include' if test x$debug = xtrue; then OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG" else - OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG" + OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG" if test x$GCC = xyes; then - OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__" + OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__" fi fi CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS" @@ -380,6 +342,7 @@ 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]) AH_TEMPLATE(ID3LIB_MAJOR, [define to major version number of id3lib]) AH_TEMPLATE(ID3LIB_MINOR, [define to minor version number of id3lib]) AH_TEMPLATE(ID3LIB_PATCH, [define to patch level of id3lib]) @@ -389,12 +352,14 @@ AC_OUTPUT( \ src/Makefile \ src/libFLAC/Makefile \ src/libFLAC/ia32/Makefile \ + src/libFLAC/ppc/Makefile \ src/libFLAC/include/Makefile \ src/libFLAC/include/private/Makefile \ src/libFLAC/include/protected/Makefile \ src/libFLAC++/Makefile \ src/libOggFLAC/Makefile \ src/libOggFLAC/include/Makefile \ + src/libOggFLAC/include/private/Makefile \ src/libOggFLAC/include/protected/Makefile \ src/libOggFLAC++/Makefile \ src/flac/Makefile \ @@ -403,17 +368,17 @@ AC_OUTPUT( \ src/monkeys_audio_utilities/flac_mac/Makefile \ src/monkeys_audio_utilities/flac_ren/Makefile \ src/plugin_common/Makefile \ - src/plugin_common/include/Makefile \ - src/plugin_common/include/private/Makefile \ src/plugin_winamp2/Makefile \ src/plugin_winamp2/include/Makefile \ src/plugin_winamp2/include/winamp2/Makefile \ - src/plugin_winamp3/Makefile \ src/plugin_xmms/Makefile \ src/share/Makefile \ - src/share/gain_analysis/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 \ @@ -424,7 +389,6 @@ AC_OUTPUT( \ src/test_streams/Makefile \ include/Makefile \ include/FLAC/Makefile \ - include/FLAC/ordinals.h \ include/FLAC++/Makefile \ include/OggFLAC/Makefile \ include/OggFLAC++/Makefile \