Merge branch 'master' of ssh://git.gnu.org.ua/gitroot/vmod-dbrw

1 files changed, 14 insertions, 0 deletions

diff --git a/README b/README
index a741783..a3d3ffc 100644
--- a/README
+++ b/README
@@ -95,2 +95,3 @@ In order to compile the package you need to have installed
 varnishd and varnishapi package.
+<<<<<<< HEAD
 
@@ -106,2 +107,15 @@ where the .pc files are located. It should contain a directory where the
 
+=======
+
+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