Changeset 24876

Timestamp:

05/19/20 12:02:04 (5 years ago)

Author:

jdquinn

Message:

BUG: Faulty test for macOS.

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -190 +190 @@
                 [VENDOR=""]                                                                                                                     dnl action if not given
         )
-        dnl defaults for host OS related variables
-        IS_MAC=no
+
+        AC_MSG_CHECKING([if this is a Mac build])
+        case "${host_os}" in
+                *darwin*)
+                        IS_MAC=yes
+                ;;
+                *)
+                        IS_MAC=no
+                ;;
+        esac
+        AM_CONDITIONAL([MAC], [test "${IS_MAC}" == "yes"])
+        AC_MSG_RESULT([${IS_MAC}])
+
         IS_WINDOWS=no
         AC_MSG_CHECKING([for vendor compilers])
@@ -285 +296 @@
         AC_SUBST([OSLIBS])
         AC_MSG_RESULT([done])
-
-        AC_MSG_CHECKING([if this is a Mac build])
-        dnl TODO: The following test is a POSIX-compliant way of testing for a
-        dnl               substring, but is not very readable. Perhaps there is a more
-        dnl               readable method of achieving the same?
-        if test "${host_os#*\"darwin\"}" == "$host_os"; then
-                IS_MAC=yes
-        fi
-        AM_CONDITIONAL([MAC], [test "${IS_MAC}" == "yes"])
-        AC_MSG_RESULT([${IS_MAC}])
 
         AC_MSG_CHECKING([if this is a Windows build])