--- rpl/Attic/configure	2010/05/07 09:17:52	1.22
+++ rpl/Attic/configure	2010/05/19 09:22:32	1.24
@@ -596,6 +596,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+MALLOC
 DATE_FR
 FINAL_ENCODING
 OPENSSL
@@ -3199,7 +3200,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
 ac_config_headers="$ac_config_headers rplconfig.h"
 
 
-NCURSES=ncurses-5.7-20100206
+NCURSES=ncurses-5.7-20100501
 READLINE=readline-6.1
 UNITS=units-1.87
 GSL=gsl-1.14
@@ -3216,7 +3217,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc-4.4 gcc
+  for ac_prog in gcc
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3260,7 +3261,7 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in gcc-4.4 gcc
+  for ac_prog in gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4004,13 +4005,18 @@ if test x"$CC" != x""; then
 			awk -F. '{ printf("%s", $1);}'`
 	GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
+	if test $GCC_VERSION_MAJEURE -ge 5; then
 		OPTIMISATION_C=-O3
 	else
-		if test $GCC_VERSION_MAJEURE -ge 5; then
+		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; \
+				then
 			OPTIMISATION_C=-O3
 		else
-			OPTIMISATION_C=-O2
+			if test $GCC_VERSION_MAJEURE -ge 2; then
+				OPTIMISATION_C=-O2
+			else
+				as_fn_error "Cannot find decent or recent gcc (gcc-4.2 or better)!" "$LINENO" 5
+			fi
 		fi
 	fi
 fi
@@ -4156,7 +4162,7 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++-4.4 g++
+  for ac_prog in g++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4200,7 +4206,7 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++-4.4 g++
+  for ac_prog in g++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4540,7 +4546,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran-4.4 gfortran
+  for ac_prog in gfortran
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4584,7 +4590,7 @@ fi
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in gfortran-4.4 gfortran
+  for ac_prog in gfortran
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4756,7 +4762,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran-4.4 gfortran
+  for ac_prog in gfortran
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4800,7 +4806,7 @@ fi
 fi
 if test -z "$FC"; then
   ac_ct_FC=$FC
-  for ac_prog in gfortran-4.4 gfortran
+  for ac_prog in gfortran
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4967,13 +4973,17 @@ if test x"$FC" != x""; then
 			awk -F. '{ printf("%s", $1);}'`
 	GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			awk -F. '{ printf("%s", $2);}'`
-	if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
+	if test $GCC_VERSION_MAJEURE -ge 5; then
 		OPTIMISATION_F=-O3
 	else
-		if test $GCC_VERSION_MAJEURE -ge 5; then
+		if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then
 			OPTIMISATION_F=-O3
 		else
-			OPTIMISATION_F=-O2
+			if test $GCC_VERSION_MAJEURE -ge 3; then
+				OPTIMISATION_F=-O2
+			else
+				as_fn_error "Cannot find decent or recent gfortran (gfortran-4.3 or better)!" "$LINENO" 5
+			fi
 		fi
 	fi
 fi
@@ -5993,12 +6003,15 @@ fi
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
 if test "$enableval" = "no"; then
-	DEBUG=""
+	DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"
 else
-	DEBUG="-DDEBUG_MEMOIRE"
+	DEBUG="-DDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC=""
 fi
 else
-  DEBUG=""
+  DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"
 fi
 
 
@@ -8951,6 +8964,7 @@ case $OS in
 		EXPORT_DYNAMIC=-flat_namespace
 		NESTED_FUNCTIONS=-fnested-functions
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+		CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING"
 	break ;;
 
 	Cygwin)
@@ -8975,6 +8989,7 @@ esac
 
 
 
+