Merge latest Disobedience changes

[disorder] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 2c008a91f97bd0acfd0bbbf4a9b8d35abd95da42..9a11b7a350b4d98d6f877bfbf97a1ca74f4b4268 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,5 @@
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -95,10 +95,22 @@ AC_DEFUN([RJK_REQUIRE_PCRE_UTF8],[
                   ])],
                   [rjk_cv_pcre_utf8=yes],
                   [rjk_cv_pcre_utf8=no],
-                  [AC_MSG_ERROR([cross-compiling, cannot check libpcre behaviour])])
+                  [AC_MSG_WARN([cross-compiling, cannot check libpcre behaviour])])
     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],
+              [AS_HELP_STRING([--with-gcov],
+                              [Enable coverage testing])],
+              [if test $withval = yes; then
+                 CFLAGS="${CFLAGS} -O0 -fprofile-arcs -ftest-coverage"
+                 GCOV=`echo $CC | sed s'/gcc/gcov/;s/ .*$//'`;
+               fi])
+  AC_SUBST([GCOV],[$GCOV])
+])