summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--README14
1 files changed, 14 insertions, 0 deletions
diff --git a/README b/README
index a741783..a3d3ffc 100644
--- a/README
+++ b/README
@@ -93,6 +93,7 @@ The VCL code differs only in the call to dbrw.config in vcl_recv:
In order to compile the package you need to have installed
varnishd and varnishapi package.
+<<<<<<< HEAD
Supposing that condition is met, run:
@@ -104,6 +105,19 @@ important one is PKG_CONFIG_PATH, which contains a path (in the UNIX sense)
where the .pc files are located. It should contain a directory where the
'varnishapi.pc' file lives. Example usage:
+=======
+
+Supposing that condition is met, run:
+
+ ./configure
+
+It should be able to automatically find the necessary components. In case
+it doesn't, tweak the configuration variables as necessary. The most
+important one is PKG_CONFIG_PATH, which contains a path (in the UNIX sense)
+where the .pc files are located. It should contain a directory where the
+'varnishapi.pc' file lives. Example usage:
+
+>>>>>>> e0e3166a8bbe666414c2f0ee9c732f6254acf550
./configure PKG_CONFIG_PATH=/usr/local/varnish/lib/pkgconfig:$PKG_CONFIG_PATH
Please read the file INSTALL for a detailed discussion of available variables

Return to:

Send suggestions and report system problems to the System administrator.