diff --git a/common_lib/Makefile.am b/common_lib/Makefile.am
index 663eef1..95e6984 100644
--- a/common_lib/Makefile.am
+++ b/common_lib/Makefile.am
@@ -64,8 +64,9 @@ else
if BUILD_SOLARIS
-lib%.so.$(SONAME): lib%.a
- $(LD) $(SOLARIS_OPTS) $(call get_linker_add,$*) -G -whole-archive $^ -no-whole-archive -o $@
+lib%.so: lib%.a
+ $(LD) $(SOLARIS_OPTS) -G --whole-archive $^ --no-whole-archive -o $@.$(call get_soname,$*) \
+ $(LDFLAGS) $(LIBQB_LIBS) $(AM_LDFLAGS) $(call get_linker_add,$*)
ln -sf lib$*.so.$(call get_soname,$*) lib$*.so
ln -sf lib$*.so.$(call get_soname,$*) lib$*.so.$(call get_major,$*)
root@zd-build-s1:/export/builds/corosync# git diff common_lib/Makefile.am ^C
root@zd-build-s1:/export/builds/corosync# git diff include/corosync/coroapi.h
diff --git a/include/corosync/coroapi.h b/include/corosync/coroapi.h
index 6069c0d..6266b45 100644
--- a/include/corosync/coroapi.h
+++ b/include/corosync/coroapi.h
@@ -35,7 +35,7 @@
#define COROAPI_H_DEFINED
#include <stdio.h>
-#ifdef COROSYNC_BSD
+#if defined(COROSYNC_BSD) || defined(COROSYNC_SOLARIS)
#include <sys/uio.h>
#endif
#include <corosync/hdb.h>
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
