Merge branch 'privlibdir'

bin/varnishtest/tests/m00000.vtc

@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so.1" ;
+	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 
 	sub vcl_deliver {
 		set resp.http.foo = std.toupper(resp.http.foo);

bin/varnishtest/tests/m00001.vtc

@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-pthread_pools=1" -vcl+backend {
-	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so.1" ;
+	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 
 	sub vcl_deliver {
 		set resp.http.foo = std.toupper(resp.http.foo);

bin/varnishtest/tests/m00002.vtc

@@ -11,7 +11,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so.1" ;
+	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 
 	sub vcl_fetch {
 		set beresp.http.rnd1 = std.random(0,1);

lib/libvarnish/Makefile.am

 INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
 
-lib_LTLIBRARIES = libvarnish.la
+pkglib_LTLIBRARIES = libvarnish.la
 
-libvarnish_la_LDFLAGS = -version-info 1:0:0
+libvarnish_la_LDFLAGS = -avoid-version
 
 libvarnish_la_SOURCES = \
 	argv.c \

lib/libvarnishcompat/Makefile.am

@@ -2,9 +2,9 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = libvarnishcompat.la
+pkglib_LTLIBRARIES = libvarnishcompat.la
 
-libvarnishcompat_la_LDFLAGS = -version-info 1:0:0
+libvarnishcompat_la_LDFLAGS = -avoid-version
 
 libvarnishcompat_la_SOURCES = \
 	daemon.c \

lib/libvcl/Makefile.am

@@ -2,9 +2,9 @@
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
 
-lib_LTLIBRARIES = libvcl.la
+pkglib_LTLIBRARIES = libvcl.la
 
-libvcl_la_LDFLAGS = -version-info 1:0:0
+libvcl_la_LDFLAGS = -avoid-version
 
 libvcl_la_SOURCES = \
 	vcc_priv.h \

lib/libvcl/vcc_vmod.c

@@ -98,7 +98,7 @@ vcc_ParseImport(struct vcc *tl)
 		bprintf(fn, "%s", tl->t->dec);
 		vcc_NextToken(tl);
 	} else {
-		bprintf(fn, "%s/libvmod_%.*s.so.1", tl->vmod_dir, PF(mod));
+		bprintf(fn, "%s/libvmod_%.*s.so", tl->vmod_dir, PF(mod));
 	}
 
 	Fh(tl, 0, "static void *VGC_vmod_%.*s;\n", PF(mod));

lib/libvgz/Makefile.am

 # $Id$
 
-lib_LTLIBRARIES = libvgz.la
+pkglib_LTLIBRARIES = libvgz.la
 
-libvgz_la_LDFLAGS = -version-info 1:0:0
+libvgz_la_LDFLAGS = -avoid-version
 libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 $(libvgz_extra_cflags)
 
 libvgz_la_SOURCES = \

lib/libvmod_std/Makefile.am

@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
 vmoddir = $(pkglibdir)/vmods
 vmod_LTLIBRARIES = libvmod_std.la
 
-libvmod_std_la_LDFLAGS = -version-info 1:0:0
+libvmod_std_la_LDFLAGS = -avoid-version
 
 libvmod_std_la_SOURCES = \
 	vcc_if.c \