Skip to content

Commit

Permalink
changed some test logic. Was not testing right on all bash
Browse files Browse the repository at this point in the history
  • Loading branch information
jfoug committed May 18, 2014
1 parent 9058ab5 commit 445ad39
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
15 changes: 6 additions & 9 deletions src/configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
#############################################################################
Expand Down Expand Up @@ -13352,29 +13352,26 @@ 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
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
Expand Down
15 changes: 6 additions & 9 deletions src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
#############################################################################
Expand Down Expand Up @@ -538,29 +538,26 @@ 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
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

Expand Down

0 comments on commit 445ad39

Please sign in to comment.