mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[master] fix BOTAN_LDFLAGS and BOTAN_INCLUDES

Browse Source
This commit is contained in:
Jelte Jansen
2011-04-28 19:22:20 +00:00
parent ec1ad75257
commit cacab413e8
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@@ -392,9 +392,17 @@ if test -z "$with_botan"; then
done done
fi fi
if test "${botan_path}" ; then if test "${botan_path}" ; then
CPPFLAGS="$CPPFLAGS -I${botan_path}/include" BOTAN_LDFLAGS="-L${botan_path}/lib -lbotan"
LDFLAGS="$LDFLAGS -L${botan_path}/lib -lbotan" BOTAN_INCLUDES="-I${botan_path}/include"
AC_SUBST(BOTAN_LDFLAGS)
AC_SUBST(BOTAN_INCLUDES)
fi fi
CPPFLAGS_SAVED=$CPPFLAGS
CPPFLAGS="$BOTAN_INCLUDES $CPPFLAGS"
LDFLAGS_SAVED=$LDFLAGS
LDFLAGS="$BOTAN_LDFLAGS $LDFLAGS"
AC_CHECK_HEADERS([botan/botan.h],,AC_MSG_ERROR([Missing required header files.])) AC_CHECK_HEADERS([botan/botan.h],,AC_MSG_ERROR([Missing required header files.]))
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <botan/botan.h> [AC_LANG_PROGRAM([#include <botan/botan.h>
@@ -408,6 +416,8 @@ AC_LINK_IFELSE(
[AC_MSG_RESULT([checking for Botan library... no]) [AC_MSG_RESULT([checking for Botan library... no])
AC_MSG_ERROR([Needs Botan library 1.8 or higher])] AC_MSG_ERROR([Needs Botan library 1.8 or higher])]
) )
CPPFLAGS=$CPPFLAGS_SAVED
LDFLAGS=$LDFLAGS_SAVED
# #
# Configure Boost header path # Configure Boost header path

2
src/lib/cryptolink/Makefile.am
View File

@@ -1,7 +1,7 @@
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES) $(BOTAN_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(B10_CXXFLAGS)
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda

2
src/lib/cryptolink/tests/Makefile.am
View File

@@ -16,7 +16,7 @@ TESTS += run_unittests
run_unittests_SOURCES = run_unittests.cc run_unittests_SOURCES = run_unittests.cc
run_unittests_SOURCES += crypto_unittests.cc run_unittests_SOURCES += crypto_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la