Add --with-regex=PATH build option #1974
Conversation
|
FTR: this build option is required to simplify MinGW cross-building of Squid for Windows. |
| dnl Look for libregex with regcomp() API | ||
| SQUID_AUTO_LIB(regex,[GNU Regex],[LIBREGEX]) | ||
| SQUID_CHECK_LIB_WORKS(regex,[ | ||
| PKG_CHECK_MODULES([LIBREGEX],[libregex],[:],[:]) |
There was a problem hiding this comment.
Hm.. what if the local install doesn't have a pkg-config file? For instance, my install of gnurx doesn't have one
There was a problem hiding this comment.
@kinkie, AFAICT, without pkg-config file, this PKG_CHECK_MODULES() call does nothing (but reporting) because its action-if-not-found is set to "do nothing" (i.e. :). The code below will add spaces to CPPFLAGS and LIBS (unless those LIBREGEX_FOO variables were set externally, I guess).
There was a problem hiding this comment.
Absent a relevant .pc file or when environment variables are preset this line has no effect.
This line exists solely for auto-detecting the cases when a libregex does provide a .pc file.
| @@ -2387,8 +2383,16 @@ AS_IF([test "x$enable_zph_qos" = "xyes"],[ | |||
| [Enable support for QOS netfilter mark preservation]) | |||
| ]) | |||
|
|
|||
| AC_CHECK_LIB(regex, regexec, [REGEXLIB="-lregex"],[REGEXLIB='']) | |||
| AC_SUBST(REGEXLIB) | |||
| dnl Look for libregex with regcomp() API | |||
There was a problem hiding this comment.
I do not see any regcomp() checks in added code; have I overlooked them?
AFAICT, removed code was checking for regexec(). If feasible, let's preserve that logic (in this PR). Otherwise, please adjust PR description to explain why we are changing what API we check.
| dnl Look for libregex with regcomp() API | ||
| SQUID_AUTO_LIB(regex,[GNU Regex],[LIBREGEX]) | ||
| SQUID_CHECK_LIB_WORKS(regex,[ | ||
| PKG_CHECK_MODULES([LIBREGEX],[libregex],[:],[:]) |
There was a problem hiding this comment.
@kinkie, AFAICT, without pkg-config file, this PKG_CHECK_MODULES() call does nothing (but reporting) because its action-if-not-found is set to "do nothing" (i.e. :). The code below will add spaces to CPPFLAGS and LIBS (unless those LIBREGEX_FOO variables were set externally, I guess).
| LIBS="$LIBREGEX_PATH $LIBREGEX_LIBS $LIBS" | ||
| AC_CHECK_HEADERS([regex.h],[ | ||
| LIBREGEX_LIBS="$LIBREGEX_PATH -lregex" |
There was a problem hiding this comment.
It looks odd that we are using LIBREGEX_LIBS to adjust LIBS and then modifying LIBREGEX_LIBS (while keeping the old value in LIBS). Why do we utilize this use-then-modify trick here?
And why does this linking-related LIBREGEX_LIBS manipulation depend on a C++ header presence (while other regex checks/adjustments do not)?
rousskov
added
the
S-waiting-for-author
A simple way to build with custom libregex paths instead of
forcing users to manually set build environment flags.
Currently only supports (re)implementations of GNU libregex.