From 445ad39a60413a64c4b4a3bcdc39c562d2aba2a1 Mon Sep 17 00:00:00 2001
From: JimF <jfoug@cox.net>
Date: Sun, 18 May 2014 01:19:48 -0500
Subject: [PATCH] changed some test logic.  Was not testing right on all bash

---
 src/configure    | 15 ++++++---------
 src/configure.ac | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/configure b/src/configure
index a6798335fd..aea647710b 100755
--- a/src/configure
+++ b/src/configure
@@ -8498,10 +8498,10 @@ CFLAGS="$CFLAGS_BACKUP"
 # is put after the $amd/lib dir, so it should not affect a system where this is already
 # set as ln -s files.  NOTE, there may be others like this which need 32/64 bit special settings
 ###########################
-if test ${CPU_BIT_STR} == "64" -a -d "$AMDAPPSDKROOT/lib/x86_64"; then
+if test $CPU_BIT_STR == 64 -a -d "$AMDAPPSDKROOT/lib/x86_64" ; then
    LDFLAGS+=" -L$AMDAPPSDKROOT/lib/x86_64"
 fi
-if test  ${CPU_BIT_STR} == "32" -a -d "$AMDAPPSDKROOT/lib/x86"; then
+if test  $CPU_BIT_STR == 32 -a -d "$AMDAPPSDKROOT/lib/x86" ; then
    LDFLAGS+=" -L$AMDAPPSDKROOT/lib/x86"
 fi
 #############################################################################
@@ -13352,7 +13352,7 @@ fi
 #    ONLY _COSMETICAL_ OUTPUT STUFF BELOW THIS LINE
 ########################################################
 
-if test "x${CL_LIBS}" = x; then
+if test x$CL_LIBS = x; then
    using_cl=no
 else
    using_cl=yes
@@ -13360,21 +13360,18 @@ fi
 
 # Hard to get proper info from AC_OPENMP. If it's enabled with no special
 # options needed, we might end up listing it as disabled
-if test "x$ac_cv_prog_c_openmp" != "x" -a
-        "x$enable_openmp" != "xno" -a
-		"x$ac_cv_prog_c_openmp" != "xunsupported";
-   then
+if test x$ac_cv_prog_c_openmp != x -a  x$enable_openmp != xno -a  x$ac_cv_prog_c_openmp != xunsupported ; then
    using_omp=yes
 else
    using_omp=no
 fi
 
-if test "x$host_cpu" != "x$CPU_STR"; then
+if test x$host_cpu != x$CPU_STR ; then
    host_cpu="$host_cpu $CPU_STR"
 fi
 
 # reports of GMP showing up blank. This should fix this.
-if test "x$ac_cv_lib_gmp___gmpz_init" == "x"; then
+if test x$ac_cv_lib_gmp___gmpz_init == x ; then
    ac_cv_lib_gmp___gmpz_init=no
 fi
 
diff --git a/src/configure.ac b/src/configure.ac
index 08b910399a..263266f9ad 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -266,10 +266,10 @@ AX_JTR_GENERIC_LOGIC
 # is put after the $amd/lib dir, so it should not affect a system where this is already
 # set as ln -s files.  NOTE, there may be others like this which need 32/64 bit special settings
 ###########################
-if test ${CPU_BIT_STR} == "64" -a -d "$AMDAPPSDKROOT/lib/x86_64"; then
+if test $CPU_BIT_STR == 64 -a -d "$AMDAPPSDKROOT/lib/x86_64" ; then
    LDFLAGS+=" -L$AMDAPPSDKROOT/lib/x86_64"
 fi
-if test  ${CPU_BIT_STR} == "32" -a -d "$AMDAPPSDKROOT/lib/x86"; then
+if test  $CPU_BIT_STR == 32 -a -d "$AMDAPPSDKROOT/lib/x86" ; then
    LDFLAGS+=" -L$AMDAPPSDKROOT/lib/x86"
 fi
 #############################################################################
@@ -538,7 +538,7 @@ AC_OUTPUT(,echo "timestamp from configure.in" > autoconfig-stamp-h)
 #    ONLY _COSMETICAL_ OUTPUT STUFF BELOW THIS LINE
 ########################################################
 
-if test "x${CL_LIBS}" = x; then
+if test x$CL_LIBS = x; then
    using_cl=no
 else
    using_cl=yes
@@ -546,21 +546,18 @@ fi
 
 # Hard to get proper info from AC_OPENMP. If it's enabled with no special
 # options needed, we might end up listing it as disabled
-if test "x$ac_cv_prog_c_openmp" != "x" -a 
-        "x$enable_openmp" != "xno" -a 
-		"x$ac_cv_prog_c_openmp" != "xunsupported";
-   then
+if test x$ac_cv_prog_c_openmp != x -a  x$enable_openmp != xno -a  x$ac_cv_prog_c_openmp != xunsupported ; then
    using_omp=yes
 else
    using_omp=no
 fi
 
-if test "x$host_cpu" != "x$CPU_STR"; then
+if test x$host_cpu != x$CPU_STR ; then
    host_cpu="$host_cpu $CPU_STR"
 fi
 
 # reports of GMP showing up blank. This should fix this.
-if test "x$ac_cv_lib_gmp___gmpz_init" == "x"; then
+if test x$ac_cv_lib_gmp___gmpz_init == x ; then
    ac_cv_lib_gmp___gmpz_init=no
 fi