Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use more compatible "=" in test(1) instead of "=="

Browse Source 
The latter is not supported in all shells and results in problems under
NetBSD for example.

Closes #18198.
This commit is contained in:
Vadim Zeitlin
2018-08-16 13:45:53 +02:00
parent 99cb097f4d
commit 48fc60609d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/aclocal/bakefile.m4
View File

@@ -323,7 +323,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
fi
if test "x$GCC" == "xyes"; then
if test "x$GCC" = "xyes"; then
PIC_FLAG="-dynamic -fPIC"
fi
if test "x$XLCC" = "xyes"; then

4
configure vendored
View File

@@ -20187,7 +20187,7 @@ $as_echo_n "checking SDK deployment version... " >&6; }
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
# If that failed, try again with the new key
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
@@ -40129,7 +40129,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; }
SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
fi
if test "x$GCC" == "xyes"; then
if test "x$GCC" = "xyes"; then
PIC_FLAG="-dynamic -fPIC"
fi
if test "x$XLCC" = "xyes"; then

2
configure.in
View File

@@ -1258,7 +1258,7 @@ dnl We need to quote the next line where we don't need macros and do need [] in
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
]
# If that failed, try again with the new key
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
[
MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
]

2
docs/changes.txt
View File

@@ -96,7 +96,7 @@ All:
- Make wxList and wxVector iterators conform to input iterator requirements.
- Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
- Fix build issues under HaikuOS (mill-j).
- Fix problem with wx-config installation under NetBSD (wiz).
- Fix problem with wx-config installation and use under NetBSD (wiz).
All (GUI):