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

Comparing trunk/OOPSE-4/ac-tools/aclocal.m4 (file contents):
Revision 1540 by gezelter, Wed Oct 6 23:03:34 2004 UTC vs.
Revision 2022 by gezelter, Mon Feb 14 23:16:48 2005 UTC

# Line 534 | Line 534 | if test "$ac_test_CFLAGS" != "set"; then
534          fi;;
535     *darwin*)
536          if test "$CC" = xlc -o "$CC" = cc; then
537 <                CFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
537 >                CFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
538          fi;;
539    esac
540  
# Line 652 | Line 652 | if test "$ac_test_CXXFLAGS" != "set"; then
652                  echo "*******************************************************"
653          fi;;
654     *darwin*)
655 <        if test "$CXX" = xlc++; then
656 <                CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
655 >        if test "$CXX" = xlc++ -o "$CXX" = xlC ; then
656 >                CXXFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec"
657          fi;;
658    esac
659  
# Line 768 | Line 768 | if test x"$F90FLAGS" = x ; then
768          fi;;
769     *darwin*)
770          if test "$F90" = f90 -o "$F90" = xlf90 -o "$F90" = xlf95; then
771 <                F90FLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto"
771 >                F90FLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto"
772          fi;;
773    esac
774  
# Line 985 | Line 985 | fi
985          AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
986                       "-llam")
987   fi
988 + $as_unset ac_cv_lib_mpich_MPI_Init
989 + if test x = x"$MPI_LIB"; then
990 +        AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich -lpmpich"], [],
991 +                     "-lpmpich")
992 + fi
993  
994   $as_unset ac_cv_lib_mpi_MPI_Init
995   if test x = x"$MPI_LIB"; then
# Line 1055 | Line 1060 | AC_DEFUN([adl_FUNC_GETOPT_LONG],
1060   AC_DEFUN([adl_FUNC_GETOPT_LONG],
1061   [AC_PREREQ(2.49)dnl
1062    # clean out junk possibly left behind by a previous configuration
1063 <  rm -f src/utils/getopt.h
1063 >  rm -f src/getopt.h
1064    # Check for getopt_long support
1065    AC_CHECK_HEADERS([getopt.h])
1066    AC_CHECK_FUNCS([getopt_long],,
# Line 1064 | Line 1069 | AC_DEFUN([adl_FUNC_GETOPT_LONG],
1069       [# use the GNU replacement
1070        AC_LIBOBJ(getopt)
1071        AC_LIBOBJ(getopt1)
1072 <      AC_CONFIG_LINKS([src/utils/getopt.h:src/utils/gnugetopt.h])])])])
1072 >      AC_CONFIG_LINKS([src/getopt.h:src/utils/gnugetopt.h])])])])
1073  
1074  
1075   AC_DEFUN([ACX_CONFIG_HOME], [

Diff Legend

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