mirror of
https://github.com/cookiengineer/audacity
synced 2025-09-17 08:40:27 +02:00
Make sure search string is unique
This commit is contained in:
parent
3c1b36d72e
commit
cf27c619da
6
configure
vendored
6
configure
vendored
@ -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
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
@ -23485,12 +23485,12 @@ $as_echo_n "checking for gtk3 use in wxWidgets... " >&6; }
|
||||
/* end confdefs.h. */
|
||||
#include <wx/wx.h>
|
||||
#if defined(__WXGTK3__)
|
||||
yes
|
||||
wxWidgets built with GTK3
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
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
|
||||
else
|
||||
enable_gtk3=no
|
||||
|
@ -270,7 +270,7 @@ dnl there isn't a way to turn them off.
|
||||
dnl-------------------------------------------------------------
|
||||
|
||||
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
|
||||
AC_MSG_ERROR([Could not find wx-config: is wxWidgets installed? is wx-config in your path?])
|
||||
fi
|
||||
@ -566,10 +566,10 @@ case "${host_os}" in
|
||||
|
||||
AC_MSG_CHECKING([for gtk3 use in wxWidgets])
|
||||
CPPFLAGS="${WX_CXXFLAGS}"
|
||||
AC_EGREP_CPP(yes,
|
||||
AC_EGREP_CPP(wxWidgets built with GTK3,
|
||||
[#include <wx/wx.h>
|
||||
#if defined(__WXGTK3__)
|
||||
yes
|
||||
wxWidgets built with GTK3
|
||||
#endif
|
||||
], enable_gtk3=yes, enable_gtk3=no)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user