| 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 |
|
|
| 653 |
|
fi;; |
| 654 |
|
*darwin*) |
| 655 |
|
if test "$CXX" = xlc++; then |
| 656 |
< |
CXXFLAGS="-qthreaded -O5 -qtune=auto -qarch=auto -qunroll=auto -qaltivec" |
| 656 |
> |
CXXFLAGS="-qthreaded -O -qtune=auto -qarch=auto -qunroll=auto -qaltivec" |
| 657 |
|
fi;; |
| 658 |
|
esac |
| 659 |
|
|
| 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 |
|
|
| 984 |
|
if test x = x"$MPI_LIB"; then |
| 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 |
| 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 utils/getopt.h |
| 1063 |
> |
rm -f src/utils/getopt.h |
| 1064 |
|
# Check for getopt_long support |
| 1065 |
|
AC_CHECK_HEADERS([getopt.h]) |
| 1066 |
|
AC_CHECK_FUNCS([getopt_long],, |
| 1069 |
|
[# use the GNU replacement |
| 1070 |
|
AC_LIBOBJ(getopt) |
| 1071 |
|
AC_LIBOBJ(getopt1) |
| 1072 |
< |
AC_CONFIG_LINKS([utils/getopt.h:utils/gnugetopt.h])])])]) |
| 1072 |
> |
AC_CONFIG_LINKS([src/utils/getopt.h:src/utils/gnugetopt.h])])])]) |
| 1073 |
> |
|
| 1074 |
> |
|
| 1075 |
> |
AC_DEFUN([ACX_CONFIG_HOME], [ |
| 1076 |
> |
myDir=${0%/*} |
| 1077 |
> |
if [ "$myDir" = "$0" ]; then |
| 1078 |
> |
# Ran from local directory |
| 1079 |
> |
myDir=$PWD |
| 1080 |
> |
fi |
| 1081 |
> |
# Resolve symlinks. |
| 1082 |
> |
myProgram="$0" |
| 1083 |
> |
while [ -L "$myProgram" ]; do |
| 1084 |
> |
ls=`/bin/ls -ld "$myProgram"` |
| 1085 |
> |
link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'` |
| 1086 |
> |
if /usr/bin/expr "$link" : '.*/.*' > /dev/null; then |
| 1087 |
> |
myProgram="$link" |
| 1088 |
> |
else |
| 1089 |
> |
myProgram="`AS_DIRNAME([$myProgram])`/$link" |
| 1090 |
> |
fi |
| 1091 |
> |
done |
| 1092 |
> |
myDir=`AS_DIRNAME([$myProgram])` |
| 1093 |
> |
fi |
| 1094 |
> |
CONFIG_HOME=$myDir |
| 1095 |
> |
]) |
| 1096 |
> |
|
| 1097 |
> |
AC_DEFUN(BB_ENABLE_DOXYGEN, |
| 1098 |
> |
[ |
| 1099 |
> |
AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation generation with doxygen (auto)]) |
| 1100 |
> |
AC_ARG_ENABLE(dot, [ --enable-dot use 'dot' to generate graphs in doxygen (auto)]) |
| 1101 |
> |
AC_ARG_ENABLE(html-docs, [ --enable-html-docs enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes]) |
| 1102 |
> |
AC_ARG_ENABLE(latex-docs, [ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no]) |
| 1103 |
> |
if test "x$enable_doxygen" = xno; then |
| 1104 |
> |
enable_doc=no |
| 1105 |
> |
else |
| 1106 |
> |
AC_PATH_PROG(DOXYGEN, doxygen, , $PATH) |
| 1107 |
> |
if test "x$DOXYGEN" = x; then |
| 1108 |
> |
if test "x$enable_doxygen" = xyes; then |
| 1109 |
> |
AC_MSG_ERROR([could not find doxygen]) |
| 1110 |
> |
fi |
| 1111 |
> |
enable_doc=no |
| 1112 |
> |
else |
| 1113 |
> |
enable_doc=yes |
| 1114 |
> |
AC_PATH_PROG(DOT, dot, , $PATH) |
| 1115 |
> |
fi |
| 1116 |
> |
fi |
| 1117 |
> |
|
| 1118 |
> |
if test "x$enable_doc" = xyes; then |
| 1119 |
> |
DOC=1 |
| 1120 |
> |
else |
| 1121 |
> |
DOC=0 |
| 1122 |
> |
fi |
| 1123 |
> |
AC_SUBST(DOC) |
| 1124 |
> |
|
| 1125 |
> |
if test x$DOT = x; then |
| 1126 |
> |
if test "x$enable_dot" = xyes; then |
| 1127 |
> |
AC_MSG_ERROR([could not find dot]) |
| 1128 |
> |
fi |
| 1129 |
> |
enable_dot=no |
| 1130 |
> |
else |
| 1131 |
> |
enable_dot=yes |
| 1132 |
> |
fi |
| 1133 |
> |
AC_SUBST(enable_dot) |
| 1134 |
> |
AC_SUBST(enable_html_docs) |
| 1135 |
> |
AC_SUBST(enable_latex_docs) |
| 1136 |
> |
]) |
| 1137 |
> |
|
