ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/ac-tools/aclocal.m4
(Generate patch)

Comparing trunk/OOPSE/ac-tools/aclocal.m4 (file contents):
Revision 838 by gezelter, Wed Oct 29 03:06:51 2003 UTC vs.
Revision 878 by gezelter, Fri Dec 12 15:42:13 2003 UTC

# Line 171 | Line 171 | call MPI_Init(ierr)
171      AC_SUBST(MPIMODLIBNAME)
172    else
173      AC_MSG_RESULT(no)
174 <    AC_MSG_ERROR([Couldn't locate MPI F90 Modules])
174 >    AC_MSG_WARN([Couldn't locate MPI F90 Modules])
175    fi
176  
177   ])
# Line 298 | Line 298 | dnl
298   ])
299   ])
300   dnl
301 +
302 +
303 + dnl
304 + dnl CHECK_MPIFH
305 + dnl
306 + AC_DEFUN([CHECK_MPIFH],
307 +
308 + AC_MSG_CHECKING(for mpif.h include file)
309 +    for dir in $withval $MPI_INC  $MPI_DIR/include; do
310 +        mpifdir="$dir"
311 +        if test -f "$dir/mpif.h"; then
312 +            found_mpif="yes";
313 +            break;
314 +        fi
315 +    done
316 +    if test x_$found_mpif != x_yes; then
317 +        AC_MSG_ERROR(Cannot find mpif.h file)
318 +    else
319 +        printf "mpif.h found in $mpifdir\n";
320 +    fi
321  
322 +  AC_LANG_SAVE()
323 +  AC_LANG([Fortran 90])
324 +  ac_save_CPPFLAGS=$CPPFLAGS
325 +  CPPFLAGS="${CPPFLAGS} -I${mkldir}/include"
326 +  ac_save_LDFLAGS=$LDFLAGS
327 +  LDFLAGS="${LDFLAGS} -L${mkldir}/lib/32 -lmkl -lvml -lguide"
328 +  AC_CHECK_HEADER(mkl.h, [
329 +    AC_CHECK_LIB(mkl,
330 +                 vslNewStream,
331 +                    [MKL_LIBDIR="${mkldir}/lib/32",
332 +                     MKL_LIB="-lmkl -lvml -lguide",
333 +                     HAVE_MKL="yes"])
334 +    ], [MKL_INC="-I${mkldir}/include"])
335 +  CPPFLAGS=$ac_save_CPPFLAGS
336 +  LDFLAGS=$ac_save_LDFLAGS
337 +  AC_LANG_RESTORE()
338 +  
339 +  if test x_$HAVE_MKL != x_yes; then
340 +        AC_MSG_ERROR(Can't build with MKL)
341 +  fi
342 +  AC_SUBST(MKL_LIBDIR)
343 +  AC_SUBST(MKL_LIB)
344 +  AC_SUBST(MKL_INC)
345 +  AC_SUBST(HAVE_MKL)
346 + ],
347 + [
348 +    AC_MSG_RESULT(no)
349 + ])
350 + dnl
351 +
352 +
353 +
354 +
355   AC_DEFUN(ACX_CHECK_CC_FLAGS,
356   [
357   AC_REQUIRE([AC_PROG_CC])
# Line 762 | Line 815 | if test "$ac_test_PREPFLAG" != "set"; then
815    esac
816  
817    if test -z "$PREPFLAG"; then
818 <        echo ""
766 <        echo "**********************************************************"
767 <        echo "* WARNING: Don't know the best PREPFLAG for this system  *"
768 <        echo "* Use  make PREPFLAG=..., or edit the top level Makefile *"
769 <        echo "* (otherwise, an empty PREPFLAG will be used)            *"
770 <        echo "**********************************************************"
771 <        echo ""
818 >        AC_MSG_WARN("Using empty PREPFLAG")
819          PREPFLAG=""
820    fi
821  
822    AC_MSG_CHECKING(to make sure F90 preprocessor flag works)
823 <  AC_LANG_SAVE()
823 >  AC_LANG_SAVE(
824    AC_LANG([Fortran 90])
825    ac_save_ext=$ac_ext
826    ac_ext=F90
# Line 827 | Line 874 | if test "$ac_test_PREPDEFFLAG" != "set"; then
874    esac
875  
876    if test -z "$PREPDEFFLAG"; then
877 <        echo ""
831 <        echo "*************************************************************"
832 <        echo "* WARNING: Don't know the best PREPDEFFLAG for this system  *"
833 <        echo "* Use  make PREPDEFFLAG=..., or edit the top level Makefile *"
834 <        echo "* (otherwise, an empty PREPDEFFLAG will be used)            *"
835 <        echo "*************************************************************"
836 <        echo ""
877 >        AC_MSG_WARN("Using empty PREPDEFFLAG")
878          PREPDEFFLAG=" "
879    fi
880  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines