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

Comparing trunk/OOPSE-3.0/ac-tools/configure.in (file contents):
Revision 2452 by gezelter, Thu Nov 17 20:39:38 2005 UTC vs.
Revision 2518 by tim, Fri Dec 16 21:52:50 2005 UTC

# Line 5 | Line 5 | builtin(include, ac-tools/aclocal.m4)
5  
6   builtin(include, ac-tools/fortran90.m4)
7   builtin(include, ac-tools/aclocal.m4)
8 + builtin(include, ac-tools/AC_CXX_HAVE_STL.m4)
9 + builtin(include, ac-tools/AC_CXX_NAMESPACES.m4)
10 + builtin(include, ac-tools/AC_CXX_STD.m4)
11  
12   AC_CONFIG_SRCDIR([src/applications/oopse/oopse.cpp])
13  
# Line 31 | Line 34 | AC_PROG_CC([icc xlc gcc cc])
34  
35  
36   dnl Checks for C compiler
37 < AC_PROG_CC([icc xlc gcc cc])
37 > AC_PROG_CC([pathcc icc xlc gcc cc])
38  
39   dnl Checks for C++ compiler
40 < AC_PROG_CXX([icpc icc xlc++ xlC CC g++ c++])
40 > AC_PROG_CXX([pathCC icpc icc xlc++ xlC CC g++ c++])
41  
42 + dnl Checks for C preprocessor
43 + AC_PROG_CPP
44 +
45 + dnl Checks for grep and egrep
46 + AC_PROG_EGREP
47 +
48   dnl If we are not running g++ then we might need some other flags
49   dnl to get the templates compiled correctly
50   OOPSE_TEMPLATE_FLAGS=""
# Line 83 | Line 92 | AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf9
92  
93   dnl Fortran 90 compilation checks are next
94  
95 < AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
95 > AC_PROG_F90([pathf95 ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
96   dnl Check the flag for Fortran90 preprocessing
97   ACX_PROG_F90_PREPFLAG
98   dnl Check to see if a flag is required for preprocessing defines
# Line 116 | Line 125 | dnl Checks for libraries.
125   AC_LANG_POP
126  
127   AC_LANG_CPLUSPLUS
128 + AC_HEADER_STDC
129 + AC_CXX_NAMESPACES
130 + AC_CXX_STD
131 +
132   dnl Checks for libraries.
133   AC_CHECK_LIB(m, asin, , exit)
134  
122 AC_LANG_PUSH(C)
135   ACX_CHECK_ZLIB
136   dnl Checks for header files.
137 < AC_CHECK_HEADERS(sys/time.h unistd.h stdlib.h stdio.h conio.h string.h)
126 < AC_CHECK_HEADERS(strstream.h iostream.h fstream.h math.h time.h)
137 > AC_CHECK_HEADERS([stdlib.h string.h sys/param.h unistd.h sys/time.h stdio.h conio.h strstream.h iostream.h fstream.h math.h time.h sys/pstat.h sys/sysmp.h sys/sysinfo.h sys/table.h sys/sysctl.h sys/sytemcfg.h machine/hal_sysinfo.h])
138   AC_LANG_CPLUSPLUS
139 < AC_CHECK_HEADERS(ctype.h iostream fstream sstream strstream)
139 > AC_CHECK_HEADERS([ctype.h iostream fstream sstream strstream])
140   AC_LANG_C
141 < AC_CHECK_HEADERS(sys/pstat.h sys/sysmp.h sys/sysinfo.h)
131 < AC_CHECK_HEADERS(sys/table.h sys/param.h sys/sysctl.h sys/sytemcfg.h)
132 < AC_CHECK_HEADERS(machine/hal_sysinfo.h)
133 < AC_CHECK_FUNCS(pstat_getstatic sysmp getsysinfo sysctl table)
141 > AC_CHECK_FUNCS([rint snprintf sranddev strcasecmp strncasecmp stricmp strnicmp pstat_getstatic sysmp getsysinfo sysctl table])
142   # special check for _system_configuration because AIX <4.3.2 do not
143   # contain the `physmem' member.
144   AC_MSG_CHECKING([for external symbol _system_configuration])
# Line 147 | Line 155 | dnl Checks for library functions.
155   AC_C_CONST
156   AC_C_INLINE
157  
150 dnl Checks for library functions.
151 AC_CHECK_FUNCS([rint sranddev])
158  
159   dnl check for system getopt
160   adl_FUNC_GETOPT_LONG
# Line 165 | Line 171 | AC_PROG_INSTALL
171       ;;
172   esac
173  
174 + AC_LANG_CPLUSPLUS
175 + # AC_CPP_FUNC
176 + # ------------------ #
177 + # Checks to see if ANSI C99 CPP variable __func__ works.
178 + # If not, perhaps __FUNCTION__ works instead.
179 + # If not, we'll just define __func__ to "".
180 + AC_DEFUN([AC_CPP_FUNC],
181 + [AC_REQUIRE([AC_PROG_CC_STDC])dnl
182 + AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
183 + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
184 + [[const char *foo = __func__;]])],
185 +  [ac_cv_cpp_func=yes],
186 +  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
187 + [[const char *foo = __FUNCTION__;]])],
188 +  [ac_cv_cpp_func=__FUNCTION__],
189 +  [ac_cv_cpp_func=no])])])
190 + if test $ac_cv_cpp_func = __FUNCTION__; then
191 +  AC_DEFINE(__func__,__FUNCTION__,
192 +            [Define to __FUNCTION__ or "" if `__func__' does not conform to
193 + ANSI C.])
194 + elif test $ac_cv_cpp_func = no; then
195 +  AC_DEFINE(__func__,"",
196 +            [Define to __FUNCTION__ or "" if `__func__' does not conform to
197 + ANSI C.])
198 + fi
199 + ])# AC_CPP_FUNC
200 +
201 + AC_CPP_FUNC
202 + AC_SUBST(__func__)
203 + AC_LANG_C
204 +
205   AC_PROG_INSTALL
206   AC_PROG_LN_S
207   AC_PROG_MAKE_SET
# Line 207 | Line 244 | if test "$ac_cv_prog_ps_syntax" = BSD; then
244  
245  
246   if test "$ac_cv_prog_ps_syntax" = BSD; then
247 <  AC_DEFINE(PSTYPE_IS_BSD, 1)
247 >  AC_DEFINE(PSTYPE_IS_BSD, 1, [ps uses BSD-style arguments])
248   else
249     if test "$ac_cv_prog_ps_syntax" = POSIX; then
250 <       AC_DEFINE(PSTYPE_IS_POSIX, 1)
250 >       AC_DEFINE(PSTYPE_IS_POSIX, 1, [ps uses POSIX-style arguments])
251     else
252         AC_MSG_ERROR(Unknown ps syntax type!)
253     fi

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines