--- rpl/Attic/configure	2010/01/30 09:16:49	1.3
+++ rpl/Attic/configure	2010/03/01 14:48:13	1.7
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for rpl 4.0.10.
+# Generated by GNU Autoconf 2.65 for rpl 4.0.11.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rpl'
 PACKAGE_TARNAME='rpl'
-PACKAGE_VERSION='4.0.10'
-PACKAGE_STRING='rpl 4.0.10'
+PACKAGE_VERSION='4.0.11'
+PACKAGE_STRING='rpl 4.0.11'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -640,7 +640,6 @@ LN_S
 RUNPATH
 LIBTOOLIZE
 PROFILAGE
-DEBUG_CODE
 X_EXTRA_LIBS
 X_LIBS
 X_PRE_LIBS
@@ -1332,7 +1331,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rpl 4.0.10 to adapt to many kinds of systems.
+\`configure' configures rpl 4.0.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1407,7 +1406,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rpl 4.0.10:";;
+     short | recursive ) echo "Configuration of rpl 4.0.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1519,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rpl configure 4.0.10
+rpl configure 4.0.11
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2230,7 +2229,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rpl $as_me 4.0.10, which was
+It was created by rpl $as_me 4.0.11, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3149,7 +3148,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rpl'
- VERSION='4.0.10'
+ VERSION='4.0.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3193,7 +3192,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
 ac_config_headers="$ac_config_headers rplconfig.h"
 
 
-NCURSES=ncurses-5.7-20100102
+NCURSES=ncurses-5.7-20100206
 READLINE=readline-6.1
 UNITS=units-1.87
 GSL=gsl-1.13
@@ -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
@@ -6085,6 +6034,7 @@ fi
 if test ! -d "$srcdir"/tools/$FILE; then
 	gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
 			(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' \
@@ -6092,8 +6042,12 @@ if test ! -d "$srcdir"/tools/$FILE; then
 		sed 's/^file_/rplfile_/g' > \
 		"$srcdir"/tools/$FILE/src/Makefile.am
 	\rm -f "$srcdir"/tools/$FILE/src/Makefile.am2
-	(cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)
-	(cd "$srcdir/tools"; autoreconf)
+	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 | \
@@ -6268,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.
@@ -9717,7 +9668,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rpl $as_me 4.0.10, which was
+This file was extended by rpl $as_me 4.0.11, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9783,7 +9734,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rpl config.status 4.0.10
+rpl config.status 4.0.11
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"