--- rpl/Attic/configure.in	2010/03/18 21:42:55	1.13
+++ rpl/Attic/configure.in	2010/04/07 07:16:10	1.16
@@ -10,13 +10,13 @@ dnl Libraries
 NCURSES=ncurses-5.7-20100206
 READLINE=readline-6.1
 UNITS=units-1.87
-GSL=gsl-1.13
+GSL=gsl-1.14
 GPP=gpp-2.24
-GNUPLOT=gnuplot-4.2.6
+GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03
 ICONV=libiconv-1.13.1
-SQLITE=sqlite-3.6.22
-OPENSSL=openssl-0.9.8m
+SQLITE=sqlite-3.6.23.1
+OPENSSL=openssl-1.0.0
 
 dnl Checks for C compiler
 AC_PROG_CC(gcc-4.4 gcc)
@@ -119,12 +119,12 @@ AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [
 if test "$enableval" = "no"; then
 	FINAL_ENCODING="\$(shell locale charmap | \
-		$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"
+		\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"
 else
 	FINAL_ENCODING="$enable_final_encoding"
 fi],
 FINAL_ENCODING="\$(shell locale charmap | \
-	$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')")
+	\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')")
 
 AC_ARG_ENABLE(tex,
 [  --enable-tex            provide the TeX support [[default=guessed]]], [
@@ -266,7 +266,7 @@ if test ! -d "$srcdir"/tools/$SQLITE; th
 fi
 if test ! -d tools/$OPENSSL; then
 	gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
-			(cd tools && tar -xf - && cd $OPENSSL && ./config)
+			(cd tools && tar -xf -)
 fi
 
 AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)
@@ -770,7 +770,23 @@ AC_CONFIG_SUBDIRS(tools/$GPP)
 AC_CONFIG_SUBDIRS(tools/$FILE)
 AC_CONFIG_SUBDIRS(tools/$ICONV)
 AC_CONFIG_SUBDIRS(tools/$SQLITE)
-tools/$OPENSSL/config
+
+dnl Check for OpenSSL os/comp
+AC_ARG_WITH(openssl_arch,
+[  --with-openssl-arch=ARCH  specify os and compiler for openssl (ARCH or list)],
+[], [with_openssl_arch=none])
+
+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)
+	AC_MSG_ERROR([OS/COMP informations are required!])
+elif test "x$with_openssl_arch" = xlist; then
+	(cd tools/$OPENSSL && ./Configure)
+	AC_MSG_ERROR([Please specify OS and Architecture])
+else
+	(cd tools/$OPENSSL && ./Configure $with_openssl_arch)
+fi
 
 if test "$MYGNUPLOT" = "yes"; then
 	if test ! -d "$srcdir"/tools/$GNUPLOT; then