1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 00:50:52 +02:00

Make sure search string is unique

This commit is contained in:
Leland Lucius 2015-07-28 18:05:38 -05:00
parent 3c1b36d72e
commit cf27c619da
2 changed files with 6 additions and 6 deletions

6
configure vendored
View File

@ -19765,7 +19765,7 @@ _ACEOF
for ac_prog in wx-config wx-config-3.0 for ac_prog in $WX_CONFIG wx-config wx-config-3.0
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
@ -23485,12 +23485,12 @@ $as_echo_n "checking for gtk3 use in wxWidgets... " >&6; }
/* end confdefs.h. */ /* end confdefs.h. */
#include <wx/wx.h> #include <wx/wx.h>
#if defined(__WXGTK3__) #if defined(__WXGTK3__)
yes wxWidgets built with GTK3
#endif #endif
_ACEOF _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then : $EGREP "wxWidgets built with GTK3" >/dev/null 2>&1; then :
enable_gtk3=yes enable_gtk3=yes
else else
enable_gtk3=no enable_gtk3=no

View File

@ -270,7 +270,7 @@ dnl there isn't a way to turn them off.
dnl------------------------------------------------------------- dnl-------------------------------------------------------------
dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is successfully installed. dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is successfully installed.
AC_PATH_PROGS(WX_CONFIG, wx-config wx-config-3.0, no, $PATH:/usr/local/bin ) AC_PATH_PROGS(WX_CONFIG, $WX_CONFIG wx-config wx-config-3.0, no, $PATH:/usr/local/bin )
if [[ "$WX_CONFIG" = "no" ]] ; then if [[ "$WX_CONFIG" = "no" ]] ; then
AC_MSG_ERROR([Could not find wx-config: is wxWidgets installed? is wx-config in your path?]) AC_MSG_ERROR([Could not find wx-config: is wxWidgets installed? is wx-config in your path?])
fi fi
@ -566,10 +566,10 @@ case "${host_os}" in
AC_MSG_CHECKING([for gtk3 use in wxWidgets]) AC_MSG_CHECKING([for gtk3 use in wxWidgets])
CPPFLAGS="${WX_CXXFLAGS}" CPPFLAGS="${WX_CXXFLAGS}"
AC_EGREP_CPP(yes, AC_EGREP_CPP(wxWidgets built with GTK3,
[#include <wx/wx.h> [#include <wx/wx.h>
#if defined(__WXGTK3__) #if defined(__WXGTK3__)
yes wxWidgets built with GTK3
#endif #endif
], enable_gtk3=yes, enable_gtk3=no) ], enable_gtk3=yes, enable_gtk3=no)