Meaningless changes made to test cvs.

[splint.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9f4d37eb5c5a45b52b49bc186d89b4e9245f49f7..5b4b8b32f87b9c42f96583fd303c469f6f16bac6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 dnl Process with autoconf to create a configure script  -*- Autoconf -*-
 AC_PREREQ(2.50)
-AC_INIT([Splint], [3.0.0.20], [splint-bug@cs.virginia.edu], [splint])
+
+AC_INIT([Splint], [3.0.1.6], [splint-bug@splint.org], [splint])
 
 dnl This MUST precede any other macro
 AC_CONFIG_AUX_DIR([config])
@@ -9,7 +10,7 @@ dnl Set up the source directory
 AC_CONFIG_SRCDIR([src/lclinit.c])
 
 dnl Deduce host
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
 dnl Set up automake & the configuration header
 AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, AC_PACKAGE_BUGREPORT)
@@ -24,6 +25,7 @@ dnl Checks for programs.
 #AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
+dnl This produces a warning.  See http://mail.gnu.org/pipermail/bug-automake/2001-August/000213.html
 AM_PROG_LEX
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -78,6 +80,26 @@ dnl AC_FUNC_VPRINTF
 dnl AC_FUNC_WAIT3
 dnl AC_CHECK_FUNCS([alarm atexit btowc bzero dup2 endgrent endpwent fchdir floor ftruncate getcwd getgroups gethostname gettimeofday isascii iswprint lchown localeconv mblen mbrlen mbrtowc memchr memmove memset mkdir mkfifo modf munmap pathconf pow putenv realpath regcomp rint rmdir rpmatch select setenv socket sqrt strcasecmp strchr strcspn strdup strerror strftime strncasecmp strpbrk strrchr strspn strstr strtod strtol strtoul strtoull tzset uname utime vprintf])
 
+dnl This was provided by Nelson Beebe for dealing with problems on IBM
+dnl AIX 4.3 with defining mode_t.
+
+dnl Checks for _ALL_SOURCE (IBM RS/6000 c89 needs this)
+AC_MSG_CHECKING(whether we need _ALL_SOURCE to expose mode_t)
+all=no
+AC_TRY_COMPILE([
+#include <stdio.h>
+mode_t x;
+], , , all=maybe)
+if test $all = maybe ; then
+AC_TRY_COMPILE([
+#define _ALL_SOURCE
+#include <stdio.h>
+mode_t x;
+], , AC_DEFINE(_ALL_SOURCE) all=yes)
+fi
+if test $all = maybe ; then all=no ; fi
+AC_MSG_RESULT($all)
+
 LCLOBJ='$(lcl_OBJECTS)'
 AC_ARG_WITH([lcl],
             AC_HELP_STRING([--without-lcl],
@@ -125,18 +147,45 @@ AC_DEFINE_UNQUOTED(DEFAULT_LCLIMPORTDIR, ".$PATH_SEPARATOR$myprefix/share/splint
 # These used to be in herald.h
 LCL_PARSE_VERSION="AC_PACKAGE_NAME AC_PACKAGE_VERSION"
 AC_DEFINE_UNQUOTED(SPLINT_VERSION,
-                   "$LCL_PARSE_VERSION --- `cat $srcdir/src/DATE`",
-                   [Splint's version number and release date])
+                   "$LCL_PARSE_VERSION --- `date +"%d %b %Y"`",
+                   [Splint's version number and configure/build date])
 AC_DEFINE_UNQUOTED(LCL_PARSE_VERSION, "$LCL_PARSE_VERSION",
                    [Splint's version number])
 AC_DEFINE_UNQUOTED(LCL_COMPILE,
                    "Compiled using $CC $CFLAGS on `uname -a` by `whoami`",
                    [String describing who compiled this binary and how])
 
+dnl TODO: Use result AC_CANONICAL_SYSTEM to figure out what to define 
 
-dnl TODO: Use result AC_CANONICAL_HOST to figure out what to define
 AC_DEFINE(UNIX, 1, [Define if you're on a Unixy system])
 
+#just define some Header constants for now...
+
+UNAME=`uname`
+AC_DEFINE_UNQUOTED(UNAME, "${UNAME}")
+
+AC_DEFINE_UNQUOTED(BUILD, "${build}")
+AC_DEFINE_UNQUOTED(HOST, "${host}")
+AC_DEFINE_UNQUOTED(TARGET, "${target}")
+
+AC_DEFINE_UNQUOTED(BUILD_ALIAS, "${build_alias}")
+AC_DEFINE_UNQUOTED(HOST_ALIAS, "${host_alias}")
+AC_DEFINE_UNQUOTED(TARGET_ALIAS, "${TARGET_ALIAS}")
+
+AC_DEFINE_UNQUOTED(BUILD_CPU, "${build_cpu}")
+AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu")
+AC_DEFINE_UNQUOTED(TARGET_CPU, "${target_cpu}")
+
+AC_DEFINE_UNQUOTED(BUILD_VENDOR, "${build_vendor}")
+AC_DEFINE_UNQUOTED(HOST_VENDOR, "${host_vendor}")
+AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${target_vendor}")
+
+AC_DEFINE_UNQUOTED(BUILD_OS, "${build_os}")
+AC_DEFINE_UNQUOTED(HOST_OS, "${host_os}")
+AC_DEFINE_UNQUOTED(TARGET_OS,"${target_os}")
+
+
+
 dnl AC_CONFIG_FILES([test/Makefile
 dnl                  test/ensuresclauses/Makefile
 dnl                  test/conditions/Makefile
@@ -153,8 +202,8 @@ dnl                  test/tests2.2/Makefile
 dnl                  test/db1/Makefile])
 
 AC_CONFIG_FILES([Makefile imports/Makefile lib/Makefile src/Makefile
-                 test/Makefile])
-AC_OUTPUT
+                 test/Makefile doc/Makefile bin/Makefile])
+AC_OUTPUT