build: dont redundant SUBST pkg-config variables

This commit is contained in:
Danny Robson 2014-12-05 13:18:16 +11:00
parent 82ae659fb5
commit 189d1f7363

View File

@ -204,20 +204,22 @@ AS_CASE([$host_os],
CHECK_RAGEL([ip.cpp]) CHECK_RAGEL([ip.cpp])
AX_BOOST_BASE([1.53], [], [AC_MSG_ERROR([Boost version >= 1.53 required])]) AX_BOOST_BASE([1.53], [], [AC_MSG_ERROR([Boost version >= 1.53 required])])
AC_SUBST(BOOST_CPPFLAGS)
AC_SUBST(BOOST_LDFLAGS)
# boost-system isn't a hard requirement, it's only really used to fulfill # boost-system isn't a hard requirement, it's only really used to fulfill
# some other dependency I've since forgotten about... # some other dependency I've since forgotten about...
AX_BOOST_SYSTEM AX_BOOST_SYSTEM
AX_BOOST_FILESYSTEM AX_BOOST_THREAD
AC_SUBST(BOOST_FILESYSTEM_LIB) AS_IF([test "x$ax_cv_boost_thread" != "xyes"], [
AC_MSG_ERROR("boost-thread is a hard requirement")
])
AX_BOOST_FILESYSTEM
AS_IF([test "x$ax_cv_boost_filesystem" != "xyes"], [ AS_IF([test "x$ax_cv_boost_filesystem" != "xyes"], [
AC_MSG_ERROR("boost-filesystem is a hard requirement") AC_MSG_ERROR("boost-filesystem is a hard requirement")
]) ])
############################################################################### ###############################################################################
## Optional packages ## Optional packages