diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2019-09-10 22:30:35 +0100 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2019-09-10 22:30:35 +0100 |
| commit | d7dcf5e10412eb58410adecefb630d8372cb4632 (patch) | |
| tree | 0eef7baf83bae5ef30c57950f06c9d258a937de0 /configure.ac | |
| parent | 4fe66103afe785e3fa20994687f53622bea51819 (diff) | |
| download | enchant-d7dcf5e10412eb58410adecefb630d8372cb4632.tar.gz | |
UnitTest++/Travis: build on Ubuntu 18.04 and remove workarounds
Previously Arch and Debian/Ubuntu needed workarounds to correctly detect and
build with UnitTest++. Remove these.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 761d9f5..f4656f6 100644 --- a/configure.ac +++ b/configure.ac @@ -156,44 +156,9 @@ glib_DEFUN([GLIB_LC_MESSAGES], GLIB_LC_MESSAGES - -dnl =========================================================================== -dnl Very hackish. -dnl Ubuntu / Debian ship older version of unittest++ with their own pkg-config -dnl and include -dnl =========================================================================== AC_LANG_PUSH([C++]) PKG_CHECK_EXISTS([UnitTest++], - [PKG_CHECK_MODULES(UNITTESTPP, [UnitTest++]) -dnl and because of the above, we need to tweak the include until we stop -dnl supporting this old version. - PKG_CHECK_VAR(UNITTESTPP_INCLUDE, [UnitTest++], [includedir]) - if test "x$UNITTESTPP_INCLUDE" != "x"; then - UNITTESTPP_CFLAGS="$UNITTESTPP_CFLAGS -I$UNITTESTPP_INCLUDE/UnitTest++" - fi - ], - [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 - ] - )] -) + [PKG_CHECK_MODULES(UNITTESTPP, [UnitTest++])]) AC_SUBST(UNITTESTPP_CFLAGS) AC_SUBST(UNITTESTPP_LIBS) AC_LANG_POP([C++]) |