--- rpl/Attic/configure.in	2010/01/29 16:51:46	1.2
+++ rpl/Attic/configure.in	2010/03/01 14:48:13	1.8
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rpl],[4.0.10])
+AC_INIT([rpl],[4.0.11])
 AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -7,7 +7,7 @@ AC_SUBST(target_cpu)
 AC_CONFIG_HEADERS([rplconfig.h])
 
 dnl Libraries
-NCURSES=ncurses-5.7-20100102
+NCURSES=ncurses-5.7-20100206
 READLINE=readline-6.1
 UNITS=units-1.87
 GSL=gsl-1.13
@@ -116,11 +116,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 +203,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 +215,6 @@ else
 	PROFILAGE="-pg"
 fi], [PROFILAGE=""])
 
-AC_SUBST(DEBUG_CODE)
 AC_SUBST(PROFILAGE)
 
 if test ! -d tools; then
@@ -250,28 +242,27 @@ if test ! -d "$srcdir"/tools/$GPP; then
 fi
 if test ! -d "$srcdir"/tools/$FILE; then
 	gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
-			(cd "$srcdir/tools" && tar -xf -)
+			(cd "$srcdir/tools" && tar -xf - )
+	(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/^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
+	(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
 
-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/^file_/rplfile_/g' > \
-	"$srcdir"/tools/$FILE/src/Makefile.am
-\rm -f "$srcdir"/tools/$FILE/src/Makefile.am2
-if test $(grep rplfile "$srcdir"/tools/$FILE/magic/Makefile.am | wc -l) \
-		-eq 0; then \
-	sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \
-		"$srcdir"/tools/$FILE/src/Makefile.am2; \
-	\mv -f "$srcdir"/tools/$FILE/src/Makefile.am2 \
-		"$srcdir"/tools/$FILE/magic/Makefile.am; \
-fi
-
 AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)
 if test "$LIBTOOLIZE" = "no"; then
 	AC_MSG_ERROR([Cannot find libtoolize! You have to install it.])
@@ -292,9 +283,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)