From 8f0b2f5eadf0fcb47c581907205a9db686214a69 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sat, 3 Mar 2018 16:16:41 -0500 Subject: Bump Cabal submodule to 2.2 Requires some ghc-cabal changes as well. Test Plan: ./validate Reviewers: hvr, bgamari Reviewed By: bgamari Subscribers: hsyl20, erikd, alpmestan, rwbarton, thomie, carter Differential Revision: https://phabricator.haskell.org/D4453 --- libraries/Cabal | 2 +- libraries/base/configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libraries') diff --git a/libraries/Cabal b/libraries/Cabal index 578d3a50db..98a72c9da6 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit 578d3a50db818223017b8891df268d4200b8ffd3 +Subproject commit 98a72c9da6f56a9917b66d7532df755719ec7a25 diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac index f472319a7e..a141a25a90 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac @@ -234,10 +234,10 @@ AS_IF([test "x$with_libcharset" != xno], fi # Hack - md5.h needs HsFFI.h. Is there a better way to do this? -CFLAGS="-I../../includes $CFLAGS" +CFLAGS="-I../.. -I../../../../includes $CFLAGS" dnl Calling AC_CHECK_TYPE(T) makes AC_CHECK_SIZEOF(T) abort on failure dnl instead of considering sizeof(T) as 0. -AC_CHECK_TYPE([struct MD5Context], [], [], [#include "include/md5.h"]) +AC_CHECK_TYPE([struct MD5Context], [], [AC_MSG_ERROR([internal error])], [#include "include/md5.h"]) AC_CHECK_SIZEOF([struct MD5Context], [], [#include "include/md5.h"]) AC_SUBST(EXTRA_LIBS) -- cgit v1.2.1