Commit ad5750db authored by Kean Johnston's avatar Kean Johnston
Browse files

[3119] Minor cosmetic cleanups as per review

parent 61f52a04
...@@ -755,22 +755,23 @@ CPPFLAGS="$BOTAN_INCLUDES $CPPFLAGS" ...@@ -755,22 +755,23 @@ CPPFLAGS="$BOTAN_INCLUDES $CPPFLAGS"
LIBS_SAVED="$LIBS" LIBS_SAVED="$LIBS"
LIBS="$LIBS $BOTAN_LIBS" LIBS="$LIBS $BOTAN_LIBS"
dnl ac_header_preproc is an autoconf symbol (undocumented but stable) that # ac_header_preproc is an autoconf symbol (undocumented but stable) that
dnl is set if the pre-processor phase passes. Thus by adding a custom # is set if the pre-processor phase passes. Thus by adding a custom
dnl failure handler we can detect the difference between a header no existing # failure handler we can detect the difference between a header not existing
dnl (or not even passing the pre-processor phase) and a header file resulting # (or not even passing the pre-processor phase) and a header file resulting
dnl in compilation failures. # in compilation failures.
AC_CHECK_HEADERS([botan/botan.h],,[ AC_CHECK_HEADERS([botan/botan.h],,[
if test "x$ac_header_preproc" = "xyes"; then if test "x$ac_header_preproc" = "xyes"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
botan/botan.h was found but is unusable. The most common cause of this problem botan/botan.h was found but is unusable. The most common cause of this problem
is attempting to use an updated C++ compiler with older C++ libraries, such as is attempting to use an updated C++ compiler with older C++ libraries, such as
the version of Botan that comes with your distribution. If you have updated the version of Botan that comes with your distribution. If you have updated
your C++ compiler we highly recommend that you use support libraries such as your C++ compiler we highly recommend that you use support libraries such as
Boost and Botan that were compiled with the same compiler version.]) Boost and Botan that were compiled with the same compiler version.])
else else
AC_MSG_ERROR([Missing required header files.]) AC_MSG_ERROR([Missing required header files.])
fi]) fi]
)
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <botan/botan.h> [AC_LANG_PROGRAM([#include <botan/botan.h>
#include <botan/hash.h> #include <botan/hash.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment