suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various bugs in the build system relating to detected CCSP and C++CSP

Browse Source
This commit is contained in:
Neil Brown 2007-10-14 17:04:11 +00:00
parent 8e2c31f191
commit 4d6d645010
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -41,6 +41,9 @@ AC_CHECK_PROG([HAVE_KROC],[kroc],[true],[false])
if test "x$HAVE_KROC" = "xfalse"; then if test "x$HAVE_KROC" = "xfalse"; then
AC_MSG_WARN([kroc not found; you will not be able to compile output from the C backend on this machine]) AC_MSG_WARN([kroc not found; you will not be able to compile output from the C backend on this machine])
ccsp_kroc_available=false ccsp_kroc_available=false
kroc_incpath=
else
kroc_incpath=`kroc --ccincpath`
fi fi
AC_CHECK_PROG([HAVE_SVN],[svn],[true],[false]) AC_CHECK_PROG([HAVE_SVN],[svn],[true],[false])
@ -68,17 +71,21 @@ AC_NEED_HASKELL_LIB([fgl],LIB_fgl)
AC_LANG(C) AC_LANG(C)
CFLAGS=$kroc_incpath
CPPFLAGS=$kroc_incpath
AC_CHECK_HEADER([cifccsp.h],[HAVE_CIFCCSP=true],[HAVE_CIFCCSP=false]) AC_CHECK_HEADER([cifccsp.h],[HAVE_CIFCCSP=true],[HAVE_CIFCCSP=false])
if test "x$HAVE_CIFCCSP_H" = "xfalse"; then if test "x$HAVE_CIFCCSP" = "xfalse"; then
AC_MSG_WARN([cifccsp.h not found; you will not be able to compile output from the C backend on this machine]) AC_MSG_WARN([cifccsp.h not found; you will not be able to compile output from the C backend on this machine])
ccsp_kroc_available=false ccsp_kroc_available=false
fi fi
CFLAGS=
CPPFLAGS=
#Must remember to switch the language to C++ before checking the C++ headers: #Must remember to switch the language to C++ before checking the C++ headers:
AC_LANG(C++) AC_LANG(C++)
AC_CHECK_HEADERS([cppcsp/cppcsp.h],[HAVE_CPPCSP=true],[HAVE_CPPCSP=false]) AC_CHECK_HEADERS([cppcsp/cppcsp.h],[HAVE_CPPCSP=true],[HAVE_CPPCSP=false])
if test "x$HAVE_CPPCSP_H" = "xfalse"; then if test "x$HAVE_CPPCSP" = "xfalse"; then
AC_MSG_WARN([cppcsp/cppcsp.h not found; you will not be able to compile output from the C++ backend on this machine]) AC_MSG_WARN([cppcsp/cppcsp.h not found; you will not be able to compile output from the C++ backend on this machine])
cppcsp_available=false cppcsp_available=false
fi fi
@ -101,6 +108,7 @@ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ ]]),
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
gnu89_inline= gnu89_inline=
) )
CFLAGS=
AC_SUBST(gnu89_inline) AC_SUBST(gnu89_inline)
AC_SUBST(ccsp_kroc_available) AC_SUBST(ccsp_kroc_available)