From 77ceb6a70726c2f84a9ad3fce66567fcd5bca8e9 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sun, 12 Feb 2017 12:31:34 +0000
Subject: [PATCH] Linux Build Settings.

Configure.ac:
  Upped version number to 2.1.3
  Made FFmpeg and LibFlac Local

Readme.txt:
  Added instruction for CFLAGS.
  Use XCodebuild instructions on Mac, not autotools.
  one reason is, on Mac must use patched wxWidgets 3.0.2
---
 README.txt   |  4 ++--
 configure    | 28 +++++++++++++++-------------
 configure.ac |  5 ++++-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/README.txt b/README.txt
index 981af96cd..b909cae2a 100644
--- a/README.txt
+++ b/README.txt
@@ -270,10 +270,10 @@ Installation of other libraries is optional, see:
 If you install libraries using a package management system like Apt or RPM,
 you need to install the "dev" (development) packages for each library.
 
-To compile on Linux, Mac OS X and other Unix systems, execute these 
+To compile on Linux and other Unix systems and using gnu tools, execute these 
 commands:
 
-  ./configure
+  ./configure CXXFLAGS="-std=gnu++11"
   make
   make install  # as root
 
diff --git a/configure b/configure
index 1270409f2..bf184960b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for audacity 2.0.6.
+# Generated by GNU Autoconf 2.69 for audacity 2.1.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='audacity'
 PACKAGE_TARNAME='audacity'
-PACKAGE_VERSION='2.0.6'
-PACKAGE_STRING='audacity 2.0.6'
+PACKAGE_VERSION='2.1.3'
+PACKAGE_STRING='audacity 2.1.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1575,7 +1575,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures audacity 2.0.6 to adapt to many kinds of systems.
+\`configure' configures audacity 2.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1645,7 +1645,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of audacity 2.0.6:";;
+     short | recursive ) echo "Configuration of audacity 2.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1866,7 +1866,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-audacity configure 2.0.6
+audacity configure 2.1.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2504,7 +2504,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacity $as_me 2.0.6, which was
+It was created by audacity $as_me 2.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3059,8 +3059,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -3373,7 +3373,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='audacity'
- VERSION='2.0.6'
+ VERSION='2.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3582,7 +3582,6 @@ END
   fi
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -22643,6 +22642,9 @@ $as_echo "$as_me: libwidgetextra library is NOT available in the local tree" >&6
    fi
 
 
+FFMPEG_ARGUMENT=local
+LIBFLAC_ARGUMENT=local
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: Figuring out what libraries to enable" >&5
 $as_echo "$as_me: Figuring out what libraries to enable" >&6;}
@@ -24703,7 +24705,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacity $as_me 2.0.6, which was
+This file was extended by audacity $as_me 2.1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24769,7 +24771,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacity config.status 2.0.6
+audacity config.status 2.1.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 9fa0845ff..f0a08a720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl Require autoconf >= 2.59
 AC_PREREQ([2.59])
 
 dnl Init autoconf
-AC_INIT([audacity], [2.1.2])
+AC_INIT([audacity], [2.1.3])
 dnl Check for existence of Audacity.h
 AC_CONFIG_SRCDIR([src/Audacity.h])
 AC_CONFIG_AUX_DIR([autotools])
@@ -360,6 +360,9 @@ AUDACITY_CHECKLIB_PORTAUDIO
 AUDACITY_CHECKLIB_PORTSMF
 AUDACITY_CHECKLIB_WIDGETEXTRA
 
+FFMPEG_ARGUMENT=local
+LIBFLAC_ARGUMENT=local
+
 dnl Decide what libraries to build with, and whether to use system or local libraries
 dnl Set variables based on choices.