Update SoftHSM v2.0 to the latest version

[aaf/sshsm.git] / SoftHSMv2 / m4 / acx_64bit.m4

diff --git a/SoftHSMv2/m4/acx_64bit.m4 b/SoftHSMv2/m4/acx_64bit.m4
index f610b21..4620184 100644 (file)
--- a/SoftHSMv2/m4/acx_64bit.m4
+++ b/SoftHSMv2/m4/acx_64bit.m4
@@ -7,23 +7,42 @@ AC_DEFUN([ACX_64BIT],[
 
        if test "x$enable_64bit" = "xyes"
        then
-               AC_MSG_CHECKING(if we can compile in 64-bit mode)
                tmp_CFLAGS=$CFLAGS
                CFLAGS="-m64"
-               AC_RUN_IFELSE(
-                       [
+               AC_CACHE_CHECK([if we can compile in 64-bit mode], [acx_cv_prog_cc_64bit],[
+                       acx_cv_prog_cc_64bit=no
+                       AC_COMPILE_IFELSE([
                                AC_LANG_PROGRAM([],[return sizeof(void*) == 8 ? 0 : 1;])
                        ], [
-                               AC_MSG_RESULT(yes)
-                               CXXFLAGS="-m64 $CXXFLAGS"
-                               LDFLAGS="-m64 $LDFLAGS"
-                               CFLAGS="-m64 $tmp_CFLAGS"
-                       ],[
-                               AC_MSG_RESULT(no)
-                               AC_MSG_ERROR([Don't know how to compile in 64-bit mode.])
-                               CFLAGS=$tmp_CFLAGS
-                       ]
-               )
+                               acx_cv_prog_cc_64bit=yes
+                       ])
+               ])
+
+               if test "x$acx_cv_prog_cc_64bit" = xyes; then
+                       AC_MSG_CHECKING([if we can run 64-bit programs])
+                       AC_CACHE_VAL([acx_cv_sys_64bit],[
+                               acx_cv_sys_64bit=no
+                               AC_RUN_IFELSE([
+                                       AC_LANG_PROGRAM([],[return sizeof(void*) == 8 ? 0 : 1;])
+                               ], [
+                                       AC_MSG_RESULT(yes)
+                                       acx_cv_sys_64bit=yes
+                               ],[
+                                       AC_MSG_RESULT(no)
+                                       AC_MSG_ERROR([Don't know how to compile in 64-bit mode.])
+                                       CFLAGS=$tmp_CFLAGS
+                               ],[
+                                       AC_MSG_WARN([Cannot test, assuming 64-bit])
+                                       acx_cv_sys_64bit=yes
+                               ])
+                       ])
+
+                       CXXFLAGS="-m64 $CXXFLAGS"
+                       LDFLAGS="-m64 $LDFLAGS"
+                       CFLAGS="-m64 $tmp_CFLAGS"
+               else
+                       CFLAGS=$tmp_CFLAGS
+               fi
        fi
 
 ])