X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..af21fb6be8e226ce86b47ed923ee124e739ca48c:/acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 6df1aa3..287c256 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -17,9 +17,9 @@
 
 AC_DEFUN([RJK_FIND_GC_H],[
   AC_CACHE_CHECK([looking for <gc.h>],[rjk_cv_gc_h],[
-    AC_PREPROC_IFELSE([
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
 		       #include <gc.h>
-		      ],
+		      ],[])],
 		      [rjk_cv_gc_h="on default include path"],[
       oldCPPFLAGS="${CPPFLAGS}"
       for dir in /usr/include/gc /usr/local/include/gc; do
@@ -28,9 +28,9 @@ AC_DEFUN([RJK_FIND_GC_H],[
 	else
 	  CPPFLAGS="${oldCPPFLAGS} -I$dir"
 	fi
-	AC_PREPROC_IFELSE([
+	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
 			   #include <gc.h>
-			  ],
+			  ],[])],
 			  [rjk_cv_gc_h=$dir;break],[rjk_cv_gc_h="not found"])
       done
       CPPFLAGS="${oldCPPFLAGS}"
@@ -101,6 +101,44 @@ AC_DEFUN([RJK_REQUIRE_PCRE_UTF8],[
   fi
 ])
 
+AC_DEFUN([RJK_REQUIRE_PCRE2_UTF8],[
+  AC_CACHE_CHECK([whether libpcre2 was built with UTF-8 support],
+                 [rjk_cv_pcre_utf8],[
+    save_CFLAGS="$CFLAGS" save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $1" LIBS="$LIBS $2"
+    AC_RUN_IFELSE([AC_LANG_PROGRAM([
+                    #define PCRE2_CODE_UNIT_WIDTH 8
+                    #include <pcre2.h>
+                    #include <stdio.h>
+                  ],
+                  [
+                    pcre2_code *r;
+                    int errcode;
+                    int erroffset;
+                    char errbuf[[128]];
+
+                    r = pcre2_compile("\x80\x80", 2, PCRE2_UTF,
+                                     &errcode, &erroffset, 0);
+                    if(!r) {
+                      pcre2_get_error_message(errcode, errbuf, sizeof(errbuf));
+                      fprintf(stderr, "pcre2_compile: %s at %d",
+                              errbuf, erroffset);
+                      exit(0);
+                    } else {
+                      fprintf(stderr, "accepted bogus UTF-8 string\n");
+                      exit(1);
+                    }
+                  ])],
+                  [rjk_cv_pcre_utf8=yes],
+                  [rjk_cv_pcre_utf8=no],
+                  [AC_MSG_WARN([cross-compiling, cannot check libpcre2 behaviour])])
+    CFLAGS="$save_CFLAGS" LIBS="$save_LIBS"
+  ])
+  if test $rjk_cv_pcre_utf8 = no; then
+    AC_MSG_ERROR([please rebuild your pcre library with --enable-utf8])
+  fi
+])
+
 AC_DEFUN([RJK_GCOV],[
   GCOV=${GCOV:-true}
   AC_ARG_WITH([gcov],