--- rpl/Attic/configure.in	2010/05/07 09:17:52	1.23
+++ rpl/Attic/configure.in	2010/07/31 10:34:15	1.31
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.0.15])
+AC_INIT([rpl],[4.0.18])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -7,32 +7,39 @@ AC_SUBST(target_cpu)
 AC_CONFIG_HEADERS([rplconfig.h])
 
 dnl Libraries
-NCURSES=ncurses-5.7-20100206
+NCURSES=ncurses-5.7-20100619
 READLINE=readline-6.1
-UNITS=units-1.87
+UNITS=units-1.88
 GSL=gsl-1.14
 GPP=gpp-2.24
 GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.6.23.1
-OPENSSL=openssl-1.0.0
+SQLITE=sqlite-3.7.0
+OPENSSL=openssl-1.0.0a
 
 dnl Checks for C compiler
-AC_PROG_CC(gcc-4.4 gcc)
+AC_PROG_CC(gcc)
+
+EXT_SQL=
 
 if test x"$CC" != x""; then
 	GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			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
+				AC_MSG_ERROR([Cannot find decent or recent gcc (gcc-4.2 or better)!])
+			fi
 		fi
 	fi
 fi
@@ -44,21 +51,21 @@ if test "$GCC" != yes; then
 fi
 
 dnl Checks for C++ compiler
-AC_PROG_CXX(g++-4.4 g++)
+AC_PROG_CXX(g++)
 
 if test "$GXX" != yes; then
 	AC_MSG_ERROR([Cannot find g++! You have to install it.])
 fi
 
 dnl Checks for Fortran 77 compiler
-AC_PROG_F77(gfortran-4.4 gfortran)
+AC_PROG_F77(gfortran)
 
 if test "$F77" != gfortran -a "$F77" != gfortran-4.4; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi
 
 dnl Check for Fortran 9* compiler
-AC_PROG_FC(gfortran-4.4 gfortran)
+AC_PROG_FC(gfortran)
 
 if test "$FC" != gfortran -a "$FC" != gfortran-4.4; then
 	AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
@@ -69,13 +76,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
+				AC_MSG_ERROR([Cannot find decent or recent gfortran (gfortran-4.3 or better)!])
+			fi
 		fi
 	fi
 fi
@@ -115,6 +126,15 @@ fi],[
 	]
 )
 
+AC_ARG_ENABLE(full-static,
+[  --enable-full-static    build static RPL/2 engine [[default=shared]]], [
+if test "$enableval" = "no"; then
+	STATIC=no
+else
+	STATIC=yes
+fi],
+STATIC=no)
+
 AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [
 if test "$enableval" = "no"; then
@@ -204,10 +224,13 @@ EXPERIMENTAL_CODE="-UEXPERIMENTAL_CODE")
 AC_ARG_ENABLE(debug,
 [  --enable-debug          enable debug code [[default=no]]], [
 if test "$enableval" = "no"; then
-	DEBUG=""
+	DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"
 else
-	DEBUG="-DDEBUG_MEMOIRE"
-fi], [DEBUG=""])
+	DEBUG="-DDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC=""
+fi], [DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS"
+	MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a"])
 
 AC_ARG_ENABLE(profile,
 [  --enable-profile        enable profile code [[default=no]]], [
@@ -458,11 +481,11 @@ AC_ARG_WITH(mysql,
 
 if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then
 	libMySQLinc="-I/usr/include"
-	libMySQLlib="-L/usr/lib"
+	libMySQLlib="/usr/lib"
 
 	AC_MSG_CHECKING(for libmysql includes in /usr/include)
 	saved_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $libMySQLinc"
+	CFLAGS="$CFLAGS -L/$libMySQLinc"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
 					libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
 	CFLAGS=$saved_CFLAGS
@@ -501,7 +524,7 @@ if test "x$with_mysql" = xcheck -o "x$wi
 else
 	if test "x$with_mysql" != xno; then
 		libMySQLinc="-I$with_mysql/include"
-		libMySQLlib="-L$with_mysql/lib"
+		libMySQLlib="$with_mysql/lib"
 
 		AC_MSG_CHECKING(for libmysql includes in $with_mysql)
 		saved_CFLAGS="$CFLAGS"
@@ -530,10 +553,19 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
 	if test $MYSQL_LIB = no; then
 		AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib)
 		saved_LIBS="$LIBS"
-		LIBS="$LIBS $libMySQLlib $libMySQLinc -lmysqlclient_r"
+		if test $STATIC = no; then
+			LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"
+		else
+			LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc"
+		fi
 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[MYSQL mysql; mysql_init(&mysql);]])],[AC_MSG_RESULT([yes]); MYSQL_LIB="yes"],[AC_MSG_RESULT([no]); MYSQL_LIB="no"])
 		LIBS=$saved_LIBS;
-		libMySQLlib="$libMySQLlib -lmysqlclient_r"
+		if test $STATIC = no; then
+			libMySQLlib="-L/$libMySQLlib -lmysqlclient_r"
+		else
+			libMySQLlib="$libMySQLlib/libmysqlclient_r.a"
+			EXT_SQL="$EXT_SQL $libMySQLlib"
+		fi
 	fi
 
 	if test $MYSQL_LIB = no; then
@@ -560,7 +592,7 @@ AC_ARG_WITH(postgresql,
 
 if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then
 	libPgSQLinc="-I/usr/include"
-	libPgSQLlib="-L/usr/lib"
+	libPgSQLlib="/usr/lib"
 
 	AC_MSG_CHECKING(for libpq includes in /usr/include)
 	saved_CFLAGS="$CFLAGS"
@@ -628,7 +660,7 @@ if test "x$with_postgresql" = xcheck -o
 else
 	if test "x$with_postgresql" != xno; then
 		libPgSQLinc="-I$with_postgresql/include"
-		libPgSQLlib="-L$with_postgresql/lib"
+		libPgSQLlib="$with_postgresql/lib"
 
 		AC_MSG_CHECKING(for libpq includes in $libPgSQLinc)
 		saved_CFLAGS="$CFLAGS"
@@ -670,11 +702,20 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
 	if test $POSTGRESQL_LIB = no; then
 		AC_MSG_CHECKING(for libpq libraries in $libPgSQLlib)
 		saved_LIBS="$LIBS"
-		LIBS="$LIBS $libPgSQLlib $libPgSQLinc -lpq"
+		if test $STATIC = no; then
+			LIBS="$LIBS -L/$libPgSQLlib $libPgSQLinc -lpq"
+		else
+			LIBS="$LIBS $libPgSQLlib/libpq.a $libPgSQLinc"
+		fi
 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "libpq-fe.h"]], [[PGconn *conn; const char *conninfo="dbname=postgres"; conn =
 			 PQconnectdb(conninfo);]])],[AC_MSG_RESULT([yes]); POSTGRESQL_LIB="yes"],[AC_MSG_RESULT([no]); POSTGRESQL_LIB="no"])
 		LIBS=$saved_LIBS;
-		libPgSQLlib="$libPgSQLlib -lpq"
+		if test $STATIC = no; then
+			libPgSQLlib="-L/$libPgSQLlib -lpq"
+		else
+			libPgSQLlib="$libPgSQLlib/libpq.a"
+			EXT_SQL="$EXT_SQL $libPgSQLlib"
+		fi
 	fi
 fi
 
@@ -833,6 +874,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)
@@ -872,6 +914,8 @@ AC_SUBST(OPENSSL)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
 AC_SUBST(DATE_FR)
+AC_SUBST(MALLOC)
+AC_SUBST(EXT_SQL)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)