--- rpl/Attic/configure.in	2010/07/25 18:15:37	1.30
+++ rpl/Attic/configure.in	2010/07/31 10:34:15	1.31
@@ -9,18 +9,20 @@ AC_CONFIG_HEADERS([rplconfig.h])
 dnl Libraries
 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
+SQLITE=sqlite-3.7.0
 OPENSSL=openssl-1.0.0a
 
 dnl Checks for C compiler
 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);}'`
@@ -124,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
@@ -470,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
@@ -513,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"
@@ -542,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
@@ -572,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"
@@ -640,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"
@@ -682,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
 
@@ -886,6 +915,7 @@ AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
 AC_SUBST(DATE_FR)
 AC_SUBST(MALLOC)
+AC_SUBST(EXT_SQL)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)