--- rpl/configure.ac	2011/10/04 19:32:33	1.4
+++ rpl/configure.ac	2011/11/17 19:29:36	1.9
@@ -2,7 +2,8 @@ dnl Process this file with autoconf to p
 AC_INIT([rpl],[4.1.4])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(silent-rules)
+AM_SILENT_RULES([yes])
 AC_SUBST(target_cpu)
 AC_CONFIG_HEADERS([rplconfig.h])
 
@@ -164,6 +165,17 @@ fi
 
 LDFLAGS="$LDFLAGS $ABI"
 
+AC_ARG_ENABLE(recursive,
+[  --enable-recursive      recursive configuration (default=yes)],[
+if test "$enableval" = "yes"; then
+	RECURSIVE=yes
+else
+	RECURSIVE=no
+fi],[
+	RECURSIVE=yes
+	]
+)
+
 AC_ARG_WITH(rpltools,
 [  --with-rpltools         specify rpltools path used for cross compilation],[
 if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then
@@ -196,17 +208,6 @@ 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]]], [
@@ -228,6 +229,37 @@ fi],[
 	]
 )
 
+AC_MSG_CHECKING([for usable shared memory])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM([#include <sys/shm.h>
+	 ],
+	[ return(0); ])],
+[SHARED_MEMORY=-DSHARED_MEMORY; AC_MSG_RESULT(yes)],
+[SHARED_MEMORY=-USHARED_MEMORY; AC_MSG_RESULT(no)]
+	)
+AC_SUBST(SHARED_MEMORY)
+
+AC_MSG_CHECKING([for pselect])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM([#include <sys/select.h>
+	 #include <unistd.h>
+	 #include <sys/time.h>
+	 #include <sys/types.h>
+	 ],
+	[
+	 struct timespec tv;
+	 fd_set s1, s2, s3;
+	 tv.tv_sec=1;
+	 tv.tv_nsec=0;
+	 FD_SET(1, &s1); FD_SET(2, &s2); FD_SET(3, &s3);
+	 pselect(5, &s1, &s2, &s3, &tv, NULL);
+	 return(0);
+	])],
+[PSELECT=-DPSELECT; AC_MSG_RESULT(yes)],
+[PSELECT=-UPSELECT; AC_MSG_RESULT(no)]
+	)
+AC_SUBST(PSELECT)
+
 AC_ARG_ENABLE(sysv-ipcs,
 [  --enable-sysv-ipcs      use SystemV IPC functions [[default=guessed]]], [
 if test "$enableval" = "no"; then
@@ -375,10 +407,13 @@ if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP
 			\$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a"
 	INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \
 			-I\$(top_builddir)/tools/$OPENMOTIF/lib \
-			-I\$(top_builddir)/tools/$LIBXPM/include"
+			-I\$(top_srcdir)/tools/$LIBXPM/include"
 	BUILD_OPENMOTIF="$LIBXPM $OPENMOTIF"
-	AC_CONFIG_SUBDIRS(tools/$LIBXPM)
-	AC_CONFIG_SUBDIRS(tools/$OPENMOTIF)
+
+	if test $RECURSIVE = yes; then
+		AC_CONFIG_SUBDIRS(tools/$LIBXPM)
+		AC_CONFIG_SUBDIRS(tools/$OPENMOTIF)
+	fi;
 fi
 
 AC_ARG_ENABLE(experimental,
@@ -1030,7 +1065,11 @@ if test "$MYGNUPLOT" = "yes"; then
 		gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \
 				(cd "$srcdir/tools" && tar -xf -)
 	fi
-	AC_CONFIG_SUBDIRS(tools/$GNUPLOT)
+
+	if test $RECURSIVE = yes; then
+		AC_CONFIG_SUBDIRS(tools/$GNUPLOT)
+	fi
+
 	GNUPLOT_COMPILATION=$GNUPLOT
 else
 	GNUPLOT_COMPILATION=
@@ -1089,7 +1128,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
@@ -1212,9 +1250,26 @@ case $OS in
 		C_STANDARD=-std=gnu99
 		ELF=
 	break ;;
+esac
+
+case $OS in
+    OS2)
+		WHOLE_LIB1=""
+		WHOLE_LIB2=""
+		LIB_PREFIX=""
+	break ;;
 
+	*)
+		WHOLE_LIB1="-Wl,-whole-archive"
+		WHOLE_LIB2="-Wl,-no-whole-archive"
+		LIB_PREFIX="lib"
+	break ;;
 esac
 
+AC_SUBST(WHOLE_LIB1)
+AC_SUBST(WHOLE_LIB2)
+AC_SUBST(LIB_PREFIX)
+
 AC_SUBST(C_STANDARD)
 AC_SUBST(EXPORT_DYNAMIC)
 AC_SUBST(NESTED_FUNCTIONS)
@@ -1259,15 +1314,17 @@ AC_SUBST(FFLAGS)
 AC_SUBST(FCFLAGS)
 AC_SUBST(LDFLAGS)
 
-AC_CONFIG_SUBDIRS(tools/$NCURSES)
-AC_CONFIG_SUBDIRS(tools/$READLINE)
-AC_CONFIG_SUBDIRS(tools/$GSL)
-AC_CONFIG_SUBDIRS(tools/$GPP)
-AC_CONFIG_SUBDIRS(tools/$FILE)
-AC_CONFIG_SUBDIRS(tools/$ICONV)
-AC_CONFIG_SUBDIRS(tools/$SQLITE)
-AC_CONFIG_SUBDIRS(tools/$UNITS)
-AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
+if test $RECURSIVE = yes; then
+	AC_CONFIG_SUBDIRS(tools/$NCURSES)
+	AC_CONFIG_SUBDIRS(tools/$READLINE)
+	AC_CONFIG_SUBDIRS(tools/$GSL)
+	AC_CONFIG_SUBDIRS(tools/$GPP)
+	AC_CONFIG_SUBDIRS(tools/$FILE)
+	AC_CONFIG_SUBDIRS(tools/$ICONV)
+	AC_CONFIG_SUBDIRS(tools/$SQLITE)
+	AC_CONFIG_SUBDIRS(tools/$UNITS)
+	AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
+fi
 
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(COPYING)