diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-02 23:56:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-02 23:56:32 +0000 |
| commit | f4361b8e3801c4cd6b174426f25251dcbe5369e4 (patch) | |
| tree | 36be7e30bd518f3c6bbff1e1547edcff606e5dcf /acinclude.m4 | |
| parent | b4dca0fbd2c7f2e26b472dd1da5889805f904a91 (diff) | |
If the LHS of an "expr LHS : RHS" expression has an X added to avoid
confusing expr if the LHS is an empty string, the RHS needs it as well.
Also, fix some typoes ("$X" rather than "X$"), and use lower-case "x",
as that's what's used elsewhere when doing that sort of thing.
svn path=/trunk/; revision=50331
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 31d3a2e3be..e0ee100643 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1653,10 +1653,10 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then # AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS) CFLAGS_saved="$CFLAGS" - if expr "X$GCC_OPTION" : "-W.*" >/dev/null + if expr "x$GCC_OPTION" : "x-W.*" >/dev/null then CFLAGS="$CFLAGS $ac_wireshark_unknown_warning_option_error $GCC_OPTION" - elif expr "X$GCC_OPTION" : "-f.*" >/dev/null + elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null then CFLAGS="$CFLAGS -Werror $GCC_OPTION" fi @@ -1722,10 +1722,10 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then # AC_MSG_CHECKING(whether we can add $GCC_OPTION to CXXFLAGS) CXXFLAGS_saved="$CXXFLAGS" - if expr "$XGCC_OPTION" : "-W.*" >/dev/null + if expr "x$GCC_OPTION" : "x-W.*" >/dev/null then CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $GCC_OPTION" - elif expr "$XGCC_OPTION" : "-f.*" >/dev/null + elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null then CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" fi |