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.

41 files changed, 41 insertions, 76 deletions

diff --git a/.travis.yml b/.travis.yml
index 4022274..de4dd82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 
-dist: xenial
+dist: bionic
 sudo: required
 
 addons:
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++])
diff --git a/tests/broker/enchant_broker_describe_tests.cpp b/tests/broker/enchant_broker_describe_tests.cpp
index d9e95ca..bd4cb3a 100644
--- a/tests/broker/enchant_broker_describe_tests.cpp
+++ b/tests/broker/enchant_broker_describe_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include <algorithm>

 #include <functional>

diff --git a/tests/broker/enchant_broker_dict_exists_tests.cpp b/tests/broker/enchant_broker_dict_exists_tests.cpp
index 2f68680..54fb526 100644
--- a/tests/broker/enchant_broker_dict_exists_tests.cpp
+++ b/tests/broker/enchant_broker_dict_exists_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 

diff --git a/tests/broker/enchant_broker_free_dict_tests.cpp b/tests/broker/enchant_broker_free_dict_tests.cpp
index c884eef..a26990a 100644
--- a/tests/broker/enchant_broker_free_dict_tests.cpp
+++ b/tests/broker/enchant_broker_free_dict_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 /**

diff --git a/tests/broker/enchant_broker_free_tests.cpp b/tests/broker/enchant_broker_free_tests.cpp
index efbb218..1e69e11 100644
--- a/tests/broker/enchant_broker_free_tests.cpp
+++ b/tests/broker/enchant_broker_free_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 

diff --git a/tests/broker/enchant_broker_get_error_tests.cpp b/tests/broker/enchant_broker_get_error_tests.cpp
index c8bbe22..f07abd7 100644
--- a/tests/broker/enchant_broker_get_error_tests.cpp
+++ b/tests/broker/enchant_broker_get_error_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 

diff --git a/tests/broker/enchant_broker_init_tests.cpp b/tests/broker/enchant_broker_init_tests.cpp
index 0da684e..95b75ae 100644
--- a/tests/broker/enchant_broker_init_tests.cpp
+++ b/tests/broker/enchant_broker_init_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 

 /**

diff --git a/tests/broker/enchant_broker_list_dicts_tests.cpp b/tests/broker/enchant_broker_list_dicts_tests.cpp
index fd759fc..82de5ba 100644
--- a/tests/broker/enchant_broker_list_dicts_tests.cpp
+++ b/tests/broker/enchant_broker_list_dicts_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 #include <vector>

diff --git a/tests/broker/enchant_broker_request_dict_tests.cpp b/tests/broker/enchant_broker_request_dict_tests.cpp
index 50482a6..daa3659 100644
--- a/tests/broker/enchant_broker_request_dict_tests.cpp
+++ b/tests/broker/enchant_broker_request_dict_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 

diff --git a/tests/broker/enchant_broker_request_pwl_dict_tests.cpp b/tests/broker/enchant_broker_request_pwl_dict_tests.cpp
index f2abab6..58adc38 100644
--- a/tests/broker/enchant_broker_request_pwl_dict_tests.cpp
+++ b/tests/broker/enchant_broker_request_pwl_dict_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantBrokerTestFixture.h"

 

diff --git a/tests/broker/enchant_broker_set_ordering_tests.cpp b/tests/broker/enchant_broker_set_ordering_tests.cpp
index 7737c70..ec0785f 100644
--- a/tests/broker/enchant_broker_set_ordering_tests.cpp
+++ b/tests/broker/enchant_broker_set_ordering_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include <fstream>

 #include "EnchantBrokerTestFixture.h"

diff --git a/tests/dictionary/enchant_dict_add_tests.cpp b/tests/dictionary/enchant_dict_add_tests.cpp
index eda9158..c155e44 100644
--- a/tests/dictionary/enchant_dict_add_tests.cpp
+++ b/tests/dictionary/enchant_dict_add_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_add_to_session_tests.cpp b/tests/dictionary/enchant_dict_add_to_session_tests.cpp
index a2acc31..3505a9b 100644
--- a/tests/dictionary/enchant_dict_add_to_session_tests.cpp
+++ b/tests/dictionary/enchant_dict_add_to_session_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_check_tests.cpp b/tests/dictionary/enchant_dict_check_tests.cpp
index e54dcdb..4bd6b41 100644
--- a/tests/dictionary/enchant_dict_check_tests.cpp
+++ b/tests/dictionary/enchant_dict_check_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_describe_tests.cpp b/tests/dictionary/enchant_dict_describe_tests.cpp
index 0bbc2a0..90bdaf5 100644
--- a/tests/dictionary/enchant_dict_describe_tests.cpp
+++ b/tests/dictionary/enchant_dict_describe_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_free_string_list_tests.cpp b/tests/dictionary/enchant_dict_free_string_list_tests.cpp
index dfe01c2..0e195c9 100644
--- a/tests/dictionary/enchant_dict_free_string_list_tests.cpp
+++ b/tests/dictionary/enchant_dict_free_string_list_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_get_error_tests.cpp b/tests/dictionary/enchant_dict_get_error_tests.cpp
index e20924a..2aeedee 100644
--- a/tests/dictionary/enchant_dict_get_error_tests.cpp
+++ b/tests/dictionary/enchant_dict_get_error_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_get_extra_word_characters_tests.cpp b/tests/dictionary/enchant_dict_get_extra_word_characters_tests.cpp
index 355ccc5..7c88c80 100644
--- a/tests/dictionary/enchant_dict_get_extra_word_characters_tests.cpp
+++ b/tests/dictionary/enchant_dict_get_extra_word_characters_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 

 #include "EnchantDictionaryTestFixture.h"

diff --git a/tests/dictionary/enchant_dict_is_added_tests.cpp b/tests/dictionary/enchant_dict_is_added_tests.cpp
index 1de7298..c29ce5e 100644
--- a/tests/dictionary/enchant_dict_is_added_tests.cpp
+++ b/tests/dictionary/enchant_dict_is_added_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_is_removed_tests.cpp b/tests/dictionary/enchant_dict_is_removed_tests.cpp
index 449bc9d..45b6658 100644
--- a/tests/dictionary/enchant_dict_is_removed_tests.cpp
+++ b/tests/dictionary/enchant_dict_is_removed_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_is_word_character_tests.cpp b/tests/dictionary/enchant_dict_is_word_character_tests.cpp
index 0368986..94df821 100644
--- a/tests/dictionary/enchant_dict_is_word_character_tests.cpp
+++ b/tests/dictionary/enchant_dict_is_word_character_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include <vector>

 #include <algorithm>

diff --git a/tests/dictionary/enchant_dict_remove_from_session_tests.cpp b/tests/dictionary/enchant_dict_remove_from_session_tests.cpp
index dcca845..577793e 100644
--- a/tests/dictionary/enchant_dict_remove_from_session_tests.cpp
+++ b/tests/dictionary/enchant_dict_remove_from_session_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_remove_tests.cpp b/tests/dictionary/enchant_dict_remove_tests.cpp
index ddfea27..c2fce89 100644
--- a/tests/dictionary/enchant_dict_remove_tests.cpp
+++ b/tests/dictionary/enchant_dict_remove_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_store_replacement_tests.cpp b/tests/dictionary/enchant_dict_store_replacement_tests.cpp
index 2ddc1e4..7d9fd2c 100644
--- a/tests/dictionary/enchant_dict_store_replacement_tests.cpp
+++ b/tests/dictionary/enchant_dict_store_replacement_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/dictionary/enchant_dict_suggest_tests.cpp b/tests/dictionary/enchant_dict_suggest_tests.cpp
index 6e8602d..cebd88e 100644
--- a/tests/dictionary/enchant_dict_suggest_tests.cpp
+++ b/tests/dictionary/enchant_dict_suggest_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include <vector>

 #include <algorithm>

diff --git a/tests/enchant_providers/Dictionary/dictionary_check.cpp b/tests/enchant_providers/Dictionary/dictionary_check.cpp
index b5a3c4f..3268498 100644
--- a/tests/enchant_providers/Dictionary/dictionary_check.cpp
+++ b/tests/enchant_providers/Dictionary/dictionary_check.cpp
@@ -18,7 +18,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

  * THE SOFTWARE.

  */

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 

 #include "../unittest_enchant_providers.h"

 #include <vector>

diff --git a/tests/enchant_providers/Dictionary/dictionary_suggest.cpp b/tests/enchant_providers/Dictionary/dictionary_suggest.cpp
index 4cc0372..0a1347a 100644
--- a/tests/enchant_providers/Dictionary/dictionary_suggest.cpp
+++ b/tests/enchant_providers/Dictionary/dictionary_suggest.cpp
@@ -18,7 +18,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

  * THE SOFTWARE.

  */

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 

 #include "../unittest_enchant_providers.h"

 #include <vector>

diff --git a/tests/enchant_providers/Provider/provider_describe_dict.cpp b/tests/enchant_providers/Provider/provider_describe_dict.cpp
index 0c2280b..55e538d 100644
--- a/tests/enchant_providers/Provider/provider_describe_dict.cpp
+++ b/tests/enchant_providers/Provider/provider_describe_dict.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 #include <glib.h>

 #include <string.h>

diff --git a/tests/enchant_providers/Provider/provider_dictionary_exists.cpp b/tests/enchant_providers/Provider/provider_dictionary_exists.cpp
index 819444c..316adf0 100644
--- a/tests/enchant_providers/Provider/provider_dictionary_exists.cpp
+++ b/tests/enchant_providers/Provider/provider_dictionary_exists.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 

 #include "../unittest_enchant_providers.h"

diff --git a/tests/enchant_providers/Provider/provider_identify_dict.cpp b/tests/enchant_providers/Provider/provider_identify_dict.cpp
index 39da578..be8f88e 100644
--- a/tests/enchant_providers/Provider/provider_identify_dict.cpp
+++ b/tests/enchant_providers/Provider/provider_identify_dict.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 #include <glib.h>

 #include <string.h>

diff --git a/tests/enchant_providers/Provider/provider_list_dicts.cpp b/tests/enchant_providers/Provider/provider_list_dicts.cpp
index 6e6fbc7..5b66413 100644
--- a/tests/enchant_providers/Provider/provider_list_dicts.cpp
+++ b/tests/enchant_providers/Provider/provider_list_dicts.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 

 #include "../unittest_enchant_providers.h"

diff --git a/tests/enchant_providers/Provider/provider_request_dict.cpp b/tests/enchant_providers/Provider/provider_request_dict.cpp
index ab129b7..1cd2ed6 100644
--- a/tests/enchant_providers/Provider/provider_request_dict.cpp
+++ b/tests/enchant_providers/Provider/provider_request_dict.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 

 #include "../unittest_enchant_providers.h"

diff --git a/tests/enchant_providers/providers.test.cpp b/tests/enchant_providers/providers.test.cpp
index 8a6484e..16f7f49 100644
--- a/tests/enchant_providers/providers.test.cpp
+++ b/tests/enchant_providers/providers.test.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant.h>

 #include <enchant-provider.h>

 #include <glib.h>

diff --git a/tests/main.test.cpp b/tests/main.test.cpp
index 2419809..dcd4349 100644
--- a/tests/main.test.cpp
+++ b/tests/main.test.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include "EnchantBrokerTestFixture.h"

 EnchantProvider * EnchantBrokerTestFixture::mock_provider=NULL;

 ConfigureHook EnchantBrokerTestFixture::userMockProviderConfiguration=NULL;

diff --git a/tests/provider/enchant_provider_broker_set_error_tests.cpp b/tests/provider/enchant_provider_broker_set_error_tests.cpp
index 37d429d..b6bc596 100644
--- a/tests/provider/enchant_provider_broker_set_error_tests.cpp
+++ b/tests/provider/enchant_provider_broker_set_error_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 

 #include "EnchantBrokerTestFixture.h"

diff --git a/tests/provider/enchant_provider_dict_set_error_tests.cpp b/tests/provider/enchant_provider_dict_set_error_tests.cpp
index e818c43..834a3f2 100644
--- a/tests/provider/enchant_provider_dict_set_error_tests.cpp
+++ b/tests/provider/enchant_provider_dict_set_error_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 #include "EnchantDictionaryTestFixture.h"

 

diff --git a/tests/provider/enchant_provider_get_prefix_dir_tests.cpp b/tests/provider/enchant_provider_get_prefix_dir_tests.cpp
index dddf3fb..34caa9f 100644
--- a/tests/provider/enchant_provider_get_prefix_dir_tests.cpp
+++ b/tests/provider/enchant_provider_get_prefix_dir_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 #include <glib.h>

 #include <string.h>

diff --git a/tests/provider/enchant_provider_get_user_config_dirs_tests.cpp b/tests/provider/enchant_provider_get_user_config_dirs_tests.cpp
index bfa0515..33e81a4 100644
--- a/tests/provider/enchant_provider_get_user_config_dirs_tests.cpp
+++ b/tests/provider/enchant_provider_get_user_config_dirs_tests.cpp
@@ -20,7 +20,7 @@
  */

 

 #include "EnchantTestFixture.h"

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 #include <string.h>

 

diff --git a/tests/provider/enchant_provider_get_user_language_tests.cpp b/tests/provider/enchant_provider_get_user_language_tests.cpp
index aba1433..cf3de52 100644
--- a/tests/provider/enchant_provider_get_user_language_tests.cpp
+++ b/tests/provider/enchant_provider_get_user_language_tests.cpp
@@ -19,7 +19,7 @@
  * THE SOFTWARE.

  */

 

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <enchant-provider.h>

 #include <glib.h>

 #include <string.h>

diff --git a/tests/pwl/enchant_pwl_tests.cpp b/tests/pwl/enchant_pwl_tests.cpp
index c6a51e7..5dc1562 100644
--- a/tests/pwl/enchant_pwl_tests.cpp
+++ b/tests/pwl/enchant_pwl_tests.cpp
@@ -20,7 +20,7 @@
  */

 

 #include <unistd.h>

-#include <UnitTest++.h>

+#include <UnitTest++/UnitTest++.h>

 #include <stdio.h>

 #include <enchant.h>

 #include <enchant-provider.h>