--- rpl/Attic/configure.in	2010/02/11 14:18:15	1.7
+++ rpl/Attic/configure.in	2010/04/07 13:44:59	1.17
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.0.11])
+AC_INIT([rpl],[4.0.14])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -10,11 +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.23.1
+OPENSSL=openssl-1.0.0
 
 dnl Checks for C compiler
 AC_PROG_CC(gcc-4.4 gcc)
@@ -116,11 +118,13 @@ fi],[
 AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [
 if test "$enableval" = "no"; then
-	FINAL_ENCODING="\$(shell locale charmap)"
+	FINAL_ENCODING="\$(shell locale charmap | \
+		\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"
 else
 	FINAL_ENCODING="$enable_final_encoding"
 fi],
-FINAL_ENCODING="\$(shell locale charmap)")
+FINAL_ENCODING="\$(shell locale charmap | \
+	\$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')")
 
 AC_ARG_ENABLE(tex,
 [  --enable-tex            provide the TeX support [[default=guessed]]], [
@@ -201,18 +205,9 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          enable debug code [[default=no]]], [
 if test "$enableval" = "no"; then
 	DEBUG=""
-	DEBUG_CODE="-UDEBUG"
 else
-	AC_CHECK_LIB(efence, DEBUG="-lefence", DEBUG="")
-	DEBUG_CODE="-DDEBUG"
-	if test "$DEBUG" = ""; then
-		AC_MSG_WARN([Can not find efence! You may install it.
-Debug flag is disabled.
-])
-	fi
-fi], [
-DEBUG_CODE="-UDEBUG"
-DEBUG=""])
+	DEBUG="-DDEBUG_MEMOIRE"
+fi], [DEBUG=""])
 
 AC_ARG_ENABLE(profile,
 [  --enable-profile        enable profile code [[default=no]]], [
@@ -222,7 +217,6 @@ else
 	PROFILAGE="-pg"
 fi], [PROFILAGE=""])
 
-AC_SUBST(DEBUG_CODE)
 AC_SUBST(PROFILAGE)
 
 if test ! -d tools; then
@@ -251,23 +245,29 @@ fi
 if test ! -d "$srcdir"/tools/$FILE; then
 	gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf - )
+	TMP=$(mktemp)
 	(cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)
-	sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \
-		"$srcdir"/tools/$FILE/src/Makefile.am2
-	sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \
-		"$srcdir"/tools/$FILE/src/Makefile.am2 | \
+	sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP
+	sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \
 		sed 's/^file_/rplfile_/g' > \
 		"$srcdir"/tools/$FILE/src/Makefile.am
-	\rm -f "$srcdir"/tools/$FILE/src/Makefile.am2
-	sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \
-		"$srcdir"/tools/$FILE/magic/Makefile.am2
-	\mv -f "$srcdir"/tools/$FILE/magic/Makefile.am2 \
-		"$srcdir"/tools/$FILE/magic/Makefile.am
+	sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP
+	\mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am
+	(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \
+		&& aclocal && automake -af && autoconf);
 fi
 if test ! -d "$srcdir"/tools/$ICONV; then
 	gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
 			(cd "$srcdir/tools" && tar -xf -)
 fi
+if test ! -d "$srcdir"/tools/$SQLITE; then
+	gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \
+			(cd "$srcdir/tools" && tar -xf -)
+fi
+if test ! -d tools/$OPENSSL; then
+	gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
+			(cd tools && tar -xf -)
+fi
 
 AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)
 if test "$LIBTOOLIZE" = "no"; then
@@ -289,9 +289,6 @@ if test "$AUTOCONF" = "no"; then
 	AC_MSG_ERROR([Cannot find autoconf! You have to install it.])
 fi
 
-(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \
-		&& aclocal && automake -af && autoconf);
-
 dnl Default installation directory
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -315,10 +312,10 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-dnl Checks for awk
-AC_CHECK_PROG(AWK, awk, yes, no)
+dnl Checks for nawk
+AC_CHECK_PROG(AWK, nawk, yes, no)
 if test "$AWK" = no; then
-	AC_MSG_ERROR([Can not find awk !])
+	AC_MSG_ERROR([Can not find nawk !])
 fi
 
 dnl Checks for sed
@@ -772,6 +769,24 @@ AC_CONFIG_SUBDIRS(tools/$GSL)
 AC_CONFIG_SUBDIRS(tools/$GPP)
 AC_CONFIG_SUBDIRS(tools/$FILE)
 AC_CONFIG_SUBDIRS(tools/$ICONV)
+AC_CONFIG_SUBDIRS(tools/$SQLITE)
+
+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
@@ -818,6 +833,24 @@ case $host_cpu in
 
 esac
 
+case $host_os in
+
+	cygwin*)
+		OS=Cygwin
+	break ;;
+
+	interix*)
+		OS=Interix
+	break ;;
+
+	*)
+		OS=$(uname)
+	break ;;
+
+esac
+
+AC_SUBST(OS)
+
 DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')
 DATE=$(env LC_ALL=C date +'%A %x, %X %Z')
 
@@ -837,6 +870,8 @@ AC_SUBST(GPP)
 AC_SUBST(GNUPLOT)
 AC_SUBST(FILE)
 AC_SUBST(ICONV)
+AC_SUBST(SQLITE)
+AC_SUBST(OPENSSL)
 AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)
 AC_SUBST(DATE_FR)
@@ -859,6 +894,7 @@ AC_CONFIG_FILES(scripts/rplcc)
 AC_CONFIG_FILES(scripts/rpllink)
 AC_CONFIG_FILES(rpltags/Makefile)
 AC_CONFIG_FILES(rpliconv/Makefile)
+AC_CONFIG_FILES(rplsums/Makefile)
 AC_CONFIG_FILES(lapack/lapack/Makefile)
 AC_CONFIG_FILES(lapack/blas/Makefile)