--- rpl/Attic/configure	2010/07/31 10:34:15	1.30
+++ rpl/Attic/configure	2010/08/06 15:27:40	1.31
@@ -3211,7 +3211,7 @@ GPP=gpp-2.24
 GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.7.0
+SQLITE=sqlite-3.7.0.1
 OPENSSL=openssl-1.0.0a
 
 ac_ext=c
@@ -6083,6 +6083,7 @@ fi
 if test ! -d "$srcdir"/tools/$SQLITE; then
 	gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf -)
+	(cd "$srcdir/tools"/$SQLITE && gunzip -c ../$SQLITE.diff.gz | patch -p1)
 fi
 if test ! -d tools/$OPENSSL; then
 	gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
@@ -8885,8 +8886,6 @@ fi
 done
 
 
-ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static"
-
 
 
 subdirs="$subdirs tools/$NCURSES"
@@ -8915,16 +8914,20 @@ else
 fi
 
 
-if test "x$with_openssl_arch" = xnone; then
-	(cd tools/$OPENSSL && ./config)
-elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then
-	(cd tools/$OPENSSL && ./Configure)
-	as_fn_error "OS/COMP informations are required!" "$LINENO" 5
-elif test "x$with_openssl_arch" = xlist; then
-	(cd tools/$OPENSSL && ./Configure)
-	as_fn_error "Please specify OS and Architecture" "$LINENO" 5
+if test $(uname) = "OS/2"; then
+	(cd tools/$OPENSSL && os2/OS2-EMX.cmd)
 else
-	(cd tools/$OPENSSL && ./Configure $with_openssl_arch)
+	if test "x$with_openssl_arch" = xnone; then
+		(cd tools/$OPENSSL && ./config)
+	elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then
+		(cd tools/$OPENSSL && ./Configure)
+		as_fn_error "OS/COMP informations are required!" "$LINENO" 5
+	elif test "x$with_openssl_arch" = xlist; then
+		(cd tools/$OPENSSL && ./Configure)
+		as_fn_error "Please specify OS and Architecture" "$LINENO" 5
+	else
+		(cd tools/$OPENSSL && ./Configure $with_openssl_arch)
+	fi
 fi
 
 if test "$MYGNUPLOT" = "yes"; then
@@ -8997,28 +9000,47 @@ DATE=$(env LC_ALL=C date +'%A %x, %X %Z'
 case $OS in
 
     Darwin)
-		EXPORT_DYNAMIC=-flat_namespace
+		EXPORT_DYNAMIC=-Wl,-flat_namespace
 		NESTED_FUNCTIONS=-fnested-functions
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
 		CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING"
+		ac_configure_args="$ac_configure_args --with-readline=builtin \
+				--disable-shared --enable-static"
 	break ;;
 
-	Cygwin)
-		EXPORT_DYNAMIC=--export-all-symbols
+    Cygwin)
+		EXPORT_DYNAMIC=-Wl,--export-all-symbols
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+		ac_configure_args="$ac_configure_args --with-readline=builtin \
+				--disable-shared --enable-static"
 	break ;;
 
-	AIX)
-		EXPORT_DYNAMIC=--export-dynamic
+    AIX)
+		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES
+		ac_configure_args="$ac_configure_args --with-readline=builtin \
+				--disable-shared --enable-static"
 	break ;;
 
+    OS/2)
+		MALLOC=
+		OS=OS2
+		FINAL_ENCODING=UTF-8
+		NESTED_FUNCTIONS=
+		EXPORT_DYNAMIC=-Zmap
+		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+		ac_configure_args="$ac_configure_args --without-readline \
+				--without-cairo --disable-shared --enable-static"
+	break;;
+
     *)
-		EXPORT_DYNAMIC=--export-dynamic
+		EXPORT_DYNAMIC=-Wl,--export-dynamic
 		NESTED_FUNCTIONS=
 		SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
+		ac_configure_args="$ac_configure_args --with-readline=builtin \
+				--disable-shared --enable-static"
 	break ;;
 
 esac