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 747 by gezelter, Fri Sep 5 21:28:52 2003 UTC vs.
Revision 840 by gezelter, Wed Oct 29 14:29:12 2003 UTC

# Line 11 | Line 11 | AC_PREFIX_DEFAULT("/usr/local")
11  
12   AC_PREFIX_DEFAULT("/usr/local")
13  
14 # what should I build?
15
16 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Compile OOPSE in debug mode]), [DEBUG=1])
17
14   # set program name
15   PROGNAME="oopse"
16   AC_SUBST(PROGNAME)
17  
18 + # there are two ways to do debugging.  One with the --enable-debug flag
19 + # and one using the DEBUG environment variable
20 +
21 + debug=0
22 + AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Compile OOPSE in debug mode]), [debug=1])
23   if test "${DEBUG}"; then
24 <        AC_DEFINE(DEBUG, 1, [Code compiled in debug mode])
24 >        AC_DEFINE(debug, 1, [Code compiled in debug mode])
25    msg="$msg, debug mode"
26   fi
27 < AC_SUBST(DEBUG)
27 > AC_SUBST(debug)
28  
29   # who am i
30   AC_CANONICAL_HOST
31  
32 < dnl Checks for programs.
32 > dnl Checks for C compiler
33   AC_PROG_CC([icc xlc gcc cc])
34 < ACX_PROG_CC_MAXOPT
35 < AC_PROG_CXX([icpc icc xlC g++ c++])
36 < ACX_PROG_CXX_MAXOPT
34 >
35 > dnl Checks for C++ compiler
36 > AC_PROG_CXX([icpc icc xlC CC g++ c++])
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=""
40 > if test $ac_cv_prog_gxx = no; then
41 >  AC_MSG_CHECKING([checking whether ${CXX} accepts -ptused -no_prelink])
42 >  echo 'void f(){}' > conftest.cc
43 >  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
44 >    AC_MSG_RESULT(yes)
45 >    OOPSE_TEMPLATE_FLAGS="-ptused -no_prelink"
46 >  else
47 >    AC_MSG_RESULT(no)
48 >  fi
49 >  rm -f conftest*
50 >  AC_MSG_CHECKING([checking whether ${CXX} accepts -instances=static])
51 >  echo 'void f(){}' > conftest.cc
52 >  if test -z "`${CXX} -instances=static -c conftest.cc 2>&1`"; then
53 >    AC_MSG_RESULT(yes)
54 >    OOPSE_TEMPLATE_FLAGS="-instances=static"
55 >  else
56 >    AC_MSG_RESULT(no)
57 >  fi
58 >  rm -f conftest*
59 >  AC_MSG_CHECKING([checking whether ${CXX} accepts -pto])
60 >  echo 'void f(){}' > conftest.cc
61 >  if test -z "`${CXX} -pto -c conftest.cc 2>&1`"; then
62 >    AC_MSG_RESULT(yes)
63 >    OOPSE_TEMPLATE_FLAGS="-pto"
64 >  else
65 >    AC_MSG_RESULT(no)
66 >  fi
67 >  rm -f conftest*
68 >  AC_MSG_CHECKING([checking whether ${CXX} accepts -LANG:std])
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 >    EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
73 >  else
74 >    AC_MSG_RESULT(no)
75 >  fi
76 > fi
77 > AC_SUBST(OOPSE_TEMPLATE_FLAGS)
78 > AC_SUBST(EXTRA_CC_FLAG)
79 >
80 > dnl Fortran 90 compilation checks are next
81 >
82   AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
83 < ACX_PROG_F90_MAXOPT
83 > dnl Check the flag for Fortran90 preprocessing
84   ACX_PROG_F90_PREPFLAG
85 + dnl Check to see if a flag is required for preprocessing defines
86   ACX_PROG_F90_PREPDEFFLAG
87 + AC_LANG_PUSH(Fortran 90)
88 + AC_LANG_PREPROC(Fortran 90)
89 + AC_F90_LIBRARY_LDFLAGS
90 + dnl How does Fortran mangle function names
91 + AC_F90_WRAPPERS
92 + AC_SUBST(F90_FUNC)
93 + AC_SUBST(F90_FUNC_)
94 + dnl Fortran 90 module suffix
95 + AC_CHECK_MODSUFFIX
96 + dnl Fortran 90 module path specifier
97 + AC_CHECK_MODDIRFLAG
98 +
99 + dnl check for strong optimization options
100 +
101 + case $debug in
102 +  1)
103 +     ;;
104 +  *)
105 +   ACX_PROG_CC_MAXOPT
106 +   ACX_PROG_CXX_MAXOPT
107 +   ACX_PROG_F90_MAXOPT
108 +     ;;
109 + esac
110 +
111   AC_PROG_INSTALL
112   AC_PROG_LN_S
113   AC_PROG_MAKE_SET
# Line 50 | Line 121 | AC_LANG_PUSH(Fortran 90)
121    exit 1
122   fi
123  
53 AC_LANG_PUSH(Fortran 90)
54 AC_LANG_PREPROC(Fortran 90)
55 AC_F90_LIBRARY_LDFLAGS
56 dnl how Fortran mangles function names
57 AC_F90_WRAPPERS
58 AC_SUBST(F90_FUNC)
59 AC_SUBST(F90_FUNC_)
60
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]],
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])
129 > AC_SUBST([mpi_dir])
130  
131   AC_MSG_CHECKING([for mpi-lib-directory])
132 < AC_ARG_WITH(MPI_LIBDIR,
133 <              [  --with-mpi-lib-dir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
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=dir  give the path for MPI-include-files [MPI_DIR/include]],
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])
# Line 126 | Line 189 | AC_CHECK_MPI_F90MOD
189  
190   AM_PATH_SPRNG
191   CHECK_MKL
192 +
193   AC_CHECK_MPI_F90MOD
194  
131 case $F90 in
132        ifc) fortran_machine_defs='Linux_ifc_machdep$(O)' ;;
133        *) fortran_machine_defs='' ;;
134 esac
135 AC_SUBST([fortran_machine_defs])
136
195   AC_EXEEXT
196   AC_OBJEXT
197   OBJEXT=".$OBJEXT"
# Line 159 | Line 217 | SUBDIRS="libBASS libmdtools src forceFields samples ut
217   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
218  
219   dnl **** Final list of subdirs
220 < SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder"
220 > SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
221  
222   dnl **** Define CFLAGS etc empty to prevent configure from setting them
223 < #CFLAGS=${CFLAGS-""}
224 < #CXXFLAGS=${CXXFLAGS-""}
225 < #CPPFLAGS=${CPPFLAGS-""}
226 < #FFLAGS=${FFLAGS-""}
227 < #LDFLAGS=${LDFLAGS-""}
228 < #OPTIMIZE=${OPTIMIZE-"-O"}
229 < #DEBUG=${DEBUG-"-g"}
223 > CFLAGS=${CFLAGS-""}
224 > CXXFLAGS=${CXXFLAGS-""}
225 > CPPFLAGS=${CPPFLAGS-""}
226 > FFLAGS=${FFLAGS-""}
227 > F90FLAGS=${F90FLAGS-""}
228 > LDFLAGS=${LDFLAGS-""}
229 > DEBUG=${DEBUG-"-g"}
230  
231   case $debug in
232 <  true)
175 <     CFLAGS="$DEBUG $CFLAGS"
176 <     CXXFLAGS="$DEBUG $CXXFLAGS"
232 >  1)
233       FFLAGS="$DEBUG $FFLAGS"
234       F90FLAGS="$DEBUG $F90FLAGS"
235       ;;
236    *)
181     CFLAGS="$OPTIMIZE $CFLAGS"
182     CXXFLAGS="$OPTIMIZE $CXXFLAGS"
183     FFLAGS="$OPTIMIZE $FFLAGS"
184     F90FLAGS="$OPTIMIZE $F90FLAGS"
237       ;;
238   esac
239  
# Line 205 | Line 257 | AC_CONFIG_FILES([Makefile
257   AC_CONFIG_FILES([Makefile
258          libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile
259          utils/sysbuilder/Makefile  forceFields/Makefile samples/Makefile
260 +        staticProps/Makefile
261          samples/alkane/Makefile samples/argon/Makefile
262          samples/beadLipid/Makefile samples/lipid/Makefile
263          samples/metals/Makefile samples/water/Makefile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines