Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-15 15:11:12 +02:00
Code Issues Releases Wiki Activity

Round 5 of wx3 changes

Browse Source 
FileDialog now complete on Linux.  Needs some fine tuning on
Windows and OSX.
Builds with wx3 and gtk2 or gtk3.
Still more effect work to do.
This commit is contained in:
Leland Lucius
2015-07-14 23:33:53 -05:00
parent 2f760c4bac
commit 9b9c8cc073
43 changed files with 3271 additions and 5352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
configure vendored
View File

@@ -1702,7 +1702,7 @@ Optional Packages:
(or the compiler's sysroot if not specified).
--with-lib-preference whether to use local and/or system libraries, in
order of preference (default="system local")
--with-wx-version select wxWidgets version (if both installed) [2.8,]
--with-wx-version select wxWidgets version (if both installed) [3.0,]
--with-expat which expat to use for XML file support:
[system,local]
--with-ffmpeg use ffmpeg for import and export support
@@ -2889,7 +2889,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
am__api_version='1.14'
am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3061,8 +3061,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
@@ -3081,7 +3081,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3409,8 +3409,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3584,6 +3584,7 @@ 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.
@@ -19774,8 +19775,10 @@ _ACEOF
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
for ac_prog in wx-config wx-config-3.0
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_WX_CONFIG+:} false; then :
@@ -19802,7 +19805,6 @@ done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_WX_CONFIG" && ac_cv_path_WX_CONFIG="no"
;;
esac
fi
@@ -19816,6 +19818,10 @@ $as_echo "no" >&6; }
fi
test -n "$WX_CONFIG" && break
done
test -n "$WX_CONFIG" || WX_CONFIG="no"
if [ "$WX_CONFIG" = "no" ] ; then
as_fn_error $? "Could not find wx-config: is wxWidgets installed? is wx-config in your path?" "$LINENO" 5
fi
@@ -19826,19 +19832,19 @@ else
wxconfigargs=""
fi
wxconfigargs="$static_wx_preference $unicode_preference $wxconfigargs $wx_preference"
wxconfigargs="$static_wx_preference $unicode_preference $wxconfigargs $wx_preference"
wx_version=`${WX_CONFIG} $wxconfigargs --version`
{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking that the chosen version of wxWidgets is 2.8.x" >&5
$as_echo "$as_me: Checking that the chosen version of wxWidgets is 2.8.x" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking that the chosen version of wxWidgets is 3.0.x" >&5
$as_echo "$as_me: Checking that the chosen version of wxWidgets is 3.0.x" >&6;}
case "${wx_version}" in
2.8.* | 3.0.*)
3.0.*)
echo "Great, you're using wxWidgets ${wx_version}!"
;;
*)
wx_list=`${WX_CONFIG} --list`
as_fn_error $? "Unable to locate a suitable configuration of wxWidgets v2.8.x or higher.
as_fn_error $? "Unable to locate a suitable configuration of wxWidgets v3.0.x or higher.
The currently available configurations are listed below. If necessary, either
install the package for your distribution or download the latest version of
wxWidgets