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 838 by gezelter, Wed Oct 29 03:06:51 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  
1801  
# Line 1828 | Line 1832 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1832  
1833  
1834  
1835 +
1836 +
1837 +
1838 +
1839   # set program name
1840   PROGNAME="oopse"
1841  
# Line 4107 | Line 4115 | if test x"$F90FLAGS" == x ; then
4115   # Try to determine "good" native compiler flags if none specified on command
4116   # line
4117  
4118 < if test x"$F90FLAGS" == x ; then
4118 > if test x"$F90FLAGS" = x ; then
4119    F90FLAGS=""
4120    case "${host_cpu}-${host_os}" in
4121  
# 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.f90 <<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.f90 > 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 + rm -f conftest*
5443 + # Intel ifc compiler generates files by the name of work.pc and work.pcl (!)
5444 + rm -f work*
5445 + cat >conftest.f90 <<EOF
5446 +        module conftest
5447 +        integer n
5448 +        parameter (n=1)
5449 +        end module conftest
5450 + EOF
5451 + # SGI and absoft compilers generates module name in upper case!
5452 + testname="conftest"
5453 + if $F90 -c conftest.f90 > conftest.out 2>&1 ; then
5454 +   mod=`ls CONFTEST* 2>/dev/null | grep -v CONFTEST.f | grep -v CONFTEST.o`
5455 +   mod=`echo "$mod" | sed -e 's/CONFTEST\.//g'`
5456 +   if test -n "$mod" ; then
5457 +      testname="CONFTEST"
5458 +   fi
5459 +   madedir=0
5460 +   if test ! -d conf ; then mkdir conf ; madedir=1; fi
5461 +   cp $testname.$MOD conf
5462 +   rm -f conftest* CONFTEST*
5463 +   cat >conftest1.f90 <<EOF
5464 +        program main
5465 +        use conftest
5466 +        print *, n
5467 +        end
5468 + EOF
5469 +   F90_WORK_FILES_ARG=""
5470 +   F90MODINCSPEC=""
5471 +   if $F90 -c -Iconf conftest1.f90 > conftest.out 2>&1 ; then
5472 +       MODDIRFLAG="-I"
5473 +       F90MODINCSPEC="-I<dir>"
5474 +       echo "$as_me:$LINENO: result: -I" >&5
5475 + echo "${ECHO_T}-I" >&6
5476 +   elif $F90 -c -Mconf conftest1.f90 >> conftest.out 2>&1 ; then
5477 +       MODDIRFLAG="-M"
5478 +       F90MODINCSPEC="-M<dir>"
5479 +       echo "$as_me:$LINENO: result: -M" >&5
5480 + echo "${ECHO_T}-M" >&6
5481 +   elif $F90 -c -pconf conftest1.f90 >> conftest.out 2>&1 ; then
5482 +       MODDIRFLAG="-p"
5483 +       F90MODINCSPEC="-p<dir>"
5484 +       echo "$as_me:$LINENO: result: -p" >&5
5485 + echo "${ECHO_T}-p" >&6
5486 +   elif test -s work.pc ; then
5487 +        cp work.pc conf/mpimod.pc
5488 +        echo "mpimod.pc" > conf/mpimod.pcl
5489 +        echo "`pwd`/conf/mpimod.pc" >> conf/mpimod.pcl
5490 +        if $F90 -c -cl,conf/mpimod.pcl conftest1.f >>conftest.out 2>&1 ; then
5491 +            MODDIRFLAG='-cl,mpimod.pcl'
5492 +            echo "$as_me:$LINENO: result: -cl,filename where filename contains a list of files and directories" >&5
5493 + echo "${ECHO_T}-cl,filename where filename contains a list of files and directories" >&6
5494 +            F90_WORK_FILES_ARG="-cl,mpimod.pcl"
5495 +            F90MODINCSPEC="-cl,<dir>/<file>mod.pcl"
5496 +
5497 +        else
5498 +            # The version of the Intel compiler that I have refuses to let
5499 +            # you put the "work catalog" list anywhere but the current
5500 +            # directory. For example, you cannot in
5501 +         :
5502 +        fi
5503 +   fi
5504 +   if test -z "MODDIRFLAG" ; then
5505 +       echo "$as_me:$LINENO: result: unknown" >&5
5506 + echo "${ECHO_T}unknown" >&6
5507 +   fi
5508 +
5509 +
5510 +   rm -f conftest* conf/conftest* conf/CONFTEST* CONFTEST* conf/mpimod*
5511 +   if test $madedir = 1 ; then rmdir conf ; fi
5512 + fi
5513 +
5514 +
5515 +
5516   echo "$as_me:$LINENO: checking for mpi-directory" >&5
5517   echo $ECHO_N "checking for mpi-directory... $ECHO_C" >&6
5518  
# Line 6686 | Line 6825 | fi;
6825  
6826  
6827  
6828 +
6829   # Check whether --with-mpi_f90_mods or --without-mpi_f90_mods was given.
6830   if test "${with_mpi_f90_mods+set}" = set; then
6831    withval="$with_mpi_f90_mods"
# Line 6704 | Line 6844 | ac_compiler_gnu=$ac_cv_f90_compiler_gnu
6844   ac_compiler_gnu=$ac_cv_f90_compiler_gnu
6845  
6846    ac_save_F90FLAGS=$F90FLAGS
6847 +
6848    if test "$mpi_f90_mods"; then
6849 <  F90FLAGS="${F90FLAGS} -I${mpi_f90_mods}"
6849 >  F90FLAGS="${F90FLAGS} ${MODDIRFLAG}${mpi_f90_mods}"
6850   fi
6851  
6852      cat >conftest.$ac_ext <<_ACEOF
# Line 6757 | Line 6898 | _ACEOF
6898   #define MPI_MOD 1
6899   _ACEOF
6900  
6901 <    MPI_F90_MODS="-I${mpi_f90_mods}"
6901 >    MPI_F90_MODS="${mpi_f90_mods}"
6902  
6903      # The library name:
6904      if test -z "$MPI_LIB" ; then
# Line 6816 | Line 6957 | case $debug in
6957  
6958   case $debug in
6959    1)
6819 –     CFLAGS="$DEBUG $CFLAGS"
6820 –     CXXFLAGS="$DEBUG $CXXFLAGS"
6960       FFLAGS="$DEBUG $FFLAGS"
6961       F90FLAGS="$DEBUG $F90FLAGS"
6962       ;;
# Line 7510 | Line 7649 | s,@mpi_dir@,$mpi_dir,;t t
7649   s,@F90LIBS@,$F90LIBS,;t t
7650   s,@F90_FUNC@,$F90_FUNC,;t t
7651   s,@F90_FUNC_@,$F90_FUNC_,;t t
7652 + s,@MOD@,$MOD,;t t
7653 + s,@F90_WORK_FILES_ARG@,$F90_WORK_FILES_ARG,;t t
7654 + s,@MODDIRFLAG@,$MODDIRFLAG,;t t
7655 + s,@F90MODINCSPEC@,$F90MODINCSPEC,;t t
7656   s,@mpi_dir@,$mpi_dir,;t t
7657   s,@MPI_LIBDIR@,$MPI_LIBDIR,;t t
7658   s,@MPI_INC@,$MPI_INC,;t t

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines