r194: configure.in

[ctsim.git] / configure.in

diff --git a/configure.in b/configure.in
index 262f928be32742d772236a4346f433a427907ed8..74d5fecfa53c0091d6e92f739ef3d033e10e9932 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,2.0.0b11)
+AM_INIT_AUTOMAKE(ctsim,2.0.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -89,7 +89,7 @@ fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -99,9 +99,11 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep)
+AC_CHECK_FUNCS(strtod strtol snprintf htonl usleep vsprintf vsnprintf)
 AC_CHECK_FUNC(basename)
 AC_CHECK_FUNC(setjmp)
+AC_CHECK_FUNC(setpriority)
+
 if test "${OSTYPE}" = "cygwin" ; then
   getopt_long=false
 else
@@ -309,7 +311,7 @@ AM_CONDITIONAL(NO_X, test "x$no_x" = "xyes")
 my_includes="$my_includes -I../include -I.."
 AC_SUBST(my_includes)
 
-AC_MSG_CHECKING([interactive graphics])
+AC_MSG_CHECKING([for X])
 if test "$no_x" != "yes" ; then
   AC_DEFINE(HAVE_X11)
   AC_DEFINE(HAVE_SGP)
@@ -319,6 +321,7 @@ if test "$no_x" != "yes" ; then
   AC_MSG_RESULT(yes)
   if test "$g2" = "true" ; then
   ctlibs_graphics="$ctlibs_graphics -lg2"
+  AC_DEFINE(HAVE_G2)
   fi   
   ctlibs_graphics="$ctlibs_graphics $X_BASIC_LIBS $X_TOOLKIT_LIBS"
 else