Changeset 13935

Timestamp:

11/09/12 18:10:23 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new options for ISSM JNI and EXE

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -1318 +1318 @@
         dnl with-android{{{
         AC_ARG_WITH([android],
-                AS_HELP_STRING([--with-android = YES], [compile with android capabilities (default is no)]),
+                AS_HELP_STRING([--with-android = EXE], [compile with android capabilities (default is no, alternatives are exe and jni)]),
                 [ANDROID=$withval],[ANDROID=no]) 
         AC_MSG_CHECKING(for android capability compilation)
 
-        if test "x$ANDROID" = "xyes"; then
-
-                dnl defaults
-                HAVE_ANDROID=yes
+        if test "x$ANDROID" = "xjni"; then
+
+                dnl defaults
+                HAVE_ANDROID=jni
 
                 AC_DEFINE([_HAVE_ANDROID_],[1],[with android capability])
-        else
+        elif test "x$ANDROID" = "xexe"; then
+                dnl defaults
+                HAVE_ANDROID=exe
+
+                AC_DEFINE([_HAVE_ANDROID_],[1],[with android capability])
+        elif test "x$ANDROID" = "xno"; then
                 HAVE_ANDROID=no
-        fi
-        AM_CONDITIONAL([ANDROID], [test x$HAVE_ANDROID = xyes])
+        else
+          AC_MSG_ERROR([--with-android should be either no, exe or jni])
+        fi
+        AM_CONDITIONAL([ANDROID], [test x$HAVE_ANDROID != xno])
+        AM_CONDITIONAL([ANDROIDJNI], [test x$HAVE_ANDROID = xjni])
+        AM_CONDITIONAL([ANDROIDEXE], [test x$HAVE_ANDROID = xexe])
         AC_MSG_RESULT($HAVE_ANDROID)
         dnl }}}