unigbrk/uc-grapheme-breaks: Fix build failure

unigbrk/uc-grapheme-breaks: Fix build failure

[Bruno Haible]

This command fails:

$ ./gnulib-tool --test --with-tests --single-configure unigbrk/uc-grapheme-breaks
...
gllib/Makefile.am:1706: error: LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_BREAKS does not appear in AM_CONDITIONAL

After the type in the Makefile.am is fixed, there is another error:

../../gllib/unigbrk/uc-grapheme-breaks.c:25:20: fatal error: unistr.h: No such file or directory

Here's the fix:


2019-01-27  Bruno Haible  <bruno@clisp.org>

	unigbrk/uc-grapheme-breaks: Fix build failure.
	* lib/unigbrk/uc-grapheme-breaks.c: Don't include unistr.h.
	* modules/unigbrk/uc-grapheme-breaks (Makefile.am): Fix typo.

diff --git a/lib/unigbrk/uc-grapheme-breaks.c b/lib/unigbrk/uc-grapheme-breaks.c
index db3dca5..9ffd74a 100644
--- a/lib/unigbrk/uc-grapheme-breaks.c
+++ b/lib/unigbrk/uc-grapheme-breaks.c
@@ -22,8 +22,6 @@
 
 #include <string.h>
 
-#include "unistr.h"
-
 /* This is similar to u32_mbtouc_unsafe(), but doesn't check invalid
    characters.  */
 static int
diff --git a/modules/unigbrk/uc-grapheme-breaks b/modules/unigbrk/uc-grapheme-breaks
index 8c3379d..1e08088 100644
--- a/modules/unigbrk/uc-grapheme-breaks
+++ b/modules/unigbrk/uc-grapheme-breaks
@@ -14,7 +14,7 @@ gl_MODULE_INDICATOR([unigbrk/uc-grapheme-breaks])
 gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/uc-grapheme-breaks])
 
 Makefile.am:
-if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_BREAKS
+if LIBUNISTRING_COMPILE_UNIGBRK_UC_GRAPHEME_BREAKS
 lib_SOURCES += unigbrk/uc-grapheme-breaks.c
 endif