generate libavahi-glib soname automatically

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1046 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-sharp/Makefile.am b/avahi-sharp/Makefile.am
index 524f39d788251268a89e452b88429df58076b937..cd07a126af13f9d6bbc2c9b65ce48692dc7bfba2 100644 (file)
--- a/avahi-sharp/Makefile.am
+++ b/avahi-sharp/Makefile.am
@@ -53,7 +53,8 @@ $(ASSEMBLY): $(AVAHISOURCES)
 
 $(ASSEMBLY).config: $(ASSEMBLY).config.in
        $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
-               $(top_builddir)/avahi-common/libavahi-common.la < $< > $@
+               $(top_builddir)/avahi-common/libavahi-common.la \
+               $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@
 
 if HAVE_MONO
 if HAVE_DBUS

diff --git a/avahi-sharp/avahi-sharp.dll.config.in b/avahi-sharp/avahi-sharp.dll.config.in
index adc696600c6374e22edddf57440047faad8c7dc7..5bae58facc3f2e1b3b37853de0bc8e6e033ed7e9 100644 (file)
--- a/avahi-sharp/avahi-sharp.dll.config.in
+++ b/avahi-sharp/avahi-sharp.dll.config.in
@@ -1,5 +1,5 @@
 <configuration>
   <dllmap dll="avahi-client" target="@CLIENT_DLNAME@"/>
   <dllmap dll="avahi-common" target="@COMMON_DLNAME@"/>
-  <dllmap dll="avahi-glib" target="libavahi-glib.so.1"/>
+  <dllmap dll="avahi-glib" target="@GLIB_DLNAME@"/>
 </configuration>

diff --git a/avahi-sharp/gencfg.sh b/avahi-sharp/gencfg.sh
index 1286c012f42e3a5cfd0441899cfb5cad6e7fa1e2..3486187783d80d18f5240d28a02c1d73103bc17b 100755 (executable)
--- a/avahi-sharp/gencfg.sh
+++ b/avahi-sharp/gencfg.sh
@@ -4,6 +4,9 @@
 client_dlname=$dlname
 . $2
 common_dlname=$dlname
+. $3
+glib_dlname=$dlname
 
 exec sed -e "s,@CLIENT_DLNAME\@,${client_dlname},g" \
-         -e "s,@COMMON_DLNAME\@,${common_dlname},g"
+         -e "s,@COMMON_DLNAME\@,${common_dlname},g" \
+         -e "s,@GLIB_DLNAME\@,${glib_dlname},g"