Commit 1eb241bd authored by Nils Goroll's avatar Nils Goroll

pull in pcre config from varnish master so pcre can be used from an alternative location

parent 5ac03fd0
......@@ -37,7 +37,34 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([pthread.h])
AC_CHECK_HEADERS([sys/resource.h])
AC_CHECK_HEADERS([pcre.h], [], [AC_MSG_ERROR([pcre development headers required to build this vmod, please install pcre-devel])])
if test -n $PKG_CONFIG; then
PKG_CHECK_MODULES([PCRE], [libpcre])
else
AC_CHECK_PROG(PCRE_CONFIG, pcre-config, pcre-config)
AC_ARG_WITH(pcre-config,
AS_HELP_STRING([--with-pcre-config=PATH],
[Location of PCRE pcre-config (auto)]),
[pcre_config="$withval"],
[pcre_config=""])
if test "x$pcre_config" != "x" ; then
AC_MSG_CHECKING(for $pcre_config)
if test -f $pcre_config ; then
PCRE_CONFIG=$pcre_config
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no - searching PATH)
fi
fi
if test "x$PCRE_CONFIG" = "x"; then
AC_CHECK_PROGS(PCRE_CONFIG, pcre-config)
fi
PCRE_CFLAGS=`$PCRE_CONFIG --cflags`
PCRE_LIBS=`$PCRE_CONFIG --libs`
fi
AC_SUBST(PCRE_CFLAGS)
AC_SUBST(PCRE_LIBS)
# Check for python
AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 python2.5 python2 python], [AC_MSG_ERROR([Python is needed to build this vmod, please install python.])])
......
INCLUDES = -I$(VARNISHSRC)/include -I$(VARNISHSRC)
AM_CPPFLAGS = -I$(VARNISHSRC)/include -I$(VARNISHSRC) @PCRE_CFLAGS@
vmoddir = $(VMODDIR)
vmod_LTLIBRARIES = libvmod_re.la
libvmod_re_la_LDFLAGS = -module -export-dynamic -avoid-version
libvmod_re_la_LIBADD = @PCRE_LIBS@
libvmod_re_la_SOURCES = \
vcc_if.c \
vcc_if.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment