ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/configure
(Generate patch)

Comparing trunk/OOPSE/configure (file contents):
Revision 822 by gezelter, Mon Oct 27 16:20:59 2003 UTC vs.
Revision 826 by gezelter, Mon Oct 27 23:00:59 2003 UTC

# Line 311 | Line 311 | ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA
311   # include <unistd.h>
312   #endif"
313  
314 < ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR F90LIBS F90_FUNC F90_FUNC_ mpi_dir MPI_LIBDIR MPI_INC MPI_LIB MPIF77 MPIF90 MPILIBS CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL MPI_F90_MODS MPIMODLIBNAME BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS'
314 > ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC mpi_dir MPI_LIBDIR MPI_INC MPI_LIB MPIF77 MPIF90 MPILIBS CPP EGREP SPRNG_LIBDIR SPRNG_LIB SPRNG_INC HAVE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL MPI_F90_MODS MPIMODLIBNAME BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LIBOBJS LTLIBOBJS'
315   ac_subst_files=''
316  
317   # Initialize some variables set by options.
# Line 1792 | Line 1792 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1792   # $SHELLVAR to the Fortran 95 mangled name.  If the SHELLVAR
1793   # argument is not supplied, it defaults to NAME.
1794   # AC_F95_FUNC
1795 +
1796 +
1797 +
1798  
1799  
1800  
# Line 1828 | Line 1831 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1831  
1832  
1833  
1834 +
1835 +
1836 +
1837 +
1838 +
1839   # set program name
1840   PROGNAME="oopse"
1841  
# Line 4860 | Line 4868 | F90FLAGS="$F90FLAGS $ac_verb"
4868   ac_save_F90FLAGS=$F90FLAGS
4869   F90FLAGS="$F90FLAGS $ac_verb"
4870  
4871 < (eval echo $as_me:4863: \"$ac_link\") >&5
4871 > (eval echo $as_me:4871: \"$ac_link\") >&5
4872   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4873   echo "$ac_f90_v_output" >&5
4874   F90FLAGS=$ac_save_F90FLAGS
# Line 4937 | Line 4945 | F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
4945   ac_save_F90FLAGS=$F90FLAGS
4946   F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
4947  
4948 < (eval echo $as_me:4940: \"$ac_link\") >&5
4948 > (eval echo $as_me:4948: \"$ac_link\") >&5
4949   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4950   echo "$ac_f90_v_output" >&5
4951   F90FLAGS=$ac_save_F90FLAGS
# Line 5370 | Line 5378 | esac
5378   echo "$as_me: WARNING: unknown Fortran 90 name-mangling scheme" >&2;}
5379            ;;
5380   esac
5381 +
5382 +
5383 +
5384 +
5385 +
5386 + echo "$as_me:$LINENO: checking for module suffix" >&5
5387 + echo $ECHO_N "checking for module suffix... $ECHO_C" >&6
5388 + rm -f conftest*
5389 + # Intel ifc compiler generates files by the name of work.pc and work.pcl (!)
5390 + rm -f work*
5391 + cat >conftest.f <<EOF
5392 +        module conftest
5393 +        integer n
5394 +        parameter (n=1)
5395 +        end module conftest
5396 + EOF
5397 + # SGI and absoft compilers generates module name in upper case!
5398 + testname="conftest"
5399 + modcase="lower"
5400 + if $F90 -c conftest.f > conftest.out 2>&1 ; then
5401 +    MOD=`ls conftest* | grep -v conftest.f | grep -v conftest.o`
5402 +    MOD=`echo "$MOD" | sed -e 's/conftest\.//g'`
5403 +    if test -z "$MOD" ; then
5404 +        MOD=`ls CONFTEST* 2>/dev/null \
5405 +                | grep -v CONFTEST.f | grep -v CONFTEST.o`
5406 +        MOD=`echo "$MOD" | sed -e 's/CONFTEST\.//g'`
5407 +        if test -n "$MOD" ; then
5408 +            testname="CONFTEST"
5409 +            modcase="upper"
5410 +        fi
5411 +    fi
5412 +    if test -z "$MOD" ; then
5413 +        echo "$as_me:$LINENO: result: unknown" >&5
5414 + echo "${ECHO_T}unknown" >&6
5415 +        # Use mod if we can't figure it out
5416 +        MOD="mod"
5417 +    else
5418 +        echo "$as_me:$LINENO: result: $MOD" >&5
5419 + echo "${ECHO_T}$MOD" >&6
5420 +    fi
5421 +    if test -s work.pcl ; then
5422 +        { echo "$as_me:$LINENO: WARNING: Compiler generates auxillery files!" >&5
5423 + echo "$as_me: WARNING: Compiler generates auxillery files!" >&2;}
5424 +    fi
5425 + else
5426 +    echo "$as_me:$LINENO: result: unknown" >&5
5427 + echo "${ECHO_T}unknown" >&6
5428 + fi
5429  
5430  
5431  
5432  
5433 +
5434 + # Check for module include path (some use -I, some (Solaris) use -M, some
5435 + # (absoft) use -p).
5436 + # Intel compilers use a wierd system: -cl,filename.pcl .  If no file is
5437 + # specified, work.pcl and work.pc are created.  However, if you specify
5438 + # a file, it must contain a the name of a file ending in .pc .  Ugh!
5439 + # Use the module made above
5440 + echo "$as_me:$LINENO: checking for module directory path flag" >&5
5441 + echo $ECHO_N "checking for module directory path flag... $ECHO_C" >&6
5442 + madedir=0
5443 + if test ! -d conf ; then mkdir conf ; madedir=1; fi
5444 + cp $testname.$MOD conf
5445 + rm -f conftest* CONFTEST*
5446 + cat >conftest1.f <<EOF
5447 +        program main
5448 +        use conftest
5449 +        print *, n
5450 +        end
5451 + EOF
5452 + F90_WORK_FILES_ARG=""
5453 + F90MODINCSPEC=""
5454 + if $F90 -c -Iconf conftest1.f > conftest.out 2>&1 ; then
5455 +    MODDIRFLAG="-I"
5456 +    F90MODINCSPEC="-I<dir>"
5457 +    echo "$as_me:$LINENO: result: -I" >&5
5458 + echo "${ECHO_T}-I" >&6
5459 + elif $F90 -c -Mconf conftest1.f >> conftest.out 2>&1 ; then
5460 +    MODDIRFLAG="-M"
5461 +    F90MODINCSPEC="-M<dir>"
5462 +    echo "$as_me:$LINENO: result: -M" >&5
5463 + echo "${ECHO_T}-M" >&6
5464 + elif $F90 -c -pconf conftest1.f >> conftest.out 2>&1 ; then
5465 +    MODDIRFLAG="-p"
5466 +    F90MODINCSPEC="-p<dir>"
5467 +    echo "$as_me:$LINENO: result: -p" >&5
5468 + echo "${ECHO_T}-p" >&6
5469 + elif test -s work.pc ; then
5470 +     cp work.pc conf/mpimod.pc
5471 +     echo "mpimod.pc" > conf/mpimod.pcl
5472 +     echo "`pwd`/conf/mpimod.pc" >> conf/mpimod.pcl
5473 +     if $F90 -c -cl,conf/mpimod.pcl conftest1.f >>conftest.out 2>&1 ; then
5474 +         MODDIRFLAG='-cl,mpimod.pcl'
5475 +         echo "$as_me:$LINENO: result: -cl,filename where filename contains a list of files and
5476 + directories" >&5
5477 + echo "${ECHO_T}-cl,filename where filename contains a list of files and
5478 + directories" >&6
5479 +         F90_WORK_FILES_ARG="-cl,mpimod.pcl"
5480 +         F90MODINCSPEC="-cl,<dir>/<file>mod.pcl"
5481 +
5482 +     else
5483 +         # The version of the Intel compiler that I have refuses to let
5484 +         # you put the "work catalog" list anywhere but the current directory.
5485 +         # For example, you cannot in
5486 +         :
5487 +     fi
5488 + fi
5489 + if test -z "MODDIRFLAG" ; then
5490 +    echo "$as_me:$LINENO: result: unknown" >&5
5491 + echo "${ECHO_T}unknown" >&6
5492 + fi
5493 +
5494 +
5495 + rm -f conftest* conf/conftest* conf/CONFTEST* CONFTEST* conf/mpimod*
5496 + if test $madedir = 1 ; then rmdir conf ; fi
5497 +
5498 +
5499 +
5500   echo "$as_me:$LINENO: checking for mpi-directory" >&5
5501   echo $ECHO_N "checking for mpi-directory... $ECHO_C" >&6
5502  
# Line 6686 | Line 6809 | fi;
6809  
6810  
6811  
6812 +
6813   # Check whether --with-mpi_f90_mods or --without-mpi_f90_mods was given.
6814   if test "${with_mpi_f90_mods+set}" = set; then
6815    withval="$with_mpi_f90_mods"
# Line 6704 | Line 6828 | ac_compiler_gnu=$ac_cv_f90_compiler_gnu
6828   ac_compiler_gnu=$ac_cv_f90_compiler_gnu
6829  
6830    ac_save_F90FLAGS=$F90FLAGS
6831 +
6832    if test "$mpi_f90_mods"; then
6833 <  F90FLAGS="${F90FLAGS} -I${mpi_f90_mods}"
6833 >  F90FLAGS="${F90FLAGS} ${MODDIRFLAG}${mpi_f90_mods}"
6834   fi
6835  
6836      cat >conftest.$ac_ext <<_ACEOF
# Line 6757 | Line 6882 | _ACEOF
6882   #define MPI_MOD 1
6883   _ACEOF
6884  
6885 <    MPI_F90_MODS="-I${mpi_f90_mods}"
6885 >    MPI_F90_MODS="${mpi_f90_mods}"
6886  
6887      # The library name:
6888      if test -z "$MPI_LIB" ; then
# Line 6816 | Line 6941 | case $debug in
6941  
6942   case $debug in
6943    1)
6819     CFLAGS="$DEBUG $CFLAGS"
6820     CXXFLAGS="$DEBUG $CXXFLAGS"
6944       FFLAGS="$DEBUG $FFLAGS"
6945       F90FLAGS="$DEBUG $F90FLAGS"
6946       ;;
# Line 7510 | Line 7633 | s,@mpi_dir@,$mpi_dir,;t t
7633   s,@F90LIBS@,$F90LIBS,;t t
7634   s,@F90_FUNC@,$F90_FUNC,;t t
7635   s,@F90_FUNC_@,$F90_FUNC_,;t t
7636 + s,@MOD@,$MOD,;t t
7637 + s,@F90_WORK_FILES_ARG@,$F90_WORK_FILES_ARG,;t t
7638 + s,@MODDIRFLAG@,$MODDIRFLAG,;t t
7639 + s,@F90MODINCSPEC@,$F90MODINCSPEC,;t t
7640   s,@mpi_dir@,$mpi_dir,;t t
7641   s,@MPI_LIBDIR@,$MPI_LIBDIR,;t t
7642   s,@MPI_INC@,$MPI_INC,;t t

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines