diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-02-04 18:43:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-04 18:43:58 +0000 |
| commit | e92045d3c46eaaa41ec4ed237a0887d097734ae0 (patch) | |
| tree | 0b6fdb744b9b98218b6b56eba8257b437b1ec9a8 | |
| parent | 2b3b34a015a80cc46917564c108cf1273e55a4e0 (diff) | |
| parent | 7e2d8f05611784b5c1f781b4bc50d4438d0170b9 (diff) | |
| download | enchant-e92045d3c46eaaa41ec4ed237a0887d097734ae0.tar.gz | |
Merge pull request #73 from TingPing/arch-workaround
build: Fix finding UnitTest++.h on Arch
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c7371c8..5b68dbb 100644 --- a/configure.ac +++ b/configure.ac @@ -294,8 +294,26 @@ dnl supporting this old version. UNITTESTPP_CFLAGS="$UNITTESTPP_CFLAGS -I$UNITTESTPP_INCLUDE/UnitTest++" fi ], - [PKG_CHECK_EXISTS([unittest++], - [PKG_CHECK_MODULES(UNITTESTPP, [unittest++])] + [PKG_CHECK_EXISTS([unittest++], [ + PKG_CHECK_MODULES(UNITTESTPP, [unittest++]) + dnl Arch ships a broken custom pkgconfig file, try to fix includedir + dnl https://bugs.archlinux.org/task/44516 + AC_LANG_PUSH([C++]) + CACHED_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $UNITTESTPP_CFLAGS" + AC_CHECK_HEADERS([UnitTest++.h], [], [ + PKG_CHECK_VAR(UNITTESTPP_INCLUDE, [unittest++], [includedir]) + UNITTESTPP_CFLAGS="$UNITTESTPP_CFLAGS -I$UNITTESTPP_INCLUDE/UnitTest++" + + CXXFLAGS="$CACHED_CXXFLAGS $UNITTESTPP_CFLAGS" + unset ac_cv_header_UnitTestpp_h + AC_CHECK_HEADERS([UnitTest++.h], [], [ + AC_MSG_WARN([Failed to include UnitTest++.h]) + ]) + ]) + CXXFLAGS="$CACHED_CXXFLAGS" + AC_LANG_POP + ] )] ) AC_SUBST(UNITTESTPP_CFLAGS) |