Skip to content

Commit 064bb94

Browse files
authored
Merge pull request #2478 from barton2526/x-prefixes
build, lint: Remove x-prefix's from comparisons, Fix some shell script issues the linter complains about, Re-enable boost include checks
2 parents 24ebaa7 + cba5a8f commit 064bb94

20 files changed

+296
-264
lines changed

.github/workflows/ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
lint:
8686
name: Lint
8787
runs-on: ubuntu-latest
88-
continue-on-error: true
8988
steps:
9089
- name: checkout
9190
uses: actions/checkout@v2
@@ -94,7 +93,6 @@ jobs:
9493
with:
9594
python-version: 3.6
9695
- name: lint
97-
continue-on-error: true
9896
run: |
9997
set -o errexit; source ./ci/lint/04_install.sh
10098
set -o errexit; source ./ci/lint/05_before_script.sh

build-aux/m4/ax_boost_base.m4

+13-13
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ AC_ARG_WITH([boost-libdir],
7575
7676
BOOST_LDFLAGS=""
7777
BOOST_CPPFLAGS=""
78-
AS_IF([test "x$want_boost" = "xyes"],
78+
AS_IF([test "$want_boost" = "yes"],
7979
[_AX_BOOST_BASE_RUNDETECT([$1],[$2],[$3])])
8080
AC_SUBST(BOOST_CPPFLAGS)
8181
AC_SUBST(BOOST_LDFLAGS)
@@ -84,13 +84,13 @@ AC_SUBST(BOOST_LDFLAGS)
8484

8585
# convert a version string in $2 to numeric and affect to polymorphic var $1
8686
AC_DEFUN([_AX_BOOST_BASE_TONUMERICVERSION],[
87-
AS_IF([test "x$2" = "x"],[_AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"],[_AX_BOOST_BASE_TONUMERICVERSION_req="$2"])
87+
AS_IF([test "$2" = ""],[_AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"],[_AX_BOOST_BASE_TONUMERICVERSION_req="$2"])
8888
_AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\.[[0-9]]*\)'`
8989
_AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\)'`
90-
AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = "x"],
90+
AS_IF([test "$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = ""],
9191
[AC_MSG_ERROR([You should at least specify libboost major version])])
9292
_AX_BOOST_BASE_TONUMERICVERSION_req_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.\([[0-9]]*\)'`
93-
AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = "x"],
93+
AS_IF([test "$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = ""],
9494
[_AX_BOOST_BASE_TONUMERICVERSION_req_minor="0"])
9595
_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
9696
AS_IF([test "X$_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor" = "X"],
@@ -130,7 +130,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
130130
dnl first we check the system location for boost libraries
131131
dnl this location ist chosen if boost libraries are installed with the --layout=system option
132132
dnl or if you install boost with RPM
133-
AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
133+
AS_IF([test "$_AX_BOOST_BASE_boost_path" != ""],[
134134
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
135135
AS_IF([test -d "$_AX_BOOST_BASE_boost_path/include" && test -r "$_AX_BOOST_BASE_boost_path/include"],[
136136
AC_MSG_RESULT([yes])
@@ -165,7 +165,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
165165
166166
dnl overwrite ld flags if we have required special directory with
167167
dnl --with-boost-libdir parameter
168-
AS_IF([test "x$_AX_BOOST_BASE_boost_lib_path" != "x"],
168+
AS_IF([test "$_AX_BOOST_BASE_boost_lib_path" != ""],
169169
[BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_lib_path"])
170170
171171
AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION)])
@@ -191,7 +191,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
191191
192192
dnl if we found no boost with system layout we search for boost libraries
193193
dnl built and installed without the --layout=system option or for a staged(not installed) version
194-
if test "x$succeeded" != "xyes" ; then
194+
if test "$succeeded" != "yes" ; then
195195
CPPFLAGS="$CPPFLAGS_SAVED"
196196
LDFLAGS="$LDFLAGS_SAVED"
197197
BOOST_CPPFLAGS=
@@ -204,7 +204,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
204204
for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
205205
_version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
206206
V_CHECK=`expr $_version_tmp \> $_version`
207-
if test "x$V_CHECK" = "x1" ; then
207+
if test "$V_CHECK" = "1" ; then
208208
_version=$_version_tmp
209209
fi
210210
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
@@ -226,13 +226,13 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
226226
fi
227227
fi
228228
else
229-
if test "x$cross_compiling" != "xyes" ; then
229+
if test "$cross_compiling" != "yes" ; then
230230
for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do
231231
if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then
232232
for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
233233
_version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
234234
V_CHECK=`expr $_version_tmp \> $_version`
235-
if test "x$V_CHECK" = "x1" ; then
235+
if test "$V_CHECK" = "1" ; then
236236
_version=$_version_tmp
237237
best_path=$_AX_BOOST_BASE_boost_path
238238
fi
@@ -259,7 +259,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
259259
stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
260260
stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
261261
V_CHECK=`expr $stage_version_shorten \>\= $_version`
262-
if test "x$V_CHECK" = "x1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then
262+
if test "$V_CHECK" = "1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then
263263
AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
264264
BOOST_CPPFLAGS="-I$BOOST_ROOT"
265265
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
@@ -283,8 +283,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
283283
AC_LANG_POP([C++])
284284
fi
285285
286-
if test "x$succeeded" != "xyes" ; then
287-
if test "x$_version" = "x0" ; then
286+
if test "$succeeded" != "yes" ; then
287+
if test "$_version" = "0" ; then
288288
AC_MSG_NOTICE([[We could not detect the boost libraries (version $1 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
289289
else
290290
AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])

build-aux/m4/ax_boost_filesystem.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
5353
[want_boost="yes"]
5454
)
5555
56-
if test "x$want_boost" = "xyes"; then
56+
if test "$want_boost" = "yes"; then
5757
AC_REQUIRE([AC_PROG_CC])
5858
CPPFLAGS_SAVED="$CPPFLAGS"
5959
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -77,17 +77,17 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
7777
ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
7878
AC_LANG_POP([C++])
7979
])
80-
if test "x$ax_cv_boost_filesystem" = "xyes"; then
80+
if test "$ax_cv_boost_filesystem" = "yes"; then
8181
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
8282
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
83-
if test "x$ax_boost_user_filesystem_lib" = "x"; then
83+
if test "$ax_boost_user_filesystem_lib" = ""; then
8484
for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
8585
ax_lib=${libextension}
8686
AC_CHECK_LIB($ax_lib, exit,
8787
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
8888
[link_filesystem="no"])
8989
done
90-
if test "x$link_filesystem" != "xyes"; then
90+
if test "$link_filesystem" != "yes"; then
9191
for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
9292
ax_lib=${libextension}
9393
AC_CHECK_LIB($ax_lib, exit,
@@ -103,10 +103,10 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
103103
done
104104
105105
fi
106-
if test "x$ax_lib" = "x"; then
106+
if test "$ax_lib" = ""; then
107107
AC_MSG_ERROR(Could not find a version of the Boost::Filesystem library!)
108108
fi
109-
if test "x$link_filesystem" != "xyes"; then
109+
if test "$link_filesystem" != "yes"; then
110110
AC_MSG_ERROR(Could not link against $ax_lib !)
111111
fi
112112
fi

build-aux/m4/ax_boost_iostreams.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
5151
[want_boost="yes"]
5252
)
5353
54-
if test "x$want_boost" = "xyes"; then
54+
if test "$want_boost" = "yes"; then
5555
AC_REQUIRE([AC_PROG_CC])
5656
CPPFLAGS_SAVED="$CPPFLAGS"
5757
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -75,17 +75,17 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
7575
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
7676
AC_LANG_POP([C++])
7777
])
78-
if test "x$ax_cv_boost_iostreams" = "xyes"; then
78+
if test "$ax_cv_boost_iostreams" = "yes"; then
7979
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
8080
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
81-
if test "x$ax_boost_user_iostreams_lib" = "x"; then
81+
if test "$ax_boost_user_iostreams_lib" = ""; then
8282
for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do
8383
ax_lib=${libextension}
8484
AC_CHECK_LIB($ax_lib, exit,
8585
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
8686
[link_iostreams="no"])
8787
done
88-
if test "x$link_iostreams" != "xyes"; then
88+
if test "$link_iostreams" != "yes"; then
8989
for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* $BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` ; do
9090
ax_lib=${libextension}
9191
AC_CHECK_LIB($ax_lib, exit,
@@ -102,10 +102,10 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
102102
done
103103
104104
fi
105-
if test "x$ax_lib" = "x"; then
105+
if test "$ax_lib" = ""; then
106106
AC_MSG_ERROR(Could not find a version of the Boost::IOStreams library!)
107107
fi
108-
if test "x$link_iostreams" != "xyes"; then
108+
if test "$link_iostreams" != "yes"; then
109109
AC_MSG_ERROR(Could not link against $ax_lib !)
110110
fi
111111
fi

build-aux/m4/ax_boost_system.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],
5353
[want_boost="yes"]
5454
)
5555
56-
if test "x$want_boost" = "xyes"; then
56+
if test "$want_boost" = "yes"; then
5757
AC_REQUIRE([AC_PROG_CC])
5858
AC_REQUIRE([AC_CANONICAL_BUILD])
5959
CPPFLAGS_SAVED="$CPPFLAGS"
@@ -76,21 +76,21 @@ AC_DEFUN([AX_BOOST_SYSTEM],
7676
CXXFLAGS=$CXXFLAGS_SAVE
7777
AC_LANG_POP([C++])
7878
])
79-
if test "x$ax_cv_boost_system" = "xyes"; then
79+
if test "$ax_cv_boost_system" = "yes"; then
8080
AC_SUBST(BOOST_CPPFLAGS)
8181
8282
AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
8383
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
8484
8585
LDFLAGS_SAVE=$LDFLAGS
86-
if test "x$ax_boost_user_system_lib" = "x"; then
86+
if test "$ax_boost_user_system_lib" = ""; then
8787
for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
8888
ax_lib=${libextension}
8989
AC_CHECK_LIB($ax_lib, exit,
9090
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
9191
[link_system="no"])
9292
done
93-
if test "x$link_system" != "xyes"; then
93+
if test "$link_system" != "yes"; then
9494
for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
9595
ax_lib=${libextension}
9696
AC_CHECK_LIB($ax_lib, exit,
@@ -107,10 +107,10 @@ AC_DEFUN([AX_BOOST_SYSTEM],
107107
done
108108
109109
fi
110-
if test "x$ax_lib" = "x"; then
110+
if test "$ax_lib" = ""; then
111111
AC_MSG_ERROR(Could not find a version of the Boost::System library!)
112112
fi
113-
if test "x$link_system" = "xno"; then
113+
if test "$link_system" = "no"; then
114114
AC_MSG_ERROR(Could not link against $ax_lib !)
115115
fi
116116
fi

build-aux/m4/ax_boost_thread.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ AC_DEFUN([AX_BOOST_THREAD],
5151
[want_boost="yes"]
5252
)
5353
54-
if test "x$want_boost" = "xyes"; then
54+
if test "$want_boost" = "yes"; then
5555
AC_REQUIRE([AC_PROG_CC])
5656
AC_REQUIRE([AC_CANONICAL_BUILD])
5757
CPPFLAGS_SAVED="$CPPFLAGS"
@@ -94,7 +94,7 @@ AC_DEFUN([AX_BOOST_THREAD],
9494
CXXFLAGS=$CXXFLAGS_SAVE
9595
AC_LANG_POP([C++])
9696
])
97-
if test "x$ax_cv_boost_thread" = "xyes"; then
97+
if test "$ax_cv_boost_thread" = "yes"; then
9898
case "x$host_os" in
9999
xsolaris )
100100
BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
@@ -126,14 +126,14 @@ AC_DEFUN([AX_BOOST_THREAD],
126126
break;
127127
;;
128128
esac
129-
if test "x$ax_boost_user_thread_lib" = "x"; then
129+
if test "$ax_boost_user_thread_lib" = ""; then
130130
for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
131131
ax_lib=${libextension}
132132
AC_CHECK_LIB($ax_lib, exit,
133133
[link_thread="yes"; break],
134134
[link_thread="no"])
135135
done
136-
if test "x$link_thread" != "xyes"; then
136+
if test "$link_thread" != "yes"; then
137137
for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
138138
ax_lib=${libextension}
139139
AC_CHECK_LIB($ax_lib, exit,
@@ -150,10 +150,10 @@ AC_DEFUN([AX_BOOST_THREAD],
150150
done
151151
152152
fi
153-
if test "x$ax_lib" = "x"; then
153+
if test "$ax_lib" = ""; then
154154
AC_MSG_ERROR(Could not find a version of the Boost::Thread library!)
155155
fi
156-
if test "x$link_thread" = "xno"; then
156+
if test "$link_thread" = "no"; then
157157
AC_MSG_ERROR(Could not link against $ax_lib !)
158158
else
159159
BOOST_THREAD_LIB="-l$ax_lib"

build-aux/m4/ax_boost_unit_test_framework.m4

+9-9
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
5151
[want_boost="yes"]
5252
)
5353
54-
if test "x$want_boost" = "xyes"; then
54+
if test "$want_boost" = "yes"; then
5555
AC_REQUIRE([AC_PROG_CC])
5656
CPPFLAGS_SAVED="$CPPFLAGS"
5757
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -70,11 +70,11 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
7070
ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
7171
AC_LANG_POP([C++])
7272
])
73-
if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
73+
if test "$ax_cv_boost_unit_test_framework" = "yes"; then
7474
AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
7575
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
7676
77-
if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
77+
if test "$ax_boost_user_unit_test_framework_lib" = ""; then
7878
saved_ldflags="${LDFLAGS}"
7979
for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do
8080
if test -r $monitor_library ; then
@@ -85,13 +85,13 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
8585
link_unit_test_framework="no"
8686
fi
8787
88-
if test "x$link_unit_test_framework" = "xyes"; then
88+
if test "$link_unit_test_framework" = "yes"; then
8989
BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
9090
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
9191
break
9292
fi
9393
done
94-
if test "x$link_unit_test_framework" != "xyes"; then
94+
if test "$link_unit_test_framework" != "yes"; then
9595
for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.dll* $BOOSTLIBDIR/boost_unit_test_framework*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e 's;^\(boost_unit_test_framework.*\)\.a.*$;\1;'` ; do
9696
ax_lib=${libextension}
9797
AC_CHECK_LIB($ax_lib, exit,
@@ -103,7 +103,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
103103
link_unit_test_framework="no"
104104
saved_ldflags="${LDFLAGS}"
105105
for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do
106-
if test "x$link_unit_test_framework" = "xyes"; then
106+
if test "$link_unit_test_framework" = "yes"; then
107107
break;
108108
fi
109109
for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do
@@ -115,18 +115,18 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
115115
link_unit_test_framework="no"
116116
fi
117117
118-
if test "x$link_unit_test_framework" = "xyes"; then
118+
if test "$link_unit_test_framework" = "yes"; then
119119
BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
120120
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
121121
break
122122
fi
123123
done
124124
done
125125
fi
126-
if test "x$ax_lib" = "x"; then
126+
if test "$ax_lib" = ""; then
127127
AC_MSG_ERROR(Could not find a version of the Boost::Unit_Test_Framework library!)
128128
fi
129-
if test "x$link_unit_test_framework" != "xyes"; then
129+
if test "$link_unit_test_framework" != "yes"; then
130130
AC_MSG_ERROR(Could not link against $ax_lib !)
131131
fi
132132
fi

build-aux/m4/ax_boost_zlib.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ AC_DEFUN([AX_BOOST_ZLIB],
4747
[want_boost="yes"]
4848
)
4949
50-
if test "x$want_boost" = "xyes"; then
50+
if test "$want_boost" = "yes"; then
5151
AC_REQUIRE([AC_PROG_CC])
5252
CPPFLAGS_SAVED="$CPPFLAGS"
5353
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -59,14 +59,14 @@ AC_DEFUN([AX_BOOST_ZLIB],
5959
6060
AC_DEFINE(HAVE_BOOST_ZLIB,,[define if the Boost::zlib library is available])
6161
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
62-
if test "x$ax_boost_user_zlib_lib" = "x"; then
62+
if test "$ax_boost_user_zlib_lib" = ""; then
6363
for libextension in `ls $BOOSTLIBDIR/libboost_zlib*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_zlib*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_zlib.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_zlib.*\)\.a.*$;\1;'` ; do
6464
ax_lib=${libextension}
6565
AC_CHECK_LIB($ax_lib, exit,
6666
[BOOST_ZLIB_LIB="-l$ax_lib"; AC_SUBST(BOOST_ZLIB_LIB) link_zlib="yes"; break],
6767
[link_zlib="no"])
6868
done
69-
if test "x$link_zlib" != "xyes"; then
69+
if test "$link_zlib" != "yes"; then
7070
for libextension in `ls $BOOSTLIBDIR/boost_zlib*.dll* $BOOSTLIBDIR/boost_zlib*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_zlib.*\)\.dll.*$;\1;' -e 's;^\(boost_zlib.*\)\.a.*$;\1;'` ; do
7171
ax_lib=${libextension}
7272
AC_CHECK_LIB($ax_lib, exit,

0 commit comments

Comments
 (0)