[Box Backup-commit] COMMIT r1072 - box/chris/merge

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-16 20:26:51 +0100 (Mon, 16 Oct 2006)
New Revision: 1072

Modified:
   box/chris/merge/configure.ac
Log:
Different check for have_regex_h (the old one doesn't seem to work on MinGW).
(refs #3)


Modified: box/chris/merge/configure.ac
===================================================================
--- box/chris/merge/configure.ac	2006-10-16 19:25:18 UTC (rev 1071)
+++ box/chris/merge/configure.ac	2006-10-16 19:26:51 UTC (rev 1072)
@@ -94,13 +94,16 @@
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([execinfo.h process.h pwd.h regex.h signal.h])
+AC_CHECK_HEADERS([execinfo.h process.h pwd.h signal.h])
 AC_CHECK_HEADERS([syslog.h time.h])
 AC_CHECK_HEADERS([netinet/in.h])
 AC_CHECK_HEADERS([sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h])
 AC_CHECK_HEADERS([sys/uio.h sys/xattr.h])
 
-if test "$ac_cv_header_regex_h" = "yes"; then
+AC_CHECK_HEADER([regex.h], [have_regex_h=yes])
+
+if test "$have_regex_h" = "yes"; then
+  AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if regex.h is available])
   AC_SEARCH_LIBS([regcomp], ["pcreposix -lpcre"])
 fi
 
@@ -258,7 +261,7 @@
 without these features, but will work better where they are present. Refer
 to the documentation for more information on each feature.
 
-Regular expressions: $ac_cv_header_regex_h
+Regular expressions: $have_regex_h
 Large files:         $have_large_file_support
 Berkeley DB:         $ax_path_bdb_ok
 Readline:            $have_libreadline