--- rpl/Attic/configure	2010/07/25 18:15:37	1.29
+++ rpl/Attic/configure	2010/07/31 10:34:15	1.30
@@ -596,6 +596,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+EXT_SQL
 MALLOC
 DATE_FR
 FINAL_ENCODING
@@ -758,6 +759,7 @@ enable_option_checking
 enable_dependency_tracking
 with_x
 enable_optimization
+enable_full_static
 enable_final_encoding
 enable_tex
 enable_vim
@@ -1424,6 +1426,7 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-optimization   set compiler flags [default=environment variables -O3]
+  --enable-full-static    build static RPL/2 engine [default=shared]
   --enable-final-encoding force final encoding [default=guessed]
   --enable-tex            provide the TeX support [default=guessed]
   --enable-vim            provide the vim support [default=guessed]
@@ -3202,13 +3205,13 @@ ac_config_headers="$ac_config_headers rp
 
 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
 
 ac_ext=c
@@ -4000,6 +4003,8 @@ fi
 
 
 
+EXT_SQL=
+
 if test x"$CC" != x""; then
 	GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
 			awk -F. '{ printf("%s", $1);}'`
@@ -5846,6 +5851,19 @@ else
 fi
 
 
+# Check whether --enable-full-static was given.
+if test "${enable_full_static+set}" = set; then :
+  enableval=$enable_full_static;
+if test "$enableval" = "no"; then
+	STATIC=no
+else
+	STATIC=yes
+fi
+else
+  STATIC=no
+fi
+
+
 # Check whether --enable-final-encoding was given.
 if test "${enable_final_encoding+set}" = set; then :
   enableval=$enable_final_encoding;
@@ -7030,12 +7048,12 @@ fi
 
 if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then
 	libMySQLinc="-I/usr/include"
-	libMySQLlib="-L/usr/lib"
+	libMySQLlib="/usr/lib"
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in /usr/include" >&5
 $as_echo_n "checking for libmysql includes in /usr/include... " >&6; }
 	saved_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $libMySQLinc"
+	CFLAGS="$CFLAGS -L/$libMySQLinc"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "mysql.h"
@@ -7149,7 +7167,7 @@ rm -f core conftest.err conftest.$ac_obj
 else
 	if test "x$with_mysql" != xno; then
 		libMySQLinc="-I$with_mysql/include"
-		libMySQLlib="-L$with_mysql/lib"
+		libMySQLlib="$with_mysql/lib"
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in $with_mysql" >&5
 $as_echo_n "checking for libmysql includes in $with_mysql... " >&6; }
@@ -7217,7 +7235,11 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql libraries in $libMySQLlib" >&5
 $as_echo_n "checking for libmysql libraries in $libMySQLlib... " >&6; }
 		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
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "mysql.h"
@@ -7239,7 +7261,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 		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
@@ -7271,7 +7298,7 @@ fi
 
 if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then
 	libPgSQLinc="-I/usr/include"
-	libPgSQLlib="-L/usr/lib"
+	libPgSQLlib="/usr/lib"
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in /usr/include" >&5
 $as_echo_n "checking for libpq includes in /usr/include... " >&6; }
@@ -7453,7 +7480,7 @@ rm -f core conftest.err conftest.$ac_obj
 else
 	if test "x$with_postgresql" != xno; then
 		libPgSQLinc="-I$with_postgresql/include"
-		libPgSQLlib="-L$with_postgresql/lib"
+		libPgSQLlib="$with_postgresql/lib"
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in $libPgSQLinc" >&5
 $as_echo_n "checking for libpq includes in $libPgSQLinc... " >&6; }
@@ -7553,7 +7580,11 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq libraries in $libPgSQLlib" >&5
 $as_echo_n "checking for libpq libraries in $libPgSQLlib... " >&6; }
 		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
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "libpq-fe.h"
@@ -7576,7 +7607,12 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 		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
 
@@ -8989,6 +9025,7 @@ esac
 
 
 
+