michael@428: Index: configure michael@428: --- configure.orig 2011-12-11 17:22:11.000000000 +0100 michael@428: +++ configure 2011-12-24 11:54:19.000000000 +0100 michael@431: @@ -3630,10 +3630,6 @@ michael@428: $as_echo "$as_me: failed program was:" >&5 michael@428: sed 's/^/| /' conftest.$ac_ext >&5 michael@428: michael@428: -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@428: -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@428: -as_fn_error 77 "C compiler cannot create executables michael@428: -See \`config.log' for more details" "$LINENO" 5; } michael@428: else michael@428: { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 michael@428: $as_echo "yes" >&6; } michael@431: @@ -4759,10 +4759,7 @@ michael@428: if $ac_preproc_ok; then : michael@428: michael@428: else michael@428: - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 michael@428: -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} michael@428: -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check michael@428: -See \`config.log' for more details" "$LINENO" 5; } michael@428: + : michael@428: fi michael@428: michael@428: ac_ext=c michael@428: Index: pcreposix.h michael@428: --- pcreposix.h.orig 2010-05-16 18:17:23.000000000 +0200 michael@428: +++ pcreposix.h 2011-12-24 11:54:19.000000000 +0100 michael@428: @@ -133,6 +133,12 @@ michael@428: michael@428: /* The functions */ michael@428: michael@428: +/* link-time symbol namespace conflict prevention */ michael@428: +#define regcomp pcreposix_regcomp michael@428: +#define regexec pcreposix_regexec michael@428: +#define regerror pcreposix_regerror michael@428: +#define regfree pcreposix_regfree michael@428: + michael@428: PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); michael@428: PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, michael@428: regmatch_t *, int);