Merge bits of r4887: Add bits from libvarnish to libvarnishapi for improved stand-alone-ish-ness.

git-svn-id: http://www.varnish-cache.org/svn/branches/2.1@5400 d4fa192b-c00b-0410-8231-f00ffab90ce4

lib/libvarnishapi/Makefile.am

 # $Id$
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
 
 lib_LTLIBRARIES = libvarnishapi.la
 
 libvarnishapi_la_LDFLAGS = -version-info 1:0:0
 
 libvarnishapi_la_SOURCES = \
+	../libvarnish/assert.c \
+	../libvarnish/vre.c \
 	base64.c \
 	instance.c \
 	shmlog.c
 
 libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
+
+libvarnishapi_la_LIBADD = @PCRE_LIBS@