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

fix bug compiling on Linux/gcc-4.9 with wxwidgets 3.0.2

Browse Source
This commit is contained in:
Darrell Walisser
2017-07-28 15:42:16 -04:00
committed by James Crook
parent 5dfff70f5b
commit 651957f8c2
4 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib-src/FileDialog/configure vendored
View File

@@ -759,6 +759,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -853,6 +854,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1105,6 +1107,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1242,7 +1253,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1395,6 +1406,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -15994,6 +16006,12 @@ wxconfigargs="$wx_preference"
WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
WX_LIBS=""
if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
WX_CXXFLAGS="${WX_CXXFLAGS} --std=gnu++11"
else
WX_CXXFLAGS="${WX_CXXFLAGS} --std=c++11"
fi
if test x"$debug_preference" = "xyes" ; then
@@ -16044,6 +16062,7 @@ fi
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

8
lib-src/FileDialog/configure.ac
View File

@@ -58,6 +58,13 @@ dnl Gather wx arguments
wxconfigargs="$wx_preference"
WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
WX_LIBS=""
dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
WX_CXXFLAGS="${WX_CXXFLAGS} --std=gnu++11"
else
WX_CXXFLAGS="${WX_CXXFLAGS} --std=c++11"
fi
AC_SUBST([WX_CXXFLAGS])
AC_SUBST([WX_LIBS])
@@ -88,6 +95,7 @@ else
AC_MSG_RESULT([no])
fi
AC_SUBST(HAVE_GTK)
PKG_CHECK_MODULES(GTK, $gtk_version, have_gtk="yes", have_gtk="no")

21
lib-src/lib-widget-extra/configure vendored
View File

@@ -739,6 +739,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -825,6 +826,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1077,6 +1079,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1214,7 +1225,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1367,6 +1378,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -16638,6 +16650,13 @@ esac
WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
WX_LIBS=$($WX_CONFIG $wxconfigargs --libs)
if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
WX_CXXFLAGS="${WX_CXXFLAGS} --std=gnu++11"
else
WX_CXXFLAGS="${WX_CXXFLAGS} --std=c++11"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5

8
lib-src/lib-widget-extra/configure.ac
View File

@@ -139,6 +139,14 @@ dnl Gather wx arguments
WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
WX_LIBS=$($WX_CONFIG $wxconfigargs --libs)
dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
WX_CXXFLAGS="${WX_CXXFLAGS} --std=gnu++11"
else
WX_CXXFLAGS="${WX_CXXFLAGS} --std=c++11"
fi
AC_SUBST([WX_CXXFLAGS])
AC_SUBST([WX_LIBS])