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

Comparing trunk/OOPSE/ac-tools/configure.in (file contents):
Revision 894 by chuckv, Mon Jan 5 21:00:05 2004 UTC vs.
Revision 1228 by gezelter, Thu Jun 3 20:02:18 2004 UTC

# Line 6 | Line 6 | builtin(include, ac-tools/aclocal.m4)
6   builtin(include, ac-tools/fortran90.m4)
7   builtin(include, ac-tools/aclocal.m4)
8  
9 –
9   AC_CONFIG_SRCDIR([src/oopse.cpp])
10  
11   AC_PREFIX_DEFAULT("/usr/local")
# Line 33 | Line 32 | AC_PROG_CXX([icpc icc xlC CC g++ c++])
32   AC_PROG_CC([icc xlc gcc cc])
33  
34   dnl Checks for C++ compiler
35 < AC_PROG_CXX([icpc icc xlC CC g++ c++])
35 > AC_PROG_CXX([icpc icc xlc++ xlC CC g++ c++])
36 >
37   dnl If we are not running g++ then we might need some other flags
38   dnl to get the templates compiled correctly
39   OOPSE_TEMPLATE_FLAGS=""
# Line 69 | Line 69 | if test $ac_cv_prog_gxx = no; then
69    echo 'void f(){}' > conftest.cc
70    if test -z "`${CXX} -LANG:std -c conftest.cc 2>&1`"; then
71      AC_MSG_RESULT(yes)
72 +    
73 +
74      EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
75    else
76      AC_MSG_RESULT(no)
# Line 79 | Line 81 | AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95
81  
82   dnl Fortran 90 compilation checks are next
83  
84 < AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
84 > AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
85   dnl Check the flag for Fortran90 preprocessing
86   ACX_PROG_F90_PREPFLAG
87   dnl Check to see if a flag is required for preprocessing defines
# Line 121 | Line 123 | AC_MSG_CHECKING([for mpi-directory])
123    exit 1
124   fi
125  
124 – AC_MSG_CHECKING([for mpi-directory])
125 – AC_ARG_WITH(mpi_dir,
126 –              [  --with-mpi_dir=MPIDIR   give the path for MPI [/usr/local]],
127 –                MPI_DIR="$withval", MPI_DIR="/usr/local")
128 – AC_MSG_RESULT([$MPI_DIR])
129 – AC_SUBST([mpi_dir])
130 –
131 – AC_MSG_CHECKING([for mpi-lib-directory])
132 – AC_ARG_WITH(mpi_libdir,
133 –              [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
134 –                MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
135 – AC_MSG_RESULT([$MPI_LIBDIR])
136 – AC_SUBST([MPI_LIBDIR])
137 –
138 – AC_MSG_CHECKING([for mpi-inc-directory])
139 – AC_ARG_WITH(mpi_inc,
140 –              [  --with-mpi_inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
141 –                MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
142 – AC_MSG_RESULT([$MPI_INC])
143 – AC_SUBST([MPI_INC])
144 –
145 –
146 – AC_MSG_CHECKING([for MPI library])
147 – MPI_LIB=""
148 – case "$host" in
149 –  *-ibm-aix*)                dnl IBM/SP2 machines
150 –    dnl checking whether to use signal-based MPI
151 –
152 –    AC_MSG_CHECKING([whether to use signal-based MPI library])
153 –    AC_MSG_RESULT([$PACX_SIGNAL])
154 –    if test "x$PACX_SIGNAL" = "xyes" ; then
155 –      if test -f "$MPI_LIBDIR/libmpi.a" ; then
156 –        MPI_LIB="-lmpi"
157 –      elif test -f "$MPI_LIBDIR/libmpi.so" ; then
158 –        MPI_LIB="-lmpi"
159 –      elif test -f "$MPI_LIBDIR/libmpich.a" ; then
160 –        MPI_LIB="-lmpich"
161 –      else
162 –        AC_MSG_ERROR([neither libmpi nor libmpich found; check path for MPI package first...])
163 –      fi
164 –    else
165 –      if test -f "$MPI_LIBDIR/libmpi_r.a" ; then
166 –         MPI_LIB="-lmpi_r"
167 –      else
168 –         AC_MSG_ERROR([libmpi_r not found; check path for MPI package...])
169 –      fi
170 –    fi
171 –    AC_MSG_RESULT(found $MPI_LIB)
172 –  ;;
173 –  *)                         dnl All other machines
174 –    if test -f "$MPI_LIBDIR/libmpi.a" ; then
175 –      MPI_LIB="-lmpi"
176 –    elif test -f "$MPI_LIBDIR/libmpi.so" ; then
177 –      MPI_LIB="-lmpi"
178 –    elif test -f "$MPI_LIBDIR/libmpich.a" ; then
179 –      MPI_LIB="-lmpich"
180 –    else
181 –      AC_MSG_ERROR([neither libmpi nor libmpich found; check path for MPI package first...])
182 –    fi
183 –    AC_MSG_RESULT(found $MPI_LIB)
184 –  ;;
185 – esac
186 – AC_SUBST(MPI_LIB)
187 –
126   ACX_MPI
127 + dnl AC_MSG_CHECKING([for mpi-directory])
128 + dnl AC_ARG_WITH(mpi,
129 + dnl           [  --with-mpi=MPIDIR   give the path for MPI [/usr/local]],
130 + dnl             MPI_DIR="$withval", MPI_DIR="/usr/local")
131 + dnl AC_MSG_RESULT([$MPI_DIR])
132 + dnl AC_SUBST([mpi])
133  
134 < AC_CHECK_MPI_F90MOD
135 <
136 < if test "$HAVE_MPI_MOD" = 1; then
137 <        AC_DEFINE(MPI_MOD, 1, [have mpi module])
138 < else
139 <        AC_LANG([Fortran 90])
140 <        AC_CHECK_HEADERS(mpif.h)
141 <        AC_LANG_RESTORE()
142 <        AC_DEFINE(MPI_H, 1, [have mpi Fortran header file])
143 < fi
134 > dnl AC_MSG_CHECKING([for mpi-lib-directory])
135 > dnl AC_ARG_WITH(mpi_libdir,
136 > dnl           [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
137 > dnl             MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
138 > dnl AC_MSG_RESULT([$MPI_LIBDIR])
139 > dnl AC_SUBST([MPI_LIBDIR])
140 > dnl
141 > dnl AC_MSG_CHECKING([for mpi-inc-directory])
142 > dnl AC_ARG_WITH(mpi-inc,
143 > dnl           [  --with-mpi-inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
144 > dnl             MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
145 > dnl AC_MSG_RESULT([$MPI_INC])
146 > dnl AC_SUBST([MPI_INC])
147 > dnl
148 > dnl AC_MSG_CHECKING([for mpi.h])
149 > dnl HAVE_MPIDOTH_C="no"
150 > dnl echo '#include <mpi.h>' > conftest.cc
151 > dnl if test -z "`${CXX} -I${MPI_INC} -c conftest.cc 2>&1`"; then
152 > dnl  AC_MSG_RESULT(yes)
153 > dnl  HAVE_MPIDOTH_C="yes"
154 > dnl else
155 > dnl   AC_MSG_RESULT(no! Check MPI include paths)
156 > dnl fi
157 > dnl rm -f conftest*
158 > dnl
159 > dnl AC_MSG_CHECKING([whether mpif.h is usable])
160 > dnl HAVE_MPIFDOTH_F90="no"
161 > dnl rm -f conftest*
162 > dnl cat >conftest.f90 <<EOF
163 > dnl program main
164 >  dnl include 'mpif.h'
165 > dnl end
166 > dnl EOF
167 > dnl if $F90 -I$MPI_INC -c conftest.f90 > conftest.out 2>&1 ; then
168 >   dnl AC_MSG_RESULT(yes)
169 >   dnl MPI_F90INC="$MPI_INC"
170 >   dnl HAVE_MPIFDOTH_F90="yes"
171 > dnl else
172 >   dnl if test -s conftest.out ; then cat conftest.out >> config.log ; fi
173 >   dnl AC_MSG_RESULT([no! Check MPI include paths])
174 > dnl fi
175 > dnl rm -f conftest*
176 > dnl AC_SUBST([MPI_F90INC])
177 > dnl
178 > dnl AC_LANG_PUSH(C)
179 > dnl ac_save_LDFLAGS=$LDFLAGS
180 > dnl LDFLAGS="${LDFLAGS} -L${MPI_LIBDIR} "
181 > dnl
182 > dnl if test x = x"$MPI_LIB"; then
183 >   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
184 > dnl fi
185 > dnl if test x = x"$MPI_LIB"; then
186 >   dnl AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich"])
187 > dnl fi
188 > dnl $as_unset ac_cv_lib_mpi_MPI_Init
189 > dnl if test x = x"$MPI_LIB"; then
190 >   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
191 >                dnl "-llam")
192 > dnl fi
193 > dnl
194 > dnl $as_unset ac_cv_lib_mpi_MPI_Init
195 > dnl if test x = x"$MPI_LIB"; then
196 >   dnl AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam -lpthread"],
197 >                dnl [AC_MSG_ERROR([Didn't find liblam, libmpi, or libmpich; check path for MPI package first...])],
198 >                dnl [-llam -lpthread])
199 > dnl fi
200 > dnl
201 > dnl AC_MSG_RESULT(found $MPI_LIB)
202 > dnl AC_SUBST(MPI_LIB)
203 > dnl
204 > dnl AC_MSG_CHECKING([for MPI Fortran library])
205 > dnl MPI_F90LIB=""
206 > dnl if test -f "$MPI_LIBDIR/libfmpich.a" ; then
207 >  dnl MPI_F90LIB="-lfmpich"
208 > dnl elif test -f "$MPI_LIBDIR/liblamf77mpi.a" ; then
209 >  dnl MPI_F90LIB="-llamf77mpi"
210 > dnl else
211 >  dnl # nothing special found, we'll assume that the C library is all we need
212 >  dnl MPI_F90LIB="  "
213 > dnl fi
214 > dnl AC_MSG_RESULT([found $MPI_F90LIB])
215 > dnl AC_SUBST(MPI_F90LIB)
216 > dnl
217 > dnl dnl CHECK_MPI
218 > dnl
219 > dnl ACX_MPI
220  
221   AM_PATH_SPRNG
222   CHECK_MKL
# Line 227 | Line 247 | SUBDIRS="libBASS libmdtools src forceFields samples ut
247   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
248  
249   dnl **** Final list of subdirs
250 < SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps third-party"
250 > SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps third-party shapes"
251  
252   dnl **** Define CFLAGS etc empty to prevent configure from setting them
253   CFLAGS=${CFLAGS-""}
# Line 272 | Line 292 | AC_CONFIG_FILES([Makefile
292          samples/alkane/Makefile samples/argon/Makefile
293          samples/beadLipid/Makefile samples/lipid/Makefile
294          samples/metals/Makefile samples/water/Makefile
295 +        shapes/Makefile
296   ])
297  
298   AC_OUTPUT

Diff Legend

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