noexpand always false.

[splint.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 70b620361891991260b8e0ff8b658dd17165a901..515e60c001c8df3e822af8d13dee4eccb1bd0ce7 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)
 dnl Process with autoconf to create a configure script  -*- Autoconf -*-
 AC_PREREQ(2.50)

-AC_INIT([Splint], [3.0.1.1], [splint-bug@splint.org], [splint])
+
+AC_INIT([Splint], [3.1.2], [splint-bug@splint.org], [splint])

 
 dnl This MUST precede any other macro
 AC_CONFIG_AUX_DIR([config])
 
 dnl This MUST precede any other macro
 AC_CONFIG_AUX_DIR([config])


@@ -9,15 +10,15 @@ dnl Set up the source directory
 AC_CONFIG_SRCDIR([src/lclinit.c])
 
 dnl Deduce host
 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)
 AM_CONFIG_HEADER([config.h:config.hin])
 
 dnl Prepare for Splint processing of config.h
 
 dnl Set up automake & the configuration header
 AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, AC_PACKAGE_BUGREPORT)
 AM_CONFIG_HEADER([config.h:config.hin])
 
 dnl Prepare for Splint processing of config.h

-AH_TOP([/*@-constmacros@*/])
-AH_BOTTOM([/*@=constmacros@*/])
+AH_TOP([/*@ -macroconstdecl@*/])
+AH_BOTTOM([/*@ =macroconstdecl@*/])

 
 dnl Checks for programs.
 #drl 12-19-2001 commented out so Splint won't depend on C++
 
 dnl Checks for programs.
 #drl 12-19-2001 commented out so Splint won't depend on C++


@@ -36,6 +37,7 @@ AC_CHECK_PROG(CAT, cat, cat, cat-is-missing)
 AC_CHECK_PROG(RM, rm, rm, rm-is-missing)
 AC_CHECK_PROG(MV, mv, mv, mv-is-missing)
 AC_CHECK_PROG(CP, cp, cp, cp-is-missing)
 AC_CHECK_PROG(RM, rm, rm, rm-is-missing)
 AC_CHECK_PROG(MV, mv, mv, mv-is-missing)
 AC_CHECK_PROG(CP, cp, cp, cp-is-missing)

+AC_CHECK_PROG(SED, sed, sed, sed-is-missing)

 
 dnl Checks for header files.
 dnl Currently all disable, as the source files don't care about the results
 
 dnl Checks for header files.
 dnl Currently all disable, as the source files don't care about the results


@@ -98,6 +100,7 @@ mode_t x;
 fi
 if test $all = maybe ; then all=no ; fi
 AC_MSG_RESULT($all)
 fi
 if test $all = maybe ; then all=no ; fi
 AC_MSG_RESULT($all)

+AH_TEMPLATE([_ALL_SOURCE], [needed to expose mode_t on some machines])

 
 LCLOBJ='$(lcl_OBJECTS)'
 AC_ARG_WITH([lcl],
 
 LCLOBJ='$(lcl_OBJECTS)'
 AC_ARG_WITH([lcl],


@@ -116,9 +119,14 @@ AC_SUBST(LCLOBJ)
 myprefix=$prefix
 test x$myprefix = xNONE && myprefix=$ac_default_prefix
 
 myprefix=$prefix
 test x$myprefix = xNONE && myprefix=$ac_default_prefix
 

+
+### Yuck!  This is really kludgey, but I don't understand autoconf well
+### enough to do something simple that always works.  Hopefully this does.
+

 # cpplib.h defines 2 include dirs; one is $includedir, the other is gcc's
 # include dir.  Not the most portable setup, but let's do our best.
 # cpplib.h defines 2 include dirs; one is $includedir, the other is gcc's
 # include dir.  Not the most portable setup, but let's do our best.

-if test x$ac_cv_c_compiler_gnu = xyes; then
+
+if test x$GCC = xyes; then

   dnl Make sure to override NLS; this assumes gcc prints only
   dnl   Reading specs from blah
   dnl   gcc version blah
   dnl Make sure to override NLS; this assumes gcc prints only
   dnl   Reading specs from blah
   dnl   gcc version blah


@@ -130,7 +138,11 @@ GCC_INCLUDE_DIR=/usr/include
 #  GCC_INCLUDE_DIR=`LANGUAGE= LANG= $CC -v 2>&1 | sed -n -e '/^gcc/ d' -e 's/.* \(.*\)specs/\1include/p'`
   AC_DEFINE_UNQUOTED(GCC_INCLUDE_DIR, "$GCC_INCLUDE_DIR",
                      [system include directory])
 #  GCC_INCLUDE_DIR=`LANGUAGE= LANG= $CC -v 2>&1 | sed -n -e '/^gcc/ d' -e 's/.* \(.*\)specs/\1include/p'`
   AC_DEFINE_UNQUOTED(GCC_INCLUDE_DIR, "$GCC_INCLUDE_DIR",
                      [system include directory])

+else
+GCC_INCLUDE_DIR=/usr/include
+AC_DEFINE_UNQUOTED(GCC_INCLUDE_DIR, "$GCC_INCLUDE_DIR", [system include directory])

 fi
 fi

+

 AC_DEFINE_UNQUOTED(GCC_INCLUDE_DIR2, "$myprefix/include",
                    [alternate include directory])
 
 AC_DEFINE_UNQUOTED(GCC_INCLUDE_DIR2, "$myprefix/include",
                    [alternate include directory])
 


@@ -154,10 +166,37 @@ AC_DEFINE_UNQUOTED(LCL_COMPILE,
                    "Compiled using $CC $CFLAGS on `uname -a` by `whoami`",
                    [String describing who compiled this binary and how])
 
                    "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])
 
 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}", uname output)
+
+AC_DEFINE_UNQUOTED(BUILD, "${build}", build)
+AC_DEFINE_UNQUOTED(HOST, "${host}", host)
+AC_DEFINE_UNQUOTED(TARGET, "${target}", target)
+
+AC_DEFINE_UNQUOTED(BUILD_ALIAS, "${build_alias}", build_alias)
+AC_DEFINE_UNQUOTED(HOST_ALIAS, "${host_alias}", host_alias)
+AC_DEFINE_UNQUOTED(TARGET_ALIAS, "${TARGET_ALIAS}", target_alias)
+
+AC_DEFINE_UNQUOTED(BUILD_CPU, "${build_cpu}", build_cpu)
+AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu", host_cpu)
+AC_DEFINE_UNQUOTED(TARGET_CPU, "${target_cpu}", target_cpu)
+
+AC_DEFINE_UNQUOTED(BUILD_VENDOR, "${build_vendor}", build_vendor)
+AC_DEFINE_UNQUOTED(HOST_VENDOR, "${host_vendor}", host_vendor)
+AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${target_vendor}", target_vendor)
+
+AC_DEFINE_UNQUOTED(BUILD_OS, "${build_os}", build_os)
+AC_DEFINE_UNQUOTED(HOST_OS, "${host_os}", host_os)
+AC_DEFINE_UNQUOTED(TARGET_OS,"${target_os}", target_os)
+
+
+

 dnl AC_CONFIG_FILES([test/Makefile
 dnl                  test/ensuresclauses/Makefile
 dnl                  test/conditions/Makefile
 dnl AC_CONFIG_FILES([test/Makefile
 dnl                  test/ensuresclauses/Makefile
 dnl                  test/conditions/Makefile


@@ -174,8 +213,8 @@ dnl                  test/tests2.2/Makefile
 dnl                  test/db1/Makefile])
 
 AC_CONFIG_FILES([Makefile imports/Makefile lib/Makefile src/Makefile
 dnl                  test/db1/Makefile])
 
 AC_CONFIG_FILES([Makefile imports/Makefile lib/Makefile src/Makefile

-                 test/Makefile doc/Makefile])
-AC_OUTPUT
+                 test/Makefile doc/Makefile bin/Makefile])
+AC_OUTPUT