From a6782da38de3b361bf6bcd37f9ca88564ecf6d1b Mon Sep 17 00:00:00 2001 From: "lllucius@gmail.com" Date: Fri, 16 May 2014 17:36:27 +0000 Subject: [PATCH] Addition of gstreamer importer support. Will only use system libraries...no locals for this fella. gstreamer-1.0 is required. --- Makefile.in | 3 + autotools/config.guess | 151 ++++----- autotools/config.sub | 43 ++- autotools/ltmain.sh | 32 +- configure | 245 ++++++++++---- configure.ac | 4 +- help/Makefile.in | 5 +- images/Makefile.in | 5 +- lib-src/Makefile.in | 5 +- locale/Makefile.in | 512 ++++++++++++++++++++++++------ m4/audacity_checklib_gstreamer.m4 | 42 +++ m4/libtool.m4 | 85 ++--- src/Makefile.am | 10 + src/Makefile.in | 185 ++++++----- src/configtemplate.h | 3 + tests/Makefile.in | 5 +- 16 files changed, 936 insertions(+), 399 deletions(-) create mode 100644 m4/audacity_checklib_gstreamer.m4 diff --git a/Makefile.in b/Makefile.in index b0398dd50..bd22fa392 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,6 +96,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/ac_c99_func_lrintf.m4 \ $(top_srcdir)/m4/audacity_checklib_ffmpeg.m4 \ + $(top_srcdir)/m4/audacity_checklib_gstreamer.m4 \ $(top_srcdir)/m4/audacity_checklib_lame.m4 \ $(top_srcdir)/m4/audacity_checklib_libexpat.m4 \ $(top_srcdir)/m4/audacity_checklib_libflac.m4 \ @@ -321,6 +322,8 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ diff --git a/autotools/config.guess b/autotools/config.guess index b79252d6b..1804e9fcd 100755 --- a/autotools/config.guess +++ b/autotools/config.guess @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,7 +26,7 @@ timestamp='2013-06-10' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -50,7 +52,9 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,27 +136,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -874,21 +857,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +884,59 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +955,54 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1256,21 +1235,19 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff --git a/autotools/config.sub b/autotools/config.sub index 9633db704..52f04bcd7 100755 --- a/autotools/config.sub +++ b/autotools/config.sub @@ -1,8 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +70,9 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -252,12 +256,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ + | arc \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | c8051 | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -286,17 +290,16 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ + | nios | nios2 \ | ns16k | ns32k \ | open8 \ - | or1k | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -366,13 +369,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -404,13 +407,12 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -794,7 +796,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i686-pc + basic_machine=i386-pc os=-mingw32 ;; mingw32ce) @@ -830,7 +832,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i686-pc + basic_machine=i386-pc os=-msys ;; mvs) @@ -1006,7 +1008,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1352,7 +1354,7 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1498,6 +1500,9 @@ case $os in -aros*) os=-aros ;; + -kaos*) + os=-kaos + ;; -zvmoe) os=-zvmoe ;; @@ -1546,9 +1551,6 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; - c8051-*) - os=-elf - ;; hexagon-*) os=-elf ;; @@ -1592,9 +1594,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/autotools/ltmain.sh b/autotools/ltmain.sh index 3825a2aa4..63ae69dc6 100644 --- a/autotools/ltmain.sh +++ b/autotools/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" +VERSION=2.4.2 TIMESTAMP="" package_revision=1.3337 @@ -6124,10 +6124,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6447,19 +6444,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -7352,9 +7349,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) diff --git a/configure b/configure index b4eeefeab..43fb2baa2 100755 --- a/configure +++ b/configure @@ -721,6 +721,8 @@ USE_LAME_FALSE USE_LAME_TRUE LAME_LIBS LAME_CFLAGS +USE_GSTREAMER_FALSE +USE_GSTREAMER_TRUE USE_LOCAL_FFMPEG_FALSE USE_LOCAL_FFMPEG_TRUE USE_FFMPEG_FALSE @@ -759,6 +761,8 @@ ID3TAG_LIBS ID3TAG_CFLAGS FLAC_LIBS FLAC_CFLAGS +GSTREAMER_LIBS +GSTREAMER_CFLAGS AVUTIL_LIBS AVUTIL_CFLAGS AVFORMAT_LIBS @@ -949,6 +953,7 @@ enable_universal_binary enable_dynamic_loading with_expat with_ffmpeg +with_gstreamer with_lame with_libflac with_libid3tag @@ -994,6 +999,8 @@ AVFORMAT_CFLAGS AVFORMAT_LIBS AVUTIL_CFLAGS AVUTIL_LIBS +GSTREAMER_CFLAGS +GSTREAMER_LIBS FLAC_CFLAGS FLAC_LIBS ID3TAG_CFLAGS @@ -1714,6 +1721,7 @@ Optional Packages: --with-expat which expat to use for XML file support: [system,local] --with-ffmpeg use ffmpeg for import and export support + --with-gstreamer include gstreamer import/export support --with-lame use lame for import and export support --with-libflac use libFLAC for FLAC support --with-libid3tag use libid3tag for mp3 id3 tag support @@ -1762,6 +1770,10 @@ Some influential environment variables: AVUTIL_CFLAGS C compiler flags for AVUTIL, overriding pkg-config AVUTIL_LIBS linker flags for AVUTIL, overriding pkg-config + GSTREAMER_CFLAGS + C compiler flags for GSTREAMER, overriding pkg-config + GSTREAMER_LIBS + linker flags for GSTREAMER, overriding pkg-config FLAC_CFLAGS C compiler flags for FLAC, overriding pkg-config FLAC_LIBS linker flags for FLAC, overriding pkg-config ID3TAG_CFLAGS @@ -8890,8 +8902,7 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -9292,6 +9303,10 @@ freebsd* | dragonfly*) fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -9330,11 +9345,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -10411,7 +10426,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -10427,16 +10442,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -10455,7 +10466,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -12134,7 +12148,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -12612,9 +12626,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -12836,7 +12847,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -13013,7 +13024,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -13467,7 +13477,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -14304,6 +14314,17 @@ freebsd* | dragonfly*) esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -14420,7 +14441,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -14469,10 +14490,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -14484,18 +14509,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -16243,6 +16256,9 @@ fi ld_shlibs_CXX=yes ;; + gnu*) + ;; + haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -16404,7 +16420,7 @@ fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -17264,7 +17280,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -17328,7 +17344,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -17699,9 +17715,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs_CXX=no - ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -18136,6 +18149,17 @@ freebsd* | dragonfly*) esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -18252,7 +18276,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -18301,10 +18325,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18316,18 +18344,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -19571,7 +19587,7 @@ CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog" FILEDIALOG_LIBS='$(top_builddir)/lib-src/FileDialog/libFileDialog.la' -LIBRARIES="EXPAT FFMPEG LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBRESAMPLE LIBSAMPLERATE LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA" +LIBRARIES="EXPAT FFMPEG GSTREAMER LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBRESAMPLE LIBSAMPLERATE LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA" { $as_echo "$as_me:${as_lineno-$LINENO}: Determining what libraries are available in this tree and on the system" >&5 $as_echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;} @@ -20157,6 +20173,96 @@ $as_echo "$as_me: ffmpeg library is NOT available in the local tree" >&6;} + +# Check whether --with-gstreamer was given. +if test "${with_gstreamer+set}" = set; then : + withval=$with_gstreamer; GSTREAMER_ARGUMENT=$withval +else + GSTREAMER_ARGUMENT="unspecified" +fi + + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5 +$as_echo_n "checking for GSTREAMER... " >&6; } + +if test -n "$GSTREAMER_CFLAGS"; then + pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-app-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-app-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 gstreamer-app-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GSTREAMER_LIBS"; then + pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-app-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-app-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 gstreamer-app-1.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-1.0 gstreamer-app-1.0" 2>&1` + else + GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-1.0 gstreamer-app-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSTREAMER_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + GSTREAMER_SYSTEM_AVAILABLE="no" +elif test $pkg_failed = untried; then + GSTREAMER_SYSTEM_AVAILABLE="no" +else + GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS + GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + GSTREAMER_SYSTEM_AVAILABLE="yes" +fi + + if test "$GSTREAMER_SYSTEM_AVAILABLE" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer libraries are available as system libraries" >&5 +$as_echo "$as_me: gstreamer libraries are available as system libraries" >&6;} + else + { $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer libraries are NOT available as system libraries" >&5 +$as_echo "$as_me: gstreamer libraries are NOT available as system libraries" >&6;} + fi + + GSTREAMER_LOCAL_AVAILABLE="no" + + + # Check whether --with-lame was given. if test "${with_lame+set}" = set; then : withval=$with_lame; LAME_ARGUMENT=$withval @@ -22721,6 +22827,27 @@ $as_echo "#define USE_FFMPEG 1" >>confdefs.h fi + + + + + if test "$GSTREAMER_USE_SYSTEM" = yes; then + USE_GSTREAMER_TRUE= + USE_GSTREAMER_FALSE='#' +else + USE_GSTREAMER_TRUE='#' + USE_GSTREAMER_FALSE= +fi + + + if test "$GSTREAMER_USE_SYSTEM" = yes; then + +$as_echo "#define USE_GSTREAMER 1" >>confdefs.h + + fi + + + if test "$LAME_USE_LOCAL" = yes; then LAME_CFLAGS='-I$(top_srcdir)/lib-src/lame' LAME_LIBS="" @@ -24038,6 +24165,10 @@ if test -z "${USE_LOCAL_FFMPEG_TRUE}" && test -z "${USE_LOCAL_FFMPEG_FALSE}"; th as_fn_error $? "conditional \"USE_LOCAL_FFMPEG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_GSTREAMER_TRUE}" && test -z "${USE_GSTREAMER_FALSE}"; then + as_fn_error $? "conditional \"USE_GSTREAMER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_LAME_TRUE}" && test -z "${USE_LAME_FALSE}"; then as_fn_error $? "conditional \"USE_LAME\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 0a4c1f81f..5733a6f03 100644 --- a/configure.ac +++ b/configure.ac @@ -330,12 +330,13 @@ dnl------------------------------------------------------------- dnl Optional library support. Lots of things we could use, but dnl can do without if they aren't available. dnl------------------------------------------------------------- -LIBRARIES="EXPAT FFMPEG LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBRESAMPLE LIBSAMPLERATE LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA" +LIBRARIES="EXPAT FFMPEG GSTREAMER LAME LIBFLAC LIBID3TAG LIBMAD LIBNYQUIST LIBRESAMPLE LIBSAMPLERATE LIBSBSMS LIBSNDFILE LIBSOUNDTOUCH LIBSOXR LIBTWOLAME LIBVAMP LIBVORBIS LV2 PORTAUDIO PORTSMF WIDGETEXTRA" AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system]) AUDACITY_CHECKLIB_EXPAT AUDACITY_CHECKLIB_FFMPEG +AUDACITY_CHECKLIB_GSTREAMER AUDACITY_CHECKLIB_LAME AUDACITY_CHECKLIB_LIBFLAC AUDACITY_CHECKLIB_LIBID3TAG @@ -506,6 +507,7 @@ dnl " This is included purely to close an otherwise endless string in vim AUDACITY_CONFIG_EXPAT AUDACITY_CONFIG_FFMPEG +AUDACITY_CONFIG_GSTREAMER AUDACITY_CONFIG_LAME AUDACITY_CONFIG_LIBFLAC AUDACITY_CONFIG_LIBID3TAG diff --git a/help/Makefile.in b/help/Makefile.in index 815b22bcd..f7330e759 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -85,6 +85,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/ac_c99_func_lrintf.m4 \ $(top_srcdir)/m4/audacity_checklib_ffmpeg.m4 \ + $(top_srcdir)/m4/audacity_checklib_gstreamer.m4 \ $(top_srcdir)/m4/audacity_checklib_lame.m4 \ $(top_srcdir)/m4/audacity_checklib_libexpat.m4 \ $(top_srcdir)/m4/audacity_checklib_libflac.m4 \ @@ -232,6 +233,8 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ diff --git a/images/Makefile.in b/images/Makefile.in index 9ba0e62cc..6d495d37a 100644 --- a/images/Makefile.in +++ b/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -87,6 +87,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/ac_c99_func_lrintf.m4 \ $(top_srcdir)/m4/audacity_checklib_ffmpeg.m4 \ + $(top_srcdir)/m4/audacity_checklib_gstreamer.m4 \ $(top_srcdir)/m4/audacity_checklib_lame.m4 \ $(top_srcdir)/m4/audacity_checklib_libexpat.m4 \ $(top_srcdir)/m4/audacity_checklib_libflac.m4 \ @@ -236,6 +237,8 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 23164fec4..e80e48237 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -122,6 +122,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/ac_c99_func_lrintf.m4 \ $(top_srcdir)/m4/audacity_checklib_ffmpeg.m4 \ + $(top_srcdir)/m4/audacity_checklib_gstreamer.m4 \ $(top_srcdir)/m4/audacity_checklib_lame.m4 \ $(top_srcdir)/m4/audacity_checklib_libexpat.m4 \ $(top_srcdir)/m4/audacity_checklib_libflac.m4 \ @@ -296,6 +297,8 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ diff --git a/locale/Makefile.in b/locale/Makefile.in index a3b3426b0..f54cb2192 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -1,116 +1,444 @@ -# locale/Makefile +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # -# Matt Brubeck 2002-01-12 -# based on the locale makefile from wxWindows 2.2.9 -# -# This is the makefile for generating the message catalog file and -# building lang.mo files from the translated lang.po catalogs. -# This makefile may be invoked to build either audacity.pot or any lang.mo +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. +# +# Origin: gettext-0.18 +GETTEXT_MACRO_VERSION = 0.18 -PROGNAME=audacity -LINGUAS=af ar be bg bn bs ca ca@valencia cs cy da de el es eu fa fi fr ga gl he hi hr hu id it ja ka km ko lt mk my nb nl oc pl pt pt_BR ro ru sk sl sr_RS sr_RS@latin sv tg tr uk vi zh zh_TW -# these languages are not generated because they are currently unmaintained and -# overlapped by another one: -# currently none - Cleber produced a pt_PT translation August 2009. +PACKAGE = audacity +VERSION = 2.0.6 +PACKAGE_BUGREPORT = -prefix=@prefix@ -datarootdir=@datarootdir@ -DATADIR=@datadir@ -DATAROOTDIR=@datarootdir@ -# this is where locale-dependant stuff (i.e. .mo files) goes -LOCALEDIR=@localedir@ -INSTALL=@INSTALL@ -AUDACITY_NAME=@AUDACITY_NAME@ +SHELL = /bin/sh -# because we are in a subdirectory setting DESTDIR to a relative path doesn't -# work - it gets interpreted relative to the locale directory in the source -# tree. This is because relative DESTDIRs aren't supported. It could be worked -# around by something along the lines of -# if (DESTDIR is relative) -# DESTDIR=$top_srcdir/DESTDIR -# fi -# but I can't see how to implement this. So for the moment stick to absolute -# paths in DESTDIR -all: allmo +srcdir = . +top_srcdir = .. -# Merge POT file with all existing message catalogs -allpo: $(LINGUAS:%=%.po) FORCE -allmo: $(LINGUAS:%=%/$(PROGNAME).mo) FORCE -# Update the POT template file. -POTFILE=audacity.pot -update: force-update $(POTFILE) updatepo FORCE +prefix = /usr/local/ +exec_prefix = ${prefix} +datarootdir = ${prefix}/share +datadir = ${datarootdir} +localedir = ${datarootdir}/locale +gettextsrcdir = $(datadir)/gettext/po -# the programs we use (TODO: use configure to detect them) -MSGFMT=msgfmt -v -XGETTEXT=xgettext -XARGS=xargs +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 -# xgettext args: -# -C: C++ syntax -# -k: mark the functions that wrap translatable strings -# -F: sort by file -XGETTEXT_ARGS=-F -C -k_ -k_NoAcc -kwxTRANSLATE \ - --add-comments="i18n-hint" \ - --msgid-bugs-address="audacity-translation@lists.sourceforge.net" \ - --package-name="${AUDACITY_NAME}" \ - --package-version="2.0.4" \ - --copyright-holder="Audacity Development Team" +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# ${SHELL} /home/yam/a/audacity/autotools/install-sh does not start with $(SHELL), so we add it. +# In automake >= 1.10, /usr/bin/mkdir -p is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. +mkinstalldirs = $(SHELL) ${SHELL} /home/yam/a/audacity/autotools/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/yam/a/audacity/autotools/install-sh +MKDIR_P = /usr/bin/mkdir -p +mkdir_p = /usr/bin/mkdir -p -# implicit rules +GMSGFMT_ = /usr/bin/msgfmt +GMSGFMT_no = /usr/bin/msgfmt +GMSGFMT_yes = /usr/bin/msgfmt +GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +MSGFMT_ = /usr/bin/msgfmt +MSGFMT_no = /usr/bin/msgfmt +MSGFMT_yes = /usr/bin/msgfmt +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) +XGETTEXT_ = /usr/bin/xgettext +XGETTEXT_no = /usr/bin/xgettext +XGETTEXT_yes = /usr/bin/xgettext +XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) +MSGMERGE = msgmerge +MSGMERGE_UPDATE = /usr/bin/msgmerge --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter -%/$(PROGNAME).mo: %.po $(POTFILE) - @test -d $* || mkdir $* - $(MSGFMT) -o $@ $< +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) -updatepo: $(POTFILE) - linguas='$(LINGUAS)'; for lang in $$linguas ; do \ - pofile="$$lang.po"; \ - if [ -f $$pofile ]; then \ - echo "Updating catalog: $$pofile"; \ - ./smartmsgmerge.py $$pofile $(POTFILE) $$pofile.new && mv $$pofile.new $$pofile; \ +POTFILES = \ + +CATALOGS = @CATALOGS@ + +# Makevars gets inserted here. (Don't remove this line!) + +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update + +.po.mo: + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ + +.po.gmo: + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ + + +all: check-macro-version all-yes + +all-yes: stamp-po +all-no: + +# Ensure that the gettext macros and this Makefile.in.in are in sync. +check-macro-version: + @test "$(GETTEXT_MACRO_VERSION)" = "0.18" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version 0.18" 1>&2; \ + exit 1; \ + } + +# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no +# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because +# we don't want to bother translators with empty POT files). We assume that +# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. +# In this case, stamp-po is a nop (i.e. a phony target). + +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + test ! -f $(srcdir)/$(DOMAIN).pot || \ + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ + } + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if LC_ALL=C grep 'GNU audacity' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ + else \ + package_gnu=''; \ + fi; \ + if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ + else \ + msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ + fi; \ + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_gnu}audacity" \ + --package-version='2.0.6' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ else \ - echo "Creating new catalog: $$pofile"; \ - cp $(POTFILE) $$pofile; \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi + + +install: install-exec install-data +install-exec: +install-data: install-data-yes + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +install-data-no: all +install-data-yes: all + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ + fi; \ + done; \ done -$(POTFILE): Makefile - touch $@ - cd ../src && find . -name "*.cpp" -or -name "*.h" \ - | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) \ - -o ../locale/$(POTFILE).template - cd ../locale && sed \ - -e 's/SOME DESCRIPTIVE TITLE/Audacity Strings for Translation/' \ - -e 's/YEAR-MO-DA HO:MI+ZONE/1999 and beyond/' \ - -e 's/FIRST AUTHOR/Audacity Team/' \ - -e 's/PACKAGE/${AUDACITY_NAME}/' \ - $(POTFILE).template > $(POTFILE) - rm -f $(POTFILE).template +install-strip: install -force-update: FORCE - rm -f $(POTFILE) - -FORCE: - -install: allmo - linguas='$(LINGUAS)'; for lang in $$linguas ; do \ - $(INSTALL) -d $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES ; \ - $(INSTALL) -m 644 $$lang/audacity.mo $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \ +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-yes + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ done -uninstall: - linguas='$(LINGUAS)'; for lang in $$linguas ; do \ - rm -f $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES/$(AUDACITY_NAME).mo ; \ +# Define this as empty until I found a useful application. +installcheck: + +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-yes + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ done -clean: - -linguas='$(LINGUAS)'; for lang in $$linguas ; do \ - rm -rf $$lang ; \ - rm -f audacity.pot ; \ - done +check: all + +info dvi ps pdf html tags TAGS ctags CTAGS ID: + +mostlyclean: + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po + rm -fr *.o + +clean: mostlyclean distclean: clean - rm -f Makefile + rm -f Makefile Makefile.in POTFILES *.mo +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f stamp-po $(GMOFILES) + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: stamp-po $(DISTFILES) + dists="$(DISTFILES)"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + dists="$$dists $(DOMAIN).pot stamp-po"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ + done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ + for file in $$dists; do \ + if test -f $$file; then \ + cp -p $$file $(distdir) || exit 1; \ + else \ + cp -p $(srcdir)/$$file $(distdir) || exit 1; \ + fi; \ + done + +update-po: Makefile + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + cd $(srcdir); \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +$(DUMMYPOFILES): + +update-gmo: Makefile $(GMOFILES) + @: + +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use /bin/sh, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ + cd $(top_builddir) \ + && /bin/sh ./config.status $(subdir)/$@.in po-directories + +force: + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/m4/audacity_checklib_gstreamer.m4 b/m4/audacity_checklib_gstreamer.m4 new file mode 100644 index 000000000..631d5500a --- /dev/null +++ b/m4/audacity_checklib_gstreamer.m4 @@ -0,0 +1,42 @@ +dnl add license? +dnl +dnl Please increment the serial number below whenever you alter this macro +dnl for the benefit of automatic macro update systems +# audacity_checklib_gstreamer.m4 serial 3 + +AC_DEFUN([AUDACITY_CHECKLIB_GSTREAMER], [ + + AC_ARG_WITH(gstreamer, + [AS_HELP_STRING([--with-gstreamer], + [include gstreamer import/export support])], + GSTREAMER_ARGUMENT=$withval, + GSTREAMER_ARGUMENT="unspecified") + + dnl see if gstreamer is installed on the system + + PKG_CHECK_MODULES(GSTREAMER, gstreamer-1.0 gstreamer-app-1.0, + GSTREAMER_SYSTEM_AVAILABLE="yes", + GSTREAMER_SYSTEM_AVAILABLE="no") + + if test "$GSTREAMER_SYSTEM_AVAILABLE" = "yes"; then + AC_MSG_NOTICE([gstreamer libraries are available as system libraries]) + else + AC_MSG_NOTICE([gstreamer libraries are NOT available as system libraries]) + fi + + GSTREAMER_LOCAL_AVAILABLE="no" +]) + +AC_DEFUN([AUDACITY_CONFIG_GSTREAMER], [ + + AC_SUBST([GSTREAMER_CFLAGS]) + AC_SUBST([GSTREAMER_LIBS]) + + AM_CONDITIONAL([USE_GSTREAMER], [test "$GSTREAMER_USE_SYSTEM" = yes]) + + if test "$GSTREAMER_USE_SYSTEM" = yes; then + AC_DEFINE(USE_GSTREAMER, 1, + [Define if the gstreamer is present]) + fi + +]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 02b4bbec5..f12cfdf0b 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,16 +1324,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1695,8 +1694,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2520,6 +2518,17 @@ freebsd* | dragonfly*) esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2636,7 +2645,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2666,10 +2675,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2681,18 +2694,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3252,6 +3253,10 @@ freebsd* | dragonfly*) fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3290,11 +3295,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4042,7 +4047,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4106,7 +4111,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4341,7 +4346,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4583,9 +4588,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4648,9 +4650,6 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4872,7 +4871,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5049,7 +5048,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5354,7 +5352,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6234,6 +6232,9 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6395,7 +6396,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/src/Makefile.am b/src/Makefile.am index b33f3c216..40975c69c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -537,6 +537,16 @@ audacity_SOURCES += \ $(NULL) endif +if USE_GSTREAMER +audacity_CPPFLAGS += $(GSTREAMER_CFLAGS) +audacity_LDADD += $(GSTREAMER_LIBS) +audacity_SOURCES += \ + import/ImportGStreamer.cpp \ + import/ImportGStreamer.h \ + $(NULL) +endif + + if USE_LADSPA audacity_CPPFLAGS += $(LADSPA_CFLAGS) audacity_LDADD += $(LADSPA_LIBS) diff --git a/src/Makefile.in b/src/Makefile.in index 9ce39c04b..e701c40bf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -100,9 +100,16 @@ bin_PROGRAMS = audacity$(EXEEXT) @USE_FFMPEG_TRUE@ import/ImportFFmpeg.h \ @USE_FFMPEG_TRUE@ $(NULL) -@USE_LADSPA_TRUE@am__append_7 = $(LADSPA_CFLAGS) -@USE_LADSPA_TRUE@am__append_8 = $(LADSPA_LIBS) -@USE_LADSPA_TRUE@am__append_9 = \ +@USE_GSTREAMER_TRUE@am__append_7 = $(GSTREAMER_CFLAGS) +@USE_GSTREAMER_TRUE@am__append_8 = $(GSTREAMER_LIBS) +@USE_GSTREAMER_TRUE@am__append_9 = \ +@USE_GSTREAMER_TRUE@ import/ImportGStreamer.cpp \ +@USE_GSTREAMER_TRUE@ import/ImportGStreamer.h \ +@USE_GSTREAMER_TRUE@ $(NULL) + +@USE_LADSPA_TRUE@am__append_10 = $(LADSPA_CFLAGS) +@USE_LADSPA_TRUE@am__append_11 = $(LADSPA_LIBS) +@USE_LADSPA_TRUE@am__append_12 = \ @USE_LADSPA_TRUE@ effects/ladspa/ladspa.h \ @USE_LADSPA_TRUE@ effects/ladspa/LadspaEffect.cpp \ @USE_LADSPA_TRUE@ effects/ladspa/LadspaEffect.h \ @@ -110,39 +117,39 @@ bin_PROGRAMS = audacity$(EXEEXT) @USE_LADSPA_TRUE@ effects/ladspa/LoadLadspa.h \ @USE_LADSPA_TRUE@ $(NULL) -@USE_LAME_TRUE@am__append_10 = $(LAME_CFLAGS) -@USE_LAME_TRUE@am__append_11 = $(LAME_LIBS) -@USE_LIBFLAC_TRUE@am__append_12 = $(FLAC_CFLAGS) -@USE_LIBFLAC_TRUE@am__append_13 = $(FLAC_LIBS) -@USE_LIBFLAC_TRUE@am__append_14 = \ +@USE_LAME_TRUE@am__append_13 = $(LAME_CFLAGS) +@USE_LAME_TRUE@am__append_14 = $(LAME_LIBS) +@USE_LIBFLAC_TRUE@am__append_15 = $(FLAC_CFLAGS) +@USE_LIBFLAC_TRUE@am__append_16 = $(FLAC_LIBS) +@USE_LIBFLAC_TRUE@am__append_17 = \ @USE_LIBFLAC_TRUE@ ondemand/ODDecodeFlacTask.cpp \ @USE_LIBFLAC_TRUE@ ondemand/ODDecodeFlacTask.h \ @USE_LIBFLAC_TRUE@ $(NULL) -@USE_LIBID3TAG_TRUE@am__append_15 = $(ID3TAG_CFLAGS) -@USE_LIBID3TAG_TRUE@am__append_16 = $(ID3TAG_LIBS) -@USE_LIBMAD_TRUE@am__append_17 = $(LIBMAD_CFLAGS) -@USE_LIBMAD_TRUE@am__append_18 = $(LIBMAD_LIBS) -@USE_LIBNYQUIST_TRUE@am__append_19 = $(LIBNYQUIST_CFLAGS) -@USE_LIBNYQUIST_TRUE@am__append_20 = $(LIBNYQUIST_LIBS) -@USE_LIBNYQUIST_TRUE@am__append_21 = \ +@USE_LIBID3TAG_TRUE@am__append_18 = $(ID3TAG_CFLAGS) +@USE_LIBID3TAG_TRUE@am__append_19 = $(ID3TAG_LIBS) +@USE_LIBMAD_TRUE@am__append_20 = $(LIBMAD_CFLAGS) +@USE_LIBMAD_TRUE@am__append_21 = $(LIBMAD_LIBS) +@USE_LIBNYQUIST_TRUE@am__append_22 = $(LIBNYQUIST_CFLAGS) +@USE_LIBNYQUIST_TRUE@am__append_23 = $(LIBNYQUIST_LIBS) +@USE_LIBNYQUIST_TRUE@am__append_24 = \ @USE_LIBNYQUIST_TRUE@ effects/nyquist/LoadNyquist.cpp \ @USE_LIBNYQUIST_TRUE@ effects/nyquist/LoadNyquist.h \ @USE_LIBNYQUIST_TRUE@ effects/nyquist/Nyquist.cpp \ @USE_LIBNYQUIST_TRUE@ effects/nyquist/Nyquist.h \ @USE_LIBNYQUIST_TRUE@ $(NULL) -@USE_LIBSOUNDTOUCH_TRUE@am__append_22 = $(SOUNDTOUCH_CFLAGS) -@USE_LIBSOUNDTOUCH_TRUE@am__append_23 = $(SOUNDTOUCH_LIBS) -@USE_LIBSOXR_TRUE@am__append_24 = $(SOXR_CFLAGS) -@USE_LIBSOXR_TRUE@am__append_25 = $(SOXR_LIBS) -@USE_LIBTWOLAME_TRUE@am__append_26 = $(LIBTWOLAME_CFLAGS) -@USE_LIBTWOLAME_TRUE@am__append_27 = $(LIBTWOLAME_LIBS) -@USE_LIBVORBIS_TRUE@am__append_28 = $(LIBVORBIS_CFLAGS) -@USE_LIBVORBIS_TRUE@am__append_29 = $(LIBVORBIS_LIBS) -@USE_LV2_TRUE@am__append_30 = $(LV2_CFLAGS) -@USE_LV2_TRUE@am__append_31 = $(LV2_LIBS) -@USE_LV2_TRUE@am__append_32 = \ +@USE_LIBSOUNDTOUCH_TRUE@am__append_25 = $(SOUNDTOUCH_CFLAGS) +@USE_LIBSOUNDTOUCH_TRUE@am__append_26 = $(SOUNDTOUCH_LIBS) +@USE_LIBSOXR_TRUE@am__append_27 = $(SOXR_CFLAGS) +@USE_LIBSOXR_TRUE@am__append_28 = $(SOXR_LIBS) +@USE_LIBTWOLAME_TRUE@am__append_29 = $(LIBTWOLAME_CFLAGS) +@USE_LIBTWOLAME_TRUE@am__append_30 = $(LIBTWOLAME_LIBS) +@USE_LIBVORBIS_TRUE@am__append_31 = $(LIBVORBIS_CFLAGS) +@USE_LIBVORBIS_TRUE@am__append_32 = $(LIBVORBIS_LIBS) +@USE_LV2_TRUE@am__append_33 = $(LV2_CFLAGS) +@USE_LV2_TRUE@am__append_34 = $(LV2_LIBS) +@USE_LV2_TRUE@am__append_35 = \ @USE_LV2_TRUE@ effects/lv2/LoadLV2.cpp \ @USE_LV2_TRUE@ effects/lv2/LoadLV2.h \ @USE_LV2_TRUE@ effects/lv2/LV2Effect.cpp \ @@ -154,27 +161,27 @@ bin_PROGRAMS = audacity$(EXEEXT) @USE_LV2_TRUE@ effects/lv2/lv2_uri_map.h \ @USE_LV2_TRUE@ $(NULL) -@USE_PORTSMF_TRUE@am__append_33 = $(PORTSMF_CFLAGS) -@USE_PORTSMF_TRUE@am__append_34 = $(PORTSMF_LIBS) -@USE_PORTSMF_TRUE@am__append_35 = \ +@USE_PORTSMF_TRUE@am__append_36 = $(PORTSMF_CFLAGS) +@USE_PORTSMF_TRUE@am__append_37 = $(PORTSMF_LIBS) +@USE_PORTSMF_TRUE@am__append_38 = \ @USE_PORTSMF_TRUE@ NoteTrack.cpp \ @USE_PORTSMF_TRUE@ NoteTrack.h \ @USE_PORTSMF_TRUE@ import/ImportMIDI.cpp \ @USE_PORTSMF_TRUE@ import/ImportMIDI.h \ @USE_PORTSMF_TRUE@ $(NULL) -@USE_QUICKTIME_TRUE@am__append_36 = $(QUICKTIME_CFLAGS) -@USE_QUICKTIME_TRUE@am__append_37 = $(QUICKTIME_LIBS) -@USE_QUICKTIME_TRUE@am__append_38 = \ +@USE_QUICKTIME_TRUE@am__append_39 = $(QUICKTIME_CFLAGS) +@USE_QUICKTIME_TRUE@am__append_40 = $(QUICKTIME_LIBS) +@USE_QUICKTIME_TRUE@am__append_41 = \ @USE_QUICKTIME_TRUE@ import/ImportQT.cpp \ @USE_QUICKTIME_TRUE@ import/ImportQT.h \ @USE_QUICKTIME_TRUE@ $(NULL) -@USE_SBSMS_TRUE@am__append_39 = $(SBSMS_CFLAGS) -@USE_SBSMS_TRUE@am__append_40 = $(SBSMS_LIBS) -@USE_VAMP_TRUE@am__append_41 = $(VAMP_CFLAGS) -@USE_VAMP_TRUE@am__append_42 = $(VAMP_LIBS) -@USE_VAMP_TRUE@am__append_43 = \ +@USE_SBSMS_TRUE@am__append_42 = $(SBSMS_CFLAGS) +@USE_SBSMS_TRUE@am__append_43 = $(SBSMS_LIBS) +@USE_VAMP_TRUE@am__append_44 = $(VAMP_CFLAGS) +@USE_VAMP_TRUE@am__append_45 = $(VAMP_LIBS) +@USE_VAMP_TRUE@am__append_46 = \ @USE_VAMP_TRUE@ effects/vamp/LoadVamp.cpp \ @USE_VAMP_TRUE@ effects/vamp/LoadVamp.h \ @USE_VAMP_TRUE@ effects/vamp/VampEffect.cpp \ @@ -189,6 +196,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/ac_c99_func_lrintf.m4 \ $(top_srcdir)/m4/audacity_checklib_ffmpeg.m4 \ + $(top_srcdir)/m4/audacity_checklib_gstreamer.m4 \ $(top_srcdir)/m4/audacity_checklib_lame.m4 \ $(top_srcdir)/m4/audacity_checklib_libexpat.m4 \ $(top_srcdir)/m4/audacity_checklib_libflac.m4 \ @@ -444,7 +452,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ effects/audiounits/AudioUnitEffect.h export/ExportFFmpeg.cpp \ export/ExportFFmpeg.h export/ExportFFmpegDialogs.cpp \ export/ExportFFmpegDialogs.h import/ImportFFmpeg.cpp \ - import/ImportFFmpeg.h effects/ladspa/ladspa.h \ + import/ImportFFmpeg.h import/ImportGStreamer.cpp \ + import/ImportGStreamer.h effects/ladspa/ladspa.h \ effects/ladspa/LadspaEffect.cpp effects/ladspa/LadspaEffect.h \ effects/ladspa/LoadLadspa.cpp effects/ladspa/LoadLadspa.h \ ondemand/ODDecodeFlacTask.cpp ondemand/ODDecodeFlacTask.h \ @@ -478,19 +487,21 @@ am__objects_1 = audacity-BlockFile.$(OBJEXT) \ @USE_FFMPEG_TRUE@ export/audacity-ExportFFmpeg.$(OBJEXT) \ @USE_FFMPEG_TRUE@ export/audacity-ExportFFmpegDialogs.$(OBJEXT) \ @USE_FFMPEG_TRUE@ import/audacity-ImportFFmpeg.$(OBJEXT) -@USE_LADSPA_TRUE@am__objects_4 = effects/ladspa/audacity-LadspaEffect.$(OBJEXT) \ +@USE_GSTREAMER_TRUE@am__objects_4 = \ +@USE_GSTREAMER_TRUE@ import/audacity-ImportGStreamer.$(OBJEXT) +@USE_LADSPA_TRUE@am__objects_5 = effects/ladspa/audacity-LadspaEffect.$(OBJEXT) \ @USE_LADSPA_TRUE@ effects/ladspa/audacity-LoadLadspa.$(OBJEXT) -@USE_LIBFLAC_TRUE@am__objects_5 = ondemand/audacity-ODDecodeFlacTask.$(OBJEXT) -@USE_LIBNYQUIST_TRUE@am__objects_6 = effects/nyquist/audacity-LoadNyquist.$(OBJEXT) \ +@USE_LIBFLAC_TRUE@am__objects_6 = ondemand/audacity-ODDecodeFlacTask.$(OBJEXT) +@USE_LIBNYQUIST_TRUE@am__objects_7 = effects/nyquist/audacity-LoadNyquist.$(OBJEXT) \ @USE_LIBNYQUIST_TRUE@ effects/nyquist/audacity-Nyquist.$(OBJEXT) -@USE_LV2_TRUE@am__objects_7 = effects/lv2/audacity-LoadLV2.$(OBJEXT) \ +@USE_LV2_TRUE@am__objects_8 = effects/lv2/audacity-LoadLV2.$(OBJEXT) \ @USE_LV2_TRUE@ effects/lv2/audacity-LV2Effect.$(OBJEXT) \ @USE_LV2_TRUE@ effects/lv2/audacity-LV2PortGroup.$(OBJEXT) -@USE_PORTSMF_TRUE@am__objects_8 = audacity-NoteTrack.$(OBJEXT) \ +@USE_PORTSMF_TRUE@am__objects_9 = audacity-NoteTrack.$(OBJEXT) \ @USE_PORTSMF_TRUE@ import/audacity-ImportMIDI.$(OBJEXT) -@USE_QUICKTIME_TRUE@am__objects_9 = \ +@USE_QUICKTIME_TRUE@am__objects_10 = \ @USE_QUICKTIME_TRUE@ import/audacity-ImportQT.$(OBJEXT) -@USE_VAMP_TRUE@am__objects_10 = \ +@USE_VAMP_TRUE@am__objects_11 = \ @USE_VAMP_TRUE@ effects/vamp/audacity-LoadVamp.$(OBJEXT) \ @USE_VAMP_TRUE@ effects/vamp/audacity-VampEffect.$(OBJEXT) am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ @@ -682,34 +693,36 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ xml/audacity-XMLWriter.$(OBJEXT) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ - $(am__objects_9) $(am__objects_10) + $(am__objects_9) $(am__objects_10) $(am__objects_11) audacity_OBJECTS = $(am_audacity_OBJECTS) @USE_FFMPEG_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@USE_LAME_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) -@USE_LIBFLAC_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) -@USE_LIBID3TAG_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) -@USE_LIBMAD_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) -@USE_LIBNYQUIST_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) -@USE_LIBSOUNDTOUCH_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) -@USE_LIBSOXR_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) -@USE_LIBTWOLAME_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) -@USE_LIBVORBIS_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) -@USE_LV2_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) -@USE_PORTSMF_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) -@USE_SBSMS_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) -@USE_VAMP_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) +@USE_GSTREAMER_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) +@USE_LAME_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@USE_LIBFLAC_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +@USE_LIBID3TAG_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) +@USE_LIBMAD_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) +@USE_LIBNYQUIST_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) +@USE_LIBSOUNDTOUCH_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) +@USE_LIBSOXR_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) +@USE_LIBTWOLAME_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) +@USE_LIBVORBIS_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) +@USE_LV2_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) +@USE_PORTSMF_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) +@USE_SBSMS_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) +@USE_VAMP_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) audacity_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \ $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \ $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \ $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \ - $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_14) $(am__DEPENDENCIES_15) + $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_14) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_15) \ + $(am__DEPENDENCIES_16) audacity_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(audacity_LDFLAGS) $(LDFLAGS) -o $@ @@ -873,6 +886,8 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ @@ -1073,20 +1088,22 @@ audacity_CPPFLAGS = -D__STDC_CONSTANT_MACROS -DLIBDIR=\"$(libdir)\" \ $(EXPAT_CFLAGS) $(FILEDIALOG_CFLAGS) $(PORTAUDIO_CFLAGS) \ $(PORTMIXER_CFLAGS) $(SNDFILE_CFLAGS) $(WIDGETEXTRA_CFLAGS) \ $(WX_CXXFLAGS) $(NULL) $(am__append_1) $(am__append_4) \ - $(am__append_7) $(am__append_10) $(am__append_12) \ - $(am__append_15) $(am__append_17) $(am__append_19) \ - $(am__append_22) $(am__append_24) $(am__append_26) \ - $(am__append_28) $(am__append_30) $(am__append_33) \ - $(am__append_36) $(am__append_39) $(am__append_41) + $(am__append_7) $(am__append_10) $(am__append_13) \ + $(am__append_15) $(am__append_18) $(am__append_20) \ + $(am__append_22) $(am__append_25) $(am__append_27) \ + $(am__append_29) $(am__append_31) $(am__append_33) \ + $(am__append_36) $(am__append_39) $(am__append_42) \ + $(am__append_44) audacity_LDFLAGS = -rdynamic audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \ $(PORTMIXER_LIBS) $(SNDFILE_LIBS) $(WIDGETEXTRA_LIBS) \ $(WX_LIBS) $(NULL) $(am__append_2) $(am__append_5) \ - $(am__append_8) $(am__append_11) $(am__append_13) \ - $(am__append_16) $(am__append_18) $(am__append_20) \ - $(am__append_23) $(am__append_25) $(am__append_27) \ - $(am__append_29) $(am__append_31) $(am__append_34) \ - $(am__append_37) $(am__append_40) $(am__append_42) + $(am__append_8) $(am__append_11) $(am__append_14) \ + $(am__append_16) $(am__append_19) $(am__append_21) \ + $(am__append_23) $(am__append_26) $(am__append_28) \ + $(am__append_30) $(am__append_32) $(am__append_34) \ + $(am__append_37) $(am__append_40) $(am__append_43) \ + $(am__append_45) audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ AboutDialog.h AColor.cpp AColor.h AllThemeResources.h \ Audacity.h AudacityApp.cpp AudacityApp.h AudacityLogger.cpp \ @@ -1259,8 +1276,9 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ widgets/Warning.cpp widgets/Warning.h xml/XMLFileReader.cpp \ xml/XMLFileReader.h xml/XMLWriter.cpp xml/XMLWriter.h $(NULL) \ $(am__append_3) $(am__append_6) $(am__append_9) \ - $(am__append_14) $(am__append_21) $(am__append_32) \ - $(am__append_35) $(am__append_38) $(am__append_43) + $(am__append_12) $(am__append_17) $(am__append_24) \ + $(am__append_35) $(am__append_38) $(am__append_41) \ + $(am__append_46) # TODO: Check *.cpp and *.h files if they are needed. EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \ @@ -1809,6 +1827,8 @@ export/audacity-ExportFFmpegDialogs.$(OBJEXT): export/$(am__dirstamp) \ export/$(DEPDIR)/$(am__dirstamp) import/audacity-ImportFFmpeg.$(OBJEXT): import/$(am__dirstamp) \ import/$(DEPDIR)/$(am__dirstamp) +import/audacity-ImportGStreamer.$(OBJEXT): import/$(am__dirstamp) \ + import/$(DEPDIR)/$(am__dirstamp) effects/ladspa/$(am__dirstamp): @$(MKDIR_P) effects/ladspa @: > effects/ladspa/$(am__dirstamp) @@ -2084,6 +2104,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-Import.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-ImportFFmpeg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-ImportFLAC.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-ImportGStreamer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-ImportLOF.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-ImportMIDI.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@import/$(DEPDIR)/audacity-ImportMP3.Po@am__quote@ @@ -5569,6 +5590,20 @@ import/audacity-ImportFFmpeg.obj: import/ImportFFmpeg.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o import/audacity-ImportFFmpeg.obj `if test -f 'import/ImportFFmpeg.cpp'; then $(CYGPATH_W) 'import/ImportFFmpeg.cpp'; else $(CYGPATH_W) '$(srcdir)/import/ImportFFmpeg.cpp'; fi` +import/audacity-ImportGStreamer.o: import/ImportGStreamer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT import/audacity-ImportGStreamer.o -MD -MP -MF import/$(DEPDIR)/audacity-ImportGStreamer.Tpo -c -o import/audacity-ImportGStreamer.o `test -f 'import/ImportGStreamer.cpp' || echo '$(srcdir)/'`import/ImportGStreamer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) import/$(DEPDIR)/audacity-ImportGStreamer.Tpo import/$(DEPDIR)/audacity-ImportGStreamer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='import/ImportGStreamer.cpp' object='import/audacity-ImportGStreamer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o import/audacity-ImportGStreamer.o `test -f 'import/ImportGStreamer.cpp' || echo '$(srcdir)/'`import/ImportGStreamer.cpp + +import/audacity-ImportGStreamer.obj: import/ImportGStreamer.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT import/audacity-ImportGStreamer.obj -MD -MP -MF import/$(DEPDIR)/audacity-ImportGStreamer.Tpo -c -o import/audacity-ImportGStreamer.obj `if test -f 'import/ImportGStreamer.cpp'; then $(CYGPATH_W) 'import/ImportGStreamer.cpp'; else $(CYGPATH_W) '$(srcdir)/import/ImportGStreamer.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) import/$(DEPDIR)/audacity-ImportGStreamer.Tpo import/$(DEPDIR)/audacity-ImportGStreamer.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='import/ImportGStreamer.cpp' object='import/audacity-ImportGStreamer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o import/audacity-ImportGStreamer.obj `if test -f 'import/ImportGStreamer.cpp'; then $(CYGPATH_W) 'import/ImportGStreamer.cpp'; else $(CYGPATH_W) '$(srcdir)/import/ImportGStreamer.cpp'; fi` + effects/ladspa/audacity-LadspaEffect.o: effects/ladspa/LadspaEffect.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT effects/ladspa/audacity-LadspaEffect.o -MD -MP -MF effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Tpo -c -o effects/ladspa/audacity-LadspaEffect.o `test -f 'effects/ladspa/LadspaEffect.cpp' || echo '$(srcdir)/'`effects/ladspa/LadspaEffect.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Tpo effects/ladspa/$(DEPDIR)/audacity-LadspaEffect.Po diff --git a/src/configtemplate.h b/src/configtemplate.h index a5c5905a9..8d422cf0c 100644 --- a/src/configtemplate.h +++ b/src/configtemplate.h @@ -128,6 +128,9 @@ */ #undef USE_FFMPEG +/* Define if the gstreamer is present */ +#undef USE_GSTREAMER + /* Define if LADSPA plug-ins are enabled */ #undef USE_LADSPA diff --git a/tests/Makefile.in b/tests/Makefile.in index 3abd2fe17..5ebdc9196 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -86,6 +86,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/ac_c99_func_lrintf.m4 \ $(top_srcdir)/m4/audacity_checklib_ffmpeg.m4 \ + $(top_srcdir)/m4/audacity_checklib_gstreamer.m4 \ $(top_srcdir)/m4/audacity_checklib_lame.m4 \ $(top_srcdir)/m4/audacity_checklib_libexpat.m4 \ $(top_srcdir)/m4/audacity_checklib_libflac.m4 \ @@ -459,6 +460,8 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@