Changeset 12258 for issm/branches/trunk-jpl-damage/m4/issm_options.m4

Timestamp:

05/16/12 13:51:50 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into branches/trunk-jpl-damage through revision 12254

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• m4/issm_options.m4 (modified) (2 diffs)

issm/branches/trunk-jpl-damage/m4/issm_options.m4

@@ -66 +66 @@
                         export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
                 elif test $VENDOR = arm-linux; then
-                        export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
-                        export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-cc
-
-                else
+                        export CC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
+                        export GCC=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-gcc
+                        export CXX=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-g++
+                        export AR=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ar
+                        export RANLIB=$ANDROID_DIR/arm-linux-android-4.0/bin/arm-linux-androideabi-ranlib
+        else
                 AC_MSG_ERROR([unknow compiler vendor!])
                 fi
@@ -949 +951 @@
 
         dnl check that --with-fortran-lib may have been provided
+        HAVE_FORTRAN=no
         if test -n "$FORTRAN_LIB" ; then
-                HAVE_FORTRAN=yes
-                FORTRANLIB="$FORTRAN_LIB"
-
-                AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
-                AC_SUBST([FORTRANLIB])
-        fi
+        if test x$FORTRAN_LIB = xno; then
+            HAVE_FORTRAN=NO
+        else
+            HAVE_FORTRAN=yes
+            FORTRANLIB="$FORTRAN_LIB"
+
+            AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
+            AC_SUBST([FORTRANLIB])
+        fi
+        fi
+        AM_CONDITIONAL([FORTRAN], [test x$HAVE_FORTRAN = xyes])
         AC_MSG_RESULT(done)
         dnl }}}