--- rpl/Attic/configure.in	2010/02/11 14:18:15	1.7
+++ rpl/Attic/configure.in	2010/03/01 14:48:13	1.8
@@ -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
@@ -263,6 +255,8 @@ if test ! -d "$srcdir"/tools/$FILE; then
 		"$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 | \
@@ -289,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)