--- rpl/configure.ac	2011/10/03 15:57:51	1.3
+++ rpl/configure.ac	2011/10/05 13:14:17	1.5
@@ -196,6 +196,17 @@ AC_SUBST(ABI)
 AC_SUBST(RPLCAS)
 AC_SUBST(LIBRPLCAS)
 
+AC_ARG_ENABLE(shared-memory,
+[  --enable-shared-memory  enable shared memory [[default=yes]]], [
+if test "$enableval" = "no"; then
+	SHARED_MEMORY="-USHARED_MEMORY"
+else
+	SHARED_MEMORY="-DSHARED_MEMORY"
+fi],[
+	SHARED_MEMORY="-USHARED_MEMORY"])
+
+AC_SUBST(SHARED_MEMORY)
+
 dnl Options
 AC_ARG_ENABLE(optimization,
 [  --enable-optimization   set compiler flags [[default=environment variables -O3]]], [
@@ -1078,7 +1089,6 @@ DATE=$(env LC_ALL=C date +'%A %x, %X %Z'
 MALLOC=
 
 case $OS in
-
     Darwin)
 		EXPORT_DYNAMIC=-Wl,-flat_namespace
 		NESTED_FUNCTIONS=-fnested-functions
@@ -1201,9 +1211,23 @@ case $OS in
 		C_STANDARD=-std=gnu99
 		ELF=
 	break ;;
+esac
 
+case $OS in
+    OS2)
+		WHOLE_LIB1=""
+		WHOLE_LIB2=""
+	break ;;
+
+	*)
+		WHOLE_LIB1="-Wl,-whole-archive"
+		WHOLE_LIB2="-Wl,-no-whole-archive"
+	break ;;
 esac
 
+AC_SUBST(WHOLE_LIB1)
+AC_SUBST(WHOLE_LIB2)
+
 AC_SUBST(C_STANDARD)
 AC_SUBST(EXPORT_DYNAMIC)
 AC_SUBST(NESTED_FUNCTIONS)