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 785 by gezelter, Thu Sep 25 16:42:34 2003 UTC vs.
Revision 822 by gezelter, Mon Oct 27 16:20:59 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.
33   AC_PROG_CC([icc xlc gcc cc])
34 < ACX_PROG_CC_MAXOPT
34 < AC_PROG_CXX([icpc icc xlC g++ c++])
35 < ACX_PROG_CXX_MAXOPT
34 > AC_PROG_CXX([icpc icc xlC CC g++ c++])
35   AC_PROG_F90([ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
37 ACX_PROG_F90_MAXOPT
36   ACX_PROG_F90_PREPFLAG
37   ACX_PROG_F90_PREPDEFFLAG
38 +
39 + case $debug in
40 +  1)
41 +     ;;
42 +  *)
43 +   ACX_PROG_CC_MAXOPT
44 +   ACX_PROG_CXX_MAXOPT
45 +   ACX_PROG_F90_MAXOPT
46 +     ;;
47 + esac
48 +
49   AC_PROG_INSTALL
50   AC_PROG_LN_S
51   AC_PROG_MAKE_SET
# Line 59 | Line 68 | AC_ARG_WITH(MPI_DIR,
68   AC_SUBST(F90_FUNC_)
69  
70   AC_MSG_CHECKING([for mpi-directory])
71 < AC_ARG_WITH(MPI_DIR,
72 <              [  --with-mpi-dir=MPIDIR   give the path for MPI [/usr/local]],
71 > AC_ARG_WITH(mpi_dir,
72 >              [  --with-mpi_dir=MPIDIR   give the path for MPI [/usr/local]],
73                  MPI_DIR="$withval", MPI_DIR="/usr/local")
74   AC_MSG_RESULT([$MPI_DIR])
75 < AC_SUBST([MPI_DIR])
75 > AC_SUBST([mpi_dir])
76  
77   AC_MSG_CHECKING([for mpi-lib-directory])
78 < AC_ARG_WITH(MPI_LIBDIR,
79 <              [  --with-mpi-lib-dir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
78 > AC_ARG_WITH(mpi_libdir,
79 >              [  --with-mpi-libdir=dir  give the path for MPI-libraries [MPI_DIR/lib]],
80                  MPI_LIBDIR="$withval", MPI_LIBDIR="$MPI_DIR/lib")
81   AC_MSG_RESULT([$MPI_LIBDIR])
82   AC_SUBST([MPI_LIBDIR])
83  
84   AC_MSG_CHECKING([for mpi-inc-directory])
85 < AC_ARG_WITH(MPI_INC,
86 <              [  --with-mpi-inc-dir=dir  give the path for MPI-include-files [MPI_DIR/include]],
85 > AC_ARG_WITH(mpi_inc,
86 >              [  --with-mpi_inc=dir  give the path for MPI-include-files [MPI_DIR/include]],
87                  MPI_INC="$withval", MPI_INC="$MPI_DIR/include")
88   AC_MSG_RESULT([$MPI_INC])
89   AC_SUBST([MPI_INC])
# Line 153 | Line 162 | SUBDIRS="libBASS libmdtools src forceFields samples ut
162   MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
163  
164   dnl **** Final list of subdirs
165 < SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder"
165 > SUBDIRS="libBASS libmdtools src forceFields samples utils utils/sysbuilder staticProps"
166  
167   dnl **** Define CFLAGS etc empty to prevent configure from setting them
168 < #CFLAGS=${CFLAGS-""}
169 < #CXXFLAGS=${CXXFLAGS-""}
170 < #CPPFLAGS=${CPPFLAGS-""}
171 < #FFLAGS=${FFLAGS-""}
172 < #LDFLAGS=${LDFLAGS-""}
173 < #OPTIMIZE=${OPTIMIZE-"-O"}
174 < #DEBUG=${DEBUG-"-g"}
168 > CFLAGS=${CFLAGS-""}
169 > CXXFLAGS=${CXXFLAGS-""}
170 > CPPFLAGS=${CPPFLAGS-""}
171 > FFLAGS=${FFLAGS-""}
172 > F90FLAGS=${F90FLAGS-""}
173 > LDFLAGS=${LDFLAGS-""}
174 > DEBUG=${DEBUG-"-g"}
175  
176   case $debug in
177 <  true)
177 >  1)
178       CFLAGS="$DEBUG $CFLAGS"
179       CXXFLAGS="$DEBUG $CXXFLAGS"
180       FFLAGS="$DEBUG $FFLAGS"
181       F90FLAGS="$DEBUG $F90FLAGS"
182       ;;
183    *)
175     CFLAGS="$OPTIMIZE $CFLAGS"
176     CXXFLAGS="$OPTIMIZE $CXXFLAGS"
177     FFLAGS="$OPTIMIZE $FFLAGS"
178     F90FLAGS="$OPTIMIZE $F90FLAGS"
184       ;;
185   esac
186  
# Line 199 | Line 204 | AC_CONFIG_FILES([Makefile
204   AC_CONFIG_FILES([Makefile
205          libBASS/Makefile libmdtools/Makefile src/Makefile utils/Makefile
206          utils/sysbuilder/Makefile  forceFields/Makefile samples/Makefile
207 +        staticProps/Makefile
208          samples/alkane/Makefile samples/argon/Makefile
209          samples/beadLipid/Makefile samples/lipid/Makefile
210          samples/metals/Makefile samples/water/Makefile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines