Changeset 13101 for issm/branches/trunk-jpl-damage/m4

Timestamp:

08/20/12 17:39:30 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 13099 into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• m4 (modified) (1 prop)
• m4/ar-lib.m4 (deleted)
• m4/issm_options.m4 (modified) (7 diffs)
• m4/libtool.m4 (deleted)
• m4/ltoptions.m4 (deleted)
• m4/ltsugar.m4 (deleted)
• m4/ltversion.m4 (deleted)
• m4/lt~obsolete.m4 (deleted)

issm/branches/trunk-jpl-damage

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/branches/trunk-jpl-damage/m4

@@ -1 @@
-svn-commit.tmp
+

@@ -1 @@
-svn-commit.tmp
+

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

@@ -15 +15 @@
         dnl }}}
     dnl shared build {{{
-    AC_ARG_ENABLE([shared],                                                dnl feature
-        AS_HELP_STRING([--enable-shared], [produce libISSM.so.0]),         dnl help string
-        [enable_shared=$enableval],                                        dnl action if given
-        [enable_shared=no])                                                dnl action if not given
-    AM_CONDITIONAL([SHARED], [test $enable_shared = yes])
+    AC_ARG_ENABLE([sharedlibs],                                                dnl feature
+        AS_HELP_STRING([--enable-sharedlibs], [produce libISSM.so.0]),         dnl help string
+        [enable_sharedlibs=$enableval],                                        dnl action if given
+        [enable_sharedlibs=no])                                                dnl action if not given
+    AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes])
+    dnl }}}
+
+    dnl shared build {{{
+    AC_ARG_ENABLE([version],                                                dnl feature
+        AS_HELP_STRING([--enable-version], [produce libISSM.so.0]),         dnl help string
+        [enable_version=$enableval],                                        dnl action if given
+        [enable_version=no])                                                dnl action if not given
+    AM_CONDITIONAL([VERSION], [test x$enable_VERSION = xyes])
     dnl }}}
 
@@ -221 +229 @@
                 MATLABWRAPPEREXT=$MEXEXT
                 AC_SUBST([MATLABWRAPPEREXT])
-                AC_SUBST([MEXLIB]) 
+            AC_SUBST([MEXLIB]) 
                 AC_SUBST([MEXLINK])
         fi
@@ -466 +474 @@
         AC_MSG_RESULT($HAVE_ADOLC)
         dnl }}}
+        dnl adolc-version{{{
+        AC_ARG_WITH([adolc-version],
+                AS_HELP_STRING([--with-adolc-version=number], [adolc version.]),
+                [ADOLC_VERSION=$withval],[ADOLC_VERSION=2]) 
+        AC_MSG_CHECKING(for adolc-version) 
+
+        AC_DEFINE_UNQUOTED([_ADOLC_VERSION_],$ADOLC_VERSION,[ADOLC version])
+        AC_MSG_RESULT($ADOLC_VERSION)
+        dnl }}}
         dnl adic2{{{
         AC_ARG_WITH([adic2-dir],
@@ -589 +606 @@
                                 ;;
                         esac
-        
+
                         METISINCL=-I"$METIS_ROOT/include" 
                         AC_DEFINE([_METIS_VERSION_],[5],[ Metis version number])
@@ -606 +623 @@
         AC_MSG_CHECKING(for mpi)
         AC_ARG_WITH([mpi-lib],
-                AS_HELP_STRING([--with-mpi-lib = otions],[mpi options, for ex: "-L$MPIROOT -lmpich]),
+                AS_HELP_STRING([--with-mpi-lib = options],[mpi options, for ex: "-L$MPIROOT -lmpich]),
                 [MPILIB=$withval],[MPILIB=""])
         
@@ -620 +637 @@
                 else
                         HAVE_MPI=yes
-                        MPIINCL=-I"$MPI_INCLUDE/"
+                        MPIINCL=-I"$MPI_INCLUDE"
                         AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
                         AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])
@@ -666 +683 @@
                         *cygwin*)
                         if test "$PETSC_MAJOR" = "2" ; then
-                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
+                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
                         else
-                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetsc.lib"
+                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetsc.lib"
                         fi
                         ;;
                         *linux*)
                         if test "$PETSC_MAJOR" = "2" ; then
-                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
+                        PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
                         else
-                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc -ldl"
+                        PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc -ldl"
                         fi
                         ;;
                         *darwin*)
                         if test "$PETSC_MAJOR" = "2" ; then
-                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
+                        PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
                         else
-                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
+                        PETSCLIB="-L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
                         fi
                         ;;

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ -1 @@
-svn-commit.tmp
+