diff --git a/configure b/configure
index c9d0e9a9a..133619260 100755
--- a/configure
+++ b/configure
@@ -22988,7 +22988,7 @@ $as_echo "#define USE_LIBID3TAG 1" >>confdefs.h
if test "$LIBMAD_USE_LOCAL" = yes; then
- LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad'
+ LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad -I../lib-src/libmad'
LIBMAD_LIBS='$(top_builddir)/lib-src/libmad/libmad.la'
subdirs="$subdirs lib-src/libmad"
@@ -23178,7 +23178,7 @@ fi
if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes; then
- SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include'
+ SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include -I../lib-src/soundtouch/include'
SOUNDTOUCH_LIBS='$(top_builddir)/lib-src/soundtouch/source/SoundTouch/.libs/libSoundTouch.a'
subdirs="$subdirs lib-src/soundtouch"
diff --git a/help/Makefile.in b/help/Makefile.in
index df6006f09..fdd08de1e 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -266,6 +266,8 @@ LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
+LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
+LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
diff --git a/images/Makefile.am b/images/Makefile.am
index 8293d82c5..6834cbced 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -81,9 +81,3 @@ EXTRA_DIST = \
SliderThumb_VerticalAlpha.xpm \
SliderThumb_VerticalDisabled.xpm \
$(NULL)
-
-# Copy AudacityLogo48x48.xpm to icons/48x48/audacity.xpm
-# We could rename this file instead and adjust all locations.
-icons/48x48/audacity.xpm: AudacityLogo48x48.xpm
- cp AudacityLogo48x48.xpm icons/48x48/audacity.xpm
-CLEANFILES = icons/48x48/audacity.xpm
diff --git a/images/Makefile.in b/images/Makefile.in
index 5d34f7622..7983bc3a7 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -270,6 +270,8 @@ LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
+LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
+LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
@@ -474,7 +476,6 @@ EXTRA_DIST = \
SliderThumb_VerticalDisabled.xpm \
$(NULL)
-CLEANFILES = icons/48x48/audacity.xpm
all: all-am
.SUFFIXES:
@@ -748,7 +749,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -852,11 +852,6 @@ uninstall-am: uninstall-dist_icons16DATA uninstall-dist_icons22DATA \
uninstall-pixmapDATA
-# Copy AudacityLogo48x48.xpm to icons/48x48/audacity.xpm
-# We could rename this file instead and adjust all locations.
-icons/48x48/audacity.xpm: AudacityLogo48x48.xpm
- cp AudacityLogo48x48.xpm icons/48x48/audacity.xpm
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/images/icons/48x48/audacity.xpm b/images/icons/48x48/audacity.xpm
new file mode 100644
index 000000000..9750627b3
--- /dev/null
+++ b/images/icons/48x48/audacity.xpm
@@ -0,0 +1,1133 @@
+/* XPM */
+static const char * AudacityLogo48x48_xpm[] = {
+"48 48 1082 2",
+" c #FFFFFF",
+". c #FFFFFE",
+"+ c #FEFEFB",
+"@ c #FCFCFB",
+"# c #E3E3F4",
+"$ c #A1A2E6",
+"% c #6B6BD8",
+"& c #4343C8",
+"* c #2B2AC2",
+"= c #1D1CBA",
+"- c #1F1EB9",
+"; c #3232BC",
+"> c #4C4CC0",
+", c #7A79D0",
+"' c #B5B4E1",
+") c #F0F0F7",
+"! c #FDFDFC",
+"~ c #FEFEFD",
+"{ c #F6F6FB",
+"] c #A5A6E7",
+"^ c #4646D4",
+"/ c #1817C3",
+"( c #1110AB",
+"_ c #0B0A8C",
+": c #090972",
+"< c #070762",
+"[ c #03045D",
+"} c #04035F",
+"| c #02026D",
+"1 c #02027B",
+"2 c #03028C",
+"3 c #03029B",
+"4 c #1313A0",
+"5 c #5B5BBC",
+"6 c #C3C3E6",
+"7 c #FBFBFC",
+"8 c #FEFEFE",
+"9 c #FDFDFB",
+"0 c #FBFBFA",
+"a c #B2B2EB",
+"b c #3A39D1",
+"c c #2423BD",
+"d c #19187D",
+"e c #070643",
+"f c #131339",
+"g c #3E3D5B",
+"h c #605F77",
+"i c #6F6F86",
+"j c #78788F",
+"k c #75748D",
+"l c #6B6A86",
+"m c #565577",
+"n c #2E2D64",
+"o c #090852",
+"p c #020268",
+"q c #020284",
+"r c #060691",
+"s c #4F4FAC",
+"t c #D3D3E8",
+"u c #FAFAF9",
+"v c #F1F1F9",
+"w c #6B6ADD",
+"x c #2F2EC7",
+"y c #25267B",
+"z c #0A0A2F",
+"A c #46465F",
+"B c #8E8D9F",
+"C c #BABABD",
+"D c #C0C0C1",
+"E c #C6C6C4",
+"F c #CCCBCA",
+"G c #CFCECD",
+"H c #D1D1D1",
+"I c #D0CFD0",
+"J c #CCCCCB",
+"K c #BBBBC3",
+"L c #7A7A9F",
+"M c #2D2D6E",
+"N c #030366",
+"O c #020185",
+"P c #0F0E8B",
+"Q c #9697C6",
+"R c #F5F5F6",
+"S c #ECECF8",
+"T c #4B4AD9",
+"U c #4040BC",
+"V c #0F0F3B",
+"W c #3C3A53",
+"X c #A2A1AF",
+"Y c #BEBFC0",
+"Z c #C5C6C5",
+"` c #DDDDDD",
+" . c #E7E7E7",
+".. c #EEEEEE",
+"+. c #F1F1F1",
+"@. c #F2F2F3",
+"#. c #F2F1F2",
+"$. c #EFEFEF",
+"%. c #E9E9E9",
+"&. c #E0E0E0",
+"*. c #D2D2D4",
+"=. c #8C8BB3",
+"-. c #1D1C6E",
+";. c #04037F",
+">. c #7171B0",
+",. c #F0F0F0",
+"'. c #FDFDFD",
+"). c #F2F2F9",
+"!. c #4948D9",
+"~. c #4041A8",
+"{. c #727283",
+"]. c #BEBEBF",
+"^. c #C3C4C4",
+"/. c #D3D4D3",
+"(. c #E5E5E4",
+"_. c #F9F9F9",
+":. c #FAFAFA",
+"<. c #F4F4F6",
+"[. c #EAE9E9",
+"}. c #CDCCD7",
+"|. c #49488E",
+"1. c #02027A",
+"2. c #030278",
+"3. c #7372AD",
+"4. c #F1F0F1",
+"5. c #FCFCFC",
+"6. c #FBFBF9",
+"7. c #6868DD",
+"8. c #3C3CB6",
+"9. c #0C0C2C",
+"0. c #878696",
+"a. c #BDBEBE",
+"b. c #C9CACA",
+"c. c #DFDFDF",
+"d. c #F2F2F2",
+"e. c #FBFBFB",
+"f. c #F6F6F5",
+"g. c #E2E2E5",
+"h. c #5B5BA2",
+"i. c #020180",
+"j. c #06056F",
+"k. c #9A9ABF",
+"l. c #B6B7EC",
+"m. c #2C2CC9",
+"n. c #0F0F41",
+"o. c #737187",
+"p. c #BFBEBE",
+"q. c #CCCCCC",
+"r. c #E6E5E5",
+"s. c #F7F7F8",
+"t. c #FAFAFB",
+"u. c #E7E7ED",
+"v. c #41409A",
+"w. c #020187",
+"x. c #19196C",
+"y. c #D2D0DB",
+"z. c #F6F6F6",
+"A. c #FAFAFC",
+"B. c #3F3ED2",
+"C. c #232284",
+"D. c #383850",
+"E. c #BCBCC0",
+"F. c #CBCAC9",
+"G. c #D0D1E5",
+"H. c #11108F",
+"I. c #02026F",
+"J. c #6D6C9B",
+"K. c #C1C1EC",
+"L. c #1C1BC1",
+"M. c #090835",
+"N. c #9B9BAA",
+"O. c #C4C4C3",
+"P. c #DFDFDE",
+"Q. c #F7F7F7",
+"R. c #FDFCF7",
+"S. c #FCFAF1",
+"T. c #FCFCF6",
+"U. c #7575C3",
+"V. c #1A195F",
+"W. c #CDCCD4",
+"X. c #F2F2F1",
+"Y. c #7777DB",
+"Z. c #131297",
+"`. c #2A2949",
+" + c #BDBEBF",
+".+ c #D2D2D2",
+"++ c #FDFDF9",
+"@+ c #FCFCF9",
+"#+ c #FBFBF2",
+"$+ c #FBF4D8",
+"%+ c #FCEDBF",
+"&+ c #FCF0CB",
+"*+ c #FBF8E7",
+"=+ c #FCFBF3",
+"-+ c #FEFEFC",
+";+ c #D4D4E9",
+">+ c #06059C",
+",+ c #020253",
+"'+ c #9F9FB3",
+")+ c #4242C9",
+"!+ c #0C0B73",
+"~+ c #595874",
+"{+ c #C2C3C4",
+"]+ c #E0E0E1",
+"^+ c #FAF9FA",
+"/+ c #FDFDFA",
+"(+ c #FBF8E6",
+"_+ c #FBF3D4",
+":+ c #FBF3D5",
+"<+ c #FCF2D1",
+"[+ c #FAE7A1",
+"}+ c #F7DB76",
+"|+ c #F8E28B",
+"1+ c #F6ECC9",
+"2+ c #F6F6EB",
+"3+ c #FBF6E2",
+"4+ c #FBEFC8",
+"5+ c #FBF6E0",
+"6+ c #FCFCF8",
+"7+ c #2222AF",
+"8+ c #03026A",
+"9+ c #72718F",
+"0+ c #DBDBDB",
+"a+ c #2121BE",
+"b+ c #06065E",
+"c+ c #77768C",
+"d+ c #CAC8C9",
+"e+ c #EAEBEA",
+"f+ c #FCFAEE",
+"g+ c #FBEDC0",
+"h+ c #F9E38E",
+"i+ c #F9E59F",
+"j+ c #F8DC6E",
+"k+ c #F3C13F",
+"l+ c #F3D85B",
+"m+ c #ECDCA6",
+"n+ c #ECE8D6",
+"o+ c #FAEABA",
+"p+ c #F8E085",
+"q+ c #F7DF82",
+"r+ c #F7E8B9",
+"s+ c #F5F5EB",
+"t+ c #4949C1",
+"u+ c #030274",
+"v+ c #575678",
+"w+ c #D3D2D1",
+"x+ c #F3F2F3",
+"y+ c #F7F7F9",
+"z+ c #1A1AC1",
+"A+ c #09095D",
+"B+ c #7C7C96",
+"C+ c #BFC0CE",
+"D+ c #C8C8E5",
+"E+ c #FBF1CE",
+"F+ c #F9E28F",
+"G+ c #F5CE4D",
+"H+ c #F6D654",
+"I+ c #F3D871",
+"J+ c #F5D64E",
+"K+ c #F6A72C",
+"L+ c #F4D53C",
+"M+ c #E8D17C",
+"N+ c #EBDAA6",
+"O+ c #F5DD8E",
+"P+ c #F6D657",
+"Q+ c #F6CA50",
+"R+ c #EEDA97",
+"S+ c #ECE9DA",
+"T+ c #F6F7F4",
+"U+ c #CECDE7",
+"V+ c #F2F2F7",
+"W+ c #5352C9",
+"X+ c #07067F",
+"Y+ c #4E4E78",
+"Z+ c #CDCDCE",
+"`+ c #D5D5F3",
+" @ c #3E3DD4",
+".@ c #2423CF",
+"+@ c #0C0B4B",
+"@@ c #7B7B96",
+"#@ c #9494C7",
+"$@ c #272795",
+"%@ c #D2D2E7",
+"&@ c #FBFAF1",
+"*@ c #F9E498",
+"=@ c #F7DC56",
+"-@ c #F7C52F",
+";@ c #F4C933",
+">@ c #EED04D",
+",@ c #F2D33B",
+"'@ c #F9931E",
+")@ c #F5D825",
+"!@ c #EDD447",
+"~@ c #EDD36E",
+"{@ c #F4D764",
+"]@ c #F6CC3E",
+"^@ c #F1C43F",
+"/@ c #E7D186",
+"(@ c #E2DFCF",
+"_@ c #B6B7EA",
+":@ c #2E2C9D",
+"<@ c #DCDCEC",
+"[@ c #504FC5",
+"}@ c #2929AF",
+"|@ c #05057B",
+"1@ c #5654A0",
+"2@ c #DFDFE8",
+"3@ c #D9D9F4",
+"4@ c #2120D2",
+"5@ c #201FD0",
+"6@ c #2222A5",
+"7@ c #020230",
+"8@ c #7A7B98",
+"9@ c #7B7CC2",
+"0@ c #090875",
+"a@ c #BFBECC",
+"b@ c #E7E6E2",
+"c@ c #F9F2D7",
+"d@ c #F9E49C",
+"e@ c #F7D450",
+"f@ c #F8E028",
+"g@ c #F8C717",
+"h@ c #F6B721",
+"i@ c #EFD238",
+"j@ c #F4D52F",
+"k@ c #F88711",
+"l@ c #FADE10",
+"m@ c #F6D520",
+"n@ c #EFD138",
+"o@ c #F1D53E",
+"p@ c #F5BE2A",
+"q@ c #F4BA35",
+"r@ c #E3CC7B",
+"s@ c #DFDAC6",
+"t@ c #EFF0EB",
+"u@ c #8D8DDB",
+"v@ c #0C0C74",
+"w@ c #C9C9D9",
+"x@ c #4A49BF",
+"y@ c #2C2CC2",
+"z@ c #18179F",
+"A@ c #020271",
+"B@ c #464592",
+"C@ c #E8E8EC",
+"D@ c #F3F3F8",
+"E@ c #3738D2",
+"F@ c #9494DD",
+"G@ c #07076D",
+"H@ c #010129",
+"I@ c #787894",
+"J@ c #7D7DBF",
+"K@ c #080774",
+"L@ c #B6B1BC",
+"M@ c #E0D6C2",
+"N@ c #F8E5A7",
+"O@ c #F7DD67",
+"P@ c #F7C829",
+"Q@ c #FCE811",
+"R@ c #FBC30B",
+"S@ c #F9A415",
+"T@ c #F0D52B",
+"U@ c #F6DA23",
+"V@ c #FB7F0F",
+"W@ c #FBE107",
+"X@ c #F9D40D",
+"Y@ c #F7CD20",
+"Z@ c #F3D72D",
+"`@ c #F7B524",
+" # c #F0BA2E",
+".# c #E2CA6D",
+"+# c #DFD5AE",
+"@# c #EFE9D3",
+"## c #FAF8EE",
+"$# c #898ADA",
+"%# c #0B0A72",
+"&# c #BBBAC8",
+"*# c #4545BB",
+"=# c #0404B0",
+"-# c #1E1CAB",
+";# c #02017C",
+"># c #02025E",
+",# c #6E6DA2",
+"'# c #EDEDEC",
+")# c #8D8DE5",
+"!# c #0807C8",
+"~# c #8282E3",
+"{# c #3E3EB1",
+"]# c #01015A",
+"^# c #010128",
+"/# c #797994",
+"(# c #7D7CC0",
+"_# c #080675",
+":# c #B3AEB3",
+"<# c #E2D09D",
+"[# c #F7D764",
+"}# c #F8DC35",
+"|# c #F9C515",
+"1# c #FDE906",
+"2# c #FCBA06",
+"3# c #FA970C",
+"4# c #F4DA21",
+"5# c #F7DA1B",
+"6# c #FB7A09",
+"7# c #FCE307",
+"8# c #FACB09",
+"9# c #F9C911",
+"0# c #F7DF1B",
+"a# c #F9AE17",
+"b# c #F3B825",
+"c# c #E7CE4E",
+"d# c #EAD26F",
+"e# c #F1DD8F",
+"f# c #F6EBC4",
+"g# c #8785CB",
+"h# c #0A0A72",
+"i# c #B9B8C7",
+"j# c #0202B1",
+"k# c #1110AE",
+"l# c #020287",
+"m# c #010165",
+"n# c #090956",
+"o# c #B9B8CC",
+"p# c #F7F8FB",
+"q# c #2222CB",
+"r# c #2221CB",
+"s# c #6767CF",
+"t# c #04038D",
+"u# c #010158",
+"v# c #010127",
+"w# c #787895",
+"x# c #7C7CBF",
+"y# c #090774",
+"z# c #B6AEAC",
+"A# c #E5CD7F",
+"B# c #F6C93B",
+"C# c #FAE318",
+"D# c #FCC409",
+"E# c #FDE806",
+"F# c #FCAE05",
+"G# c #FA8E0A",
+"H# c #F9E118",
+"I# c #F8D514",
+"J# c #FC7605",
+"K# c #FDDF04",
+"L# c #FCBD06",
+"M# c #FAB60B",
+"N# c #FAEB0B",
+"O# c #FBAD0E",
+"P# c #F6B91A",
+"Q# c #EFD533",
+"R# c #F1CD37",
+"S# c #F5D245",
+"T# c #F4DD7D",
+"U# c #837BB2",
+"V# c #0A0A71",
+"W# c #B7B7C6",
+"X# c #4645BB",
+"Y# c #0202B0",
+"Z# c #100EAB",
+"`# c #030290",
+" $ c #010170",
+".$ c #01014D",
+"+$ c #585786",
+"@$ c #E1E1E1",
+"#$ c #BDBDEF",
+"$$ c #0303C1",
+"%$ c #3F3FCE",
+"&$ c #2322AD",
+"*$ c #02018A",
+"=$ c #010157",
+"-$ c #797998",
+";$ c #7D7CBF",
+">$ c #B7ABA1",
+",$ c #E8CB6A",
+"'$ c #F7C327",
+")$ c #FCEC0D",
+"!$ c #FCC006",
+"~$ c #FDE905",
+"{$ c #FCA106",
+"]$ c #FC8207",
+"^$ c #FAE810",
+"/$ c #FBD40C",
+"($ c #FC7105",
+"_$ c #FCDA04",
+":$ c #FBA405",
+"<$ c #FA9208",
+"[$ c #FDF307",
+"}$ c #FAAE09",
+"|$ c #F9B90F",
+"1$ c #F7DD1A",
+"2$ c #F6C417",
+"3$ c #F9D719",
+"4$ c #F2D73A",
+"5$ c #827491",
+"6$ c #B5B5C4",
+"7$ c #0F0EAC",
+"8$ c #020292",
+"9$ c #01017C",
+"0$ c #010156",
+"a$ c #141350",
+"b$ c #CBCBD0",
+"c$ c #7878D8",
+"d$ c #0404BD",
+"e$ c #3735C3",
+"f$ c #080798",
+"g$ c #010189",
+"h$ c #7B7A93",
+"i$ c #7C7BBE",
+"j$ c #080775",
+"k$ c #BCAA88",
+"l$ c #ECCE50",
+"m$ c #F9B91D",
+"n$ c #FCEE08",
+"o$ c #FBBA04",
+"p$ c #FDE904",
+"q$ c #FC8A05",
+"r$ c #FC7404",
+"s$ c #FCF00A",
+"t$ c #FAC708",
+"u$ c #FC6704",
+"v$ c #FCD404",
+"w$ c #FC7D05",
+"x$ c #FC7103",
+"y$ c #FDF606",
+"z$ c #FAA407",
+"A$ c #FCAE07",
+"B$ c #FAEB0D",
+"C$ c #FBB209",
+"D$ c #FCE709",
+"E$ c #F6C21D",
+"F$ c #817476",
+"G$ c #0A0970",
+"H$ c #B4B2B6",
+"I$ c #100FAE",
+"J$ c #030293",
+"K$ c #010184",
+"L$ c #01015B",
+"M$ c #020239",
+"N$ c #9F9EB1",
+"O$ c #E4E5E4",
+"P$ c #4B4BCB",
+"Q$ c #0605BC",
+"R$ c #2422B9",
+"S$ c #020189",
+"T$ c #817C8F",
+"U$ c #7D79B3",
+"V$ c #080875",
+"W$ c #CAB152",
+"X$ c #F3DB2A",
+"Y$ c #FAB20E",
+"Z$ c #FCF006",
+"`$ c #FCAD05",
+" % c #FCDB05",
+".% c #FC7104",
+"+% c #FC6403",
+"@% c #FBEE05",
+"#% c #FBB305",
+"$% c #FC5A03",
+"%% c #FCCA04",
+"&% c #FB4C05",
+"*% c #FC4F03",
+"=% c #FAE604",
+"-% c #FC8105",
+";% c #FB9B05",
+">% c #FBF806",
+",% c #FB9506",
+"'% c #F9A80E",
+")% c #847A61",
+"!% c #B9B1A2",
+"~% c #4744B8",
+"{% c #110FAE",
+"]% c #030294",
+"^% c #020188",
+"/% c #010161",
+"(% c #010138",
+"_% c #7D7C96",
+":% c #DADADB",
+"<% c #F8F8F9",
+"[% c #2F2EC1",
+"}% c #0504B5",
+"|% c #1613AC",
+"1% c #020192",
+"2% c #847D87",
+"3% c #8178A2",
+"4% c #080772",
+"5% c #D3C225",
+"6% c #F9BE0E",
+"7% c #FA9606",
+"8% c #FDE104",
+"9% c #FC9704",
+"0% c #FCBB04",
+"a% c #FC5004",
+"b% c #FC5304",
+"c% c #FDD404",
+"d% c #FB8F05",
+"e% c #FC4803",
+"f% c #FCAC04",
+"g% c #FC3103",
+"h% c #FBB806",
+"i% c #FC4C03",
+"j% c #FC6904",
+"k% c #FCE806",
+"l% c #FB6204",
+"m% c #FBBD07",
+"n% c #FC7B05",
+"o% c #89805D",
+"p% c #0B0971",
+"q% c #BEB08B",
+"r% c #4543B5",
+"s% c #010162",
+"t% c #010132",
+"u% c #6F6F87",
+"v% c #D3D3D4",
+"w% c #F5F4F5",
+"x% c #2323BB",
+"y% c #0303B1",
+"z% c #0E0EAB",
+"A% c #020191",
+"B% c #877D84",
+"C% c #847598",
+"D% c #090673",
+"E% c #D6BB1A",
+"F% c #FA7205",
+"G% c #FA7506",
+"H% c #FABE04",
+"I% c #FC6E04",
+"J% c #FC9204",
+"K% c #FC2603",
+"L% c #FC4103",
+"M% c #FCB505",
+"N% c #FB5D05",
+"O% c #FC3404",
+"P% c #FC8006",
+"Q% c #FC2004",
+"R% c #FB1904",
+"S% c #FA6407",
+"T% c #FC2E03",
+"U% c #FC3003",
+"V% c #FC9606",
+"W% c #FB3D04",
+"X% c #FB7B05",
+"Y% c #FB5105",
+"Z% c #877059",
+"`% c #0A0971",
+" & c #BCAE83",
+".& c #4441B0",
+"+& c #100FAF",
+"@& c #02018D",
+"#& c #01012F",
+"$& c #6B6B7F",
+"%& c #D0D1D1",
+"&& c #2D2CBA",
+"*& c #0202AC",
+"=& c #0A09A7",
+"-& c #867C7E",
+";& c #867694",
+">& c #070574",
+",& c #D59F18",
+"'& c #FB4E05",
+")& c #FC4204",
+"!& c #FB8006",
+"~& c #FB4D05",
+"{& c #FC1A03",
+"]& c #FC3303",
+"^& c #FB8605",
+"/& c #FC3503",
+"(& c #FB2204",
+"_& c #FB4105",
+":& c #FD1103",
+"<& c #FC0E03",
+"[& c #FC1704",
+"}& c #FD1503",
+"|& c #FD1202",
+"1& c #FB2C04",
+"2& c #FC1D04",
+"3& c #FC2604",
+"4& c #FB3405",
+"5& c #864B5D",
+"6& c #0A096E",
+"7& c #BDAD82",
+"8& c #4341B0",
+"9& c #02018C",
+"0& c #01015E",
+"a& c #6D6D81",
+"b& c #CECFD0",
+"c& c #4646C0",
+"d& c #0202A7",
+"e& c #0706A6",
+"f& c #01018A",
+"g& c #887C7A",
+"h& c #86768E",
+"i& c #080573",
+"j& c #D57817",
+"k& c #FC3703",
+"l& c #FC2903",
+"m& c #FB2B06",
+"n& c #FB2005",
+"o& c #FC4B07",
+"p& c #FC5C05",
+"q& c #FC1C04",
+"r& c #FC1503",
+"s& c #FD0F03",
+"t& c #FE0E02",
+"u& c #FD0E03",
+"v& c #FC1104",
+"w& c #FD0D03",
+"x& c #FD1203",
+"y& c #FD1602",
+"z& c #FC2305",
+"A& c #86255A",
+"B& c #0A0A70",
+"C& c #4341AF",
+"D& c #100EAD",
+"E& c #010186",
+"F& c #010153",
+"G& c #010122",
+"H& c #77768A",
+"I& c #CFCFCE",
+"J& c #7373CD",
+"K& c #02019F",
+"L& c #0402A2",
+"M& c #030295",
+"N& c #010159",
+"O& c #8A7D76",
+"P& c #8A7686",
+"Q& c #080674",
+"R& c #D54F17",
+"S& c #FD3103",
+"T& c #FB3B06",
+"U& c #FC2304",
+"V& c #FC3104",
+"W& c #FC6105",
+"X& c #FA8505",
+"Y& c #FC1903",
+"Z& c #FC2A04",
+"`& c #FB4405",
+" * c #FD2702",
+".* c #FC2D03",
+"+* c #FB4406",
+"@* c #FB3805",
+"#* c #FB2E05",
+"$* c #872758",
+"%* c #0B0970",
+"&* c #BCAD82",
+"** c #100FAD",
+"=* c #01017D",
+"-* c #010144",
+";* c #020219",
+">* c #9090A3",
+",* c #D1D2D1",
+"'* c #B3B3E1",
+")* c #030298",
+"!* c #03029C",
+"~* c #030297",
+"{* c #8B7D75",
+"]* c #8B7681",
+"^* c #D63417",
+"/* c #FC3403",
+"(* c #FC6C05",
+"_* c #FB5A05",
+":* c #FB7505",
+"<* c #FC4904",
+"[* c #FC9004",
+"}* c #FBBA05",
+"|* c #FC5303",
+"1* c #FB5B05",
+"2* c #FC2F03",
+"3* c #FC9C07",
+"4* c #FB4704",
+"5* c #FB8D04",
+"6* c #FC6204",
+"7* c #FB6504",
+"8* c #FCE406",
+"9* c #FC4D04",
+"0* c #FAB707",
+"a* c #FA5F07",
+"b* c #86545E",
+"c* c #0A096F",
+"d* c #0F0FAB",
+"e* c #02018F",
+"f* c #01016B",
+"g* c #0F0F29",
+"h* c #B4B4B8",
+"i* c #D5D6D5",
+"j* c #F5F5F5",
+"k* c #1C1B9D",
+"l* c #020193",
+"m* c #8A7D75",
+"n* c #8A757F",
+"o* c #080572",
+"p* c #D46518",
+"q* c #FC7A05",
+"r* c #FBBE05",
+"s* c #FC9705",
+"t* c #FC8406",
+"u* c #FCAE04",
+"v* c #FCE805",
+"w* c #FB6105",
+"x* c #FDAD05",
+"y* c #FB4A05",
+"z* c #FC6C06",
+"A* c #FCDE05",
+"B* c #FB6604",
+"C* c #FBC505",
+"D* c #FB9606",
+"E* c #FBBF05",
+"F* c #FCEF04",
+"G* c #FA8906",
+"H* c #FCF306",
+"I* c #FBA307",
+"J* c #88785D",
+"K* c #BBAB86",
+"L* c #4341B1",
+"M* c #0F0EAB",
+"N* c #010151",
+"O* c #01011C",
+"P* c #4A4862",
+"Q* c #BFBFBE",
+"R* c #FCFCFA",
+"S* c #7D7DC2",
+"T* c #01018E",
+"U* c #877C7B",
+"V* c #85748E",
+"W* c #D4971B",
+"X* c #FC8C05",
+"Y* c #FC9505",
+"Z* c #FBEC04",
+"`* c #FCA704",
+" = c #FABF05",
+".= c #FBC106",
+"+= c #FDF405",
+"@= c #FB7E05",
+"#= c #FCC905",
+"$= c #FB6704",
+"%= c #FAA505",
+"&= c #FBEC03",
+"*= c #FB7D05",
+"== c #F9E906",
+"-= c #FBBB07",
+";= c #FBCE07",
+">= c #FDED06",
+",= c #F9A509",
+"'= c #FBF209",
+")= c #F7C514",
+"!= c #837565",
+"~= c #090970",
+"{= c #B3A99B",
+"]= c #4242B4",
+"^= c #0C0BA5",
+"/= c #010166",
+"(= c #01012E",
+"_= c #050518",
+":= c #9493A3",
+"<= c #C7C7C6",
+"[= c #E8E8E8",
+"}= c #FCFCFD",
+"|= c #EBEBF4",
+"1= c #252591",
+"2= c #01015D",
+"3= c #817B87",
+"4= c #7F74A2",
+"5= c #080671",
+"6= c #D2B228",
+"7= c #FBA809",
+"8= c #FBAF06",
+"9= c #FDF805",
+"0= c #FBB606",
+"a= c #F9DB06",
+"b= c #FAC10A",
+"c= c #FAEA0C",
+"d= c #FB9B08",
+"e= c #FACD05",
+"f= c #FCCC06",
+"g= c #FCED06",
+"h= c #FA9508",
+"i= c #FBF009",
+"j= c #FACD0A",
+"k= c #FBCC09",
+"l= c #FCE90A",
+"m= c #F9B10D",
+"n= c #F5DC1B",
+"o= c #EBC833",
+"p= c #7B6C80",
+"q= c #09086F",
+"r= c #AEABAF",
+"s= c #4242B8",
+"t= c #0202B2",
+"u= c #04048F",
+"v= c #01013A",
+"w= c #020212",
+"x= c #504E62",
+"y= c #BABBBA",
+"z= c #D5D5D5",
+"A= c #C0C0DB",
+"B= c #111176",
+"C= c #010169",
+"D= c #01015F",
+"E= c #01012A",
+"F= c #7B7A92",
+"G= c #7A76B5",
+"H= c #CDB23F",
+"I= c #F7C211",
+"J= c #FBC709",
+"K= c #FBFB05",
+"L= c #FAC407",
+"M= c #FCEB06",
+"N= c #F6C20F",
+"O= c #F7DD19",
+"P= c #FAB40C",
+"Q= c #FCD006",
+"R= c #FB9106",
+"S= c #FAE00B",
+"T= c #FAE50C",
+"U= c #F9A90D",
+"V= c #F7E214",
+"W= c #F7D712",
+"X= c #F8C50D",
+"Y= c #FBE60E",
+"Z= c #F5B91B",
+"`= c #E7C941",
+" - c #D6BF6B",
+".- c #7067A0",
+"+- c #080871",
+"@- c #AFAEBC",
+"#- c #4544BC",
+"$- c #0202A4",
+"%- c #010211",
+"&- c #2C2B41",
+"*- c #AEAEB3",
+"=- c #C7C7C8",
+"-- c #E6E6E6",
+";- c #F9F9F7",
+">- c #B5B6D3",
+",- c #242373",
+"'- c #010147",
+")- c #7A7995",
+"!- c #797ABA",
+"~- c #07065E",
+"{- c #C7AA59",
+"]- c #F3CD26",
+"^- c #F8CC0F",
+"/- c #F9EF0A",
+"(- c #FBD00B",
+"_- c #F9EA0C",
+":- c #F5C51E",
+"<- c #EFD229",
+"[- c #F5C315",
+"}- c #FAD408",
+"|- c #FAA408",
+"1- c #F9E410",
+"2- c #F7DB16",
+"3- c #F7B719",
+"4- c #EFD326",
+"5- c #F2D521",
+"6- c #F9CA14",
+"7- c #F9E213",
+"8- c #F1BF27",
+"9- c #DCC363",
+"0- c #CEC49E",
+"a- c #7573AF",
+"b- c #070662",
+"c- c #B2B1C0",
+"d- c #4543B6",
+"e- c #020260",
+"f- c #030319",
+"g- c #3E3D53",
+"h- c #ABAAAD",
+"i- c #C2C2C0",
+"j- c #DCDCDC",
+"k- c #F7F8F6",
+"l- c #D9D9DF",
+"m- c #7F7F9F",
+"n- c #494971",
+"o- c #8F8FA6",
+"p- c #A7A7BF",
+"q- c #AFA8B2",
+"r- c #D9C48E",
+"s- c #E4C25A",
+"t- c #EFCA3A",
+"u- c #F1D12A",
+"v- c #F2CB24",
+"w- c #EFD12A",
+"x- c #E9C43F",
+"y- c #E6C34A",
+"z- c #F1CA28",
+"A- c #F9D70E",
+"B- c #F8BB14",
+"C- c #F3D922",
+"D- c #F2CF29",
+"E- c #EEBF2E",
+"F- c #E7C648",
+"G- c #E9C83E",
+"H- c #F2C928",
+"I- c #F4D526",
+"J- c #E5C53D",
+"K- c #D6C37E",
+"L- c #D3CCBE",
+"M- c #D9D8DA",
+"N- c #9391B8",
+"O- c #C4C3CE",
+"P- c #7675B2",
+"Q- c #5C5B7D",
+"R- c #8E8E9E",
+"S- c #B8B9BA",
+"T- c #C5C4C6",
+"U- c #F1F1F2",
+"V- c #F8F8F8",
+"W- c #D8D8D8",
+"X- c #DEDEDE",
+"Y- c #E8E6E4",
+"Z- c #E1D9C8",
+"`- c #DFCFA8",
+" ; c #E2C988",
+".; c #DFC272",
+"+; c #E0C066",
+"@; c #DCBF6E",
+"#; c #D7BE7A",
+"$; c #DBBF79",
+"%; c #EBC54D",
+"&; c #F2D12C",
+"*; c #F2C52E",
+"=; c #E7C93F",
+"-; c #E4C44D",
+";; c #E2C35A",
+">; c #DBC174",
+",; c #DDC170",
+"'; c #E7C558",
+"); c #E6C554",
+"!; c #DEC368",
+"~; c #D4C69C",
+"{; c #DAD7CE",
+"]; c #EBEBE9",
+"^; c #EDEDED",
+"/; c #E4E4E4",
+"(; c #E3E3E3",
+"_; c #D3D3D3",
+":; c #D4D4D4",
+"<; c #E3E3E2",
+"[; c #F3F3F3",
+"}; c #F3F3F4",
+"|; c #F8F8F7",
+"1; c #F5F3F4",
+"2; c #EFECE6",
+"3; c #E9E3D8",
+"4; c #D9D1BE",
+"5; c #D8CEBD",
+"6; c #D9D1C2",
+"7; c #DCD3BE",
+"8; c #E1CFA7",
+"9; c #DFC887",
+"0; c #DDC283",
+"a; c #D6BF8D",
+"b; c #D5C198",
+"c; c #D4C7A7",
+"d; c #D6CCB5",
+"e; c #D9CFB9",
+"f; c #DCCFB1",
+"g; c #D9CBAA",
+"h; c #D6CAB0",
+"i; c #D8D2C8",
+"j; c #E5E3DF",
+"k; c #F4F3F4",
+"l; c #F9F9FA",
+"m; c #F1F2F3",
+"n; c #ECECEC",
+"o; c #ECECED",
+"p; c #EEEFEF",
+"q; c #EDEBEE",
+"r; c #E5E4E5",
+"s; c #DDDDDC",
+"t; c #DAD9D8",
+"u; c #DDDCDA",
+"v; c #E0E0E2",
+"w; c #E5E5E6",
+"x; c #EAE9EA",
+"y; c #EDEBEC",
+"z; c #E9E8E7",
+"A; c #F2F1F1",
+"B; c #F7F8FA",
+"C; c #F4F3F5",
+"D; c #F6F6F7",
+"E; c #F9F8F9",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . + @ # $ % & * = - ; > , ' ) ! ~ ",
+" . . { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 . ",
+" 9 0 a b c d e f g h i j k l m n o p q r s t u 8 ",
+" ~ ! v w x y z A B C D E F G H H I J K L M N O P Q R 9 ",
+" ! S T U V W X Y Z H ` ...+.@.@.#.$.%.&.*.=.-.1 ;.>.,.'. ",
+" 8 ).!.~.z {.].^./.(.+._.'.8 . '.:.<.[.}.|.1.2.3.4.5. ",
+" 8 6.7.8.9.0.a.b.c.d.e. @ f.g.h.i.j.k.d.8 ",
+" ~ l.m.n.o.p.q.r.s.8 8 t.u.v.w.x.y.z.8 ",
+" A.B.C.D.E.F.r._. @ G.H.I.J.r.e. ",
+" ~ K.L.M.N.O.P.Q. 8 R.S.T.+ . . . . 6.U.2 V.W.X.8 ",
+" ~ ! Y.Z.`. +.++.8 ~ ++@+#+$+%+&+*+@+++=+#+++-+ ! ;+>+,+'+ .5. ",
+" ~ 9 )+!+~+{+]+^+ /+(+_+:+<+[+}+|+1+2+3+4+4+5+6+ ~ @ 7+8+9+0+Q. ",
+" 8 9 a+b+c+d+e+! . f+g+h+h+i+j+k+l+m+n+o+p+q+r+s+@ 8 9 ! t+u+v+w+x+ ",
+" ~ y+z+A+B+C+D+0 ~ =+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+'.! U+V+W+X+Y+Z+$.8 ",
+" 9 `+ @.@+@@@#@$@%@Q.&@E+*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@X.7 _@:@<@[@}@|@1@2@! ",
+" . 3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u u@v@w@x@y@z@A@B@C@5. ",
+" ~ D@E@5@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#5. ",
+" 8 )#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#*#j#k#l#m#n#o#@.8 ",
+" p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$_. ",
+" #$$$%$&$*$=$^#-$;$K@>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$V#6$*#j#7$8$9$0$a$b$,. ",
+" c$d$e$f$g$u#H@h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$X#j#I$J$K$L$M$N$O$5. ",
+" P$Q$R$J$S$u#H@T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%7#'%)%h#!%~%j#{%]%^%/%(%_%:%<% ",
+" [%}%|%1%g$u#H@2%3%4%5%6%7%8%9%0%a%b%c%d%e%f%g%g%h%i%j%k%l%m%n%o%p%q%r%Y#I$]%S$s%t%u%v%w% ",
+" x%y%z%A%g$u#^#B%C%D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &.&j#+&J$@&s%#&$&%&d. ",
+" &&*&=&A%g$u#^#-&;&>&,&'&)&!&T%~&{&]&^&/&(&_&:&<&[&}&|&1&2&3&4&5&6&7&8&j#+&J$9&0&^#a&b&d. ",
+" c&d&e&1%f&u#^#g&h&i&j&k&l&m&{&(&n&o&p&q&r&s&t&u&v&w&x&y&:&|&z&A&B&7&C&j#D&J$E&F&G&H&I&d. ",
+" J&K&L&M&S$N&^#O&P&Q&R&S&T&U&V&T%W&X&~&q&q&Y&Z&z&`& *.*+*T%@*#*$*%*&*C&j#**1%=*-*;*>*,*d.. ",
+" '*)*!*~**$N&H@{*]*Q&^*/*(*_*:*<*[*}*|*1*2*2*3*4*5*6*7*8*9*0*a*b*c*&*8&j#d*e*f*t%g*h*i*j* ",
+" D@k*l*~*S$=$^#m*n*o*p*9*q*r*s*t*u*v*w*x*y*z*A*B*C*D*E*F*G*H*I*J*G$K*L*j#M*w.N*O*P*Q*` <% ",
+" R*S*w.T*g$N&^#U*V*D%W*X*Y*Z*`* =.=+=@=#=$=%=&=*===-=;=>=,='=)=!=~={=]=j#^=/=(=_=:=<=[=}= ",
+" |=1=1.O 2=^#3=4=5=6=7=8=9=0=a=b=c=d=e=!&f=g=h=i=j=k=l=m=n=o=p=q=r=s=t=u=v=w=x=y=z=d. ",
+" '.A=B=C=D=E=F=G=4%H=I=J=K=L=M=N=O=P=Q=R=S=T=U=V=W=X=Y=Z=`= -.-+-@-#-$-.$%-&-*-=---t. ",
+" ;->-,-'-(=)-!-~-{-]-^-/-(-_-:-<-[-}-|-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-f-g-h-i-j-j*8 ",
+" ~ k-l-m-n-o-p-q-r-s-t-u-v-w-x-y-z-A-B-C-D-E-F-G-H-I-J-K-L-M-N-O-P-Q-R-S-T-0+U-~ ",
+" 8 V-%.W-I&X-Y-Z-`- ;.;+;@;#;$;%;&;*;=;-;;;>;,;';);!;~;{;];^;/;--(;_;:;<;[;'. ",
+" 5.j*,.};|;1;2;3;Z-4;5;6;7;8;9;0;a;b;c;d;e;f;g;h;i;j;k;:.<%<%R +.x+l;8 ",
+" 8 5.s.m;..n;o;p;q;r;s;t;u;v;w;x;y;z;r;%.A;l; 8 ",
+" 8 ! @ e.@ @ e.B;R C;R D;_.:.:._.E;:.5. ",
+" 8 ",
+" ",
+" ",
+" "};
diff --git a/lib-src/FileDialog/FileDialog.h b/lib-src/FileDialog/FileDialog.h
index 130c268b0..b181e93e4 100644
--- a/lib-src/FileDialog/FileDialog.h
+++ b/lib-src/FileDialog/FileDialog.h
@@ -22,7 +22,15 @@ custom controls.
typedef void (*fdCallback)(void *, int);
-#include "FileDialogPrivate.h"
+#if defined(__WXGTK__)
+#include "gtk/FileDialogPrivate.h"
+#elif defined(__WXMAC__)
+#include "mac/FileDialogPrivate.h"
+#elif defined(__WXMSW__)
+#include "win/FileDialogPrivate.h"
+#else
+#error Unknown implementation
+#endif
/////////////////////////////////////////////////////////////////////////////
// Name: filedlg.h
diff --git a/lib-src/FileDialog/FileDialog.vcproj b/lib-src/FileDialog/FileDialog.vcproj
deleted file mode 100644
index 4db5671da..000000000
--- a/lib-src/FileDialog/FileDialog.vcproj
+++ /dev/null
@@ -1,566 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib-src/FileDialog/FileDialogPrivate.h.in b/lib-src/FileDialog/FileDialogPrivate.h.in
deleted file mode 100644
index e7c9bff64..000000000
--- a/lib-src/FileDialog/FileDialogPrivate.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#include "@IMPLEMENTATION@/FileDialogPrivate.h"
diff --git a/lib-src/FileDialog/Makefile.in b/lib-src/FileDialog/Makefile.in
index bc4f6d5ad..fafa050f5 100644
--- a/lib-src/FileDialog/Makefile.in
+++ b/lib-src/FileDialog/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -96,12 +96,10 @@ host_triplet = @host@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in $(srcdir)/FileDialogPrivate.h.in \
$(top_srcdir)/autotools/depcomp autotools/ar-lib \
- autotools/compile autotools/config.guess autotools/config.sub \
- autotools/depcomp autotools/install-sh autotools/missing \
- autotools/ltmain.sh $(top_srcdir)/autotools/ar-lib \
- $(top_srcdir)/autotools/compile \
+ autotools/config.guess autotools/config.sub autotools/depcomp \
+ autotools/install-sh autotools/missing autotools/ltmain.sh \
+ $(top_srcdir)/autotools/ar-lib \
$(top_srcdir)/autotools/config.guess \
$(top_srcdir)/autotools/config.sub \
$(top_srcdir)/autotools/install-sh \
@@ -117,8 +115,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = FileDialogPrivate.h
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -233,8 +230,7 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -305,7 +301,6 @@ GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HAVE_GTK = @HAVE_GTK@
-IMPLEMENTATION = @IMPLEMENTATION@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -409,8 +404,7 @@ libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) $(am__append_2)
libFileDialog_la_LIBADD = $(WX_LIBS) $(am__append_3)
libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h $(am__append_1) \
$(am__append_4) $(am__append_5) $(am__append_6)
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -449,23 +443,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-config.h: stamp-h1
- @test -f $@ || rm -f stamp-h1
- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-FileDialogPrivate.h: $(top_builddir)/config.status $(srcdir)/FileDialogPrivate.h.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -742,16 +719,10 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -850,7 +821,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) config.h
+all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(libdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -903,7 +874,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR) generic/$(DEPDIR) gtk/$(DEPDIR) mac/$(DEPDIR) win/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-tags
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -967,18 +938,18 @@ ps-am:
uninstall-am: uninstall-libLTLIBRARIES
-.MAKE: all install-am install-strip
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
install-libLTLIBRARIES install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
diff --git a/lib-src/FileDialog/config.h.in b/lib-src/FileDialog/config.h.in
deleted file mode 100644
index 9c01ebead..000000000
--- a/lib-src/FileDialog/config.h.in
+++ /dev/null
@@ -1,65 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if GTK is available */
-#undef HAVE_GTK
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/lib-src/FileDialog/configure b/lib-src/FileDialog/configure
index 9a0ad0355..a48d305ab 100755
--- a/lib-src/FileDialog/configure
+++ b/lib-src/FileDialog/configure
@@ -643,7 +643,6 @@ GTK_FALSE
GTK_TRUE
GENERIC_FALSE
GENERIC_TRUE
-IMPLEMENTATION
GTK_LIBS
GTK_CFLAGS
PKG_CONFIG_LIBDIR
@@ -2325,7 +2324,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.13'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2862,47 +2861,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard:
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: .
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- 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; }
@@ -4167,65 +4125,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
- # Make sure it works both with $CC and with simple cc.
- # Following AC_PROG_CC_C_O, we do the test twice because some
- # compilers refuse to overwrite an existing .o file with -o,
- # though they will create one.
- am_cv_prog_cc_c_o=yes
- for am_i in 1 2; do
- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } \
- && test -f conftest2.$ac_objext; then
- : OK
- else
- am_cv_prog_cc_c_o=no
- break
- fi
- done
- rm -f core conftest*
- unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4462,13 +4361,7 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; }
if ${am_cv_ar_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- am_cv_ar_interface=ar
+ am_cv_ar_interface=ar
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int some_variable = 0;
@@ -4499,11 +4392,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
@@ -15764,7 +15652,6 @@ $as_echo "#define HAVE_GTK 1" >>confdefs.h
;;
esac
-
if test "$IMPLEMENTATION" = "generic"; then
GENERIC_TRUE=
GENERIC_FALSE='#'
@@ -15800,9 +15687,7 @@ fi
echo "Implementation to use: $IMPLEMENTATION"
-ac_config_headers="$ac_config_headers config.h"
-
-ac_config_files="$ac_config_files FileDialogPrivate.h Makefile"
+ac_config_files="$ac_config_files Makefile"
#
@@ -15898,7 +15783,43 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-DEFS=-DHAVE_CONFIG_H
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section. Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+ g
+ s/^\n//
+ s/\n/ /g
+ p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
ac_libobjs=
ac_ltlibobjs=
@@ -16380,15 +16301,11 @@ case $ac_config_files in *"
"*) set x $ac_config_files; shift; ac_config_files=$*;;
esac
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
-config_headers="$ac_config_headers"
config_commands="$ac_config_commands"
_ACEOF
@@ -16410,15 +16327,10 @@ Usage: $0 [OPTION]... [TAG]...
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
Configuration files:
$config_files
-Configuration headers:
-$config_headers
-
Configuration commands:
$config_commands
@@ -16485,18 +16397,7 @@ do
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
- --help | --hel | -h )
+ --he | --h | --help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -16934,8 +16835,6 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "FileDialogPrivate.h") CONFIG_FILES="$CONFIG_FILES FileDialogPrivate.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -16949,7 +16848,6 @@ done
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
@@ -17138,116 +17036,8 @@ fi
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[ ]*#[ ]*define[ ][ ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' >$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_set[key] = 1
- FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg[1] == "#") {
- defundef = arg[2]
- mac1 = arg[3]
- } else {
- defundef = substr(arg[1], 2)
- mac1 = arg[2]
- }
- split(mac1, mac2, "(") #)
- macro = mac2[1]
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_set[macro]) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro P[macro] D[macro]
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS"
shift
for ac_tag
do
@@ -17466,64 +17256,7 @@ which seems to be undefined. Please make sure it is defined" >&2;}
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
- :H)
- #
- # CONFIG_HEADER
- #
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
- fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
+
:C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
diff --git a/lib-src/FileDialog/configure.ac b/lib-src/FileDialog/configure.ac
index 3595626ac..d1019f568 100644
--- a/lib-src/FileDialog/configure.ac
+++ b/lib-src/FileDialog/configure.ac
@@ -105,7 +105,6 @@ case "${host_os}" in
;;
esac
-AC_SUBST([IMPLEMENTATION])
AM_CONDITIONAL([GENERIC], test "$IMPLEMENTATION" = "generic")
AM_CONDITIONAL([GTK], test "$IMPLEMENTATION" = "gtk")
AM_CONDITIONAL([MAC], test "$IMPLEMENTATION" = "mac")
@@ -113,8 +112,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "win")
echo "Implementation to use: $IMPLEMENTATION"
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([FileDialogPrivate.h Makefile])
+AC_CONFIG_FILES([Makefile])
#
# Write it all out
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f232622a5..7071a051a 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -313,6 +313,8 @@ LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
+LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
+LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@
@@ -438,6 +440,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# Distribute patches
+
+# Distribute library schedule
EXTRA_DIST = ffmpeg/libavcodec/avcodec.h ffmpeg/libavcodec/avfft.h \
ffmpeg/libavcodec/dxva2.h ffmpeg/libavcodec/old_codec_ids.h \
ffmpeg/libavcodec/vaapi.h ffmpeg/libavcodec/vda.h \
@@ -477,8 +481,8 @@ EXTRA_DIST = ffmpeg/libavcodec/avcodec.h ffmpeg/libavcodec/avfft.h \
ffmpeg/win32/stdint.h lame/lame/lame.h $(NULL) \
portsmf/autotools.patch portsmf/autotools-fix-make-dist.patch \
sbsms/autotools.patch sbsms/autotools-fix-make-dist.patch \
- sbsms/dont-mangle-cflags.patch $(NULL) \
- libsoxr/add-make-check-support.patch libsoxr/AUTHORS \
+ sbsms/dont-mangle-cflags.patch $(NULL) audacity-patches.txt \
+ $(NULL) libsoxr/add-make-check-support.patch libsoxr/AUTHORS \
libsoxr/CMakeLists.txt \
libsoxr/cmake/Modules/FindLibAVCodec.cmake \
libsoxr/cmake/Modules/FindOpenMP.cmake \
diff --git a/lib-src/audacity-patches.txt b/lib-src/audacity-patches.txt
index e6e8e4aca..b047201c8 100644
--- a/lib-src/audacity-patches.txt
+++ b/lib-src/audacity-patches.txt
@@ -121,6 +121,7 @@ Version in Audacity SVN: 0.1.1
Patches:
* "libsoxr/configure" file: modified cmake params
* add-make-check-support.patch: Add a check target for GNU Autotools integration.
+ * libsoxr-srcdir.patch: Adds srcdir handling
Upstream Version: 0.1.1
libvamp
@@ -129,6 +130,7 @@ Library to load and use VAMP plug-ins. http://www.vamp-plugins.org/
Version in Audacity SVN: 2.5
Patches: fix-linkage-against-dl.patch: Fix linkage against dl for hostsdk library.
fix-all-target.patch: Fix all target to not build disabled targets.
+ libvamp-srcdir.patch: Adds srcdir handling
Upstream Version: 2.5
libvorbis
@@ -244,6 +246,7 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2561247&group_id=17779
because attachements there don't seem to work.
autotools.patch: Fix all autotools warnings.
autotools-fix-make-dist.patch: Correct file lists to make dist target work.
+sbsms-srcdir.patch: Adds srcdir handling
soundtouch
----------
diff --git a/lib-src/libnyquist/Makefile.am b/lib-src/libnyquist/Makefile.am
index 6730d4904..8d13ec653 100644
--- a/lib-src/libnyquist/Makefile.am
+++ b/lib-src/libnyquist/Makefile.am
@@ -2,22 +2,23 @@
# Makefile(.in) for libnyquist using Autotools (but not libtool).
# Written by Richard Ash following Gary Vaughan's Autobook
-PORTAUDIO_CFLAGS = -I../portaudio-v19/include
-SNDFILE_CFLAGS = -I../libsndfile/src
+PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
+SNDFILE_CFLAGS = -I${srcdir}/../libsndfile/src
# tell aclocal that extra macros can be found in autotools/m4/
ACLOCAL_AMFLAGS = -I autotools/m4
INC = \
-I. \
- -Inyquist/nyqsrc \
- -Inyquist/tran \
- -Inyquist/xlisp \
- -Inyquist/sys/unix \
- -Inyquist/cmt \
- -Inyquist/ffts/src \
- -Inyquist/nyqstk/include \
- -Inyquist/nyqstk
+ -I${srcdir} \
+ -I${srcdir}/nyquist/nyqsrc \
+ -I${srcdir}/nyquist/tran \
+ -I${srcdir}/nyquist/xlisp \
+ -I${srcdir}/nyquist/sys/unix \
+ -I${srcdir}/nyquist/cmt \
+ -I${srcdir}/nyquist/ffts/src \
+ -I${srcdir}/nyquist/nyqstk/include \
+ -I${srcdir}/nyquist/nyqstk
AM_CFLAGS = $(INC) $(PORTAUDIO_CFLAGS) $(SNDFILE_CFLAGS) \
-DCMTSTUFF -DEXT
diff --git a/lib-src/libnyquist/Makefile.in b/lib-src/libnyquist/Makefile.in
index c85ea4ff3..e0fec381f 100644
--- a/lib-src/libnyquist/Makefile.in
+++ b/lib-src/libnyquist/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -463,21 +463,22 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-PORTAUDIO_CFLAGS = -I../portaudio-v19/include
-SNDFILE_CFLAGS = -I../libsndfile/src
+PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
+SNDFILE_CFLAGS = -I${srcdir}/../libsndfile/src
# tell aclocal that extra macros can be found in autotools/m4/
ACLOCAL_AMFLAGS = -I autotools/m4
INC = \
-I. \
- -Inyquist/nyqsrc \
- -Inyquist/tran \
- -Inyquist/xlisp \
- -Inyquist/sys/unix \
- -Inyquist/cmt \
- -Inyquist/ffts/src \
- -Inyquist/nyqstk/include \
- -Inyquist/nyqstk
+ -I${srcdir} \
+ -I${srcdir}/nyquist/nyqsrc \
+ -I${srcdir}/nyquist/tran \
+ -I${srcdir}/nyquist/xlisp \
+ -I${srcdir}/nyquist/sys/unix \
+ -I${srcdir}/nyquist/cmt \
+ -I${srcdir}/nyquist/ffts/src \
+ -I${srcdir}/nyquist/nyqstk/include \
+ -I${srcdir}/nyquist/nyqstk
AM_CFLAGS = $(INC) $(PORTAUDIO_CFLAGS) $(SNDFILE_CFLAGS) \
-DCMTSTUFF -DEXT
@@ -1958,16 +1959,10 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
- @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -2009,10 +2004,9 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
diff --git a/lib-src/libnyquist/configure b/lib-src/libnyquist/configure
index c6a161f79..442b9cb22 100755
--- a/lib-src/libnyquist/configure
+++ b/lib-src/libnyquist/configure
@@ -2282,7 +2282,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# which also contains a subdir containing macros
-am__api_version='1.14'
+am__api_version='1.13'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2819,47 +2819,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard:
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: .
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- 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; }
@@ -3675,65 +3634,6 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
- # Make sure it works both with $CC and with simple cc.
- # Following AC_PROG_CC_C_O, we do the test twice because some
- # compilers refuse to overwrite an existing .o file with -o,
- # though they will create one.
- am_cv_prog_cc_c_o=yes
- for am_i in 1 2; do
- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } \
- && test -f conftest2.$ac_objext; then
- : OK
- else
- am_cv_prog_cc_c_o=no
- break
- fi
- done
- rm -f core conftest*
- unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -4558,18 +4458,12 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; }
if ${am_cv_ar_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- am_cv_ar_interface=ar
+ am_cv_ar_interface=ar
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int some_variable = 0;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
(eval $am_ar_try) 2>&5
@@ -4595,11 +4489,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
@@ -4622,6 +4511,131 @@ unknown)
;;
esac
+if test "x$CC" != xcc; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+fi
+set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } &&
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; };
+then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ if test "x$CC" != xcc; then
+ # Test first that cc exists at all.
+ if { ac_try='cc -c conftest.$ac_ext >&5'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+ if { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } &&
+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; };
+ then
+ # cc works too.
+ :
+ else
+ # cc exists but doesn't like -o.
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
+ fi
+ fi
+else
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+
CFLAGS="$cflags_save"
CPPFLAGS="$cppflags_save"
@@ -4751,6 +4765,7 @@ $as_echo "$as_me: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&6;}
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking wall_flags for maximum warnings" >&5
$as_echo_n "checking wall_flags for maximum warnings... " >&6; }
if ${ac_cv_cflags_warn_all+:} false; then :
@@ -4890,7 +4905,6 @@ $as_echo "$ac_cv_path_SED" >&6; }
-
flag=`echo "$wall_flags" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler accepts the $wall_flags flag" >&5
diff --git a/lib-src/libsoxr/configure b/lib-src/libsoxr/configure
index 0c71041f2..b4b0c0c56 100755
--- a/lib-src/libsoxr/configure
+++ b/lib-src/libsoxr/configure
@@ -10,4 +10,8 @@
# Autotools options should not be passed to this script.
-cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF .
+srcdir="$@"
+srcdir="${srcdir#*--srcdir=}"
+srcdir="./${srcdir/ */}"
+
+cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF "${srcdir}"
diff --git a/lib-src/libsoxr/libsoxr-srcdir.patch b/lib-src/libsoxr/libsoxr-srcdir.patch
new file mode 100644
index 000000000..3bc93e345
--- /dev/null
+++ b/lib-src/libsoxr/libsoxr-srcdir.patch
@@ -0,0 +1,14 @@
+Index: lib-src/libsoxr/configure
+===================================================================
+--- lib-src/libsoxr/configure (revision 13509)
++++ lib-src/libsoxr/configure (working copy)
+@@ -10,4 +10,8 @@
+
+ # Autotools options should not be passed to this script.
+
+-cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF .
++srcdir="$@"
++srcdir="${srcdir#*--srcdir=}"
++srcdir="./${srcdir/ */}"
++
++cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF "${srcdir}"
diff --git a/lib-src/libvamp/Makefile.in b/lib-src/libvamp/Makefile.in
index 9b7053908..4fc9378b5 100644
--- a/lib-src/libvamp/Makefile.in
+++ b/lib-src/libvamp/Makefile.in
@@ -3,6 +3,9 @@
# libraries, example plugins, and the test host. Please adjust to
# suit your operating system requirements.
+srcdir = @srcdir@
+VPATH = @srcdir@
+
APIDIR = vamp
SDKDIR = vamp-sdk
@@ -40,7 +43,7 @@ all: @TARGETS@
#
CC = @CC@
CXX = @CXX@
-CXXFLAGS = -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
+CXXFLAGS = -I. -I$(srcdir) @CXXFLAGS@ @SNDFILE_CFLAGS@
# ar, ranlib
#
@@ -104,7 +107,7 @@ HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_
# Additional flags for making a plugin. This version script tells the
# GNU linker to make all symbols in the library hidden except for the
# public entry point. It's not essential, but makes a tidier library.
-PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=build/vamp-plugin.map
+PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=${srcdir}/build/vamp-plugin.map
## For OS/X with g++:
@@ -218,8 +221,10 @@ RDFGEN_OBJECTS = \
RDFGEN_TARGET = \
$(RDFGENDIR)/vamp-rdf-template-generator
+prep:
+ mkdir -p $(SDKSRCDIR) $(HOSTSDKSRCDIR) $(EXAMPLEDIR)
-sdk: sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
+sdk: prep sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
sdkstatic: $(SDK_STATIC) $(HOSTSDK_STATIC)
$(RANLIB) $(SDK_STATIC)
diff --git a/lib-src/libvamp/libvamp-srcdir.patch b/lib-src/libvamp/libvamp-srcdir.patch
new file mode 100644
index 000000000..e35bd0b54
--- /dev/null
+++ b/lib-src/libvamp/libvamp-srcdir.patch
@@ -0,0 +1,44 @@
+Index: lib-src/libvamp/Makefile.in
+===================================================================
+--- lib-src/libvamp/Makefile.in (revision 13509)
++++ lib-src/libvamp/Makefile.in (working copy)
+@@ -3,6 +3,9 @@
+ # libraries, example plugins, and the test host. Please adjust to
+ # suit your operating system requirements.
+
++srcdir = @srcdir@
++VPATH = @srcdir@
++
+ APIDIR = vamp
+
+ SDKDIR = vamp-sdk
+@@ -40,7 +43,7 @@
+ #
+ CC = @CC@
+ CXX = @CXX@
+-CXXFLAGS = -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
++CXXFLAGS = -I. -I$(srcdir) @CXXFLAGS@ @SNDFILE_CFLAGS@
+
+ # ar, ranlib
+ #
+@@ -104,7 +107,7 @@
+ # Additional flags for making a plugin. This version script tells the
+ # GNU linker to make all symbols in the library hidden except for the
+ # public entry point. It's not essential, but makes a tidier library.
+-PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=build/vamp-plugin.map
++PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=${srcdir}/build/vamp-plugin.map
+
+
+ ## For OS/X with g++:
+@@ -218,8 +221,10 @@
+
+ RDFGEN_TARGET = \
+ $(RDFGENDIR)/vamp-rdf-template-generator
++prep:
++ mkdir -p $(SDKSRCDIR) $(HOSTSDKSRCDIR) $(EXAMPLEDIR)
+
+-sdk: sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
++sdk: prep sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
+
+ sdkstatic: $(SDK_STATIC) $(HOSTSDK_STATIC)
+ $(RANLIB) $(SDK_STATIC)
diff --git a/lib-src/sbsms/Makefile.in b/lib-src/sbsms/Makefile.in
index 16f57fe5c..e8f54df4b 100644
--- a/lib-src/sbsms/Makefile.in
+++ b/lib-src/sbsms/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.
diff --git a/lib-src/sbsms/sbsms-srcdir.patch b/lib-src/sbsms/sbsms-srcdir.patch
new file mode 100644
index 000000000..213cd5d97
--- /dev/null
+++ b/lib-src/sbsms/sbsms-srcdir.patch
@@ -0,0 +1,39 @@
+Index: lib-src/sbsms/Makefile.in
+===================================================================
+--- lib-src/sbsms/Makefile.in (revision 13509)
++++ lib-src/sbsms/Makefile.in (working copy)
+@@ -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.
+Index: lib-src/sbsms/src/Makefile.am
+===================================================================
+--- lib-src/sbsms/src/Makefile.am (revision 13509)
++++ lib-src/sbsms/src/Makefile.am (working copy)
+@@ -1,4 +1,4 @@
+-AM_CXXFLAGS = -I../include @SBSMS_CFLAGS@
++AM_CXXFLAGS = -I$(srcdir)/../include @SBSMS_CFLAGS@
+
+ libsbsmsincludedir = $(includedir)
+ libsbsmsinclude_HEADERS = ../include/sbsms.h
+Index: lib-src/sbsms/src/Makefile.in
+===================================================================
+--- lib-src/sbsms/src/Makefile.in (revision 13509)
++++ lib-src/sbsms/src/Makefile.in (working copy)
+@@ -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.
+@@ -339,7 +339,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CXXFLAGS = -I../include @SBSMS_CFLAGS@
++AM_CXXFLAGS = -I$(srcdir)/../include @SBSMS_CFLAGS@
+ libsbsmsincludedir = $(includedir)
+ libsbsmsinclude_HEADERS = ../include/sbsms.h
+ lib_LTLIBRARIES = libsbsms.la
diff --git a/lib-src/sbsms/src/Makefile.am b/lib-src/sbsms/src/Makefile.am
index ddd732949..21264909d 100644
--- a/lib-src/sbsms/src/Makefile.am
+++ b/lib-src/sbsms/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I../include @SBSMS_CFLAGS@
+AM_CXXFLAGS = -I$(srcdir)/../include @SBSMS_CFLAGS@
libsbsmsincludedir = $(includedir)
libsbsmsinclude_HEADERS = ../include/sbsms.h
diff --git a/lib-src/sbsms/src/Makefile.in b/lib-src/sbsms/src/Makefile.in
index dbdc360ad..89504e54f 100644
--- a/lib-src/sbsms/src/Makefile.in
+++ b/lib-src/sbsms/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.
@@ -339,7 +339,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CXXFLAGS = -I../include @SBSMS_CFLAGS@
+AM_CXXFLAGS = -I$(srcdir)/../include @SBSMS_CFLAGS@
libsbsmsincludedir = $(includedir)
libsbsmsinclude_HEADERS = ../include/sbsms.h
lib_LTLIBRARIES = libsbsms.la
diff --git a/m4/audacity_checklib_libmad.m4 b/m4/audacity_checklib_libmad.m4
index 3554155fd..fbf247f80 100644
--- a/m4/audacity_checklib_libmad.m4
+++ b/m4/audacity_checklib_libmad.m4
@@ -48,7 +48,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [
AC_DEFUN([AUDACITY_CONFIG_LIBMAD], [
if test "$LIBMAD_USE_LOCAL" = yes; then
- LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad'
+ LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad -I../lib-src/libmad'
LIBMAD_LIBS='$(top_builddir)/lib-src/libmad/libmad.la'
AC_CONFIG_SUBDIRS([lib-src/libmad])
fi
diff --git a/m4/audacity_checklib_libsoundtouch.m4 b/m4/audacity_checklib_libsoundtouch.m4
index 0e045d359..3eae82b0f 100644
--- a/m4/audacity_checklib_libsoundtouch.m4
+++ b/m4/audacity_checklib_libsoundtouch.m4
@@ -54,7 +54,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
AC_DEFUN([AUDACITY_CONFIG_LIBSOUNDTOUCH], [
if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes; then
- SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include'
+ SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include -I../lib-src/soundtouch/include'
SOUNDTOUCH_LIBS='$(top_builddir)/lib-src/soundtouch/source/SoundTouch/.libs/libSoundTouch.a'
AC_CONFIG_SUBDIRS([lib-src/soundtouch])
fi
diff --git a/src/Makefile.am b/src/Makefile.am
index bc28b6e39..2ad507fdf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
bin_PROGRAMS = audacity
+bin_SCRIPTS = ../audacity$(EXEEXT)
desktopdir = $(datadir)/applications
desktop_DATA = audacity.desktop
@@ -716,3 +717,7 @@ EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \
effects/ScoreAlignDialog.cpp \
effects/ScoreAlignDialog.h \
$(NULL)
+
+../audacity$(EXEEXT): audacity$(EXEEXT)
+ cp audacity$(EXEEXT) ../audacity$(EXEEXT)
+CLEANFILES = ../audacity$(EXEEXT)
diff --git a/src/Makefile.in b/src/Makefile.in
index ad29a9078..4cd3c73d1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,6 +15,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -267,8 +268,8 @@ AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \
- "$(DESTDIR)$(mimedir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"
PROGRAMS = $(bin_PROGRAMS)
am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
DirManager.h Dither.cpp Dither.h FileFormats.cpp FileFormats.h \
@@ -750,6 +751,34 @@ audacity_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
audacity_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(audacity_CXXFLAGS) \
$(CXXFLAGS) $(audacity_LDFLAGS) $(LDFLAGS) -o $@
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+SCRIPTS = $(bin_SCRIPTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -809,33 +838,6 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
DATA = $(desktop_DATA) $(dist_mime_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)configtemplate.h configtemplate.h
@@ -1068,6 +1070,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+bin_SCRIPTS = ../audacity$(EXEEXT)
desktopdir = $(datadir)/applications
desktop_DATA = audacity.desktop
mimedir = $(datarootdir)/mime/packages
@@ -1341,6 +1344,7 @@ EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \
effects/ScoreAlignDialog.h \
$(NULL)
+CLEANFILES = ../audacity$(EXEEXT)
all: configwin.h configunix.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1947,6 +1951,41 @@ effects/VST/audacity-VSTEffect.$(OBJEXT): effects/VST/$(am__dirstamp) \
audacity$(EXEEXT): $(audacity_OBJECTS) $(audacity_DEPENDENCIES) $(EXTRA_audacity_DEPENDENCIES)
@rm -f audacity$(EXEEXT)
$(AM_V_CXXLD)$(audacity_LINK) $(audacity_OBJECTS) $(audacity_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -6100,9 +6139,10 @@ distdir: $(DISTFILES)
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES)
check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) configwin.h configunix.h
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) configwin.h \
+ configunix.h
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -6127,6 +6167,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -6196,7 +6237,7 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
install-html: install-html-am
@@ -6236,8 +6277,8 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
- uninstall-dist_mimeDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ uninstall-desktopDATA uninstall-dist_mimeDATA
.MAKE: all check-am install-am install-strip
@@ -6247,18 +6288,22 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-desktopDATA \
- install-dist_mimeDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ install-binSCRIPTS install-data install-data-am \
+ install-desktopDATA install-dist_mimeDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-desktopDATA uninstall-dist_mimeDATA
+../audacity$(EXEEXT): audacity$(EXEEXT)
+ cp audacity$(EXEEXT) ../audacity$(EXEEXT)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/effects/SoundTouchEffect.h b/src/effects/SoundTouchEffect.h
index efbd5c44b..497a47971 100644
--- a/src/effects/SoundTouchEffect.h
+++ b/src/effects/SoundTouchEffect.h
@@ -12,6 +12,8 @@
**********************************************************************/
+#include "../Audacity.h"
+
#if USE_SOUNDTOUCH
#ifndef __AUDACITY_EFFECT_SOUNDTOUCH__
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7de51d383..6fe70a5e4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -493,6 +493,8 @@ LIBOBJS = @LIBOBJS@
LIBRESAMPLE_CFLAGS = @LIBRESAMPLE_CFLAGS@
LIBRESAMPLE_LIBS = @LIBRESAMPLE_LIBS@
LIBS = @LIBS@
+LIBSAMPLERATE_SYSTEM_CFLAGS = @LIBSAMPLERATE_SYSTEM_CFLAGS@
+LIBSAMPLERATE_SYSTEM_LIBS = @LIBSAMPLERATE_SYSTEM_LIBS@
LIBTOOL = @LIBTOOL@
LIBTWOLAME_CFLAGS = @LIBTWOLAME_CFLAGS@
LIBTWOLAME_LIBS = @LIBTWOLAME_LIBS@