--- rpl/Attic/configure	2010/02/11 14:18:15	1.6
+++ rpl/Attic/configure	2010/03/01 14:48:13	1.7
@@ -640,7 +640,6 @@ LN_S
 RUNPATH
 LIBTOOLIZE
 PROFILAGE
-DEBUG_CODE
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -5832,12 +5831,14 @@ fi
 if test "${enable_final_encoding+set}" = set; then :
   enableval=$enable_final_encoding;
 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
 else
-  FINAL_ENCODING="\$(shell locale charmap)"
+  FINAL_ENCODING="\$(shell locale charmap | \
+	awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')"
 fi
 
 
@@ -5984,62 +5985,11 @@ if test "${enable_debug+set}" = set; the
   enableval=$enable_debug;
 if test "$enableval" = "no"; then
 	DEBUG=""
-	DEBUG_CODE="-UDEBUG"
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEBUG=\"-lefence\" in -lefence" >&5
-$as_echo_n "checking for DEBUG=\"-lefence\" in -lefence... " >&6; }
-if test "${ac_cv_lib_efence_DEBUG___lefence_+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lefence  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char DEBUG="-lefence" ();
-int
-main ()
-{
-return DEBUG="-lefence" ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_efence_DEBUG___lefence_=yes
-else
-  ac_cv_lib_efence_DEBUG___lefence_=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_DEBUG___lefence_" >&5
-$as_echo "$ac_cv_lib_efence_DEBUG___lefence_" >&6; }
-if test "x$ac_cv_lib_efence_DEBUG___lefence_" = x""yes; then :
-  DEBUG=""
-fi
-
-	DEBUG_CODE="-DDEBUG"
-	if test "$DEBUG" = ""; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find efence! You may install it.
-Debug flag is disabled.
-" >&5
-$as_echo "$as_me: WARNING: Can not find efence! You may install it.
-Debug flag is disabled.
-" >&2;}
-	fi
+	DEBUG="-DDEBUG_MEMOIRE"
 fi
 else
-
-DEBUG_CODE="-UDEBUG"
-DEBUG=""
+  DEBUG=""
 fi
 
 
@@ -6058,7 +6008,6 @@ fi
 
 
 
-
 if test ! -d tools; then
 	mkdir tools
 fi
@@ -6097,6 +6046,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 | \
@@ -6271,9 +6222,6 @@ if test "$AUTOCONF" = "no"; then
 	as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5
 fi
 
-(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \
-		&& aclocal && automake -af && autoconf);
-
 
 
 # Check whether --enable-final-run-path was given.