Changeset 11237 for issm/trunk/m4
- Timestamp:
- 01/27/12 08:19:58 (13 years ago)
- Location:
- issm/trunk
- Files:
-
- 3 edited
- 5 copied
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk
- Property svn:ignore
-
old new 1 autom4te.cache 2 aclocal.m4 1 3 bin 4 config.log 5 config.h 6 config.h.in 7 config.status 2 8 configure 9 doxygen 10 ISSM.paf 11 ISSM.ppf 12 ISSM.ppf_cache 13 libtool 14 list 3 15 Makefile 4 16 Makefile.in 5 ISSM.paf6 list7 ISSM.ppf_cache8 config.log9 config.h10 .ignore.txt11 config.status12 17 stamp-h1 13 18 svn-commit* 14 ISSM.ppf15 config.h.in16 autom4te.cache17 aclocal.m418 doxygen
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
issm/trunk/m4/issm_options.m4
r10229 r11237 409 409 fi 410 410 411 if test "$PARALLEL_VALUE" = "yes" ; then411 dnl if test "$PARALLEL_VALUE" = "yes" ; then 412 412 AC_MSG_CHECKING(for petsc version) 413 413 PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'` … … 416 416 AC_DEFINE_UNQUOTED([_PETSC_MINOR_],$PETSC_MINOR,[ Petsc version minor]) 417 417 AC_MSG_RESULT($PETSC_MAJOR.$PETSC_MINOR) 418 fi418 dnl fi 419 419 420 420 … … 434 434 if test -d "$PETSC_ROOT"; then 435 435 436 PETSCINCL="-I$PETSC_ROOT/$PETSC_ARCH/include -I$PETSC_ROOT/include -I$PETSC_ROOT/ -I$PETSC_ROOT/bmake/$PETSC_ARCH -I$PETSC_ROOT/src/mat/impls/dense/mpi/plapack/"436 PETSCINCL="-I$PETSC_ROOT/$PETSC_ARCH/include -I$PETSC_ROOT/include/$PETSC_ARCH/ -I$PETSC_ROOT/include -I$PETSC_ROOT/ -I$PETSC_ROOT/bmake/$PETSC_ARCH -I$PETSC_ROOT/src/mat/impls/dense/mpi/plapack/" 437 437 438 438 case "${host_os}" in -
issm/trunk/m4/matlab.m4
r10884 r11237 291 291 292 292 # For Matlab R2008a and more, the version number is stored in .VERSION 293 ax_cv_matlab_version=`cat $MATLAB/.VERSION` 293 if test -f "$MATLAB/.VERSION" ; then 294 ax_cv_matlab_version=`cat $MATLAB/.VERSION` 295 if test -n "$ax_cv_matlab_version" ; then 296 break 297 fi 298 fi 299 300 #Last hope, find version in file stored in bin/util/mex/version.txt 301 # 302 ax_cv_matlab_version=`cat $MATLAB/bin/util/mex/version.txt` 294 303 if test -n "$ax_cv_matlab_version" ; then 295 304 break
Note:
See TracChangeset
for help on using the changeset viewer.