diff options
| author | Akira TAGOH <akira@tagoh.org> | 2012-04-20 20:04:17 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2012-04-20 20:12:24 +0900 |
| commit | 22dc5460906f78b3dc1b12ab2440e62b930adf0b (patch) | |
| tree | 8aefd08e552b3f79f64c2a5525f8a1352ec4fde4 | |
| parent | 9fa7b7c8f2d1d8a9c50f3ba0f99087f653b6a9b8 (diff) | |
Fix a build issue again when no regex functions available
Reported by Jon TURNEY
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/fcstr.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 9bb0988..62bc25e 100644 --- a/configure.in +++ b/configure.in @@ -138,11 +138,9 @@ AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol # # regex # -use_regex=0 if test "x$ac_cv_func_regcomp" = "xyes" -a "x$ac_cv_func_regerror" = "xyes" -a "x$ac_cv_func_regexec" = "xyes" -a "x$ac_cv_func_regfree"; then - use_regex=1 + AC_DEFINE(USE_REGEX,,[Use regex]) fi -AC_DEFINE_UNQUOTED(USE_REGEX,$use_regex,[Use regex.]) # # Checks for iconv diff --git a/src/fcstr.c b/src/fcstr.c index a6f0ba7..ae37ff0 100644 --- a/src/fcstr.c +++ b/src/fcstr.c @@ -306,7 +306,7 @@ _FcStrRegexCmp (const FcChar8 *s, const FcChar8 *regex, int cflags, int eflags) return ret == 0 ? FcTrue : FcFalse; } #else -# define _FcStrRegexCmp(_s_, _regex_) (FcFalse) +# define _FcStrRegexCmp(_s_, _regex_, _cflags_, _eflags_) (FcFalse) #endif FcBool |