--- rpl/Attic/configure	2011/10/02 14:14:29	1.87
+++ rpl/Attic/configure	2011/10/05 13:14:17	1.90
@@ -639,6 +639,8 @@ SEMAPHORES_NOMMES
 NESTED_FUNCTIONS
 EXPORT_DYNAMIC
 C_STANDARD
+WHOLE_LIB2
+WHOLE_LIB1
 OS
 HOST
 GNUPLOT_COMPILATION
@@ -673,9 +675,11 @@ LN_S
 RUNPATH
 PROFILAGE
 subdirs
+SHARED_MEMORY
 LIBRPLCAS
 RPLCAS
 ABI
+RPLTOOLS
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -790,7 +794,9 @@ enable_dependency_tracking
 with_x
 with_32bits_abi
 with_64bits_abi
-with_rplcas
+with_rpltools
+enable_rplcas
+enable_shared_memory
 enable_optimization
 enable_sysv_ipcs
 enable_full_static
@@ -1464,6 +1470,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-rplcas         compile rplcas (default=no)
+  --enable-shared-memory  enable shared memory [default=yes]
   --enable-optimization   set compiler flags [default=environment variables -O3]
   --enable-sysv-ipcs      use SystemV IPC functions [default=guessed]
   --enable-full-static    build static RPL/2 engine [default=shared]
@@ -1484,7 +1492,7 @@ Optional Packages:
   --with-x                use the X Window System
   --with-32bits-abi       force 32bits ABI (multilib)
   --with-64bits-abi       force 64bits ABI (multilib)
-  --with-rplcas           compile rplcas (default=no)
+  --with-rpltools         specify rpltools path used for cross compilation
   --with-mysql=PATH         specify directory for installed mysql
   --with-postgresql=PATH    specify directory for installed postgresql
   --with-bourne-shell=PATH  specify path for OS/2 bourne shell
@@ -4838,10 +4846,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-if test "$F77" != gfortran -a "$F77" != gfortran-4.4; then
-	as_fn_error $? "Cannot find gfortran! You have to install it." "$LINENO" 5
-fi
-
 ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
@@ -5049,7 +5053,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-if test "$FC" != gfortran -a "$FC" != gfortran-4.4; then
+if test x"$F77" == x; then
+	as_fn_error $? "Cannot find gfortran! You have to install it." "$LINENO" 5
+fi
+
+if test x"$FC" == x; then
 	as_fn_error $? "Cannot find gfortran! You have to install it." "$LINENO" 5
 fi
 
@@ -5947,10 +5955,28 @@ fi
 LDFLAGS="$LDFLAGS $ABI"
 
 
-# Check whether --with-rplcas was given.
-if test "${with_rplcas+set}" = set; then :
-  withval=$with_rplcas;
-if test "$with-rplcas" = "no"; then
+# Check whether --with-rpltools was given.
+if test "${with_rpltools+set}" = set; then :
+  withval=$with_rpltools;
+if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then
+	as_fn_error $? "You have to specify rpltools path !" "$LINENO" 5
+else
+	RPLTOOLS=$with_rpltools
+fi
+else
+
+	RPLTOOLS=\$\(top_builddir\)
+
+
+fi
+
+
+
+
+# Check whether --enable-rplcas was given.
+if test "${enable_rplcas+set}" = set; then :
+  enableval=$enable_rplcas;
+if test "$enableval" = "no"; then
 	RPLCAS=-URPLCAS
 	LIBRPLCAS=
 else
@@ -5970,6 +5996,22 @@ fi
 
 
 
+# Check whether --enable-shared-memory was given.
+if test "${enable_shared_memory+set}" = set; then :
+  enableval=$enable_shared_memory;
+if test "$enableval" = "no"; then
+	SHARED_MEMORY="-USHARED_MEMORY"
+else
+	SHARED_MEMORY="-DSHARED_MEMORY"
+fi
+else
+
+	SHARED_MEMORY="-USHARED_MEMORY"
+fi
+
+
+
+
 # Check whether --enable-optimization was given.
 if test "${enable_optimization+set}" = set; then :
   enableval=$enable_optimization;
@@ -5999,12 +6041,15 @@ fi
 if test "${enable_sysv_ipcs+set}" = set; then :
   enableval=$enable_sysv_ipcs;
 if test "$enableval" = "no"; then
-	IPCS_SYSV=no
+	IPCS_SYSV=-UIPCS_SYSV
+	POSIX_IPCS=no
 else
-	IPCS_SYSV=yes
+	IPCS_SYSV=-DIPCS_SYSV
+	POSIX_IPCS=yes
 fi
 else
   REG=$LDFLAGS
+POSIX_IPCS=guessed
 LDFLAGS=-lrt
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX semaphores and shared objects" >&5
 $as_echo_n "checking for POSIX semaphores and shared objects... " >&6; }
@@ -6053,7 +6098,7 @@ LDFLAGS=$REG
 fi
 
 
-if test "$IPCS_SYSV" = "-UIPCS_SYSV"; then
+if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then
 REG=$LDFLAGS
 LDFLAGS=-pthread
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX anonymous semaphores" >&5
@@ -9222,7 +9267,7 @@ fi
 
 
 
-HOST=$host
+HOST=$target
 
 
 my_save_cflags="$CFLAGS"
@@ -9324,7 +9369,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
@@ -9447,11 +9491,25 @@ 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
 
 
 
+
+
+