--- rpl/Attic/configure.in	2010/08/15 14:46:23	1.37
+++ rpl/Attic/configure.in	2010/12/09 11:01:46	1.49
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.0.18])
+AC_INIT([rpl],[4.0.20])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -12,11 +12,11 @@ READLINE=readline-6.1
 UNITS=units-1.88
 GSL=gsl-1.14
 GPP=gpp-2.24
-GNUPLOT=gnuplot-4.4.0
+GNUPLOT=gnuplot-4.4.2
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.7.0.1
-OPENSSL=openssl-1.0.0a
+SQLITE=sqlite-3.7.4
+OPENSSL=openssl-1.0.0c
 
 dnl Checks for C compiler
 AC_PROG_CC(gcc)
@@ -126,6 +126,15 @@ fi],[
 	]
 )
 
+AC_ARG_ENABLE(sysv-semaphores,
+[  --enable-sysv-ipcs      use SystemV IPC functions [[default=no]]], [
+if test "$enableval" = "no"; then
+	IPCS_SYSV=no
+else
+	IPCS_SYSV=yes
+fi],
+IPCS_SYSV=no)
+
 AC_ARG_ENABLE(full-static,
 [  --enable-full-static    build static RPL/2 engine [[default=shared]]], [
 if test "$enableval" = "no"; then
@@ -228,12 +237,9 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          enable debug code [[default=no]]], [
 if test "$enableval" = "no"; then
 	DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
-	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"
 else
 	DEBUG="-DDEBUG_MEMOIRE -UDEBUG_ERREURS"
-	MALLOC=""
-fi], [DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
-	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"])
+fi], [DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"])
 
 AC_ARG_ENABLE(profile,
 [  --enable-profile        enable profile code [[default=no]]], [
@@ -319,7 +325,10 @@ AC_PROG_RANLIB
 dnl Checks for nawk
 AC_CHECK_PROG(AWK, nawk, yes, no)
 if test "$AWK" = no; then
-	AC_MSG_ERROR([Can not find nawk !])
+	AC_CHECK_PROG(AWK, gawk, yes, no)
+	if test "$AWK" = no; then
+		AC_MSG_ERROR([Can not find nawk !])
+	fi
 fi
 
 dnl Checks for sed
@@ -749,6 +758,37 @@ AC_SUBST(POSTGRESQL_SUPPORT)
 AC_SUBST(libPgSQLinc)
 AC_SUBST(libPgSQLlib)
 
+# with_postgresql : check [pas défini], yes [uniquement --with],
+# no [--without], valeur [--with=valeur].
+AC_ARG_WITH(bourne_shell,
+[  --with-bourne-shell=PATH  specify path for OS/2 bourne shell],
+[], [with_bourne_shell=no])
+
+if test "x$with_bourne_shell" = xyes; then
+	AC_MSG_ERROR([You have to specify a valide shell path !])
+fi
+
+if test "x$with_bourne_shell" = xno; then
+	if test $(uname) = "OS/2"; then
+		AC_MSG_ERROR([With OS/2 or eComstation, you have to specify a valide shell path !])
+	fi
+
+	BSH_PATH=
+else
+	if test ! -x $with_bourne_shell; then
+		AC_MSG_ERROR([$with_bourne_shell is not executable !])
+	fi
+
+	if test $(uname) = "OS/2"; then
+		with_os2_bourne_shell=$(echo $with_bourne_shell | \
+				sed -e '1,$s/\//\\\\\\\\/g')
+		BSH_PATH=-DBOURNE_SHELL=\"\\\"$with_os2_bourne_shell\\\"\"
+	else
+		AC_MSG_WARN([--with-bourne-shell ignored])
+		BSH_PATH=
+	fi
+fi
+
 dnl Checks for sizes
 AC_CHECK_SIZEOF(void *, 4)
 AC_CHECK_SIZEOF(char, 1)
@@ -795,7 +835,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include
 #include <signal.h>
 int flag;
 void handler(int signal, siginfo_t *siginfo, void *context)
-{ flag = ((*siginfo).si_pid == getpid()) ? 0 : -1; }],
+{ flag = ((*siginfo).si_pid == getpid()) ? 0 : 1; }],
 [struct sigaction    action;
 action.sa_sigaction = handler;
 action.sa_flags = SA_SIGINFO;
@@ -913,7 +953,7 @@ case $OS in
 		EXPORT_DYNAMIC=-Wl,-flat_namespace
 		NESTED_FUNCTIONS=-fnested-functions
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+		IPCS_SYSV=-UIPCS_SYSV
 		CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING"
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
@@ -924,7 +964,7 @@ case $OS in
 		EXPORT_DYNAMIC=-Wl,--export-all-symbols
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+		IPCS_SYSV=-UIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
 		C_STANDARD=-std=gnu99
@@ -934,7 +974,7 @@ case $OS in
 		EXPORT_DYNAMIC=-Wl,--export-all-symbols
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+		IPCS_SYSV=-UIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
 		C_STANDARD=-std=gnu99
@@ -944,35 +984,34 @@ case $OS in
 		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+		IPCS_SYSV=-UIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
 		C_STANDARD=-std=gnu99
 	break ;;
 
     OS/2)
-		MALLOC=
-		if test FORCED_FINAL_ENCODING -eq 0; then \
+		if test $FORCED_FINAL_ENCODING -eq 0; then \
 			FINAL_ENCODING=CP850; \
 		fi;
 		OS=OS2
 		NESTED_FUNCTIONS=
 		EXPORT_DYNAMIC=-Zmap
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-DSEMAPHORES_SYSV
+		IPCS_SYSV=-DIPCS_SYSV
 		ac_configure_args="$ac_configure_args --without-readline \
 				--without-cairo --disable-shared --enable-static"
 		C_STANDARD=
 	break;;
 
 	OpenBSD)
-		if test FORCED_FINAL_ENCODING -eq 0; then \
+		if test $FORCED_FINAL_ENCODING -eq 0; then \
 			FINAL_ENCODING=UTF-8; \
 		fi;
 		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+		IPCS_SYSV=-DIPCS_SYSV
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
 		C_STANDARD=-std=gnu99
@@ -982,7 +1021,13 @@ case $OS in
 		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
-		SEMAPHORES_SYSV=-USEMAPHORES_SYSV
+
+		if test $IPCS_SYSV = no; then
+			IPCS_SYSV=-UIPCS_SYSV
+		else
+			IPCS_SYSV=-DIPCS_SYSV
+		fi
+
 		ac_configure_args="$ac_configure_args --with-readline=builtin \
 				--disable-shared --enable-static"
 		C_STANDARD=-std=gnu99
@@ -994,10 +1039,11 @@ AC_SUBST(C_STANDARD)
 AC_SUBST(EXPORT_DYNAMIC)
 AC_SUBST(NESTED_FUNCTIONS)
 AC_SUBST(SEMAPHORES_NOMMES)
-AC_SUBST(SEMAPHORES_SYSV)
+AC_SUBST(IPCS_SYSV)
 AC_SUBST(SEMUN)
 AC_SUBST(IPV6)
 AC_SUBST(BROKEN_SIGINFO)
+AC_SUBST(BSH_PATH)
 
 AC_SUBST(NCURSES)
 AC_SUBST(READLINE)
@@ -1012,7 +1058,6 @@ AC_SUBST(OPENSSL)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
 AC_SUBST(DATE_FR)
-AC_SUBST(MALLOC)
 AC_SUBST(EXT_SQL)
 
 AC_SUBST(CFLAGS)
@@ -1034,9 +1079,9 @@ AC_CONFIG_FILES(scripts/rpllink)
 AC_CONFIG_FILES(rpltags/Makefile)
 AC_CONFIG_FILES(rpliconv/Makefile)
 AC_CONFIG_FILES(rplsums/Makefile)
+AC_CONFIG_FILES(rplawk/Makefile)
 AC_CONFIG_FILES(lapack/lapack/Makefile)
 AC_CONFIG_FILES(lapack/blas/Makefile)
-AC_CONFIG_FILES(ptmalloc3/Makefile)
 
 AC_CONFIG_FILES(man/rpl.1)
 AC_CONFIG_FILES(man/rplcc.1)