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

.github/workflows/ci.yml

@@ -85,7 +85,6 @@ jobs:
     lint:
         name: Lint
         runs-on: ubuntu-latest
-        continue-on-error: true
         steps:
         - name: checkout
           uses: actions/checkout@v2
@@ -94,7 +93,6 @@ jobs:
           with:
             python-version: 3.6
         - name: lint
-          continue-on-error: true
           run: |
             set -o errexit; source ./ci/lint/04_install.sh
             set -o errexit; source ./ci/lint/05_before_script.sh

build-aux/m4/ax_boost_base.m4

@@ -75,7 +75,7 @@ AC_ARG_WITH([boost-libdir],
 
 BOOST_LDFLAGS=""
 BOOST_CPPFLAGS=""
-AS_IF([test "x$want_boost" = "xyes"],
+AS_IF([test "$want_boost" = "yes"],
       [_AX_BOOST_BASE_RUNDETECT([$1],[$2],[$3])])
 AC_SUBST(BOOST_CPPFLAGS)
 AC_SUBST(BOOST_LDFLAGS)
@@ -84,13 +84,13 @@ AC_SUBST(BOOST_LDFLAGS)
 
 # convert a version string in $2 to numeric and affect to polymorphic var $1
 AC_DEFUN([_AX_BOOST_BASE_TONUMERICVERSION],[
-  AS_IF([test "x$2" = "x"],[_AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"],[_AX_BOOST_BASE_TONUMERICVERSION_req="$2"])
+  AS_IF([test "$2" = ""],[_AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"],[_AX_BOOST_BASE_TONUMERICVERSION_req="$2"])
   _AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\.[[0-9]]*\)'`
   _AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\)'`
-  AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = "x"],
+  AS_IF([test "$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = ""],
         [AC_MSG_ERROR([You should at least specify libboost major version])])
   _AX_BOOST_BASE_TONUMERICVERSION_req_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.\([[0-9]]*\)'`
-  AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = "x"],
+  AS_IF([test "$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = ""],
         [_AX_BOOST_BASE_TONUMERICVERSION_req_minor="0"])
   _AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
   AS_IF([test "X$_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor" = "X"],
@@ -130,7 +130,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
     dnl first we check the system location for boost libraries
     dnl this location ist chosen if boost libraries are installed with the --layout=system option
     dnl or if you install boost with RPM
-    AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[
+    AS_IF([test "$_AX_BOOST_BASE_boost_path" != ""],[
         AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"])
          AS_IF([test -d "$_AX_BOOST_BASE_boost_path/include" && test -r "$_AX_BOOST_BASE_boost_path/include"],[
            AC_MSG_RESULT([yes])
@@ -165,7 +165,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
 
     dnl overwrite ld flags if we have required special directory with
     dnl --with-boost-libdir parameter
-    AS_IF([test "x$_AX_BOOST_BASE_boost_lib_path" != "x"],
+    AS_IF([test "$_AX_BOOST_BASE_boost_lib_path" != ""],
           [BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_lib_path"])
 
     AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION)])
@@ -191,7 +191,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
 
     dnl if we found no boost with system layout we search for boost libraries
     dnl built and installed without the --layout=system option or for a staged(not installed) version
-    if test "x$succeeded" != "xyes" ; then
+    if test "$succeeded" != "yes" ; then
         CPPFLAGS="$CPPFLAGS_SAVED"
         LDFLAGS="$LDFLAGS_SAVED"
         BOOST_CPPFLAGS=
@@ -204,7 +204,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
                 for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
                     _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
                     V_CHECK=`expr $_version_tmp \> $_version`
-                    if test "x$V_CHECK" = "x1" ; then
+                    if test "$V_CHECK" = "1" ; then
                         _version=$_version_tmp
                     fi
                     VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
@@ -226,13 +226,13 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
                 fi
             fi
         else
-            if test "x$cross_compiling" != "xyes" ; then
+            if test "$cross_compiling" != "yes" ; then
                 for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local /opt/homebrew ; do
                     if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then
                         for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do
                             _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
                             V_CHECK=`expr $_version_tmp \> $_version`
-                            if test "x$V_CHECK" = "x1" ; then
+                            if test "$V_CHECK" = "1" ; then
                                 _version=$_version_tmp
                                 best_path=$_AX_BOOST_BASE_boost_path
                             fi
@@ -259,7 +259,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
                     stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
                         stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
                     V_CHECK=`expr $stage_version_shorten \>\= $_version`
-                    if test "x$V_CHECK" = "x1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then
+                    if test "$V_CHECK" = "1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then
                         AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
                         BOOST_CPPFLAGS="-I$BOOST_ROOT"
                         BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
@@ -283,8 +283,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
         AC_LANG_POP([C++])
     fi
 
-    if test "x$succeeded" != "xyes" ; then
-        if test "x$_version" = "x0" ; then
+    if test "$succeeded" != "yes" ; then
+        if test "$_version" = "0" ; then
             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.]])
         else
             AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])

build-aux/m4/ax_boost_filesystem.m4

@@ -53,7 +53,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
         [want_boost="yes"]
 	)
 
-	if test "x$want_boost" = "xyes"; then
+	if test "$want_boost" = "yes"; then
         AC_REQUIRE([AC_PROG_CC])
 		CPPFLAGS_SAVED="$CPPFLAGS"
 		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -77,17 +77,17 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
 					       ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
          AC_LANG_POP([C++])
 		])
-		if test "x$ax_cv_boost_filesystem" = "xyes"; then
+		if test "$ax_cv_boost_filesystem" = "yes"; then
 			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_filesystem_lib" = "x"; then
+            if test "$ax_boost_user_filesystem_lib" = ""; then
                 for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
                                  [link_filesystem="no"])
 				done
-                if test "x$link_filesystem" != "xyes"; then
+                if test "$link_filesystem" != "yes"; then
                 for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
@@ -103,10 +103,10 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
                   done
 
             fi
-            if test "x$ax_lib" = "x"; then
+            if test "$ax_lib" = ""; then
                 AC_MSG_ERROR(Could not find a version of the Boost::Filesystem library!)
             fi
-			if test "x$link_filesystem" != "xyes"; then
+			if test "$link_filesystem" != "yes"; then
 				AC_MSG_ERROR(Could not link against $ax_lib !)
 			fi
 		fi

build-aux/m4/ax_boost_iostreams.m4

@@ -51,7 +51,7 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
         [want_boost="yes"]
 	)
 
-	if test "x$want_boost" = "xyes"; then
+	if test "$want_boost" = "yes"; then
         AC_REQUIRE([AC_PROG_CC])
 		CPPFLAGS_SAVED="$CPPFLAGS"
 		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -75,17 +75,17 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
                              ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
          AC_LANG_POP([C++])
 		])
-		if test "x$ax_cv_boost_iostreams" = "xyes"; then
+		if test "$ax_cv_boost_iostreams" = "yes"; then
 			AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_iostreams_lib" = "x"; then
+            if test "$ax_boost_user_iostreams_lib" = ""; then
                 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
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
                                  [link_iostreams="no"])
 				done
-                if test "x$link_iostreams" != "xyes"; then
+                if test "$link_iostreams" != "yes"; then
                 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
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
@@ -102,10 +102,10 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
                   done
 
             fi
-            if test "x$ax_lib" = "x"; then
+            if test "$ax_lib" = ""; then
                 AC_MSG_ERROR(Could not find a version of the Boost::IOStreams library!)
             fi
-			if test "x$link_iostreams" != "xyes"; then
+			if test "$link_iostreams" != "yes"; then
 				AC_MSG_ERROR(Could not link against $ax_lib !)
 			fi
 		fi

build-aux/m4/ax_boost_system.m4

@@ -53,7 +53,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],
         [want_boost="yes"]
 	)
 
-	if test "x$want_boost" = "xyes"; then
+	if test "$want_boost" = "yes"; then
         AC_REQUIRE([AC_PROG_CC])
         AC_REQUIRE([AC_CANONICAL_BUILD])
 		CPPFLAGS_SAVED="$CPPFLAGS"
@@ -76,21 +76,21 @@ AC_DEFUN([AX_BOOST_SYSTEM],
 			 CXXFLAGS=$CXXFLAGS_SAVE
              AC_LANG_POP([C++])
 		])
-		if test "x$ax_cv_boost_system" = "xyes"; then
+		if test "$ax_cv_boost_system" = "yes"; then
 			AC_SUBST(BOOST_CPPFLAGS)
 
 			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
 
 			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
+            if test "$ax_boost_user_system_lib" = ""; then
                 for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
                                  [link_system="no"])
 				done
-                if test "x$link_system" != "xyes"; then
+                if test "$link_system" != "yes"; then
                 for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
@@ -107,10 +107,10 @@ AC_DEFUN([AX_BOOST_SYSTEM],
                   done
 
             fi
-            if test "x$ax_lib" = "x"; then
+            if test "$ax_lib" = ""; then
                 AC_MSG_ERROR(Could not find a version of the Boost::System library!)
             fi
-			if test "x$link_system" = "xno"; then
+			if test "$link_system" = "no"; then
 				AC_MSG_ERROR(Could not link against $ax_lib !)
 			fi
 		fi

build-aux/m4/ax_boost_thread.m4

@@ -51,7 +51,7 @@ AC_DEFUN([AX_BOOST_THREAD],
         [want_boost="yes"]
     )
 
-    if test "x$want_boost" = "xyes"; then
+    if test "$want_boost" = "yes"; then
         AC_REQUIRE([AC_PROG_CC])
         AC_REQUIRE([AC_CANONICAL_BUILD])
         CPPFLAGS_SAVED="$CPPFLAGS"
@@ -94,7 +94,7 @@ AC_DEFUN([AX_BOOST_THREAD],
              CXXFLAGS=$CXXFLAGS_SAVE
              AC_LANG_POP([C++])
         ])
-        if test "x$ax_cv_boost_thread" = "xyes"; then
+        if test "$ax_cv_boost_thread" = "yes"; then
             case "x$host_os" in
                 xsolaris )
                     BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
@@ -126,14 +126,14 @@ AC_DEFUN([AX_BOOST_THREAD],
                           break;
                           ;;
                         esac
-            if test "x$ax_boost_user_thread_lib" = "x"; then
+            if test "$ax_boost_user_thread_lib" = ""; then
                 for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do
                      ax_lib=${libextension}
                     AC_CHECK_LIB($ax_lib, exit,
                                  [link_thread="yes"; break],
                                  [link_thread="no"])
                 done
-                if test "x$link_thread" != "xyes"; then
+                if test "$link_thread" != "yes"; then
                 for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do
                      ax_lib=${libextension}
                     AC_CHECK_LIB($ax_lib, exit,
@@ -150,10 +150,10 @@ AC_DEFUN([AX_BOOST_THREAD],
                   done
 
             fi
-            if test "x$ax_lib" = "x"; then
+            if test "$ax_lib" = ""; then
                 AC_MSG_ERROR(Could not find a version of the Boost::Thread library!)
             fi
-            if test "x$link_thread" = "xno"; then
+            if test "$link_thread" = "no"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             else
                 BOOST_THREAD_LIB="-l$ax_lib"

build-aux/m4/ax_boost_unit_test_framework.m4

@@ -51,7 +51,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
         [want_boost="yes"]
 	)
 
-	if test "x$want_boost" = "xyes"; then
+	if test "$want_boost" = "yes"; then
         AC_REQUIRE([AC_PROG_CC])
 		CPPFLAGS_SAVED="$CPPFLAGS"
 		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -70,11 +70,11 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
                    ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
          AC_LANG_POP([C++])
 		])
-		if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
+		if test "$ax_cv_boost_unit_test_framework" = "yes"; then
 			AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
 
-            if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
+            if test "$ax_boost_user_unit_test_framework_lib" = ""; then
 			saved_ldflags="${LDFLAGS}"
                 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
                     if test -r $monitor_library ; then
@@ -85,13 +85,13 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
                        link_unit_test_framework="no"
                     fi
 
-			    if test "x$link_unit_test_framework" = "xyes"; then
+			    if test "$link_unit_test_framework" = "yes"; then
                       BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
                       AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 					  break
 				    fi
                 done
-                if test "x$link_unit_test_framework" != "xyes"; then
+                if test "$link_unit_test_framework" != "yes"; then
                 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
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
@@ -103,7 +103,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
                 link_unit_test_framework="no"
 			saved_ldflags="${LDFLAGS}"
                 for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do
-                   if test "x$link_unit_test_framework" = "xyes"; then
+                   if test "$link_unit_test_framework" = "yes"; then
                       break;
                    fi
                    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],
                        link_unit_test_framework="no"
                     fi
 
-				if test "x$link_unit_test_framework" = "xyes"; then
+				if test "$link_unit_test_framework" = "yes"; then
                         BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
                         AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 					    break
 				    fi
                   done
                done
             fi
-            if test "x$ax_lib" = "x"; then
+            if test "$ax_lib" = ""; then
                 AC_MSG_ERROR(Could not find a version of the Boost::Unit_Test_Framework library!)
             fi
-			if test "x$link_unit_test_framework" != "xyes"; then
+			if test "$link_unit_test_framework" != "yes"; then
 				AC_MSG_ERROR(Could not link against $ax_lib !)
 			fi
 		fi

build-aux/m4/ax_boost_zlib.m4

@@ -47,7 +47,7 @@ AC_DEFUN([AX_BOOST_ZLIB],
         [want_boost="yes"]
 	)
 
-	if test "x$want_boost" = "xyes"; then
+	if test "$want_boost" = "yes"; then
         AC_REQUIRE([AC_PROG_CC])
 		CPPFLAGS_SAVED="$CPPFLAGS"
 		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -59,14 +59,14 @@ AC_DEFUN([AX_BOOST_ZLIB],
 
 			AC_DEFINE(HAVE_BOOST_ZLIB,,[define if the Boost::zlib library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-            if test "x$ax_boost_user_zlib_lib" = "x"; then
+            if test "$ax_boost_user_zlib_lib" = ""; then
                 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
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_ZLIB_LIB="-l$ax_lib"; AC_SUBST(BOOST_ZLIB_LIB) link_zlib="yes"; break],
                                  [link_zlib="no"])
 				done
-                if test "x$link_zlib" != "xyes"; then
+                if test "$link_zlib" != "yes"; then
                 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
                      ax_lib=${libextension}
 				    AC_CHECK_LIB($ax_lib, exit,