--- mstflint-4.37.0-1.1/configure.ac
+++ mstflint-4.37.0-1.1/configure.ac
@@ -73,11 +73,11 @@
 #endif
 ]])], [OPENSSL_VERSION_VALID=yes], [OPENSSL_VERSION_VALID=no])
 OS=$(uname -s)
-KERNEL_VER=`uname -r | egrep -E -o '[[0-9]]+\.[[0-9]]+' | head -1`
-OFED_VER=`ofed_info -s | egrep -E -o '[[0-9]]+\.[[0-9]]+' | head -1`
+KERNEL_VER=`uname -r | grep -E -o '[0-9]+\.[0-9]+' | head -1`
+OFED_VER=`ofed_info -s | grep -E -o '[0-9]+\.[0-9]+' | head -1`
 MIN_OFED_VER="5.6"
 MIN_RDMA_CORE_VER="2607"
-RDMA_CORE_VER=`{ rpm -q rdma-core --queryformat '%{VERSION}\n' 2>/dev/null; dpkg-query -W -f='${Version}\n' rdma-core 2>/dev/null; } | egrep -E -o '^[[0-9]]+' | head -1`
+RDMA_CORE_VER=`{ rpm -q rdma-core --queryformat '%{VERSION}\n' 2>/dev/null; dpkg-query -W -f='${Version}\n' rdma-core 2>/dev/null; } | grep -E -o '^[0-9]+' | head -1`
 MTCR_CONF_DIR=""
 LDL=""
 LDFLAGS="$LDFLAGS -lstdc++"
@@ -90,17 +90,18 @@
 OFED_VERSION_CHK=0
 KERNEL_BUILD_CHK=0
 
-if test -n "$OFED_VER" && test $(echo $OFED_VER $MIN_OFED_VER | tr " " "\n" | sort -V | tail -n 1) == "$OFED_VER" ; then
+if test -n "$OFED_VER" && test $(echo $OFED_VER $MIN_OFED_VER | tr " " "\n" | sort -V | tail -n 1) = "$OFED_VER" ; then
     OFED_VERSION_CHK=1
 fi
-if test -n "$RDMA_CORE_VER" && test $(echo $RDMA_CORE_VER $MIN_RDMA_CORE_VER | tr " " "\n" | sort -V | tail -n 1) == "$RDMA_CORE_VER" ; then
+if test -n "$RDMA_CORE_VER" && test $(echo $RDMA_CORE_VER $MIN_RDMA_CORE_VER | tr " " "\n" | sort -V | tail -n 1) = "$RDMA_CORE_VER" ; then
     OFED_VERSION_CHK=1
 fi
 
 AM_CONDITIONAL(OFED_BUILD,[test ${OFED_VERSION_CHK} = 1])
 AC_SUBST(OFED_BUILD)
 
-if test ${KERNEL_VER} \> "x5.13" ; then
+KERN_VER_ALIGNED=`echo ${KERNEL_VER} | tr '.' ' '`
+if test `printf '%03d' ${KERN_VER_ALIGNED}` -gt '005013000' ; then
     KERNEL_BUILD_CHK=1
 fi
 
@@ -789,12 +790,13 @@
 CFLAGS="$CFLAGS -DMST_UL"
 CXXFLAGS="$CXXFLAGS -DMST_UL"
 
-CCVER=`${CC} --version | grep ${CC} | grep -E -o "( )[[4-9]]\.[[0-9]]\.[[0-9]]" | head -1`
+CCVER=`${CC} --version | grep ${CC} | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+" | head -1`
+CCVER_ALIGNED=`echo ${CCVER} | tr '.' ' '`
 AC_MSG_NOTICE(Compiler: ${CC}; version: ${CCVER};)
-if test ${CCVER} \> 5.0.0 ; then
+if test `printf '%03d' ${CCVER_ALIGNED}` -gt 005000000 ; then
     CXXFLAGS="$CXXFLAGS -std=c++14"
     CFLAGS="$CFLAGS -fgnu89-inline"
-elif test ${CCVER} \> 4.7.2 ; then
+elif test `printf '%03d' ${CCVER_ALIGNED}` -gt 004007002 ; then
     CXXFLAGS="$CXXFLAGS -std=c++11"
 fi
 
@@ -844,7 +846,7 @@
 AC_SUBST(TOOLS_BUILD_TIME)
 
 AC_ARG_VAR(MSTFLINT_VERSION_STR, The MSTFLINT version)
-if test x"$MSTFLINT_VERSION_STR" == x; then
+if test x"$MSTFLINT_VERSION_STR" = x; then
     MSTFLINT_VERSION_STR="$PACKAGE_STRING"
 fi
 
--- mstflint-4.37.0-1.1/mtcr_ul/Makefile.am
+++ mstflint-4.37.0-1.1/mtcr_ul/Makefile.am
@@ -32,7 +32,8 @@
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common -I$(top_srcdir)/dev_mgt
 
-pkglib_LTLIBRARIES = libmtcr_ul.la
+noinst_LIBRARIES = libmtcr_ul.a
+noinst_LTLIBRARIES = libmtcr_ul.la
 
 libmtcr_ul_la_SOURCES = mtcr_ul.c mtcr_ib.h  mtcr_int_defs.h\
 			mtcr_ib_res_mgt.h mtcr_ib_res_mgt.c\
@@ -71,10 +72,7 @@
 
 libmtcr_ul_la_LIBADD = $(libmtcr_ul_la_DEPENDENCIES)
 
+libmtcr_ul_a_SOURCES = $(libmtcr_ul_la_SOURCES)
 
 libraryincludedir=$(includedir)/mstflint
 libraryinclude_HEADERS = $(top_srcdir)/include/mtcr_ul/mtcr.h  $(top_srcdir)/include/mtcr_ul/mtcr_com_defs.h  $(top_srcdir)/include/mtcr_ul/mtcr_mf.h
-
-install-exec-hook:
-	rm -f $(DESTDIR)$(pkglibdir)/libmtcr_ul.so* $(DESTDIR)$(pkglibdir)/libmtcr_ul.la
-	ln -snf mstflint/libmtcr_ul.a $(DESTDIR)$(libdir)/libmtcr_ul.a