Changeset 19705

Timestamp:

11/11/15 14:01:30 (9 years ago)

Author:

Eric.Larour

Message:

CHG: handle issues with libraries for llvm emscripten linking.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -343 +343 @@
         AC_MSG_RESULT(done)
         dnl }}}
+        dnl javascript{{{
+        AC_ARG_WITH([javascript],
+          AS_HELP_STRING([--with-javascript], [compile javascript wrappers? default is no.]),
+          [JAVASCRIPT=$withval],[JAVASCRIPT="no"]) 
+
+        dnl Check whether javascript wrappers are desired
+        AC_MSG_CHECKING([for javascript])
+        if test "x$JAVASCRIPT" = "xno" ; then
+                HAVE_JAVASCRIPT=no
+        else
+                HAVE_JAVASCRIPT=yes
+                AC_DEFINE([_HAVE_JAVASCRIPT_],[1],[with javascript])
+        fi
+        AC_MSG_RESULT($HAVE_JAVASCRIPT)
+        AM_CONDITIONAL([JAVASCRIPT],[test x$HAVE_JAVASCRIPT = xyes])
+        JAVASCRIPTWRAPPEREXT=.js
+        AC_SUBST([JAVASCRIPTWRAPPEREXT])
+
+        dnl }}}
         dnl triangle {{{
         AC_ARG_WITH([triangle-dir],
@@ -376 +395 @@
                                 ;;
                                 *darwin*)
-                                TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+                                if test "x$HAVE_JAVASCRIPT" = "xyes"; then
+                                        TRIANGLELIB=$TRIANGLE_ROOT/triangle.o dnl go to the bit code, not the library.
+                                else
+                                        TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
+                                fi
                                 ;;
                         esac
@@ -551 +574 @@
         AM_CONDITIONAL([ISSM_DAKOTA],[test x$DAKOTA_MAJOR = x6])
         dnl }}}
-        dnl javascript{{{
-        AC_ARG_WITH([javascript],
-          AS_HELP_STRING([--with-javascript], [compile javascript wrappers? default is no.]),
-          [JAVASCRIPT=$withval],[JAVASCRIPT="no"]) 
-
-        dnl Check whether javascript wrappers are desired
-        AC_MSG_CHECKING([for javascript])
-        if test "x$JAVASCRIPT" = "xno" ; then
-                HAVE_JAVASCRIPT=no
-        else
-                HAVE_JAVASCRIPT=yes
-                AC_DEFINE([_HAVE_JAVASCRIPT_],[1],[with javascript])
-        fi
-        AC_MSG_RESULT($HAVE_JAVASCRIPT)
-        AM_CONDITIONAL([JAVASCRIPT],[test x$HAVE_JAVASCRIPT = xyes])
-        JAVASCRIPTWRAPPEREXT=.js
-        AC_SUBST([JAVASCRIPTWRAPPEREXT])
-
-        dnl }}}
         dnl python{{{
         AC_ARG_WITH([python-dir],