[Pkg-voip-commits] [dahdi-tools] 96/285: menuselect: Remove last bits completely from the repo

tzafrir at debian.org tzafrir at debian.org
Thu Jul 7 19:18:37 UTC 2016


This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit b8d8cc4f8ddf5366aaef9aff304f989581a7ffaf
Author: Russ Meyerriecks <rmeyerriecks at digium.com>
Date:   Fri Sep 21 19:43:49 2012 +0000

    menuselect: Remove last bits completely from the repo
    
    menuselect has not been used in dahdi-tools since r10411 (7 months ago). This
    patch removes menuselect from the repository completely.
    
    Reported-by: Sean Bright
    Internal-Issue-ID: DAHTOOL-61
    Patches: kill-menuselect.patch by Sean Bright (license #5060)
    
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
    
    
    
    git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10721 17933a7a-c749-41c5-a318-cba88f637d49
---
 README                                      |    6 +-
 build_tools/make_tree                       |    7 -
 build_tools/menuselect-deps.in              |    2 -
 configure.ac                                |    2 +-
 menuselect/Makefile                         |  123 -
 menuselect/README                           |  179 -
 menuselect/acinclude.m4                     |  199 -
 menuselect/aclocal.m4                       |   14 -
 menuselect/autoconfig.h.in                  |  128 -
 menuselect/bootstrap.sh                     |   41 -
 menuselect/config.guess                     | 1501 ------
 menuselect/config.sub                       | 1705 ------
 menuselect/configure                        | 7422 ---------------------------
 menuselect/configure.ac                     |  146 -
 menuselect/contrib/Makefile-dummy           |   17 -
 menuselect/contrib/menuselect-dummy         |  741 ---
 menuselect/example_menuselect-tree          |  487 --
 menuselect/install-sh                       |  323 --
 menuselect/linkedlists.h                    |  372 --
 menuselect/make_version                     |   56 -
 menuselect/makeopts.in                      |   22 -
 menuselect/menuselect.c                     | 2096 --------
 menuselect/menuselect.h                     |  157 -
 menuselect/menuselect_curses.c              | 1034 ----
 menuselect/menuselect_gtk.c                 |  358 --
 menuselect/menuselect_newt.c                |  427 --
 menuselect/menuselect_stub.c                |   39 -
 menuselect/missing                          |  360 --
 menuselect/mxml/ANNOUNCEMENT                |    5 -
 menuselect/mxml/CHANGES                     |  213 -
 menuselect/mxml/COPYING                     |  482 --
 menuselect/mxml/Makefile.in                 |  342 --
 menuselect/mxml/README                      |  204 -
 menuselect/mxml/config.h.in                 |   69 -
 menuselect/mxml/configure                   | 5702 --------------------
 menuselect/mxml/configure.in                |  343 --
 menuselect/mxml/install-sh                  |  251 -
 menuselect/mxml/mxml-attr.c                 |  181 -
 menuselect/mxml/mxml-entity.c               |  472 --
 menuselect/mxml/mxml-file.c                 | 2844 ----------
 menuselect/mxml/mxml-index.c                |  649 ---
 menuselect/mxml/mxml-node.c                 |  664 ---
 menuselect/mxml/mxml-private.c              |  128 -
 menuselect/mxml/mxml-search.c               |  199 -
 menuselect/mxml/mxml-set.c                  |  257 -
 menuselect/mxml/mxml-string.c               |  377 --
 menuselect/mxml/mxml.h                      |  254 -
 menuselect/mxml/mxml.list.in                |  115 -
 menuselect/mxml/mxml.pc.in                  |   10 -
 menuselect/strcompat.c                      |  243 -
 menuselect/test/build_tools/menuselect-deps |   52 -
 menuselect/test/menuselect-tree             |  716 ---
 52 files changed, 4 insertions(+), 32732 deletions(-)

diff --git a/README b/README
index 5e97c30..29ef174 100644
--- a/README
+++ b/README
@@ -73,9 +73,9 @@ This can be useful for any partial install target from the list above.
 
 Options For ./configure
 ^^^^^^^^^^^^^^^^^^^^^^^
-The configure script various several tests and based on them generates
-some files ( build_tools/menuselect-deps and makeopts). You can pass it
---with options and variable settings, for instance:
+The configure script executes various tests and based on them generates
+makeopts. You can pass it --with options and variable settings, for
+instance:
 
   ./configure --without-ncurses CC="gcc-4.10"
 
diff --git a/build_tools/make_tree b/build_tools/make_tree
index 01af666..e69de29 100755
--- a/build_tools/make_tree
+++ b/build_tools/make_tree
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "<?xml version=\"1.0\"?>"
-echo
-echo "<menu name=\"DAHDI Tools Selection\">"
-cat dahdi.xml
-echo "</menu>"
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index d8ff845..e69de29 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -1,2 +0,0 @@
-LIBNEWT=@PBX_NEWT@
-HDLC=@PBX_HDLC@
diff --git a/configure.ac b/configure.ac
index 752d671..4fa396b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,7 @@ fi
 
 AC_SUBST(PPPD_VERSION)
 
-AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
+AC_CONFIG_FILES([makeopts])
 AC_OUTPUT
 
 AC_MSG_NOTICE(*** dahdi-tools build successfully configured ***)
diff --git a/menuselect/Makefile b/menuselect/Makefile
deleted file mode 100644
index 2ddf35b..0000000
--- a/menuselect/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Asterisk -- A telephony toolkit for Linux.
-# 
-# Makefile for Menuselect
-#
-# Copyright (C) 2005-2008, Digium, Inc.
-#
-# Russell Bryant <russell at digium.com>
-#
-# This program is free software, distributed under the terms of
-# the GNU General Public License
-#
-
-# even though we could use '-include makeopts' here, use a wildcard
-# lookup anyway, so that make won't try to build makeopts if it doesn't
-# exist (other rules will force it to be built if needed)
-ifneq ($(wildcard makeopts),)
-  include makeopts
-endif
-
-.PHONY: clean dist-clean distclean test ntest ctest gtest
-
-# Basic set of sources and flags/libraries/includes
-OBJS:=menuselect.o strcompat.o
-CFLAGS+=-g -D_GNU_SOURCE -Wall
-
-ifeq ($(MENUSELECT_DEBUG),yes)
-  CFLAGS += -DMENUSELECT_DEBUG
-endif
-
-ifdef NCURSES_LIB
-  C_OBJS += menuselect_curses.o
-  C_LIBS +=$(NCURSES_LIB)
-  C_INCLUDE += $(NCURSES_INCLUDE)
-  ALL_TGTS += cmenuselect
-else
-  ifdef CURSES_LIB
-    C_OBJS += menuselect_curses.o
-    C_LIBS +=$(CURSES_LIB)
-    C_INCLUDE += $(CURSES_INCLUDE)
-    ALL_TGTS += cmenuselect
-  endif
-endif
-
-ifdef GTK2_LIB
-  G_OBJS += menuselect_gtk.o
-  G_LIBS += $(GTK2_LIB)
-  G_INCLUDE += $(GTK2_INCLUDE)
-  ALL_TGTS += gmenuselect
-endif
-
-ifdef NEWT_LIB
-  N_OBJS += menuselect_newt.o
-  N_LIBS += $(NEWT_LIB)
-  N_INCLUDE += $(NEWT_INCLUDE)
-  ALL_TGTS += nmenuselect
-endif
-
-M_OBJS += menuselect_stub.o
-ALL_TGTS += menuselect
-
-all: $(ALL_TGTS)
-
-$(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h
-
-makeopts autoconfig.h: autoconfig.h.in makeopts.in
-	@./configure $(CONFIGURE_SILENT)
-
-$(ALL_TGTS): mxml/libmxml.a
-
-ifdef C_OBJS
-menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
-cmenuselect: $(OBJS) $(C_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(C_LIBS)
-else
-cmenuselect:
-endif
-
-ifdef G_OBJS
-menuselect_gtk.o: CFLAGS+=$(G_INCLUDE)
-gmenuselect: $(OBJS) $(G_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(G_LIBS)
-else
-gmenuselect:
-endif
-
-ifdef N_OBJS
-menuselect_newt.o: CFLAGS+=$(N_INCLUDE)
-nmenuselect: $(OBJS) $(N_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(N_LIBS)
-else
-nmenuselect:
-endif
-
-menuselect: $(OBJS) $(M_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $^ $(M_LIBS)
-
-mxml/libmxml.a:
-	@if test ! -f mxml/Makefile ; then cd mxml && ./configure ; fi
-	@$(MAKE) -C mxml libmxml.a
-
-test: menuselect
-	(cd test; ../$< menuselect.makeopts)
-
-ctest: cmenuselect
-	(cd test; ../$< menuselect.makeopts)
-
-gtest: gmenuselect
-	(cd test; ../$< menuselect.makeopts)
-
-ntest: nmenuselect
-	(cd test; ../$< menuselect.makeopts)
-
-clean:
-	rm -f menuselect cmenuselect gmenuselect nmenuselect $(OBJS) $(M_OBJS) $(C_OBJS) $(G_OBJS) $(N_OBJS)
-	@if test -f mxml/Makefile ; then $(MAKE) -C mxml clean ; fi
-
-dist-clean: distclean
-
-distclean: clean
-	@if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
-	rm -f autoconfig.h config.status config.log makeopts
-	rm -rf autom4te.cache
diff --git a/menuselect/README b/menuselect/README
deleted file mode 100644
index 1a63790..0000000
--- a/menuselect/README
+++ /dev/null
@@ -1,179 +0,0 @@
-MENUSELECT
-Copyright (C) 2005-2006, Digium, Inc.
-Russell Bryant <russell at digium.com>
--------------------------------------------------------------------------------
-
-
-ABOUT
-
-Menuselect is a tool designed to be used in conjunction with GNU make. It
-allows for an XML specification of Makefile variables and optional space
-delimited values of these variables. These values can then be used in the
-Makefile to make various decisions during the build process.
-
-Menuselect also provides a mechanism for dependency checking for each possible
-member (value) of each category (Makefile variable). These dependencies are
-generally checked by using autoconf and the results provided to menuselect. If
-dependencies for a member are not met, the user will not be allowed to make
-that selection. In the same way the menuselect does dependency checking, it
-also does conflict checking. If a listed conflict for a member is met, then
-the user will not be allowed to select it.
-
-For use with automated builds or when the user has no desire to make selections
-different than the defined defaults, menuselect can generate a default output
-file for use in the build.
-
-Menuselect can also do a sanity check on existing input files. If any member
-has been selected that has conflicts or unmet dependencies, then menuselect
-will exit with an error and output to notify the user of the situation. This is
-typically done at the beginning of the build process to ensure that given all
-of the known information, the build is going to be successful.
-
-
-MENUSELECT DEPENDENCIES
-
-libncurses -- This is needed for the curses frontend.
-libnewt -- This is needed for the newt frontend (optional).
-libmxml -- This library, Mini-XML, is used for XML parsing. 
-           (http://www.easysw.com/~mike/mxml/)
-	   (Asterisk uses the code in http://svn.digium.com/svn/mxml/ )
-
-
-ENVIRONMENT SETUP
-
-The file menuselect.h contains a couple of defines which specify locations for
-various files.  These locations are relative to the directory from which
-menuselect will be executed.
-
-#define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
-This is the location where the menuselect output will be saved.
-
-#define MENUSELECT_DEPS         "build_tools/menuselect-deps"
-This is the location where menuselect will expect to find the input file that
-provides dependency and conflict information. More information on the format of
-this file can be found in the section about dependency and conflict checking.
-
-
-DEPENDENCY AND CONFLICT CHECKING
-
-Members may have as many conflicts and dependencies specified as needed. An
-example of the MENUSELECT_DEPS file would look like this:
-
-DEPENDENCY1=1
-DEPENDENCY2=0
-CONFLICT1=0
-
-In this case, "DEPENDENCY1" has been met, "DEPENDENCY2" has not been met, and
-"CONFLICT1" is not present.
-
-To ask menuselect to do a background sanity check on dependencies and
-conflicts, it can be called like this:
-
-./menuselect --check-deps <input_file1> [input_file2] [...]
-
-The format of the input files must be of the same format menuselect uses to
-create the OUPUT_MAKEOPTS_DEFAULT.
-
-
-ENABLING AND DISABLING OPTIONS FROM THE COMMAND LINE
-
-If you would like menuselect to update choices via the command line, it can be
-done with the following syntax:
-
-Enable an option:
-   $ menuselect/menuselect --enable TEST_FRAMEWORK menuselect.makeopts
-
-Enable all options in a category:
-   $ menuselect/menuselect --enable-category MENUSELECT_TEST menuselect.makeopts
-
-Disable an option:
-   $ menuselect/menuselect --disable TEST_FRAMEWORK menuselect.makeopts
-
-Disable all options in a category:
-   $ menuselect/menuselect --disable-category MENUSELECT_TEST menuselect.makeopts
-
-
-SETTING UP AVAILABLE OPTIONS
-
-The XML specification for the menu lives in the file "menuselect-tree" and should
-be in the same directory that menuselect will be executed from. An example
-menuselect-tree file as used in the Asterisk project (http://www.asterisk.org) is
-provided in example_menuselect-tree
-
-Menu:
-   The top level tag in menuselect-tree is the <menu> tag. All of the categories
-   reside inside of the <menu> ... </menu> block.
-
-Menu Attributes:
-   name="Asterisk Module Selection"
-   This specifies the title of the menu. It is displayed at the top of the
-   screen when using the curses frontend
-
-Categories:
-   A <category> contains members. The category tag can contain a number of
-   different attributes to specify different behavior.
-
-Category Attributes:
-   name="MENUSELECT_APPS"
-   The name attribute is required. This is the name of the variable that will
-   be in the output from menuselect.
-	
-   displayname="Applications"
-   If this is specfied, this is what will be shown in the menu to the user.
-
-   positive_output="yes"
-   The default for menuselect is to output all of the members of a category
-   that are *not* selected. This is because it is often convenient to be able
-   to define a full list in the Makefile and then filter out the results from
-   menuselect. Using GNU make, an example of this would be:
-   APPS:=$(filter-out $(MENUSELECT_APPS),$(APPS)) 
-
-   remove_on_change=".lastclean"
-   This attribute can contain a space delimited list of files to be deleted
-   when it is time to build an output file if any of the members of this
-   category have changed values from their values for existing input when the
-   application was started.
-
-Members:
-   A <member> contains conflicts and dependencies. The member tag can contain a
-   number of different attributes to specify different behavior.
-
-Member Attributes:
-   name="app_meetme"
-   The name attribute is required. This is the value that will be added to the 
-   variable specified by the category when selected (or not selected) depending
-   on the setting of the positive_output attribute of the category.
-	
-   displayname="Call Conferencing Application"
-   If this is specified, this will be provided as a description of this member
-   when the cursor is on it in the menu.
-
-   remove_on_change="apps/app_meetme.o apps/app_meetme.so"
-   This attribute can contain a space delimeted list of files to be deleted
-   when it is time to build an output file if the value of this member has
-   changed from its value in any existing input when the application was
-   started.
-
-Dependencies:
-   A dependency for a <member> is specified using a <depend> tag. The name of
-   the dependency corresponds to names in the MENUSELECT_DEPS file. This is an
-   example of specifying a dependency for a member:
-      <member name="app_meetme">
-         <depend>zaptel</depend>
-      </member>   
-
-Conflicts:
-   A conflict for a <member> is specified using a <conflict> tag. The name of
-   the conflict corresponds to names in the MENUSELECT_DEPS file. This is an
-   example of specifying a dependency for a member:
-      <member name="res_musiconhold">
-         <conflict>win32</conflict>
-      </member>
-
-
-REPORTING BUGS
-
-Any bug reports or feature enhancement submissions to menuselect should be
-submitted at https://issues.asterisk.org/
-
-Thank you!
diff --git a/menuselect/acinclude.m4 b/menuselect/acinclude.m4
deleted file mode 100644
index 9410608..0000000
--- a/menuselect/acinclude.m4
+++ /dev/null
@@ -1,199 +0,0 @@
-# Helper function to check for gcc attributes.
-# AST_GCC_ATTRIBUTE([attribute name], [attribute syntax], [attribute scope], [makeopts flag])
-
-AC_DEFUN([AST_GCC_ATTRIBUTE],
-[
-AC_MSG_CHECKING(checking for compiler 'attribute $1' support)
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-m4_ifval([$4],$4=0)
-
-if test "x$2" = "x"
-then
-AC_COMPILE_IFELSE(
-	AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
-			[]),
-	AC_MSG_RESULT(yes)
-	m4_ifval([$4],$4=1)
-	AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
-	AC_MSG_RESULT(no)
-)
-else
-AC_COMPILE_IFELSE(
-	AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
-			[]),
-	AC_MSG_RESULT(yes)
-	m4_ifval([$4],$4=1)
-	AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
-	AC_MSG_RESULT(no)
-)
-fi
-
-m4_ifval([$4],[AC_SUBST($4)])
-CFLAGS="$saved_CFLAGS"
-])
-
-# AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
-
-AC_DEFUN([AST_EXT_LIB_SETUP],
-[
-$1_DESCRIP="$2"
-$1_OPTION="$3"
-AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),[
-case ${withval} in
-     n|no)
-     USE_$1=no
-     ;;
-     y|ye|yes)
-     $1_MANDATORY="yes"
-     ;;
-     *)
-     $1_DIR="${withval}"
-     $1_MANDATORY="yes"
-     ;;
-esac
-])
-PBX_$1=0
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([PBX_$1])
-])
-
-# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data])
-
-AC_DEFUN([AST_EXT_LIB_CHECK],
-[
-if test "${USE_$1}" != "no"; then
-   pbxlibdir=""
-   if test "x${$1_DIR}" != "x"; then
-      if test -d ${$1_DIR}/lib; then
-      	 pbxlibdir="-L${$1_DIR}/lib"
-      else
-      	 pbxlibdir="-L${$1_DIR}"
-      fi
-   fi
-   AC_CHECK_LIB([$2], [$3], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], ${pbxlibdir} $5)
-
-   if test "${AST_$1_FOUND}" = "yes"; then
-      $1_LIB="-l$2 $5"
-      $1_HEADER_FOUND="1"
-      if test "x${$1_DIR}" != "x"; then
-         $1_LIB="${pbxlibdir} ${$1_LIB}"
-	 $1_INCLUDE="-I${$1_DIR}/include"
-	 if test "x$4" != "x" ; then
-	    AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0] )
-	 fi
-      else
-	 if test "x$4" != "x" ; then
-            AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0] )
-	 fi
-      fi
-      if test "x${$1_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${$1_MANDATORY}" ;
-         then
-            AC_MSG_NOTICE( ***)
-            AC_MSG_NOTICE( *** It appears that you do not have the $2 development package installed.)
-            AC_MSG_NOTICE( *** Please install it to include ${$1_DESCRIP} support, or re-run configure)
-            AC_MSG_NOTICE( *** without explicitly specifying --with-${$1_OPTION})
-            exit 1
-         fi
-         $1_LIB=""
-         $1_INCLUDE=""
-         PBX_$1=0
-      else
-         PBX_$1=1
-         AC_DEFINE_UNQUOTED([HAVE_$1], 1, [Define to indicate the ${$1_DESCRIP} library])
-      fi
-   elif test ! -z "${$1_MANDATORY}";
-   then
-      AC_MSG_NOTICE(***)
-      AC_MSG_NOTICE(*** The ${$1_DESCRIP} installation on this system appears to be broken.)
-      AC_MSG_NOTICE(*** Either correct the installation, or run configure)
-      AC_MSG_NOTICE(*** without explicitly specifying --with-${$1_OPTION})
-      exit 1
-   fi
-fi
-])
-
-
-AC_DEFUN(
-[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK([for GNU make], [ac_cv_GNU_MAKE],
-   ac_cv_GNU_MAKE='Not Found' ;
-   ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
-   ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
-   for a in make gmake gnumake ; do
-      if test -z "$a" ; then continue ; fi ;
-      if ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
-         ac_cv_GNU_MAKE=$a ;
-         ac_cv_GNU_MAKE_VERSION_MAJOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
-         ac_cv_GNU_MAKE_VERSION_MINOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
-         break;
-      fi
-   done ;
-) ;
-if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
-   AC_MSG_ERROR( *** Please install GNU make.  It is required to build Asterisk!)
-   exit 1
-fi
-AC_SUBST([GNU_MAKE], [$ac_cv_GNU_MAKE])
-])
-
-# AST_FUNC_FORK
-# -------------
-AN_FUNCTION([fork],  [AST_FUNC_FORK])
-AN_FUNCTION([vfork], [AST_FUNC_FORK])
-AC_DEFUN([AST_FUNC_FORK],
-[AC_REQUIRE([AC_TYPE_PID_T])dnl
-AC_CHECK_HEADERS(vfork.h)
-AC_CHECK_FUNCS(fork vfork)
-if test "x$ac_cv_func_fork" = xyes; then
-  _AST_FUNC_FORK
-else
-  ac_cv_func_fork_works=$ac_cv_func_fork
-fi
-if test "x$ac_cv_func_fork_works" = xcross; then
-  case $host in
-    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* | *-*-linux-uclibc* )
-      # Override, as these systems have only a dummy fork() stub
-      ac_cv_func_fork_works=no
-      ;;
-    *)
-      ac_cv_func_fork_works=yes
-      ;;
-  esac
-  AC_MSG_WARN([result $ac_cv_func_fork_works guessed because of cross compilation])
-fi
-ac_cv_func_vfork_works=$ac_cv_func_vfork
-if test "x$ac_cv_func_vfork" = xyes; then
-  _AC_FUNC_VFORK
-fi;
-if test "x$ac_cv_func_fork_works" = xcross; then
-  ac_cv_func_vfork_works=$ac_cv_func_vfork
-  AC_MSG_WARN([result $ac_cv_func_vfork_works guessed because of cross compilation])
-fi
-
-if test "x$ac_cv_func_vfork_works" = xyes; then
-  AC_DEFINE(HAVE_WORKING_VFORK, 1, [Define to 1 if `vfork' works.])
-else
-  AC_DEFINE(vfork, fork, [Define as `fork' if `vfork' does not work.])
-fi
-if test "x$ac_cv_func_fork_works" = xyes; then
-  AC_DEFINE(HAVE_WORKING_FORK, 1, [Define to 1 if `fork' works.])
-fi
-])# AST_FUNC_FORK
-
-
-# _AST_FUNC_FORK
-# -------------
-AC_DEFUN([_AST_FUNC_FORK],
-  [AC_CACHE_CHECK(for working fork, ac_cv_func_fork_works,
-    [AC_RUN_IFELSE(
-      [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-	[
-	  /* By Ruediger Kuhlmann. */
-	  return fork () < 0;
-	])],
-      [ac_cv_func_fork_works=yes],
-      [ac_cv_func_fork_works=no],
-      [ac_cv_func_fork_works=cross])])]
-)# _AST_FUNC_FORK
diff --git a/menuselect/aclocal.m4 b/menuselect/aclocal.m4
deleted file mode 100644
index cdae6e7..0000000
--- a/menuselect/aclocal.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include([acinclude.m4])
diff --git a/menuselect/autoconfig.h.in b/menuselect/autoconfig.h.in
deleted file mode 100644
index 4af955a..0000000
--- a/menuselect/autoconfig.h.in
+++ /dev/null
@@ -1,128 +0,0 @@
-/* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
-
-#ifndef MENUSELECT_AUTOCONFIG_H
-#define MENUSELECT_AUTOCONFIG_H
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define to 1 if your GCC C compiler supports the 'weak' attribute. */
-#undef HAVE_ATTRIBUTE_weak
-
-/* Define to 1 if your GCC C compiler supports the 'weak_import' attribute. */
-#undef HAVE_ATTRIBUTE_weak_import
-
-/* Define to 1 if your GCC C compiler supports the 'weakref' attribute. */
-#undef HAVE_ATTRIBUTE_weakref
-
-/* Define to indicate the ${CURSES_DESCRIP} library */
-#undef HAVE_CURSES
-
-/* Define to 1 if you have the `getloadavg' function. */
-#undef HAVE_GETLOADAVG
-
-/* Define if your system has the GTK2 libraries. */
-#undef HAVE_GTK2
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to indicate the ${NCURSES_DESCRIP} library */
-#undef HAVE_NCURSES
-
-/* Define to indicate the ${NEWT_DESCRIP} library */
-#undef HAVE_NEWT
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasestr' function. */
-#undef HAVE_STRCASESTR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
-
-/* Define to 1 if you have the `strnlen' function. */
-#undef HAVE_STRNLEN
-
-/* Define to 1 if you have the `strsep' function. */
-#undef HAVE_STRSEP
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `unsetenv' function. */
-#undef HAVE_UNSETENV
-
-/* Define to 1 if you have the `vasprintf' function. */
-#undef HAVE_VASPRINTF
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-#endif
-
diff --git a/menuselect/bootstrap.sh b/menuselect/bootstrap.sh
deleted file mode 100755
index cbc26aa..0000000
--- a/menuselect/bootstrap.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-check_for_app() {
-	$1 --version 2>&1 >/dev/null
-	if [ $? != 0 ]
-	then
-		echo "Please install $1 and run bootstrap.sh again!"
-		exit 1
-	fi
-}
-
-uname -s | grep -q FreeBSD
-if [ $? = 0 ]
-then
-	check_for_app autoconf259
-	check_for_app autoheader259
-	check_for_app automake19
-	check_for_app aclocal19
-	echo "Generating the configure script ..."
-	aclocal19 2>/dev/null
-	autoconf259
-	autoheader259
-	automake19 --add-missing --copy 2>/dev/null
-else
-	AUTOCONF_VERSION=2.59
-	AUTOMAKE_VERSION=1.9
-	export AUTOCONF_VERSION
-	export AUTOMAKE_VERSION
-
-	check_for_app autoconf
-	check_for_app autoheader
-	check_for_app automake
-	check_for_app aclocal
-	echo "Generating the configure script ..."
-	aclocal 2>/dev/null
-	autoconf
-	autoheader
-	automake --add-missing --copy 2>/dev/null
-fi
-
-exit 0
diff --git a/menuselect/config.guess b/menuselect/config.guess
deleted file mode 100755
index 64cae27..0000000
--- a/menuselect/config.guess
+++ /dev/null
@@ -1,1501 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-12-13'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi at noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel at ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes at openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf at swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green at stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches at gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/menuselect/config.sub b/menuselect/config.sub
deleted file mode 100755
index 110a68e..0000000
--- a/menuselect/config.sub
+++ /dev/null
@@ -1,1705 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
-
-timestamp='2009-12-13'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches at gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches at gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-        -bluegene*)
-	        os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-        microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/menuselect/configure b/menuselect/configure
deleted file mode 100755
index 11f6e21..0000000
--- a/menuselect/configure
+++ /dev/null
@@ -1,7422 +0,0 @@
-#! /bin/sh
-# From configure.ac Revision: 40837 .
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-#
-# "Menuselect"
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf at gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="menuselect"
-ac_unique_file="menuselect.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-enable_option_checking=no
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-subdirs
-GTK2_LIB
-GTK2_INCLUDE
-PBX_GTK2
-PKGCONFIG
-PBX_NCURSES
-NCURSES_INCLUDE
-NCURSES_LIB
-PBX_CURSES
-CURSES_INCLUDE
-CURSES_LIB
-PBX_NEWT
-NEWT_INCLUDE
-NEWT_LIB
-EGREP
-GREP
-CPP
-ALLOCA
-PBX_WEAKREF
-MENUSELECT_DEBUG
-GNU_MAKE
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-HOST_OS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_debug
-with_newt
-with_curses
-with_ncurses
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-ac_subdirs_all='mxml'
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-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 this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug          Turn on debug mode
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-newt=PATH        use newt files in PATH
-  --with-curses=PATH      use curses files in PATH
-  --with-ncurses=PATH     use ncurses files in PATH
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.63
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-
-"Menuselect"
-_ACEOF
-  exit
-fi
-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 $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# check existence of the package
-
-
-# specify output header file
-ac_config_headers="$ac_config_headers autoconfig.h"
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-HOST_OS=${host_os}
-
-
-PBX_WINARCH=0
-case "${host_os}" in
-     freebsd*)
-     OSARCH=FreeBSD
-     ;;
-     netbsd*)
-     OSARCH=NetBSD
-     ;;
-     openbsd*)
-     OSARCH=OpenBSD
-     ;;
-     solaris*)
-     OSARCH=SunOS
-     ;;
-     mingw32)
-     OSARCH=mingw32
-     PBX_WINARCH=1
-     ;;
-     cygwin)
-     OSARCH=cygwin
-     PBX_WINARCH=1
-     ;;
-     linux-gnueabi)
-     OSARCH=linux-gnu
-     ;;
-     *)
-     OSARCH=${host_os}
-     ;;
-esac
-
-
-
-
-
-
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-{ $as_echo "$as_me:$LINENO: checking for GNU make" >&5
-$as_echo_n "checking for GNU make... " >&6; }
-if test "${ac_cv_GNU_MAKE+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_GNU_MAKE='Not Found' ;
-   ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
-   ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
-   for a in make gmake gnumake ; do
-      if test -z "$a" ; then continue ; fi ;
-      if ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
-         ac_cv_GNU_MAKE=$a ;
-         ac_cv_GNU_MAKE_VERSION_MAJOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
-         ac_cv_GNU_MAKE_VERSION_MINOR=`$ac_cv_GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.' | cut -c1-2`
-         break;
-      fi
-   done ;
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_GNU_MAKE" >&5
-$as_echo "$ac_cv_GNU_MAKE" >&6; } ;
-if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
-   { { $as_echo "$as_me:$LINENO: error: *** Please install GNU make.  It is required to build Asterisk!" >&5
-$as_echo "$as_me: error: *** Please install GNU make.  It is required to build Asterisk!" >&2;}
-   { (exit 1); exit 1; }; }
-   exit 1
-fi
-GNU_MAKE=$ac_cv_GNU_MAKE
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug; case "${enableval}" in
-		y|ye|yes) MENUSELECT_DEBUG=yes ;;
-		n|no)  MENUSELECT_DEBUG=no ;;
-		*) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
-$as_echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
-   { (exit 1); exit 1; }; }  ;;
-    esac
-fi
-
-
-
-# Support weak symbols on a platform specific basis.  The Mac OS X
-# (Darwin) support must be isolated from the other platforms because
-# it has caused other platforms to fail.
-#
-case "${OSARCH}" in
-	darwin*)
-	# Allow weak symbol support on Darwin platforms only because there
-	# is active community support for it.
-	# However, Darwin seems to break weak symbols for each new version.
-	#
-
-
-{ $as_echo "$as_me:$LINENO: checking checking for compiler 'attribute weak_import' support" >&5
-$as_echo_n "checking checking for compiler 'attribute weak_import' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-PBX_WEAKREF=0
-
-if test "x" = "x"
-then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- void __attribute__((weak_import)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weak_import 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weak_import 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-
-	# Several other platforms including Linux have GCC versions that
-	# define the weak attribute.  However, this attribute is only
-	# setup for use in the code by Darwin.
-
-{ $as_echo "$as_me:$LINENO: checking checking for compiler 'attribute weak' support" >&5
-$as_echo_n "checking checking for compiler 'attribute weak' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-PBX_WEAKREF=0
-
-if test "x" = "x"
-then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- void __attribute__((weak)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weak 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
- void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weak 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-	;;
-	linux-gnu)
-	# Primarily support weak symbols on Linux platforms.
-	#
-
-{ $as_echo "$as_me:$LINENO: checking checking for compiler 'attribute weakref' support" >&5
-$as_echo_n "checking checking for compiler 'attribute weakref' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-PBX_WEAKREF=0
-
-if test "xweakref("foo")" = "x"
-then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-static void __attribute__((weakref)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weakref 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-static void __attribute__((weakref("foo"))) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weakref 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-	;;
-	*)
-	# Allow weak symbols on other platforms.  However, any problems
-	# with this feature on other platforms must be fixed by the
-	# community.
-	#
-
-{ $as_echo "$as_me:$LINENO: checking checking for compiler 'attribute weakref' support" >&5
-$as_echo_n "checking checking for compiler 'attribute weakref' support... " >&6; }
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
-PBX_WEAKREF=0
-
-if test "xweakref("foo")" = "x"
-then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-static void __attribute__((weakref)) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weakref 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-static void __attribute__((weakref("foo"))) *test(void *muffin, ...) {return (void *) 0;}
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	PBX_WEAKREF=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_weakref 1
-_ACEOF
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-CFLAGS="$saved_CFLAGS"
-
-	;;
-esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_working_alloca_h=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-				    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_alloca_works=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-
-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main ()
-{
-  return find_stack_direction () < 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_stack_direction=1
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
-
-
-
-
-
-
-
-
-for ac_func in asprintf getloadavg setenv strcasestr strndup strnlen strsep unsetenv vasprintf
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# The frontend can use curses, ncurses, newt or GTK2 so check for all of them
-
-
-NEWT_DESCRIP="newt"
-NEWT_OPTION="newt"
-
-# Check whether --with-newt was given.
-if test "${with_newt+set}" = set; then
-  withval=$with_newt;
-case ${withval} in
-     n|no)
-     USE_NEWT=no
-     ;;
-     y|ye|yes)
-     NEWT_MANDATORY="yes"
-     ;;
-     *)
-     NEWT_DIR="${withval}"
-     NEWT_MANDATORY="yes"
-     ;;
-esac
-
-fi
-
-PBX_NEWT=0
-
-
-
-
-
-CURSES_DESCRIP="curses"
-CURSES_OPTION="curses"
-
-# Check whether --with-curses was given.
-if test "${with_curses+set}" = set; then
-  withval=$with_curses;
-case ${withval} in
-     n|no)
-     USE_CURSES=no
-     ;;
-     y|ye|yes)
-     CURSES_MANDATORY="yes"
-     ;;
-     *)
-     CURSES_DIR="${withval}"
-     CURSES_MANDATORY="yes"
-     ;;
-esac
-
-fi
-
-PBX_CURSES=0
-
-
-
-
-
-NCURSES_DESCRIP="ncurses"
-NCURSES_OPTION="ncurses"
-
-# Check whether --with-ncurses was given.
-if test "${with_ncurses+set}" = set; then
-  withval=$with_ncurses;
-case ${withval} in
-     n|no)
-     USE_NCURSES=no
-     ;;
-     y|ye|yes)
-     NCURSES_MANDATORY="yes"
-     ;;
-     *)
-     NCURSES_DIR="${withval}"
-     NCURSES_MANDATORY="yes"
-     ;;
-esac
-
-fi
-
-PBX_NCURSES=0
-
-
-
-
-
-
-if test "${USE_NEWT}" != "no"; then
-   pbxlibdir=""
-   if test "x${NEWT_DIR}" != "x"; then
-      if test -d ${NEWT_DIR}/lib; then
-      	 pbxlibdir="-L${NEWT_DIR}/lib"
-      else
-      	 pbxlibdir="-L${NEWT_DIR}"
-      fi
-   fi
-   { $as_echo "$as_me:$LINENO: checking for newtBell in -lnewt" >&5
-$as_echo_n "checking for newtBell in -lnewt... " >&6; }
-if test "${ac_cv_lib_newt_newtBell+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnewt ${pbxlibdir}  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* 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 newtBell ();
-int
-main ()
-{
-return newtBell ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_newt_newtBell=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_newt_newtBell=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_newt_newtBell" >&5
-$as_echo "$ac_cv_lib_newt_newtBell" >&6; }
-if test "x$ac_cv_lib_newt_newtBell" = x""yes; then
-  AST_NEWT_FOUND=yes
-else
-  AST_NEWT_FOUND=no
-fi
-
-
-   if test "${AST_NEWT_FOUND}" = "yes"; then
-      NEWT_LIB="-lnewt "
-      NEWT_HEADER_FOUND="1"
-      if test "x${NEWT_DIR}" != "x"; then
-         NEWT_LIB="${pbxlibdir} ${NEWT_LIB}"
-	 NEWT_INCLUDE="-I${NEWT_DIR}/include"
-	 if test "xnewt.h" != "x" ; then
-	    as_ac_Header=`$as_echo "ac_cv_header_${NEWT_DIR}/include/newt.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for ${NEWT_DIR}/include/newt.h" >&5
-$as_echo_n "checking for ${NEWT_DIR}/include/newt.h... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt.h usability" >&5
-$as_echo_n "checking ${NEWT_DIR}/include/newt.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <${NEWT_DIR}/include/newt.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt.h presence" >&5
-$as_echo_n "checking ${NEWT_DIR}/include/newt.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <${NEWT_DIR}/include/newt.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NEWT_DIR}/include/newt.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ${NEWT_DIR}/include/newt.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for ${NEWT_DIR}/include/newt.h" >&5
-$as_echo_n "checking for ${NEWT_DIR}/include/newt.h... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  NEWT_HEADER_FOUND=1
-else
-  NEWT_HEADER_FOUND=0
-fi
-
-
-	 fi
-      else
-	 if test "xnewt.h" != "x" ; then
-            if test "${ac_cv_header_newt_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for newt.h" >&5
-$as_echo_n "checking for newt.h... " >&6; }
-if test "${ac_cv_header_newt_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_newt_h" >&5
-$as_echo "$ac_cv_header_newt_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking newt.h usability" >&5
-$as_echo_n "checking newt.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <newt.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking newt.h presence" >&5
-$as_echo_n "checking newt.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <newt.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: newt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: newt.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: newt.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: newt.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: newt.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: newt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: newt.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: newt.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: newt.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for newt.h" >&5
-$as_echo_n "checking for newt.h... " >&6; }
-if test "${ac_cv_header_newt_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_newt_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_newt_h" >&5
-$as_echo "$ac_cv_header_newt_h" >&6; }
-
-fi
-if test "x$ac_cv_header_newt_h" = x""yes; then
-  NEWT_HEADER_FOUND=1
-else
-  NEWT_HEADER_FOUND=0
-fi
-
-
-	 fi
-      fi
-      if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${NEWT_MANDATORY}" ;
-         then
-            { $as_echo "$as_me:$LINENO: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-            { $as_echo "$as_me:$LINENO: *** It appears that you do not have the newt development package installed." >&5
-$as_echo "$as_me: *** It appears that you do not have the newt development package installed." >&6;}
-            { $as_echo "$as_me:$LINENO: *** Please install it to include ${NEWT_DESCRIP} support" >&5
-$as_echo "$as_me: *** Please install it to include ${NEWT_DESCRIP} support" >&or re-run configure;}
-            { $as_echo "$as_me:$LINENO: *** without explicitly specifying --with-${NEWT_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${NEWT_OPTION}" >&6;}
-            exit 1
-         fi
-         NEWT_LIB=""
-         NEWT_INCLUDE=""
-         PBX_NEWT=0
-      else
-         PBX_NEWT=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_NEWT 1
-_ACEOF
-
-      fi
-   elif test ! -z "${NEWT_MANDATORY}";
-   then
-      { $as_echo "$as_me:$LINENO: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-      { $as_echo "$as_me:$LINENO: *** The ${NEWT_DESCRIP} installation on this system appears to be broken." >&5
-$as_echo "$as_me: *** The ${NEWT_DESCRIP} installation on this system appears to be broken." >&6;}
-      { $as_echo "$as_me:$LINENO: *** Either correct the installation" >&5
-$as_echo "$as_me: *** Either correct the installation" >&or run configure;}
-      { $as_echo "$as_me:$LINENO: *** without explicitly specifying --with-${NEWT_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${NEWT_OPTION}" >&6;}
-      exit 1
-   fi
-fi
-
-
-if test "${USE_CURSES}" != "no"; then
-   pbxlibdir=""
-   if test "x${CURSES_DIR}" != "x"; then
-      if test -d ${CURSES_DIR}/lib; then
-      	 pbxlibdir="-L${CURSES_DIR}/lib"
-      else
-      	 pbxlibdir="-L${CURSES_DIR}"
-      fi
-   fi
-   { $as_echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
-$as_echo_n "checking for initscr in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_initscr+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses ${pbxlibdir}  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* 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 initscr ();
-int
-main ()
-{
-return initscr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_curses_initscr=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_curses_initscr=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
-$as_echo "$ac_cv_lib_curses_initscr" >&6; }
-if test "x$ac_cv_lib_curses_initscr" = x""yes; then
-  AST_CURSES_FOUND=yes
-else
-  AST_CURSES_FOUND=no
-fi
-
-
-   if test "${AST_CURSES_FOUND}" = "yes"; then
-      CURSES_LIB="-lcurses "
-      CURSES_HEADER_FOUND="1"
-      if test "x${CURSES_DIR}" != "x"; then
-         CURSES_LIB="${pbxlibdir} ${CURSES_LIB}"
-	 CURSES_INCLUDE="-I${CURSES_DIR}/include"
-	 if test "xcurses.h" != "x" ; then
-	    as_ac_Header=`$as_echo "ac_cv_header_${CURSES_DIR}/include/curses.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for ${CURSES_DIR}/include/curses.h" >&5
-$as_echo_n "checking for ${CURSES_DIR}/include/curses.h... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ${CURSES_DIR}/include/curses.h usability" >&5
-$as_echo_n "checking ${CURSES_DIR}/include/curses.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <${CURSES_DIR}/include/curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ${CURSES_DIR}/include/curses.h presence" >&5
-$as_echo_n "checking ${CURSES_DIR}/include/curses.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <${CURSES_DIR}/include/curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for ${CURSES_DIR}/include/curses.h" >&5
-$as_echo_n "checking for ${CURSES_DIR}/include/curses.h... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  CURSES_HEADER_FOUND=1
-else
-  CURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      else
-	 if test "xcurses.h" != "x" ; then
-            if test "${ac_cv_header_curses_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for curses.h" >&5
-$as_echo_n "checking for curses.h... " >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-$as_echo "$ac_cv_header_curses_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking curses.h usability" >&5
-$as_echo_n "checking curses.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking curses.h presence" >&5
-$as_echo_n "checking curses.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: curses.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for curses.h" >&5
-$as_echo_n "checking for curses.h... " >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_curses_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-$as_echo "$ac_cv_header_curses_h" >&6; }
-
-fi
-if test "x$ac_cv_header_curses_h" = x""yes; then
-  CURSES_HEADER_FOUND=1
-else
-  CURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      fi
-      if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${CURSES_MANDATORY}" ;
-         then
-            { $as_echo "$as_me:$LINENO: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-            { $as_echo "$as_me:$LINENO: *** It appears that you do not have the curses development package installed." >&5
-$as_echo "$as_me: *** It appears that you do not have the curses development package installed." >&6;}
-            { $as_echo "$as_me:$LINENO: *** Please install it to include ${CURSES_DESCRIP} support" >&5
-$as_echo "$as_me: *** Please install it to include ${CURSES_DESCRIP} support" >&or re-run configure;}
-            { $as_echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
-            exit 1
-         fi
-         CURSES_LIB=""
-         CURSES_INCLUDE=""
-         PBX_CURSES=0
-      else
-         PBX_CURSES=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CURSES 1
-_ACEOF
-
-      fi
-   elif test ! -z "${CURSES_MANDATORY}";
-   then
-      { $as_echo "$as_me:$LINENO: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-      { $as_echo "$as_me:$LINENO: *** The ${CURSES_DESCRIP} installation on this system appears to be broken." >&5
-$as_echo "$as_me: *** The ${CURSES_DESCRIP} installation on this system appears to be broken." >&6;}
-      { $as_echo "$as_me:$LINENO: *** Either correct the installation" >&5
-$as_echo "$as_me: *** Either correct the installation" >&or run configure;}
-      { $as_echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
-      exit 1
-   fi
-fi
-
-
-if test "${USE_NCURSES}" != "no"; then
-   pbxlibdir=""
-   if test "x${NCURSES_DIR}" != "x"; then
-      if test -d ${NCURSES_DIR}/lib; then
-      	 pbxlibdir="-L${NCURSES_DIR}/lib"
-      else
-      	 pbxlibdir="-L${NCURSES_DIR}"
-      fi
-   fi
-   { $as_echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-$as_echo_n "checking for initscr in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses ${pbxlibdir}  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* 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 initscr ();
-int
-main ()
-{
-return initscr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_ncurses_initscr=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ncurses_initscr=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
-$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
-if test "x$ac_cv_lib_ncurses_initscr" = x""yes; then
-  AST_NCURSES_FOUND=yes
-else
-  AST_NCURSES_FOUND=no
-fi
-
-
-   if test "${AST_NCURSES_FOUND}" = "yes"; then
-      NCURSES_LIB="-lncurses "
-      NCURSES_HEADER_FOUND="1"
-      if test "x${NCURSES_DIR}" != "x"; then
-         NCURSES_LIB="${pbxlibdir} ${NCURSES_LIB}"
-	 NCURSES_INCLUDE="-I${NCURSES_DIR}/include"
-	 if test "xcurses.h" != "x" ; then
-	    as_ac_Header=`$as_echo "ac_cv_header_${NCURSES_DIR}/include/curses.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for ${NCURSES_DIR}/include/curses.h" >&5
-$as_echo_n "checking for ${NCURSES_DIR}/include/curses.h... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking ${NCURSES_DIR}/include/curses.h usability" >&5
-$as_echo_n "checking ${NCURSES_DIR}/include/curses.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <${NCURSES_DIR}/include/curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking ${NCURSES_DIR}/include/curses.h presence" >&5
-$as_echo_n "checking ${NCURSES_DIR}/include/curses.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <${NCURSES_DIR}/include/curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for ${NCURSES_DIR}/include/curses.h" >&5
-$as_echo_n "checking for ${NCURSES_DIR}/include/curses.h... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  NCURSES_HEADER_FOUND=1
-else
-  NCURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      else
-	 if test "xcurses.h" != "x" ; then
-            if test "${ac_cv_header_curses_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for curses.h" >&5
-$as_echo_n "checking for curses.h... " >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-$as_echo "$ac_cv_header_curses_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking curses.h usability" >&5
-$as_echo_n "checking curses.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking curses.h presence" >&5
-$as_echo_n "checking curses.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: curses.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for curses.h" >&5
-$as_echo_n "checking for curses.h... " >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_curses_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-$as_echo "$ac_cv_header_curses_h" >&6; }
-
-fi
-if test "x$ac_cv_header_curses_h" = x""yes; then
-  NCURSES_HEADER_FOUND=1
-else
-  NCURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      fi
-      if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${NCURSES_MANDATORY}" ;
-         then
-            { $as_echo "$as_me:$LINENO: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-            { $as_echo "$as_me:$LINENO: *** It appears that you do not have the ncurses development package installed." >&5
-$as_echo "$as_me: *** It appears that you do not have the ncurses development package installed." >&6;}
-            { $as_echo "$as_me:$LINENO: *** Please install it to include ${NCURSES_DESCRIP} support" >&5
-$as_echo "$as_me: *** Please install it to include ${NCURSES_DESCRIP} support" >&or re-run configure;}
-            { $as_echo "$as_me:$LINENO: *** without explicitly specifying --with-${NCURSES_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${NCURSES_OPTION}" >&6;}
-            exit 1
-         fi
-         NCURSES_LIB=""
-         NCURSES_INCLUDE=""
-         PBX_NCURSES=0
-      else
-         PBX_NCURSES=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_NCURSES 1
-_ACEOF
-
-      fi
-   elif test ! -z "${NCURSES_MANDATORY}";
-   then
-      { $as_echo "$as_me:$LINENO: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-      { $as_echo "$as_me:$LINENO: *** The ${NCURSES_DESCRIP} installation on this system appears to be broken." >&5
-$as_echo "$as_me: *** The ${NCURSES_DESCRIP} installation on this system appears to be broken." >&6;}
-      { $as_echo "$as_me:$LINENO: *** Either correct the installation" >&5
-$as_echo "$as_me: *** Either correct the installation" >&or run configure;}
-      { $as_echo "$as_me:$LINENO: *** without explicitly specifying --with-${NCURSES_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${NCURSES_OPTION}" >&6;}
-      exit 1
-   fi
-fi
-
-
-PBX_GTK2=0
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PKGCONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PKGCONFIG"; then
-  ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_PKGCONFIG="${ac_tool_prefix}pkg-config"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PKGCONFIG=$ac_cv_prog_PKGCONFIG
-if test -n "$PKGCONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
-$as_echo "$PKGCONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_PKGCONFIG"; then
-  ac_ct_PKGCONFIG=$PKGCONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_PKGCONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_PKGCONFIG"; then
-  ac_cv_prog_ac_ct_PKGCONFIG="$ac_ct_PKGCONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_PKGCONFIG="pkg-config"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_PKGCONFIG=$ac_cv_prog_ac_ct_PKGCONFIG
-if test -n "$ac_ct_PKGCONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_PKGCONFIG" >&5
-$as_echo "$ac_ct_PKGCONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_PKGCONFIG" = x; then
-    PKGCONFIG="No"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKGCONFIG=$ac_ct_PKGCONFIG
-  fi
-else
-  PKGCONFIG="$ac_cv_prog_PKGCONFIG"
-fi
-
-if test ! "x${PKGCONFIG}" = xNo; then
-   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
-   GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
-   PBX_GTK2=1
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GTK2 1
-_ACEOF
-
-fi
-
-
-
-
-test "$silent"=yes && ac_sub_configure_args="${ac_sub_configure_args} --silent"
-
-ac_config_files="$ac_config_files makeopts"
-
-
-
-subdirs="$subdirs mxml"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTION]... [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to <bug-autoconf at gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconfig.h" ;;
-    "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
- ;;
-
-
-  esac
-
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    --disable-option-checking)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:$LINENO: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
-    { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-{ $as_echo "$as_me:$LINENO: Menuselect build configuration successfully completed" >&5
-$as_echo "$as_me: Menuselect build configuration successfully completed" >&6;}
diff --git a/menuselect/configure.ac b/menuselect/configure.ac
deleted file mode 100644
index b4bebe1..0000000
--- a/menuselect/configure.ac
+++ /dev/null
@@ -1,146 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-
-m4_define([MENUSELECT_VERSION],
-          m4_bpatsubst(m4_esyscmd([./make_version .]),
-                       [\([0-9.]*\)\(\w\|\W\)*],
-                       [\1]))
-AC_INIT(menuselect, MENUSELECT_VERSION, www.asterisk.org)
-
-# check existence of the package
-AC_CONFIG_SRCDIR([menuselect.c])
-
-# specify output header file
-AC_CONFIG_HEADER(autoconfig.h)
-
-AC_COPYRIGHT("Menuselect")
-AC_REVISION($Revision: 40837 $)
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-
-HOST_OS=${host_os}
-AC_SUBST(HOST_OS)
-
-PBX_WINARCH=0
-case "${host_os}" in
-     freebsd*)
-     OSARCH=FreeBSD
-     ;;
-     netbsd*)
-     OSARCH=NetBSD
-     ;;
-     openbsd*)
-     OSARCH=OpenBSD
-     ;;
-     solaris*)
-     OSARCH=SunOS
-     ;;
-     mingw32)
-     OSARCH=mingw32
-     PBX_WINARCH=1
-     ;;
-     cygwin)
-     OSARCH=cygwin
-     PBX_WINARCH=1
-     ;;
-     linux-gnueabi)
-     OSARCH=linux-gnu
-     ;;
-     *)
-     OSARCH=${host_os}
-     ;;
-esac
-
-AH_TOP(
-#ifndef MENUSELECT_AUTOCONFIG_H
-#define MENUSELECT_AUTOCONFIG_H
-
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-)
-
-AH_BOTTOM(
-#endif
-)
-
-# Checks for programs.
-AC_PROG_CC
-AST_CHECK_GNU_MAKE
-
-
-AC_LANG(C)
-AC_ARG_ENABLE([debug],
-	[AS_HELP_STRING([--enable-debug], [Turn on debug mode])],
-	[case "${enableval}" in
-		y|ye|yes) MENUSELECT_DEBUG=yes ;;
-		n|no)  MENUSELECT_DEBUG=no ;;
-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug)  ;;
-    esac])
-AC_SUBST(MENUSELECT_DEBUG)
-
-# Support weak symbols on a platform specific basis.  The Mac OS X
-# (Darwin) support must be isolated from the other platforms because
-# it has caused other platforms to fail.
-#
-case "${OSARCH}" in
-	darwin*)
-	# Allow weak symbol support on Darwin platforms only because there
-	# is active community support for it.
-	# However, Darwin seems to break weak symbols for each new version.
-	#
-	AST_GCC_ATTRIBUTE(weak_import, [], [], PBX_WEAKREF)
-
-	# Several other platforms including Linux have GCC versions that
-	# define the weak attribute.  However, this attribute is only
-	# setup for use in the code by Darwin.
-	AST_GCC_ATTRIBUTE(weak, [], [], PBX_WEAKREF)
-	;;
-	linux-gnu)
-	# Primarily support weak symbols on Linux platforms.
-	#
-	AST_GCC_ATTRIBUTE(weakref, [weakref("foo")], static, PBX_WEAKREF)
-	;;
-	*)
-	# Allow weak symbols on other platforms.  However, any problems
-	# with this feature on other platforms must be fixed by the
-	# community.
-	#
-	AST_GCC_ATTRIBUTE(weakref, [weakref("foo")], static, PBX_WEAKREF)
-	;;
-esac
-
-AC_FUNC_ALLOCA
-AC_CHECK_FUNCS([asprintf getloadavg setenv strcasestr strndup strnlen strsep unsetenv vasprintf])
-
-# The frontend can use curses, ncurses, newt or GTK2 so check for all of them
-
-AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
-AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
-
-AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
-AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
-AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
-
-PBX_GTK2=0
-AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
-if test ! "x${PKGCONFIG}" = xNo; then
-   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
-   GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)   
-   PBX_GTK2=1
-   AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.])
-fi
-AC_SUBST(PBX_GTK2)
-AC_SUBST(GTK2_INCLUDE)
-AC_SUBST(GTK2_LIB)
-
-test "$silent"=yes && ac_sub_configure_args="${ac_sub_configure_args} --silent"
-
-AC_CONFIG_FILES([makeopts])
-AC_CONFIG_SUBDIRS([mxml])
-AC_OUTPUT
-
-AC_MSG_NOTICE(Menuselect build configuration successfully completed)
diff --git a/menuselect/contrib/Makefile-dummy b/menuselect/contrib/Makefile-dummy
deleted file mode 100644
index 7b677fc..0000000
--- a/menuselect/contrib/Makefile-dummy
+++ /dev/null
@@ -1,17 +0,0 @@
-all:
-
-clean:
-
-dist-clean:
-
-makeopts:
-
-menuselect:
-	./menuselect-dummy
-
-# Generate some dummy files to satifsy dependencies from the main
-# Makefile.
-dummies:
-	touch linkedlists.h menuselect.c menuselect_curses.c \
-		menuselect.h menuselect_stub.c
-
diff --git a/menuselect/contrib/menuselect-dummy b/menuselect/contrib/menuselect-dummy
deleted file mode 100755
index 993ab27..0000000
--- a/menuselect/contrib/menuselect-dummy
+++ /dev/null
@@ -1,741 +0,0 @@
-#!/usr/bin/perl -w
-
-# menuselect - a simple drop-in replacement of the batch-mode menuselect
-# included with Asterisk.
-#
-# Copyright (C) 2008 by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
-
-# Installation: copy this script to menuselect/menuselect . Copy the
-# included Makefile as menuselect/Makefile and run:
-#
-#   make -C makefile dummies
-#
-# It takes configuration from build_tools/conf . Sample config file:
-#
-#   By default all modules will be built (except those marked not be
-#   used by default)
-#
-#   # exclude: Don't try to build the following modules. 
-#   #exclude app_test
-#
-#   # You can have multiple items in each line, and multiple lines.
-#   # Each item is a perl regular expression that must match the whole
-#   # module name.
-#   #exclude res_config_.*
-#
-#   # include: syntax is the same as exclude. Overrides exclude and
-#   # modules that are marked as disabled by defualt:
-#   #include res_config_sqlite3 app_skel
-#
-#   # If you want to make sure some modules will be conifgured to build,
-#   # you can require them. If modules that match any of the 'require'
-#   # pattern are not configured to build, menuselect will panic.
-#   # Same pattern rules apply here. Why would you want that? I have no
-#   # idea.
-#   #require chan_h323 app_directory
-#
-#   # random - the value for this keyword is a number between 1 and 
-#   # 100. The higher it is, more chances not to include each module.
-#   # Writes the list of modules that got hit to
-#   # build_tools/mods_removed_random .
-#   # Note that unlike 'make randomconfig' and such the random
-#   # configuration changes each time you run 'make', thus if a build
-#   # failed you should first read build_tools/mods_removed_random
-#   # before re-running make.
-#   #random 10
-#
-#   # Anything after a '#' is ignored, and likewise empty lines.
-#   # Naturally.
-
-use strict;
-use Getopt::Long;
-
-# Holds global dependncy information. Keys are module names.
-my %ModInfo = ();
-
-# extract configuration from kernel modules:
-my $AutoconfDepsFile = "build_tools/menuselect-deps";
-
-my $AutoconfOptsFile = "makeopts";
-my %ConfigureOpts = (); # 
-
-# configuration file to read for some directives:
-my $ConfFile = "build_tools/conf";
-
-my $DumpFile = 'build_tools/dump_deps';
-
-# Modules removed randomely:
-my $RandomeModsFile = "build_tools/mods_removed_random";
-
-my $MakedepsFile = "menuselect.makedeps";
-
-my $MakeoptsFile = "menuselect.makeopts";
-
-# If those modules are not present, the build will fail (PCRE patterns)
-my @RequiredModules = ();
-
-my @Subdirs = qw/addons apps bridges cdr cel channels codecs formats funcs main pbx res tests utils/;
-
-my @XmlCategories = 'cflags';
-
-# Modules should not bother building (PCRE patterns)
-my @ExcludedModules = ();
-
-# Do try building those. Overrides 'exclude' and 'defaultenable: no'
-my @IncludedModules = ();
-
-# A chance to rule-out a module randomely.
-my $RandomKnockoutFactor = 0;
-
-sub warning($) {
-	my $msg = shift;
-	print STDERR "$0: Warning: $msg\n";
-}
-
-# Convert XML syntax to mail-header-like syntax:
-# <var>value</var> --> Var: value
-sub extract_xml_key($) {
-	my %attr = ();
-	my $xml_line = shift;
-	if ($xml_line !~ m{^\s*<([a-z_A-Z0-9]+)(\s+([^>]*))?>([^<]*)</\1>}) {
-		warning "parsed empty value from XML line $xml_line";
-		return ('', ''); # warn?
-	}
-	my ($var, $val) = ($1, $4);
-	$var =~ s{^[a-z]}{\u$&};
-	if (defined $3) {
-		my $attr_text = $3;
-		while ($attr_text =~ /^( *([^=]+)="([^"]+)")/) {
-			my ($var, $val) = ($2, $3);
-			$attr_text =~ s/^$1//;
-			$attr{$var} = $val;
-		}
-	}
-	return ($var, $val, %attr);
-}
-
-# Get information embedded in source files from a subdirectory.
-# First parameter is the subdirectory and further ones are the actual
-# source files.
-sub get_subdir_module_info {
-	my $subdir = shift;
-	my @files = @_;
-
-	my $dir = uc($subdir);
-
-	foreach my $src (@files) {
-		open SRC,$src or die "Can't read from source file $src: $!\n";
-		$src =~ m|.*/([^/]*)\.c|;
-		my $mod_name = $1;
-		my %data = (
-			Type=>'module', 
-			Module=>$mod_name, 
-			Dir=> $dir, 
-			Avail=>1
-		);
-
-		while (<SRC>) {
-			next unless (m|^/\*\*\* MODULEINFO| .. m|^ *[*]+/|);
-			next unless (m|^[A-Z]| || m|^\s*<|);
-
-			# At this point we can assume we're in the module 
-			# info section.
-			chomp;
-			my ($var, $val, %attr) = extract_xml_key($_);
-			foreach (keys %attr) {
-				push @{$data{$_}},($attr{$_});
-			}
-			if ($var =~ /^(Depend|Use)$/i) {
-				# use uppercase for dependency names;
-				$val = uc($val); 
-			}
-			if ( ! exists $data{$var} ) {
-				$data{$var} = [$val];
-			} else {
-				push @{$data{$var}},($val);
-			}
-		}
-		close SRC;
-
-		$ModInfo{uc($mod_name)} = \%data;
-	}
-}
-
-# extract embedded information in all the source tree.
-sub extract_subdirs {
-	for my $subdir(@_) {
-		get_subdir_module_info($subdir, <$subdir/*.c> , <$subdir/*.cc>);
-	}
-}
-
-# parse a partial XML document that is included as an input 
-# for menuselect in a few places. Naturally a full-fledged XML parsing
-# will not be done here. A line-based parsing that happens to work will
-# have to do.
-sub parse_menuselect_xml_file($) {
-	my $file_name = shift;
-	open XML,$file_name or 
-		die "Failed opening XML file $file_name: $!.\n";
-	
-	my $header = <XML>;
-	$header =~ /^\s*<category\s+name="MENUSELECT_([^"]+)"\s/;
-	my $category = $1;
-	my $member;
-
-	while(<XML>){
-		next unless (m{^\s*<(/?[a-z]+)[>\s]});
-		my $tag = $1;
-
-		if ($tag eq 'member') {
-			if (! m{^\s*<member\s+name="([^"]+)" displayname="([^"]+)"\s*>}){
-				warning "Bad XML member line: $_ ($file_name:$.)\n";
-				next;
-			}
-			my ($name, $display_name) = ($1, $2);
-
-			$member = {
-				Type => 'XML',
-				Dir => $category,
-				Module => $1,
-				DisplayName => $2,
-				Defaultenabled => ['no'],
-				Avail => 1, 
-
-			};
-		} elsif ($tag eq '/member') {
-			$ModInfo{$member->{Module}} = $member;
-		} elsif ($tag eq '/category') {
-			last;
-		} else {
-			if (! m/^\s*<([a-z]+)>([^<]+)</) {
-				warning "(1) Unknown XML line $_ ($file_name:$.)\n";
-				next
-			}
-			my ($key, $val) = extract_xml_key($_);
-			if ($key eq '') {
-				warning "Unknown XML line $_ ($file_name:$.)\n";
-				next
-			}
-			if (! exists $member->{$key}) {
-				$member->{$key} = [];
-			}
-			
-			# Make sure dependencies are upper-case.
-			# FIXME: this is not the proper place for such a fix
-			$val = uc($val) if ($key =~ /Depend|Use/);
-
-			# Using "unshift' rather than 'push'.
-			# For a singleton value this makes the action an 
-			# override, as only the first value counts.
-			# For a list value, however, it means a reversed
-			# order.
-			unshift @{$member->{$key}}, ($val);
-		}
-	}
-
-	
-	close XML;
-}
-
-# Dump our data structure to a file.
-sub dump_deps($) {
-	my $file = shift;
-	open OUTPUT,">$file" or 
-	die "cannot open category file $file for writing: $!\n";
-
-	foreach my $mod_name (sort keys %ModInfo) { 
-	print OUTPUT "Key: $mod_name\n";
-		my $data = $ModInfo{$mod_name};
-		foreach my $var (sort keys %{$data} ) {
-			my $val = $$data{$var};
-			if (ref($val) eq 'ARRAY') {
-				print OUTPUT $var.": ". (join ", ", @$val)."\n";
-			} else {
-				print OUTPUT "$var: $val\n";
-			}
-		}
-		print OUTPUT "\n";
-	}
-	close OUTPUT;
-}
-
-# Get the available libraries that autoconf generated.
-sub get_autoconf_deps() {
-	open DEPS, $AutoconfDepsFile or
-		die "Failed to open $AutoconfDepsFile. Aborting: $!\n";
-
-	my @deps_list = (<DEPS>);
-	foreach (@deps_list){
-		chomp;
-		my ($lib, $avail_val) = split(/=/);
-		my ($avail, $avail_old) = split(/:/, $avail_val);
-		my $disabled = 0;
-		if ($avail == -1) { 
-			$disabled = 1;
-			$avail = 0;
-		}
-		$ModInfo{$lib} = {
-			Type=>'lib', Avail=>$avail, Disabled => $disabled
-		};
-		if (defined $avail_old) {
-			$ModInfo{$lib}{AvailOld} = $avail_old;
-		}
-		# FIXME: 
-		if (($avail ne "0") && ($avail ne "1")) {
-			warning "Library $lib has invalid availability ".
-				"value <$avail> (check $AutoconfDepsFile).\n";
-		}
-	}
-	close DEPS;
-}
-
-# Get the available libraries that autoconf generated.
-sub get_autoconf_opts() {
-	open OPTS, $AutoconfOptsFile or
-		die "Failed to open $AutoconfOptsFile. Aborting: $!\n";
-
-	while (<OPTS>) {
-		chomp;
-		next if /^(#|$)/;
-		my ($var, $val) = split /\s*=\s*/, $_, 2;
-		$ConfigureOpts{$var} = $val;
-	}
-	close OPTS;
-	if (not exists $ConfigureOpts{AST_DEVMODE}) {
-		$ConfigureOpts{AST_DEVMODE} = 'no';
-	}
-}
-
-# Read our specific config file.
-#
-# Its format:
-#
-#   keyword  values
-#
-# values are always a spaces-separated list.
-sub read_conf() {
-	open CONF,$ConfFile or return;
-
-	while (<CONF>) {
-		# remove comments and empty lines:
-		chomp;
-		s/#.*$//;
-		next if /^\s*$/;
-
-		my ($keyword, @value) = split;
-
-		if ($keyword eq 'exclude') {
-			push @ExcludedModules, @value;
-		} elsif ($keyword eq 'include') {
-			push @IncludedModules, @value;
-		} elsif ($keyword eq 'require') {
-			push @RequiredModules, @value;
-		} elsif ($keyword eq 'random') {
-			$RandomKnockoutFactor = $value[0] / 100;
-		} else {
-			warning "unknown keyword $keyword in line $. of $ConfFile.";
-		}
-	}
-}
-
-# generate menuselect.makedeps.
-# In this file menuselect writes dependecies of each module. CFLAGS will
-# then automatically include for each module the _INCLUDE and LDFLAGS
-# will include the _LIBS from all the depedencies of the module.
-sub gen_makedeps() {
-	open MAKEDEPSS, ">$MakedepsFile" or
-		die "Failed to open deps file $MakedepsFile for writing. Aborting: $!\n";
-
-	for my $mod_name (sort keys %ModInfo) {
-		next unless ($ModInfo{$mod_name}{Type} eq 'module');
-
-		my $mod = $ModInfo{$mod_name};
-		my @deps = ();
-
-		# if we have Depend or Use, put their values into 
-		# @deps . If we have none, move on.
-		push @deps, @{$mod->{Depend}} if (exists $mod->{Depend});
-		push @deps, @{$mod->{Use}}    if (exists $mod->{Use});
-		next unless @deps; 
-
-		# TODO: don't print dependencies that are not external libs. 
-		# Not done yet until I figure out if this is safe.
-		my $dep = join(' ', @deps);
-		print MAKEDEPSS "MENUSELECT_DEPENDS_".$mod->{Module}."=$dep\n";
-	}
-
-	close MAKEDEPSS;
-}
-
-# Set modules from patterns specified by 'exclude' in the configuration file
-# to exclude modules from building (mark them as unavailable).
-sub apply_excluded_patterns() {
-	foreach my $pattern (@ExcludedModules) {
-		my @excluded = grep {/^$pattern$/i} (keys %ModInfo);
-		foreach (@excluded) {
-			$ModInfo{$_}{Avail} = 0;
-		}
-	}
-}
-
-# Set modules from patterns specified by 'include' in the configuration
-# file to exclude from building (mark them as available).
-sub apply_included_patterns() {
-	foreach my $pattern (@IncludedModules) {
-		my @included = grep {/^$pattern$/i} (keys %ModInfo);
-		foreach (@included) {
-			$ModInfo{$_}{Avail} = 1;
-		}
-	}
-}
-
-# If user set the "random" config to anything > 0, drop some random
-# modules. May help expose wrong dependencies.
-sub apply_random_drop() {
-	return if ($RandomKnockoutFactor <= 0);
-
-	open MODS_LIST, ">$RandomeModsFile" or
-		die "Failed to open modules list file $RandomeModsFile for writing. Aborting: $!\n";
-	for my $mod (keys %ModInfo) {
-		next unless ($ModInfo{$mod}{Type} eq 'module');
-		next unless (rand() < $RandomKnockoutFactor);
-		$ModInfo{$mod}{Avail} = 0;
-		$ModInfo{$mod}{RandomKill} = 1;
-		print MODS_LIST $ModInfo{$mod}{Module}."\n";
-	}
-
-	close MODS_LIST;
-	
-
-}
-
-sub check_required_patterns() {
-	my @failed = ();
-	foreach my $pattern (@RequiredModules) {
-		my @required = grep {/^$pattern$/i} (keys %ModInfo);
-		foreach my $mod (@required) {
-			if ((! exists $ModInfo{$mod}{Checked}) ||
-				(! $ModInfo{$mod}{Checked}) )
-			{
-				push @failed, $mod;
-			}
-		}
-	}
-	return unless (@failed);
-
-	my $failed_str = join ' ', at failed;
-	die("Missing dependencies for the following modules: $failed_str\n");
-}
-
-# Disable building for modules that were marked in the embedded module 
-# information as disabled for building by default.
-sub apply_default_enabled() {
-	foreach my $mod (keys %ModInfo) {
-		if ((exists $ModInfo{$mod}{Defaultenabled}) &&
-				$ModInfo{$mod}{Defaultenabled}[0] eq 'no')
-		{
-			$ModInfo{$mod}{Avail} = 0;
-		}
-	}
-}
-
-# We found a dependency we don't know about. Warn the user, and add
-# information about it:
-sub handle_unknown_dep($$) {
-	my ($dep_mod, $mod) = @_;
-
-	my $mod_info = {
-		Type => 'Unknown',
-		Avail => 0,
-		Checked => 0,
-	};
-	$ModInfo{$dep_mod} = $mod_info;
-
-	warning "Unknown dependency module $dep_mod (for e.g. $mod)\n";
-}
-
-# recursively check dependency for a module.
-#
-# We run a scan for modules. Modules marked as 'Checked' are ones we
-# have already fully verified to have proper dependencies.
-#
-# We can only use a module or library marked as Avail => 1 (library
-# available or module not excluded).
-sub check_module($);
-sub check_module($) {
-	my $mod = shift;
-
-	# we checked it:
-	if (exists $ModInfo{$mod}{Checked}) {
-		return $ModInfo{$mod}{Checked};
-	}
-	# A library has no dependencies of its own.
-	if ($ModInfo{$mod}{Type} eq 'lib') {
-		return ($ModInfo{$mod}{Avail} || 0);
-	}
-	# An excluded module.
-	if ($ModInfo{$mod}{Avail} == 0) {
-		return 0;
-	}
-	if (! exists $ModInfo{$mod}{Depend}) {
-		$ModInfo{$mod}{Checked} = 1;
-		return 1;
-	}
-
-	my $deps_checked = 1; # may be reset below on failures:
-
-	if (exists $ModInfo{$mod}{Tested}) {
-		# this probably means a circular dependency of some sort.
-		warning "Got to module $mod that is already tested.";
-	}
-	$ModInfo{$mod}{Tested} = 1;
-
-	foreach my $dep_mod (@{$ModInfo{$mod}{Depend}} ) {
-		if (!exists ${ModInfo}{$dep_mod}) {
-			handle_unknown_dep($dep_mod, $mod);
-			return 0;
-		}
-		$deps_checked &= check_module($dep_mod);
-		last if(!$deps_checked) # no point testing further if we failed.
-	}
-
-	$ModInfo{$mod}{Checked} = $deps_checked;
-	return $deps_checked;
-}
-
-# The main dependency resolver function.
-sub resolve_deps() {
-	apply_default_enabled();
-	apply_excluded_patterns();
-	apply_included_patterns();
-
-	foreach my $mod (keys %ModInfo) {
-		check_module($mod);
-	}
-}
-
-# generate menuselect.makeopts. 
-# The values in this file obey to different semantics:
-# 1. For modules, a module will be built unles listed here
-# 2. For XML values (sounds, CFLAGS) it will be enabled if listed here
-sub gen_makeopts() {
-	open MAKEDEPS, ">$MakeoptsFile" or
-		die "Failed to open opts file $MakeoptsFile for writing. Aborting: $!\n";
-
-	my %Subdirs;
-	foreach my $mod (sort keys %ModInfo) {
-		next unless ($ModInfo{$mod}{Type} =~ /^(module|XML)$/);
-		if ($ModInfo{$mod}{Type} eq 'XML') {
-			next unless ($ModInfo{$mod}{Checked});
-		} else {
-			next if ($ModInfo{$mod}{Checked});
-		}
-		my $dir = $ModInfo{$mod}{Dir};
-		if (! exists $Subdirs{$dir}) {
-			$Subdirs{$dir} = [];
-		}
-		push @{$Subdirs{$dir}},( $ModInfo{$mod}{Module} );
-	}
-	foreach my $dir (sort keys %Subdirs) {
-		my $deps = join(' ', @{$Subdirs{$dir}});
-		print MAKEDEPS "MENUSELECT_$dir=$deps\n";
-	}
-
-	close MAKEDEPS;
-}
-
-# Main function for --check-deps
-sub check_dependencies() {
-	read_conf();
-
-	extract_subdirs(@Subdirs);
-
-	get_autoconf_opts();
-
-	parse_menuselect_xml_file('build_tools/cflags.xml');
-	if ($ConfigureOpts{AST_DEVMODE} eq 'yes') {
-		parse_menuselect_xml_file('build_tools/cflags-devmode.xml');
-	} 
-	parse_menuselect_xml_file('sounds/sounds.xml');
-
-	apply_random_drop();
-
-	get_autoconf_deps();
-
-	#dump_deps('build_tools/dump_deps_before_resolve');
-	resolve_deps();
-
-	# Handy debugging:
-	dump_deps($DumpFile);
-
-	check_required_patterns();
-
-	gen_makedeps();
-
-	gen_makeopts();
-}
-
-# 
-# The main program start here
-#
-
-sub read_dump() {
-	my %items = ();
-	my $saved_rs = $/;
-	$/ = "\n\n";
-	open DUMP_FILE,$DumpFile or die "Can't read from dump file $DumpFile\n";
-	while (<DUMP_FILE>) {
-		my %item = ();
-		my @item_lines = split /\n\r?/;
-		foreach (@item_lines) {
-			my ($var, $value) = split /: /, $_, 2;
-			$item{$var} = $value;
-		}
-		# FIXME: dependencies are a list. This should not be a 
-		# special case.
-		if (exists $item{Depend}) {
-			$item{Depend} = [split /\s*,\s*/,$item{Depend}];
-		}
-		$items{$item{Key}} = \%item;
-	}
-	close DUMP_FILE;
-	$/ = $saved_rs;
-	return \%items;
-}
-
-# Explain why a module (read from the dump file) was not enabled.
-# (We assume here that $item->{Avail} is 0)
-sub fail_reason($) {
-	my $item = shift;
-	if ($item->{Type} eq 'lib') {
-		return " Not found: system library";
-	} elsif ($item->{Type} eq 'XML') {
-		if ($item->{Defaultenabled} !~ /^y/) {
-			return "Not enabled";
-		} else {
-			return "Missing dependencies";
-		}
-	} elsif ($item->{Type} eq 'module') {
-		if (exists ($item->{Defaultenabled}) && 
-			$item->{Defaultenabled} =~ /^n/) {
-			return "Disabled";
-		} else {
-			return "Missing dependencies";
-		}
-	}
-}
-
-sub item_used($) {
-	my $item = shift;
-	my $type = $item->{Type};
-
-	return $item->{Avail} if ($type eq 'lib');
-	return $item->{Checked};
-}
-
-sub print_module_status {
-	my $flag_verbose = shift;
-	my $items = read_dump();
-	my %items_matched = ();
-
-	foreach my $pattern (@_) {
-		foreach (keys %$items) {
-			if (/$pattern/i) {
-				$items_matched{$_} = 1;
-			}
-		}
-	}
-
-	my @items_list = sort keys %items_matched;
-
-	foreach my $item_name (@items_list) {
-		my $item = $items->{$item_name};
-		if ($flag_verbose) {
-			printf "%s %-8s %-30s\n",
-				(item_used($item)? 'Y':'n'),
-				$item->{Type},
-				$item->{Key};
-			if (!$item->{Avail}) {
-				my $reason = fail_reason($item);
-				print " $reason\n";
-			}
-			foreach (@{$item->{Depend}}) {
-				my $depmod = $items->{$_};
-					printf(" * %-12s ",$_);
-					print (item_used($depmod)? '': "un");
-					print "available\n";
-			}
-		} else {
-			printf "%s %-8s %-30s",
-				(item_used($item)? 'Y':'n'),
-				$item->{Type},
-				$item->{Key};
-			foreach (@{$item->{Depend}}) {
-				my $depmod = $items->{$_};
-				if (item_used($depmod)) {
-					print "$_ ";
-				} else {
-					printf "[%s] ", $_;
-				}
-			}
-			print "\n";
-		}
-	}
-}
-
-sub usage() {
-	print "$0: menuselect reimplementation\n";
-	print "\n";
-	print "Usage:\n";
-	print "$0  # menuselect processing\n";
-	print "$0 -m|--modinfo|--moduls-info PATTERN # Status of modules\n";
-	print "$0 -v|--verbose                       # verbose (modinfo)\n";
-	print "$0 -c|--check-deps                    # Check for dependencies\n";
-	print "\n";
-	print "PATTERN is a partial perl regex. Use '-m .' to list all.\n";
-}
-
-my @module_status = ();
-
-my $flag_verbose = 0;
-
-my $action = '';
-
-my $rc = GetOptions(
-	'modinfo|modules-info|m=s' => \@module_status,
-	'verbose|v' => \$flag_verbose,
-	'check-deps|c:s' => sub { $action = 'check_dependencies'},
-	'help|h' => sub { usage(); exit 0 },
-);
-if (!$rc) {
-	usage();
-	exit $rc;
-}
-
-if (@module_status) {
-	$action = 'module_status';
-}
-
-if ($action eq 'module_status') {
-	print_module_status($flag_verbose, @module_status);
-	exit 0;
-} elsif ( $action eq 'check_dependencies') {
-	check_dependencies();
-} else {
-	usage(); exit(1);
-}
diff --git a/menuselect/example_menuselect-tree b/menuselect/example_menuselect-tree
deleted file mode 100644
index 23031a3..0000000
--- a/menuselect/example_menuselect-tree
+++ /dev/null
@@ -1,487 +0,0 @@
-<?xml version=1.0?>
-
-<menu name="Asterisk Module Selection">
-	<category name="MENUSELECT_APPS" displayname="Applications">
-		<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
-		</member>
-		<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
-		</member>
-		<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
-		</member>
-		<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
-		</member>
-		<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
-		</member>
-		<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
-		</member>
-		<member name="app_channelredirect" displayname="Channel Redirect" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
-		</member>
-		<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
-		</member>
-		<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
-		</member>
-		<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
-		</member>
-		<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
-		</member>
-		<member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
-		</member>
-		<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
-		</member>
-		<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
-		</member>
-		<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
-		</member>
-		<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
-		</member>
-		<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
-		</member>
-		<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
-		</member>
-		<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
-		</member>
-		<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
-		</member>
-		<member name="app_flash" displayname="Flash zap trunk application" remove_on_change="apps/app_flash.o apps/app_flash.so">
-	<depend>zaptel</depend>
-		</member>
-		<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-		</member>
-		<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities." remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
-		</member>
-		<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
-		</member>
-		<member name="app_hasnewvoicemail" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="apps/app_hasnewvoicemail.o apps/app_hasnewvoicemail.so">
-		</member>
-		<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
-		</member>
-		<member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
-		</member>
-		<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
-	<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="app_lookupblacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="apps/app_lookupblacklist.o apps/app_lookupblacklist.so">
-		</member>
-		<member name="app_lookupcidname" displayname="Look up CallerID Name from local database" remove_on_change="apps/app_lookupcidname.o apps/app_lookupcidname.so">
-		</member>
-		<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
-		</member>
-		<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
-	<depend>zaptel</depend>
-		</member>
-		<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
-		</member>
-		<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
-		</member>
-		<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
-		</member>
-		<member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
-		</member>
-		<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
-		</member>
-		<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
-	<depend>libosptk</depend>
-	<depend>ssl</depend>
-		</member>
-		<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
-	<depend>zaptel</depend>
-		</member>
-		<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
-		</member>
-		<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
-		</member>
-		<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
-		</member>
-		<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
-		</member>
-		<member name="app_random" displayname="Random goto" remove_on_change="apps/app_random.o apps/app_random.so">
-		</member>
-		<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
-		</member>
-		<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
-		</member>
-		<member name="app_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="apps/app_realtime.o apps/app_realtime.so">
-		</member>
-		<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
-		</member>
-		<member name="app_rpt" displayname="Radio Repeater / Remote Base  version 0.48  06/13/2006" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
-	<depend>zaptel</depend>
-	<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
-		</member>
-		<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
-		</member>
-		<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
-		</member>
-		<member name="app_setcallerid" displayname="Set CallerID Application" remove_on_change="apps/app_setcallerid.o apps/app_setcallerid.so">
-		</member>
-		<member name="app_setcdruserfield" displayname="CDR user field apps" remove_on_change="apps/app_setcdruserfield.o apps/app_setcdruserfield.so">
-		</member>
-		<member name="app_settransfercapability" displayname="Set ISDN Transfer Capability" remove_on_change="apps/app_settransfercapability.o apps/app_settransfercapability.so">
-		</member>
-		<member name="app_skel" displayname="Trivial skeleton Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
-	<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
-		</member>
-		<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
-		</member>
-		<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
-		</member>
-		<member name="app_stack" displayname="Stack Routines" remove_on_change="apps/app_stack.o apps/app_stack.so">
-		</member>
-		<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
-		</member>
-		<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
-		</member>
-		<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
-		</member>
-		<member name="app_transfer" displayname="Transfer" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
-		</member>
-		<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
-		</member>
-		<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
-		</member>
-		<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
-		</member>
-		<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
-		</member>
-		<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
-		</member>
-		<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
-		</member>
-		<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
-		</member>
-		<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
-		</member>
-		<member name="app_zapbarge" displayname="Barge in on Zap channel application" remove_on_change="apps/app_zapbarge.o apps/app_zapbarge.so">
-	<depend>zaptel</depend>
-		</member>
-		<member name="app_zapras" displayname="Zap RAS Application" remove_on_change="apps/app_zapras.o apps/app_zapras.so">
-	<depend>zaptel</depend>
-		</member>
-		<member name="app_zapscan" displayname="Scan Zap channels application" remove_on_change="apps/app_zapscan.o apps/app_zapscan.so">
-	<depend>zaptel</depend>
-		</member>
-	</category>
-	<category name="MENUSELECT_CDR" displayname="Call Detail Recording">
-		<member name="cdr_csv" displayname="Comma Separated Values CDR Backend" remove_on_change="cdr/cdr_csv.o cdr/cdr_csv.so">
-		</member>
-		<member name="cdr_custom" displayname="Customizable Comma Separated Values CDR Backend" remove_on_change="cdr/cdr_custom.o cdr/cdr_custom.so">
-		</member>
-		<member name="cdr_manager" displayname="Asterisk Call Manager CDR Backend" remove_on_change="cdr/cdr_manager.o cdr/cdr_manager.so">
-		</member>
-		<member name="cdr_odbc" displayname="ODBC CDR Backend" remove_on_change="cdr/cdr_odbc.o cdr/cdr_odbc.so">
-	<depend>unixodbc</depend>
-		</member>
-		<member name="cdr_pgsql" displayname="PostgreSQL CDR Backend" remove_on_change="cdr/cdr_pgsql.o cdr/cdr_pgsql.so">
-	<depend>pgsql</depend>
-		</member>
-		<member name="cdr_radius" displayname="RADIUS CDR Backend" remove_on_change="cdr/cdr_radius.o cdr/cdr_radius.so">
-	<depend>radiusclient</depend>
-		</member>
-		<member name="cdr_sqlite" displayname="SQLite CDR Backend" remove_on_change="cdr/cdr_sqlite.o cdr/cdr_sqlite.so">
-	<depend>sqlite</depend>
-		</member>
-		<member name="cdr_tds" displayname="MSSQL CDR Backend" remove_on_change="cdr/cdr_tds.o cdr/cdr_tds.so">
-	<depend>freetds</depend>
-		</member>
-	</category>
-	<category name="MENUSELECT_CHANNELS" displayname="Channel Drivers">
-		<member name="chan_agent" displayname="Agent Proxy Channel" remove_on_change="channels/chan_agent.o channels/chan_agent.so">
-		</member>
-		<member name="chan_alsa" displayname="ALSA Console Channel Driver" remove_on_change="channels/chan_alsa.o channels/chan_alsa.so">
-	<depend>asound</depend>
-		</member>
-		<member name="chan_features" displayname="Feature Proxy Channel" remove_on_change="channels/chan_features.o channels/chan_features.so">
-		</member>
-		<member name="chan_h323" displayname="The NuFone Network's Open H.323 Channel Driver" remove_on_change="channels/chan_h323.o channels/chan_h323.so">
-	<depend>h323</depend>
-		</member>
-		<member name="chan_iax2" displayname="Inter Asterisk eXchange (Ver 2)" remove_on_change="channels/chan_iax2.o channels/chan_iax2.so">
-		</member>
-		<member name="chan_jingle" displayname="Jingle Channel Driver" remove_on_change="channels/chan_jingle.o channels/chan_jingle.so">
-	<depend>iksemel</depend>
-		</member>
-		<member name="chan_local" displayname="Local Proxy Channel" remove_on_change="channels/chan_local.o channels/chan_local.so">
-		</member>
-		<member name="chan_mgcp" displayname="Media Gateway Control Protocol (MGCP)" remove_on_change="channels/chan_mgcp.o channels/chan_mgcp.so">
-		</member>
-		<member name="chan_misdn" displayname="Channel driver for mISDN Support (Bri/Pri)" remove_on_change="channels/chan_misdn.o channels/chan_misdn.so">
-		</member>
-		<member name="chan_nbs" displayname="Network Broadcast Sound Driver" remove_on_change="channels/chan_nbs.o channels/chan_nbs.so">
-	<depend>nbs</depend>
-		</member>
-		<member name="chan_oss" displayname="OSS Console Channel Driver" remove_on_change="channels/chan_oss.o channels/chan_oss.so">
-	<depend>ossaudio</depend>
-		</member>
-		<member name="chan_phone" displayname="Standard Linux Telephony API Driver" remove_on_change="channels/chan_phone.o channels/chan_phone.so">
-	<depend>ixjuser</depend>
-		</member>
-		<member name="chan_sip" displayname="Session Initiation Protocol (SIP)" remove_on_change="channels/chan_sip.o channels/chan_sip.so">
-		</member>
-		<member name="chan_skinny" displayname="Skinny Client Control Protocol (Skinny)" remove_on_change="channels/chan_skinny.o channels/chan_skinny.so">
-		</member>
-		<member name="chan_vpb" displayname="Standard VoiceTronix API Driver" remove_on_change="channels/chan_vpb.o channels/chan_vpb.so">
-	<depend>vpbapi</depend>
-		</member>
-		<member name="chan_zap" displayname="Zapata Telephony" remove_on_change="channels/chan_zap.o channels/chan_zap.so">
-	<depend>zaptel</depend>
-		</member>
-	</category>
-	<category name="MENUSELECT_CODECS" displayname="Codec Translators">
-		<member name="codec_a_mu" displayname="A-law and Mulaw direct Coder/Decoder" remove_on_change="codecs/codec_a_mu.o codecs/codec_a_mu.so">
-		</member>
-		<member name="codec_adpcm" displayname="Adaptive Differential PCM Coder/Decoder" remove_on_change="codecs/codec_adpcm.o codecs/codec_adpcm.so">
-		</member>
-		<member name="codec_alaw" displayname="A-law Coder/Decoder" remove_on_change="codecs/codec_alaw.o codecs/codec_alaw.so">
-		</member>
-		<member name="codec_g723_1" displayname="" remove_on_change="codecs/codec_g723_1.o codecs/codec_g723_1.so">
-	<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="codec_g726" displayname="ITU G.726-32kbps G726 Transcoder" remove_on_change="codecs/codec_g726.o codecs/codec_g726.so">
-		</member>
-		<member name="codec_gsm" displayname="GSM/PCM16 (signed linear) Codec Translator" remove_on_change="codecs/codec_gsm.o codecs/codec_gsm.so">
-	<depend>libgsm</depend>
-		</member>
-		<member name="codec_ilbc" displayname="iLBC/PCM16 (signed linear) Codec Translator" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
-		</member>
-		<member name="codec_lpc10" displayname="LPC10 2.4kbps (signed linear) Voice Coder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
-		</member>
-		<member name="codec_speex" displayname="Speex/PCM16 (signed linear) Codec Translator" remove_on_change="codecs/codec_speex.o codecs/codec_speex.so">
-	<depend>libspeex</depend>
-		</member>
-		<member name="codec_ulaw" displayname="Mu-law Coder/Decoder" remove_on_change="codecs/codec_ulaw.o codecs/codec_ulaw.so">
-		</member>
-		<member name="codec_zap" displayname="Generic Zaptel Transcoder Codec Translator" remove_on_change="codecs/codec_zap.o codecs/codec_zap.so">
-	<depend>zaptel</depend>
-		</member>
-	</category>
-	<category name="MENUSELECT_FORMATS" displayname="Format Interpreters">
-		<member name="format_g723" displayname="G.723.1 Simple Timestamp File Format" remove_on_change="formats/format_g723.o formats/format_g723.so">
-		</member>
-		<member name="format_g726" displayname="Raw G.726 (16/24/32/40kbps) data" remove_on_change="formats/format_g726.o formats/format_g726.so">
-		</member>
-		<member name="format_g729" displayname="Raw G729 data" remove_on_change="formats/format_g729.o formats/format_g729.so">
-		</member>
-		<member name="format_gsm" displayname="Raw GSM data" remove_on_change="formats/format_gsm.o formats/format_gsm.so">
-		</member>
-		<member name="format_h263" displayname="Raw h263 data" remove_on_change="formats/format_h263.o formats/format_h263.so">
-		</member>
-		<member name="format_h264" displayname="Raw h264 data" remove_on_change="formats/format_h264.o formats/format_h264.so">
-		</member>
-		<member name="format_ilbc" displayname="Raw iLBC data" remove_on_change="formats/format_ilbc.o formats/format_ilbc.so">
-		</member>
-		<member name="format_jpeg" displayname="JPEG (Joint Picture Experts Group) Image Format" remove_on_change="formats/format_jpeg.o formats/format_jpeg.so">
-		</member>
-		<member name="format_ogg_vorbis" displayname="OGG/Vorbis audio" remove_on_change="formats/format_ogg_vorbis.o formats/format_ogg_vorbis.so">
-	<depend>libvorbis</depend>
-	<depend>ogg</depend>
-		</member>
-		<member name="format_pcm" displayname="Raw/Sun uLaw/ALaw 8khz Audio support (PCM,PCMA,AU)" remove_on_change="formats/format_pcm.o formats/format_pcm.so">
-		</member>
-		<member name="format_sln" displayname="Raw Signed Linear Audio support (SLN)" remove_on_change="formats/format_sln.o formats/format_sln.so">
-		</member>
-		<member name="format_vox" displayname="Dialogic VOX (ADPCM) File Format" remove_on_change="formats/format_vox.o formats/format_vox.so">
-		</member>
-		<member name="format_wav" displayname="Microsoft WAV format (8000hz Signed Linear)" remove_on_change="formats/format_wav.o formats/format_wav.so">
-		</member>
-		<member name="format_wav_gsm" displayname="Microsoft WAV format (Proprietary GSM)" remove_on_change="formats/format_wav_gsm.o formats/format_wav_gsm.so">
-		</member>
-	</category>
-	<category name="MENUSELECT_FUNCS" displayname="Dialplan Functions">
-		<member name="func_base64" displayname="base64 encode/decode dialplan functions" remove_on_change="funcs/func_base64.o funcs/func_base64.so">
-		</member>
-		<member name="func_callerid" displayname="Caller ID related dialplan function" remove_on_change="funcs/func_callerid.o funcs/func_callerid.so">
-		</member>
-		<member name="func_cdr" displayname="CDR dialplan function" remove_on_change="funcs/func_cdr.o funcs/func_cdr.so">
-		</member>
-		<member name="func_channel" displayname="Channel information dialplan function" remove_on_change="funcs/func_channel.o funcs/func_channel.so">
-		</member>
-		<member name="func_curl" displayname="Load external URL" remove_on_change="funcs/func_curl.o funcs/func_curl.so">
-	<depend>curl</depend>
-		</member>
-		<member name="func_cut" displayname="Cut out information from a string" remove_on_change="funcs/func_cut.o funcs/func_cut.so">
-		</member>
-		<member name="func_db" displayname="Database (astdb) related dialplan functions" remove_on_change="funcs/func_db.o funcs/func_db.so">
-		</member>
-		<member name="func_enum" displayname="ENUM related dialplan functions" remove_on_change="funcs/func_enum.o funcs/func_enum.so">
-		</member>
-		<member name="func_env" displayname="Environment/filesystem dialplan functions" remove_on_change="funcs/func_env.o funcs/func_env.so">
-		</member>
-		<member name="func_global" displayname="Global variable dialplan functions" remove_on_change="funcs/func_global.o funcs/func_global.so">
-		</member>
-		<member name="func_groupcount" displayname="Channel group dialplan functions" remove_on_change="funcs/func_groupcount.o funcs/func_groupcount.so">
-		</member>
-		<member name="func_language" displayname="Channel language dialplan function" remove_on_change="funcs/func_language.o funcs/func_language.so">
-		</member>
-		<member name="func_logic" displayname="Logical dialplan functions" remove_on_change="funcs/func_logic.o funcs/func_logic.so">
-		</member>
-		<member name="func_math" displayname="Mathematical dialplan function" remove_on_change="funcs/func_math.o funcs/func_math.so">
-		</member>
-		<member name="func_md5" displayname="MD5 digest dialplan functions" remove_on_change="funcs/func_md5.o funcs/func_md5.so">
-		</member>
-		<member name="func_moh" displayname="Music-on-hold dialplan function" remove_on_change="funcs/func_moh.o funcs/func_moh.so">
-		</member>
-		<member name="func_odbc" displayname="ODBC lookups" remove_on_change="funcs/func_odbc.o funcs/func_odbc.so">
-	<depend>unixodbc</depend>
-		</member>
-		<member name="func_rand" displayname="Random number dialplan function" remove_on_change="funcs/func_rand.o funcs/func_rand.so">
-		</member>
-		<member name="func_realtime" displayname="Read/Write values from a RealTime repository" remove_on_change="funcs/func_realtime.o funcs/func_realtime.so">
-		</member>
-		<member name="func_sha1" displayname="SHA-1 computation dialplan function" remove_on_change="funcs/func_sha1.o funcs/func_sha1.so">
-		</member>
-		<member name="func_strings" displayname="String handling dialplan functions" remove_on_change="funcs/func_strings.o funcs/func_strings.so">
-		</member>
-		<member name="func_timeout" displayname="Channel timeout dialplan functions" remove_on_change="funcs/func_timeout.o funcs/func_timeout.so">
-		</member>
-		<member name="func_uri" displayname="URI encode/decode dialplan functions" remove_on_change="funcs/func_uri.o funcs/func_uri.so">
-		</member>
-	</category>
-	<category name="MENUSELECT_PBX" displayname="PBX Modules">
-		<member name="pbx_ael" displayname="Asterisk Extension Language Compiler v2" remove_on_change="pbx/pbx_ael.o pbx/pbx_ael.so">
-		</member>
-		<member name="pbx_config" displayname="Text Extension Configuration" remove_on_change="pbx/pbx_config.o pbx/pbx_config.so">
-		</member>
-		<member name="pbx_dundi" displayname="Distributed Universal Number Discovery (DUNDi)" remove_on_change="pbx/pbx_dundi.o pbx/pbx_dundi.so">
-	<depend>zlib</depend>
-		</member>
-		<member name="pbx_gtkconsole" displayname="Asterisk PBX Console (GTK Version)" remove_on_change="pbx/pbx_gtkconsole.o pbx/pbx_gtkconsole.so">
-	<depend>gtk</depend>
-	<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="pbx_loopback" displayname="Loopback Switch" remove_on_change="pbx/pbx_loopback.o pbx/pbx_loopback.so">
-		</member>
-		<member name="pbx_realtime" displayname="Realtime Switch" remove_on_change="pbx/pbx_realtime.o pbx/pbx_realtime.so">
-		</member>
-		<member name="pbx_spool" displayname="Outgoing Spool Support" remove_on_change="pbx/pbx_spool.o pbx/pbx_spool.so">
-		</member>
-	</category>
-	<category name="MENUSELECT_RES" displayname="Resource Modules">
-		<member name="res_adsi" displayname="ADSI Resource" remove_on_change="res/res_adsi.o res/res_adsi.so">
-		</member>
-		<member name="res_agi" displayname="Asterisk Gateway Interface (AGI)" remove_on_change="res/res_agi.o res/res_agi.so">
-		</member>
-		<member name="res_clioriginate" displayname="Call origination from the CLI" remove_on_change="res/res_clioriginate.o res/res_clioriginate.so">
-		</member>
-		<member name="res_config_odbc" displayname="ODBC Configuration" remove_on_change="res/res_config_odbc.o res/res_config_odbc.so">
-	<depend>unixodbc</depend>
-		</member>
-		<member name="res_config_pgsql" displayname="Postgresql RealTime Configuration Driver" remove_on_change="res/res_config_pgsql.o res/res_config_pgsql.so">
-	<depend>pgsql</depend>
-		</member>
-		<member name="res_convert" displayname="File format conversion CLI command" remove_on_change="res/res_convert.o res/res_convert.so">
-		</member>
-		<member name="res_crypto" displayname="Cryptographic Digital Signatures" remove_on_change="res/res_crypto.o res/res_crypto.so">
-	<depend>ssl</depend>
-		</member>
-		<member name="res_features" displayname="Call Features Resource" remove_on_change="res/res_features.o res/res_features.so">
-		</member>
-		<member name="res_indications" displayname="Indications Configuration" remove_on_change="res/res_indications.o res/res_indications.so">
-		</member>
-		<member name="res_jabber" displayname="AJI - Asterisk JABBER Interface" remove_on_change="res/res_jabber.o res/res_jabber.so">
-	<depend>iksemel</depend>
-		</member>
-		<member name="res_monitor" displayname="Call Monitoring Resource" remove_on_change="res/res_monitor.o res/res_monitor.so">
-		</member>
-		<member name="res_musiconhold" displayname="Music On Hold Resource" remove_on_change="res/res_musiconhold.o res/res_musiconhold.so">
-	<conflict>win32</conflict>
-		</member>
-		<member name="res_odbc" displayname="ODBC Resource" remove_on_change="res/res_odbc.o res/res_odbc.so">
-	<depend>unixodbc</depend>
-		</member>
-		<member name="res_osp" displayname="Open Settlement Protocol Support" remove_on_change="res/res_osp.o res/res_osp.so">
-	<depend>libosptk</depend>
-	<depend>ssl</depend>
-		</member>
-		<member name="res_smdi" displayname="Asterisk Simplified Message Desk Interface (SMDI) Module" remove_on_change="res/res_smdi.o res/res_smdi.so">
-		</member>
-		<member name="res_snmp" displayname="SNMP [Sub]Agent for Asterisk" remove_on_change="res/res_snmp.o res/res_snmp.so">
-	<depend>netsnmp</depend>
-	<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="res_speech" displayname="Generic Speech Recognition API" remove_on_change="res/res_speech.o res/res_speech.so">
-		</member>
-	</category>
-	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
-		<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
-		</member>
-		<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
-		</member>
-		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
-		</member>
-		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
-		</member>
-		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations from the Compiler">
-		</member>
-		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
-		</member>
-		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
-		</member>
-		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
-		</member>
-		<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
-		</member>
-		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
-		</member>
-		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
-		</member>
-	</category>
-	<category name="MENUSELECT_CORE_SOUNDS" displayname="Core Sound Packages" positive_output="yes">
-		<member name="CORE-SOUNDS-EN-WAV" displayname="English, WAV format">
-		</member>
-		<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
-		</member>
-		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
-		</member>
-		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
-			<defaultenabled>yes</defaultenabled>
-		</member>
-		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
-		</member>
-		<member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format">
-		</member>
-		<member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format">
-		</member>
-		<member name="CORE-SOUNDS-ES-ALAW" displayname="Spanish, a-Law format">
-		</member>
-		<member name="CORE-SOUNDS-ES-GSM" displayname="Spanish, GSM format">
-		</member>
-		<member name="CORE-SOUNDS-ES-G729" displayname="Spanish, G.729 format">
-		</member>
-		<member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format">
-		</member>
-		<member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
-		</member>
-		<member name="CORE-SOUNDS-FR-ALAW" displayname="French, a-Law format">
-		</member>
-		<member name="CORE-SOUNDS-FR-GSM" displayname="French, GSM format">
-		</member>
-		<member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
-		</member>
-	</category>
-	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
-		<member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" >
-		</member>
-		<member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
-		</member>
-	</category>
-<category name="MENUSELECT_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o">
-	<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
-		<depend>unixodbc</depend>
-		<defaultenabled>no</defaultenabled>
-	</member>
-	<member name="EXTENDED_ODBC_STORAGE" displayname="Storage of Voicemail using ODBC (extended)">
-		<depend>unixodbc</depend>
-		<defaultenabled>no</defaultenabled>
-	</member>
-</category>
-</menu>
diff --git a/menuselect/install-sh b/menuselect/install-sh
deleted file mode 100755
index 4d4a951..0000000
--- a/menuselect/install-sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-05-14.22
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/menuselect/linkedlists.h b/menuselect/linkedlists.h
deleted file mode 100644
index 02c23a0..0000000
--- a/menuselect/linkedlists.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2006, Digium, Inc.
- *
- * Mark Spencer <markster at digium.com>
- * Kevin P. Fleming <kpfleming at digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#ifndef ASTERISK_LINKEDLISTS_H
-#define ASTERISK_LINKEDLISTS_H
-
-/*!
-  \brief Defines a structure to be used to hold a list of specified type (with no lock).
-  \param name This will be the name of the defined structure.
-  \param type This is the type of each list entry.
-
-  This macro creates a structure definition that can be used
-  to hold a list of the entries of type \a type. It does not actually
-  declare (allocate) a structure; to do that, either follow this
-  macro with the desired name of the instance you wish to declare,
-  or use the specified \a name to declare instances elsewhere.
-
-  Example usage:
-  \code
-  static AST_LIST_HEAD_NOLOCK(entry_list, entry) entries;
-  \endcode
-
-  This would define \c struct \c entry_list, and declare an instance of it named
-  \a entries, all intended to hold a list of type \c struct \c entry.
-*/
-#define AST_LIST_HEAD_NOLOCK(name, type)				\
-struct name {								\
-	struct type *first;						\
-	struct type *last;						\
-}
-
-/*!
-  \brief Defines initial values for a declaration of AST_LIST_HEAD_NOLOCK
-*/
-#define AST_LIST_HEAD_NOLOCK_INIT_VALUE	{	\
-	.first = NULL,					\
-	.last = NULL,					\
-	}
-
-/*!
-  \brief Defines a structure to be used to hold a list of specified type, statically initialized.
-
-  This is the same as AST_LIST_HEAD_STATIC, except without the lock included.
-*/
-#define AST_LIST_HEAD_NOLOCK_STATIC(name, type)				\
-struct name {								\
-	struct type *first;						\
-	struct type *last;						\
-} name = AST_LIST_HEAD_NOLOCK_INIT_VALUE
-
-/*!
-  \brief Initializes a list head structure with a specified first entry.
-  \param head This is a pointer to the list head structure
-  \param entry pointer to the list entry that will become the head of the list
-
-  This macro initializes a list head structure by setting the head
-  entry to the supplied value.
-*/
-#define AST_LIST_HEAD_SET_NOLOCK(head, entry) do {			\
-	(head)->first = (entry);					\
-	(head)->last = (entry);						\
-} while (0)
-
-/*!
-  \brief Declare a forward link structure inside a list entry.
-  \param type This is the type of each list entry.
-
-  This macro declares a structure to be used to link list entries together.
-  It must be used inside the definition of the structure named in
-  \a type, as follows:
-
-  \code
-  struct list_entry {
-  	...
-  	AST_LIST_ENTRY(list_entry) list;
-  }
-  \endcode
-
-  The field name \a list here is arbitrary, and can be anything you wish.
-*/
-#define AST_LIST_ENTRY(type)						\
-struct {								\
-	struct type *next;						\
-}
- 
-/*!
-  \brief Returns the first entry contained in a list.
-  \param head This is a pointer to the list head structure
- */
-#define	AST_LIST_FIRST(head)	((head)->first)
-
-/*!
-  \brief Returns the last entry contained in a list.
-  \param head This is a pointer to the list tail structure
- */
-#define	AST_LIST_LAST(head)	((head)->last)
-
-/*!
-  \brief Returns the next entry in the list after the given entry.
-  \param elm This is a pointer to the current entry.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-*/
-#define AST_LIST_NEXT(elm, field)	((elm)->field.next)
-
-/*!
-  \brief Checks whether the specified list contains any entries.
-  \param head This is a pointer to the list head structure
-
-  Returns non-zero if the list has entries, zero if not.
- */
-#define	AST_LIST_EMPTY(head)	(AST_LIST_FIRST(head) == NULL)
-
-/*!
-  \brief Loops over (traverses) the entries in a list.
-  \param head This is a pointer to the list head structure
-  \param var This is the name of the variable that will hold a pointer to the
-  current list entry on each iteration. It must be declared before calling
-  this macro.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-
-  This macro is use to loop over (traverse) the entries in a list. It uses a
-  \a for loop, and supplies the enclosed code with a pointer to each list
-  entry as it loops. It is typically used as follows:
-  \code
-  static AST_LIST_HEAD(entry_list, list_entry) entries;
-  ...
-  struct list_entry {
-  	...
-  	AST_LIST_ENTRY(list_entry) list;
-  }
-  ...
-  struct list_entry *current;
-  ...
-  AST_LIST_TRAVERSE(&entries, current, list) {
-     (do something with current here)
-  }
-  \endcode
-  \warning If you modify the forward-link pointer contained in the \a current entry while
-  inside the loop, the behavior will be unpredictable. At a minimum, the following
-  macros will modify the forward-link pointer, and should not be used inside
-  AST_LIST_TRAVERSE() against the entry pointed to by the \a current pointer without
-  careful consideration of their consequences:
-  \li AST_LIST_NEXT() (when used as an lvalue)
-  \li AST_LIST_INSERT_AFTER()
-  \li AST_LIST_INSERT_HEAD()
-  \li AST_LIST_INSERT_TAIL()
-*/
-#define AST_LIST_TRAVERSE(head,var,field) 				\
-	for((var) = (head)->first; (var); (var) = (var)->field.next)
-
-/*!
-  \brief Loops safely over (traverses) the entries in a list.
-  \param head This is a pointer to the list head structure
-  \param var This is the name of the variable that will hold a pointer to the
-  current list entry on each iteration. It must be declared before calling
-  this macro.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-
-  This macro is used to safely loop over (traverse) the entries in a list. It
-  uses a \a for loop, and supplies the enclosed code with a pointer to each list
-  entry as it loops. It is typically used as follows:
-
-  \code
-  static AST_LIST_HEAD(entry_list, list_entry) entries;
-  ...
-  struct list_entry {
-  	...
-  	AST_LIST_ENTRY(list_entry) list;
-  }
-  ...
-  struct list_entry *current;
-  ...
-  AST_LIST_TRAVERSE_SAFE_BEGIN(&entries, current, list) {
-     (do something with current here)
-  }
-  AST_LIST_TRAVERSE_SAFE_END;
-  \endcode
-
-  It differs from AST_LIST_TRAVERSE() in that the code inside the loop can modify
-  (or even free, after calling AST_LIST_REMOVE_CURRENT()) the entry pointed to by
-  the \a current pointer without affecting the loop traversal.
-*/
-#define AST_LIST_TRAVERSE_SAFE_BEGIN(head, var, field) {				\
-	typeof((head)->first) __list_next;						\
-	typeof((head)->first) __list_prev = NULL;					\
-	typeof((head)->first) __new_prev = NULL;					\
-	for ((var) = (head)->first, __new_prev = (var),					\
-	      __list_next = (var) ? (var)->field.next : NULL;				\
-	     (var);									\
-	     __list_prev = __new_prev, (var) = __list_next,				\
-	     __new_prev = (var),							\
-	     __list_next = (var) ? (var)->field.next : NULL				\
-	    )
-
-/*!
-  \brief Removes the \a current entry from a list during a traversal.
-  \param head This is a pointer to the list head structure
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-
-  \note This macro can \b only be used inside an AST_LIST_TRAVERSE_SAFE_BEGIN()
-  block; it is used to unlink the current entry from the list without affecting
-  the list traversal (and without having to re-traverse the list to modify the
-  previous entry, if any).
- */
-#define AST_LIST_REMOVE_CURRENT(head, field) do {					\
-	__new_prev->field.next = NULL;							\
-	__new_prev = __list_prev;							\
-	if (__list_prev)								\
-		__list_prev->field.next = __list_next;					\
-	else										\
-		(head)->first = __list_next;						\
-	if (!__list_next)								\
-		(head)->last = __list_prev;						\
-	} while (0)
-
-/*!
-  \brief Inserts a list entry before the current entry during a traversal.
-  \param head This is a pointer to the list head structure
-  \param elm This is a pointer to the entry to be inserted.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-
-  \note This macro can \b only be used inside an AST_LIST_TRAVERSE_SAFE_BEGIN()
-  block.
- */
-#define AST_LIST_INSERT_BEFORE_CURRENT(head, elm, field) do {		\
-	if (__list_prev) {						\
-		(elm)->field.next = __list_prev->field.next;		\
-		__list_prev->field.next = elm;				\
-	} else {							\
-		(elm)->field.next = (head)->first;			\
-		(head)->first = (elm);					\
-	}								\
-	__new_prev = (elm);						\
-} while (0)
-
-/*!
-  \brief Closes a safe loop traversal block.
- */
-#define AST_LIST_TRAVERSE_SAFE_END  }
-
-/*!
-  \brief Initializes a list head structure.
-  \param head This is a pointer to the list head structure
-
-  This macro initializes a list head structure by setting the head
-  entry to \a NULL (empty list). There is no embedded lock handling
-  with this macro.
-*/
-#define AST_LIST_HEAD_INIT_NOLOCK(head) {				\
-	(head)->first = NULL;						\
-	(head)->last = NULL;						\
-}
-
-/*!
-  \brief Inserts a list entry after a given entry.
-  \param head This is a pointer to the list head structure
-  \param listelm This is a pointer to the entry after which the new entry should
-  be inserted.
-  \param elm This is a pointer to the entry to be inserted.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
- */
-#define AST_LIST_INSERT_AFTER(head, listelm, elm, field) do {		\
-	(elm)->field.next = (listelm)->field.next;			\
-	(listelm)->field.next = (elm);					\
-	if ((head)->last == (listelm))					\
-		(head)->last = (elm);					\
-} while (0)
-
-/*!
-  \brief Inserts a list entry at the head of a list.
-  \param head This is a pointer to the list head structure
-  \param elm This is a pointer to the entry to be inserted.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
- */
-#define AST_LIST_INSERT_HEAD(head, elm, field) do {			\
-		(elm)->field.next = (head)->first;			\
-		(head)->first = (elm);					\
-		if (!(head)->last)					\
-			(head)->last = (elm);				\
-} while (0)
-
-/*!
-  \brief Appends a list entry to the tail of a list.
-  \param head This is a pointer to the list head structure
-  \param elm This is a pointer to the entry to be appended.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-
-  Note: The link field in the appended entry is \b not modified, so if it is
-  actually the head of a list itself, the entire list will be appended
-  temporarily (until the next AST_LIST_INSERT_TAIL is performed).
- */
-#define AST_LIST_INSERT_TAIL(head, elm, field) do {			\
-      if (!(head)->first) {						\
-		(head)->first = (elm);					\
-		(head)->last = (elm);					\
-      } else {								\
-		(head)->last->field.next = (elm);			\
-		(head)->last = (elm);					\
-      }									\
-} while (0)
-
-/*!
-  \brief Removes and returns the head entry from a list.
-  \param head This is a pointer to the list head structure
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-
-  Removes the head entry from the list, and returns a pointer to it.
-  This macro is safe to call on an empty list.
- */
-#define AST_LIST_REMOVE_HEAD(head, field) ({				\
-		typeof((head)->first) cur = (head)->first;		\
-		if (cur) {						\
-			(head)->first = cur->field.next;		\
-			cur->field.next = NULL;				\
-			if ((head)->last == cur)			\
-				(head)->last = NULL;			\
-		}							\
-		cur;							\
-	})
-
-/*!
-  \brief Removes a specific entry from a list.
-  \param head This is a pointer to the list head structure
-  \param elm This is a pointer to the entry to be removed.
-  \param field This is the name of the field (declared using AST_LIST_ENTRY())
-  used to link entries of this list together.
-  \warning The removed entry is \b not freed nor modified in any way.
- */
-#define AST_LIST_REMOVE(head, elm, field) do {			        \
-	if ((head)->first == (elm)) {					\
-		(head)->first = (elm)->field.next;			\
-		if ((head)->last == (elm))			\
-			(head)->last = NULL;			\
-	} else {								\
-		typeof(elm) curelm = (head)->first;			\
-		while (curelm && (curelm->field.next != (elm)))			\
-			curelm = curelm->field.next;			\
-		if (curelm) { \
-			curelm->field.next = (elm)->field.next;			\
-			if ((head)->last == (elm))				\
-				(head)->last = curelm;				\
-		} \
-	}								\
-        (elm)->field.next = NULL;                                       \
-} while (0)
-
-#endif /* _ASTERISK_LINKEDLISTS_H */
diff --git a/menuselect/make_version b/menuselect/make_version
deleted file mode 100755
index c6bef89..0000000
--- a/menuselect/make_version
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-if [ -f ${1}/.version ]; then
-	cat ${1}.version
-elif [ -f ${1}/.svnrevision ]; then
-	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
-elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/menuselect/::' | sed -e 's:/: :g'`
-    BRANCH=0
-    TEAM=0
-    
-    REV=`svnversion -c ${1} | cut -d: -f2`
-    
-    if [ "${PARTS}" = "trunk" ]
-	then
-	echo SVN-'trunk'-r${REV}
-	exit 0
-    fi
-    
-    for PART in $PARTS
-      do
-      if [ ${BRANCH} != 0 ]
-	  then
-	  RESULT="${RESULT}-${PART}"
-	  break
-      fi
-      
-      if [ ${TEAM} != 0 ]
-	  then
-	  RESULT="${RESULT}-${PART}"
-	  continue
-      fi
-      
-      if [ "${PART}" = "branches" ]
-	  then
-	  BRANCH=1
-	  RESULT="branch"
-	  continue
-      fi
-      
-      if [ "${PART}" = "tags" ]
-	  then
-	  BRANCH=1
-	  RESULT="tag"
-	  continue
-      fi
-      
-      if [ "${PART}" = "team" ]
-	  then
-	  TEAM=1
-	  continue
-      fi
-    done
-    
-    echo SVN-${RESULT##-}-r${REV}
-fi
diff --git a/menuselect/makeopts.in b/menuselect/makeopts.in
deleted file mode 100644
index 81cb1ed..0000000
--- a/menuselect/makeopts.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# NOTE: Names of _INCLUDE and _LIB entries in this file must be
-#       the exact uppercase equivalents of the names used for
-#       dependencies in menuselect for the same package.
-
-CC=@CC@
-
-OSARCH=@HOST_OS@
-MENUSELECT_DEBUG=@MENUSELECT_DEBUG@
-
-# The frontend can use curses, ncurses, newt or gtk2
-
-CURSES_INCLUDE=@CURSES_INCLUDE@
-CURSES_LIB=@CURSES_LIB@
-
-GTK2_INCLUDE=@GTK2_INCLUDE@
-GTK2_LIB=@GTK2_LIB@
-
-NCURSES_INCLUDE=@NCURSES_INCLUDE@
-NCURSES_LIB=@NCURSES_LIB@
-
-NEWT_INCLUDE=@NEWT_INCLUDE@
-NEWT_LIB=@NEWT_LIB@
diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
deleted file mode 100644
index 2265022..0000000
--- a/menuselect/menuselect.c
+++ /dev/null
@@ -1,2096 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2005 - 2010, Digium, Inc.
- *
- * Russell Bryant <russell at digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- *
- * \author Russell Bryant <russell at digium.com>
- *
- * \brief A menu-driven system for Asterisk module selection
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <getopt.h>
-
-#include "autoconfig.h"
-#include "mxml/mxml.h"
-#include "linkedlists.h"
-#include "menuselect.h"
-
-#ifdef MENUSELECT_DEBUG
-static FILE *debug;
-#endif
-
-/*! The list of categories */
-struct categories categories = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
-
-/*!
-   We have to maintain a pointer to the root of the trees generated from reading
-   the build options XML files so that we can free it when we're done.  We don't
-   copy any of the information over from these trees. Our list is just a
-   convenient mapping to the information contained in these lists with one
-   additional piece of information - whether the build option is enabled or not.
-*/
-struct tree {
-	/*! the root of the tree */
-	mxml_node_t *root;
-	/*! for linking */
-	AST_LIST_ENTRY(tree) list;
-};
-
-/*! The list of trees from menuselect-tree files */
-static AST_LIST_HEAD_NOLOCK_STATIC(trees, tree);
-
-static const char * const tree_files[] = {
-	"menuselect-tree"
-};
-
-static char *output_makeopts = OUTPUT_MAKEOPTS_DEFAULT;
-static char *output_makedeps = OUTPUT_MAKEDEPS_DEFAULT;
-
-/*! This is set to 1 if menuselect.makeopts pre-existed the execution of this app */
-static int existing_config = 0;
-
-/*! This is set when the --check-deps argument is provided. */
-static int check_deps = 0;
-
-/*! These are set when the --list-options or --list-groups arguments are provided. */
-static int list_options = 0, list_groups = 0;
-
-/*! This variable is non-zero when any changes are made */
-int changes_made = 0;
-
-/*! Menu name */
-const char *menu_name = "Menuselect";
-
-enum dep_file_state {
-	DEP_FILE_UNKNOWN = -2,
-	DEP_FILE_DISABLED = -1,
-	DEP_FILE_UNMET = 0,
-	DEP_FILE_MET = 1,
-};
-
-/*! Global list of dependencies that are external to the tree */
-struct dep_file {
-	char name[32];
-	enum dep_file_state met;
-	enum dep_file_state previously_met;
-	AST_LIST_ENTRY(dep_file) list;
-};
-AST_LIST_HEAD_NOLOCK_STATIC(deps_file, dep_file);
-
-#if !defined(ast_strdupa) && defined(__GNUC__)
-#define ast_strdupa(s)                                                    \
-	(__extension__                                                    \
-	({                                                                \
-		const char *__old = (s);                                  \
-		size_t __len = strlen(__old) + 1;                         \
-		char *__new = __builtin_alloca(__len);                    \
-		memcpy (__new, __old, __len);                             \
-		__new;                                                    \
-	}))
-#endif
-
-/*! \brief return a pointer to the first non-whitespace character */
-static inline char *skip_blanks(char *str)
-{
-	if (!str)
-		return NULL;
-
-	while (*str && *str < 33)
-		str++;
-
-	return str;
-}
-
-static int open_debug(void)
-{
-#ifdef MENUSELECT_DEBUG
-	if (!(debug = fopen("menuselect_debug.txt", "w"))) {
-		fprintf(stderr, "Failed to open menuselect_debug.txt for debug output.\n");
-		return -1;
-	}
-#endif
-	return 0;
-}
-
-#define print_debug(f, ...) __print_debug(__LINE__, f, ## __VA_ARGS__)
-static void __attribute__((format(printf, 2, 3))) __print_debug(int line, const char *format, ...)
-{
-#ifdef MENUSELECT_DEBUG
-	va_list ap;
-
-	fprintf(debug, "%d -", line);
-
-	va_start(ap, format);
-	vfprintf(debug, format, ap);
-	va_end(ap);
-
-	fflush(debug);
-#endif
-}
-
-static void close_debug(void)
-{
-#ifdef MENUSELECT_DEBUG
-	if (debug)
-		fclose(debug);
-#endif
-}
-
-/*! \brief Add a category to the category list, ensuring that there are no duplicates */
-static struct category *add_category(struct category *cat)
-{
-	struct category *tmp;
-
-	AST_LIST_TRAVERSE(&categories, tmp, list) {
-		if (!strcmp(tmp->name, cat->name)) {
-			return tmp;
-		}
-	}
-	AST_LIST_INSERT_TAIL(&categories, cat, list);
-
-	return cat;
-}
-
-#if 0
-/*! \brief Add a member to the member list of a category, ensuring that there are no duplicates */
-static int add_member(struct member *mem, struct category *cat)
-{
-	struct member *tmp;
-
-	AST_LIST_TRAVERSE(&cat->members, tmp, list) {
-		if (!strcmp(tmp->name, mem->name)) {
-			fprintf(stderr, "Member '%s' already exists in category '%s', ignoring.\n", mem->name, cat->name);
-			return -1;
-		}
-	}
-	AST_LIST_INSERT_TAIL(&cat->members, mem, list);
-
-	return 0;
-}
-#endif
-
-static int add_member_after(struct member *mem, struct category *cat, struct member *place)
-{
-	struct member *tmp;
-
-	AST_LIST_TRAVERSE(&cat->members, tmp, list) {
-		if (!strcmp(tmp->name, mem->name)) {
-			fprintf(stderr, "Member '%s' already exists in category '%s', ignoring.\n", mem->name, cat->name);
-			return -1;
-		}
-	}
-	AST_LIST_INSERT_AFTER(&cat->members, place, mem, list);
-
-	return 0;
-
-}
-
-static int add_member_head(struct member *mem, struct category *cat)
-{
-	struct member *tmp;
-
-	AST_LIST_TRAVERSE(&cat->members, tmp, list) {
-		if (!strcmp(tmp->name, mem->name)) {
-			fprintf(stderr, "Member '%s' already exists in category '%s', ignoring.\n", mem->name, cat->name);
-			return -1;
-		}
-	}
-	AST_LIST_INSERT_HEAD(&cat->members, mem, list);
-
-	return 0;
-}
-
-/*! \brief Free a member structure and all of its members */
-static void free_member(struct member *mem)
-{
-	struct reference *dep;
-	struct reference *cnf;
-	struct reference *use;
-
-	while ((dep = AST_LIST_REMOVE_HEAD(&mem->deps, list)))
-		free(dep);
-	while ((cnf = AST_LIST_REMOVE_HEAD(&mem->conflicts, list)))
-		free(cnf);
-	while ((use = AST_LIST_REMOVE_HEAD(&mem->uses, list)))
-		free(use);
-	free(mem);
-}
-
-/*! \assigns values to support level strings */
-static enum support_level_values string_to_support_level(const char *support_level)
-{
-	if (!support_level) {
-		return SUPPORT_UNSPECIFIED;
-	}
-
-	if (!strcasecmp(support_level, "core")) {
-		return SUPPORT_CORE;
-	}
-
-	if (!strcasecmp(support_level, "extended")) {
-		return SUPPORT_EXTENDED;
-	}
-
-	if (!strcasecmp(support_level, "deprecated")) {
-		return SUPPORT_DEPRECATED;
-	}
-
-	return SUPPORT_UNSPECIFIED;
-}
-
-/*! \gets const separator strings from support level values */
-static const char *support_level_to_string(enum support_level_values support_level)
-{
-	switch (support_level) {
-	case SUPPORT_CORE:
-		return "core";
-	case SUPPORT_EXTENDED:
-		return "extended";
-	case SUPPORT_DEPRECATED:
-		return "deprecated";
-	default:
-		return "unspecified";
-	}
-}
-
-/*! \sets default values for a given separator */
-static int initialize_separator(struct member *separators[], enum support_level_values level)
-{
-	separators[level] = calloc(1, sizeof(*(separators[level])));
-	separators[level]->name = support_level_to_string(level);
-	separators[level]->displayname = "";
-	separators[level]->is_separator = 1;
-	return 0;
-}
-
-/*! \Iterates through an existing category's members.  If separators are found, they are
-	 added to the provided separator array.  Any separators left unfound will then be
-	 initialized with initialize_separator. */
-static void find_or_initialize_separators(struct member *separators[], struct category *cat, int used[])
-{
-	enum support_level_values level;
-	struct member *tmp;
-	AST_LIST_TRAVERSE(&cat->members, tmp, list) {
-		if (tmp->is_separator) {
-			level = string_to_support_level(tmp->name);
-			separators[level] = tmp;
-			used[level] = 1;
-		}
-	}
-
-	for (level = 0; level < SUPPORT_COUNT; level++) {
-		if (!used[level]) {
-			initialize_separator(separators, level);
-		}
-	}
-}
-
-/*! \adds a member to a category and attaches it to the last element of a particular support level used */
-static int add_member_list_order(struct member *mem, struct category *cat, struct member *tails[], int used[], struct member *separators[])
-{
-	enum support_level_values support_level = string_to_support_level(mem->support_level);
-	int tail_index;
-
-	/* Works backwards from support_level to find properly ordered linked list member to insert from */
-	for (tail_index = support_level; ; tail_index--) {
-		if (tail_index == -1) {
-			break;
-		}
-		if (used[tail_index]) {
-			break;
-		}
-	}
-
-	if (tail_index == -1) { /* None of the nodes that should come before the list were in use, so use head. */
-		if (add_member_head(mem, cat)) { /* Failure to insert the node... */
-			return -1;
-		}
-
-		/* If we successfully added the member, we need to update its support level pointer info */
-		tails[support_level] = mem;
-		used[support_level] = 1;
-		if (add_member_head(separators[support_level], cat)) {
-			printf("Separator insertion failed.  This should be impossible, report an issue if this occurs.\n");
-			return -1;
-		}
-		return 0;
-
-	} else { /* We found an appropriate node to use to insert before we reached the head. */
-		if (add_member_after(mem, cat, tails[tail_index])) {
-			return -1;
-		}
-
-		tails[support_level] = mem;
-		used[support_level] = 1;
-		if (support_level != tail_index) {
-			if (add_member_after(separators[support_level], cat, tails[tail_index])) {
-				printf("Separator insertion failed.  This should be impossible, report an issue if this occurs.\n");
-				return -1;
-			}
-		}
-
-		return 0;
-
-	}
-
-	return -2; /* failed to place... for whatever reason.  This should be impossible to reach. */
-}
-
-/*! \brief Parse an input makeopts file */
-static int parse_tree(const char *tree_file)
-{
-	FILE *f;
-	struct tree *tree;
-	struct member *mem;
-	struct reference *dep;
-	struct reference *cnf;
-	struct reference *use;
-	mxml_node_t *cur;
-	mxml_node_t *cur2;
-	mxml_node_t *cur3;
-	mxml_node_t *menu;
-	const char *tmp;
-
-	if (!(f = fopen(tree_file, "r"))) {
-		fprintf(stderr, "Unable to open '%s' for reading!\n", tree_file);
-		return -1;
-	}
-
-	if (!(tree = calloc(1, sizeof(*tree)))) {
-		fclose(f);
-		return -1;
-	}
-
-	if (!(tree->root = mxmlLoadFile(NULL, f, MXML_OPAQUE_CALLBACK))) {
-		fclose(f);
-		free(tree);
-		return -1;
-	}
-
-	AST_LIST_INSERT_HEAD(&trees, tree, list);
-
-	menu = mxmlFindElement(tree->root, tree->root, "menu", NULL, NULL, MXML_DESCEND);
-	if ((tmp = mxmlElementGetAttr(menu, "name")))
-		menu_name = tmp;
-	for (cur = mxmlFindElement(menu, menu, "category", NULL, NULL, MXML_DESCEND_FIRST);
-	     cur;
-	     cur = mxmlFindElement(cur, menu, "category", NULL, NULL, MXML_NO_DESCEND))
-	{
-		struct category *cat;
-		struct category *newcat;
-
-		/* Member seperator definitions */
-		struct member *separators[SUPPORT_COUNT];
-
-		/* link list tails... used to put new elements in in order of support level */
-		struct member *support_tails[SUPPORT_COUNT];
-		int support_tails_placed[SUPPORT_COUNT] = { 0 };
-
-		if (!(cat = calloc(1, sizeof(*cat))))
-			return -1;
-
-		cat->name = mxmlElementGetAttr(cur, "name");
-
-		newcat = add_category(cat);
-
-		if (newcat != cat) {
-			/* want to append members, and potentially update the category. */
-			free(cat);
-			cat = newcat;
-		}
-
-		find_or_initialize_separators(separators, cat, support_tails_placed);
-
-		if ((tmp = mxmlElementGetAttr(cur, "displayname")))
-			cat->displayname = tmp;
-		if ((tmp = mxmlElementGetAttr(cur, "positive_output")))
-			cat->positive_output = !strcasecmp(tmp, "yes");
-		if ((tmp = mxmlElementGetAttr(cur, "exclusive")))
-			cat->exclusive = !strcasecmp(tmp, "yes");
-		if ((tmp = mxmlElementGetAttr(cur, "remove_on_change")))
-			cat->remove_on_change = tmp;
-		if ((tmp = mxmlElementGetAttr(cur, "touch_on_change")))
-			cat->touch_on_change = tmp;
-
-		for (cur2 = mxmlFindElement(cur, cur, "member", NULL, NULL, MXML_DESCEND_FIRST);
-		     cur2;
-		     cur2 = mxmlFindElement(cur2, cur, "member", NULL, NULL, MXML_NO_DESCEND))
-		{
-			if (!(mem = calloc(1, sizeof(*mem))))
-				return -1;
-
-			mem->name = mxmlElementGetAttr(cur2, "name");
-			mem->displayname = mxmlElementGetAttr(cur2, "displayname");
-			mem->touch_on_change = mxmlElementGetAttr(cur2, "touch_on_change");
-			mem->remove_on_change = mxmlElementGetAttr(cur2, "remove_on_change");
-			mem->support_level = "unspecified";
-
-			if ((tmp = mxmlElementGetAttr(cur2, "explicitly_enabled_only"))) {
-				mem->explicitly_enabled_only = !strcasecmp(tmp, "yes");
-			}
-
-			cur3 = mxmlFindElement(cur2, cur2, "defaultenabled", NULL, NULL, MXML_DESCEND);
-			if (cur3 && cur3->child) {
-				mem->defaultenabled = cur3->child->value.opaque;
-			}
-
-			if (!cat->positive_output) {
-				mem->enabled = 1;
-				if (!(mem->defaultenabled && strcasecmp(mem->defaultenabled, "no"))) {
-					mem->was_enabled = 1;
-					print_debug("Enabled %s because the category does not have positive output\n", mem->name);
-				}
-			}
-
-			cur3 = mxmlFindElement(cur2, cur2, "support_level", NULL, NULL, MXML_DESCEND);
-			if (cur3 && cur3->child) {
-				mem->support_level = cur3->child->value.opaque;
-				print_debug("Set support_level for %s to %s\n", mem->name, mem->support_level);
-			}
-
-			cur3 = mxmlFindElement(cur2, cur2, "replacement", NULL, NULL, MXML_DESCEND);
-			if (cur3 && cur3->child) {
-				mem->replacement = cur3->child->value.opaque;
-			}
-
-			for (cur3 = mxmlFindElement(cur2, cur2, "depend", NULL, NULL, MXML_DESCEND_FIRST);
-			     cur3 && cur3->child;
-			     cur3 = mxmlFindElement(cur3, cur2, "depend", NULL, NULL, MXML_NO_DESCEND))
-			{
-				if (!(dep = calloc(1, sizeof(*dep)))) {
-					free_member(mem);
-					return -1;
-				}
-				if ((tmp = mxmlElementGetAttr(cur3, "name"))) {
-					if (!strlen_zero(tmp)) {
-						dep->name = tmp;
-					}
-				}
-				if (!strlen_zero(cur3->child->value.opaque)) {
-					dep->displayname = cur3->child->value.opaque;
-					if (!dep->name) {
-						dep->name = dep->displayname;
-					}
-					AST_LIST_INSERT_TAIL(&mem->deps, dep, list);
-				} else
-					free(dep);
-			}
-
-			for (cur3 = mxmlFindElement(cur2, cur2, "conflict", NULL, NULL, MXML_DESCEND_FIRST);
-			     cur3 && cur3->child;
-			     cur3 = mxmlFindElement(cur3, cur2, "conflict", NULL, NULL, MXML_NO_DESCEND))
-			{
-				if (!(cnf = calloc(1, sizeof(*cnf)))) {
-					free_member(mem);
-					return -1;
-				}
-				if ((tmp = mxmlElementGetAttr(cur3, "name"))) {
-					if (!strlen_zero(tmp)) {
-						cnf->name = tmp;
-					}
-				}
-				if (!strlen_zero(cur3->child->value.opaque)) {
-					cnf->displayname = cur3->child->value.opaque;
-					if (!cnf->name) {
-						cnf->name = cnf->displayname;
-					}
-					AST_LIST_INSERT_TAIL(&mem->conflicts, cnf, list);
-				} else
-					free(cnf);
-			}
-
-			for (cur3 = mxmlFindElement(cur2, cur2, "use", NULL, NULL, MXML_DESCEND_FIRST);
-			     cur3 && cur3->child;
-			     cur3 = mxmlFindElement(cur3, cur2, "use", NULL, NULL, MXML_NO_DESCEND))
-			{
-				if (!(use = calloc(1, sizeof(*use)))) {
-					free_member(mem);
-					return -1;
-				}
-				if ((tmp = mxmlElementGetAttr(cur3, "name"))) {
-					if (!strlen_zero(tmp)) {
-						use->name = tmp;
-					}
-				}
-				if (!strlen_zero(cur3->child->value.opaque)) {
-					use->displayname = cur3->child->value.opaque;
-					if (!use->name) {
-						use->name = use->displayname;
-					}
-
-					AST_LIST_INSERT_TAIL(&mem->uses, use, list);
-				} else {
-					free(use);
-				}
-			}
-
-			if (add_member_list_order(mem, cat, support_tails, support_tails_placed, separators)) {
-				free_member(mem);
-			}
-		}
-	}
-
-	fclose(f);
-
-	return 0;
-}
-
-/*!
- * \arg interactive Set to non-zero if being called while user is making changes
- */
-static unsigned int calc_dep_failures(int interactive, int pre_confload)
-{
-	unsigned int result = 0;
-	struct category *cat;
-	struct member *mem;
-	struct reference *dep;
-	struct dep_file *dep_file;
-	unsigned int changed, old_failure;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-			old_failure = mem->depsfailed;
-			AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-				if (dep->member)
-					continue;
-
-				mem->depsfailed = HARD_FAILURE;
-				AST_LIST_TRAVERSE(&deps_file, dep_file, list) {
-					if (!strcasecmp(dep_file->name, dep->name)) {
-						if (dep_file->met == DEP_FILE_MET) {
-							mem->depsfailed = NO_FAILURE;
-						}
-						break;
-					}
-				}
-				if (mem->depsfailed != NO_FAILURE) {
-					break; /* This dependency is not met, so we can stop now */
-				}
-			}
-			if (old_failure == SOFT_FAILURE && mem->depsfailed != HARD_FAILURE)
-				mem->depsfailed = SOFT_FAILURE;
-		}
-	}
-
-	if (pre_confload) {
-		return 0;
-	}
-
-	do {
-		changed = 0;
-
-		AST_LIST_TRAVERSE(&categories, cat, list) {
-			AST_LIST_TRAVERSE(&cat->members, mem, list) {
-				if (mem->is_separator) {
-					continue;
-				}
-
-				old_failure = mem->depsfailed;
-
-				if (mem->depsfailed == HARD_FAILURE)
-					continue;
-
-				mem->depsfailed = NO_FAILURE;
-
-				AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-					if (!dep->member)
-						continue;
-					if (dep->member->depsfailed == HARD_FAILURE) {
-						mem->depsfailed = HARD_FAILURE;
-						break;
-					} else if (dep->member->depsfailed == SOFT_FAILURE) {
-						mem->depsfailed = SOFT_FAILURE;
-					} else if (!dep->member->enabled) {
-						mem->depsfailed = SOFT_FAILURE;
-					}
-				}
-
-				if (mem->depsfailed != old_failure) {
-					if ((mem->depsfailed == NO_FAILURE) && mem->was_defaulted) {
-						mem->enabled = !strcasecmp(mem->defaultenabled, "yes");
-						print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
-					} else {
-						mem->enabled = interactive ? 0 : mem->was_enabled;
-						print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
-					}
-					changed = 1;
-					break; /* This dependency is not met, so we can stop now */
-				}
-			}
-			if (changed)
-				break;
-		}
-
-		if (changed)
-			result = 1;
-
-	} while (changed);
-
-	return result;
-}
-
-static unsigned int calc_conflict_failures(int interactive, int pre_confload)
-{
-	unsigned int result = 0;
-	struct category *cat;
-	struct member *mem;
-	struct reference *cnf;
-	struct dep_file *dep_file;
-	unsigned int changed, old_failure;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			old_failure = mem->conflictsfailed;
-			AST_LIST_TRAVERSE(&mem->conflicts, cnf, list) {
-				if (cnf->member)
-					continue;
-
-				mem->conflictsfailed = NO_FAILURE;
-				AST_LIST_TRAVERSE(&deps_file, dep_file, list) {
-					if (!strcasecmp(dep_file->name, cnf->name)) {
-						if (dep_file->met == DEP_FILE_MET) {
-							mem->conflictsfailed = HARD_FAILURE;
-							print_debug("Setting %s conflictsfailed to HARD_FAILURE\n", mem->name);
-						}
-						break;
-					}
-				}
-
-				if (mem->conflictsfailed != NO_FAILURE)
-					break; /* This conflict was found, so we can stop now */
-			}
-			if (old_failure == SOFT_FAILURE && mem->conflictsfailed != HARD_FAILURE) {
-				print_debug("%d - Setting %s conflictsfailed to SOFT_FAILURE\n", __LINE__, mem->name);
-				mem->conflictsfailed = SOFT_FAILURE;
-			}
-		}
-	}
-
-	if (pre_confload) {
-		return 0;
-	}
-
-	do {
-		changed = 0;
-
-		AST_LIST_TRAVERSE(&categories, cat, list) {
-			AST_LIST_TRAVERSE(&cat->members, mem, list) {
-				if (mem->is_separator) {
-					continue;
-				}
-
-				old_failure = mem->conflictsfailed;
-
-				if (mem->conflictsfailed == HARD_FAILURE)
-					continue;
-
-				mem->conflictsfailed = NO_FAILURE;
-
-				AST_LIST_TRAVERSE(&mem->conflicts, cnf, list) {
-					if (!cnf->member)
-						continue;
-
-					if (cnf->member->enabled) {
-						mem->conflictsfailed = SOFT_FAILURE;
-						print_debug("%d - Setting %s conflictsfailed to SOFT_FAILURE because %s is enabled\n", __LINE__, mem->name, cnf->member->name);
-						break;
-					}
-				}
-
-				if (mem->conflictsfailed != old_failure && mem->conflictsfailed != NO_FAILURE) {
-					mem->enabled = 0;
-					print_debug("Just set %s enabled to %d because of conflicts\n", mem->name, mem->enabled);
-					changed = 1;
-					break; /* This conflict has been found, so we can stop now */
-				}
-			}
-			if (changed)
-				break;
-		}
-
-		if (changed)
-			result = 1;
-
-	} while (changed);
-
-	return result;
-}
-
-/*! \brief Process dependencies against the input dependencies file */
-static int process_deps(void)
-{
-	FILE *f;
-	char buf[80];
-	int res = 0;
-	struct dep_file *dep_file;
-
-	if (!(f = fopen(MENUSELECT_DEPS, "r"))) {
-		fprintf(stderr, "Unable to open '%s' for reading!  Did you run ./configure ?\n", MENUSELECT_DEPS);
-		return -1;
-	}
-
-	/* Build a dependency list from the file generated by configure */
-	while (memset(buf, 0, sizeof(buf)), fgets(buf, sizeof(buf), f)) {
-		char *name, *cur, *prev, *p;
-		int val;
-
-		/* Strip trailing CR/NL */
-		while ((p = strchr(buf, '\r')) || (p = strchr(buf, '\n'))) {
-			*p = '\0';
-		}
-
-		p = buf;
-		name = strsep(&p, "=");
-
-		if (!p)
-			continue;
-
-		cur = strsep(&p, ":");
-		prev = strsep(&p, ":");
-
-		if (!(dep_file = calloc(1, sizeof(*dep_file))))
-			break;
-
-		strncpy(dep_file->name, name, sizeof(dep_file->name) - 1);
-		dep_file->met = DEP_FILE_UNKNOWN;
-		dep_file->previously_met = DEP_FILE_UNKNOWN;
-
-		if (sscanf(cur, "%d", &val) != 1) {
-			fprintf(stderr, "Unknown value '%s' found in %s for %s\n", cur, MENUSELECT_DEPS, name);
-		} else {
-			switch (val) {
-			case DEP_FILE_MET:
-			case DEP_FILE_UNMET:
-			case DEP_FILE_DISABLED:
-				dep_file->met = val;
-				break;
-			default:
-				fprintf(stderr, "Unknown value '%s' found in %s for %s\n", cur, MENUSELECT_DEPS, name);
-				break;
-			}
-		}
-
-		if (prev) {
-			if (sscanf(prev, "%d", &val) != 1) {
-				fprintf(stderr, "Unknown value '%s' found in %s for %s\n", prev, MENUSELECT_DEPS, name);
-			} else {
-				switch (val) {
-				case DEP_FILE_MET:
-				case DEP_FILE_UNMET:
-				case DEP_FILE_DISABLED:
-					dep_file->previously_met = val;
-					break;
-				default:
-					fprintf(stderr, "Unknown value '%s' found in %s for %s\n", prev, MENUSELECT_DEPS, name);
-					break;
-				}
-			}
-		}
-
-		AST_LIST_INSERT_TAIL(&deps_file, dep_file, list);
-	}
-
-	fclose(f);
-
-	return res;
-}
-
-static void free_deps_file(void)
-{
-	struct dep_file *dep_file;
-
-	/* Free the dependency list we built from the file */
-	while ((dep_file = AST_LIST_REMOVE_HEAD(&deps_file, list)))
-		free(dep_file);
-}
-
-static int match_member_relations(void)
-{
-	struct category *cat, *cat2;
-	struct member *mem, *mem2;
-	struct reference *dep;
-	struct reference *cnf;
-	struct reference *use;
-
-	/* Traverse through each module's dependency list and determine whether each is another module */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-				AST_LIST_TRAVERSE(&cat->members, mem2, list) {
-					if (mem->is_separator) {
-						continue;
-					}
-
-					if (strcasecmp(mem2->name, dep->name))
-						continue;
-
-					dep->member = mem2;
-					break;
-				}
-				if (dep->member)
-					continue;
-
-				AST_LIST_TRAVERSE(&categories, cat2, list) {
-					AST_LIST_TRAVERSE(&cat2->members, mem2, list) {
-						if (mem->is_separator) {
-							continue;
-						}
-
-						if (strcasecmp(mem2->name, dep->name))
-							continue;
-
-						dep->member = mem2;
-						break;
-					}
-					if (dep->member)
-						break;
-				}
-			}
-		}
-	}
-
-	/* Traverse through each module's use list and determine whether each is another module */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			AST_LIST_TRAVERSE(&mem->uses, use, list) {
-				AST_LIST_TRAVERSE(&cat->members, mem2, list) {
-					if (mem->is_separator) {
-						continue;
-					}
-
-					if (strcasecmp(mem2->name, use->name))
-						continue;
-
-					use->member = mem2;
-					break;
-				}
-				if (use->member)
-					continue;
-
-				AST_LIST_TRAVERSE(&categories, cat2, list) {
-					AST_LIST_TRAVERSE(&cat2->members, mem2, list) {
-						if (mem->is_separator) {
-							continue;
-						}
-
-						if (strcasecmp(mem2->name, use->name))
-							continue;
-
-						use->member = mem2;
-						break;
-					}
-					if (use->member)
-						break;
-				}
-			}
-		}
-	}
-
-	/* If weak linking is not supported, move module uses which are other modules to the dependency list */
-#if !defined(HAVE_ATTRIBUTE_weak_import) && !defined(HAVE_ATTRIBUTE_weakref) && !defined(HAVE_ATTRIBUTE_weak)
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			AST_LIST_TRAVERSE_SAFE_BEGIN(&mem->uses, use, list) {
-				if (use->member) {
-					AST_LIST_REMOVE_CURRENT(&mem->uses, list);
-					AST_LIST_INSERT_TAIL(&mem->deps, use, list);
-				}
-			}
-			AST_LIST_TRAVERSE_SAFE_END;
-		}
-	}
-#endif
-
-	/* Traverse through each category marked as exclusive and mark every member as conflicting with every other member */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (!cat->exclusive)
-			continue;
-
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			AST_LIST_TRAVERSE(&cat->members, mem2, list) {
-				if (mem->is_separator) {
-					continue;
-				}
-
-				if (mem2 == mem)
-					continue;
-
-				if (!(cnf = calloc(1, sizeof(*cnf))))
-					return -1;
-
-				cnf->name = mem2->name;
-				cnf->member = mem2;
-				AST_LIST_INSERT_TAIL(&mem->conflicts, cnf, list);
-			}
-		}
-	}
-
-	/* Traverse through each category and determine whether named conflicts for each module are other modules */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			AST_LIST_TRAVERSE(&mem->conflicts, cnf, list) {
-				AST_LIST_TRAVERSE(&cat->members, mem2, list) {
-					if (mem->is_separator) {
-						continue;
-					}
-
-					if (strcasecmp(mem2->name, cnf->name))
-						continue;
-
-					cnf->member = mem2;
-					break;
-				}
-				if (cnf->member)
-					continue;
-
-				AST_LIST_TRAVERSE(&categories, cat2, list) {
-					AST_LIST_TRAVERSE(&cat2->members, mem2, list) {
-						if (mem->is_separator) {
-							continue;
-						}
-
-						if (strcasecmp(mem2->name, cnf->name))
-							continue;
-
-						cnf->member = mem2;
-						break;
-					}
-					if (cnf->member)
-						break;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-/*! \brief Iterate through all of the input tree files and call the parse function on them */
-static int build_member_list(void)
-{
-	int i;
-	int res = -1;
-
-	for (i = 0; i < (sizeof(tree_files) / sizeof(tree_files[0])); i++) {
-		if ((res = parse_tree(tree_files[i]))) {
-			fprintf(stderr, "Error parsing '%s'!\n", tree_files[i]);
-			break;
-		}
-	}
-
-	if (!res)
-		res = match_member_relations();
-
-	return res;
-}
-
-/*! \brief Given the string representation of a member and category, mark it as present in a given input file */
-static void mark_as_present(const char *member, const char *category)
-{
-	struct category *cat;
-	struct member *mem;
-	char negate = 0;
-
-	if (*member == '-') {
-		member++;
-		negate = 1;
-	}
-
-	print_debug("Marking %s of %s as present\n", member, category);
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (strcmp(category, cat->name))
-			continue;
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if (!strcmp(member, mem->name)) {
-				mem->was_enabled = mem->enabled = (negate ? !cat->positive_output : cat->positive_output);
-				print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
-				break;
-			}
-		}
-		if (!mem)
-			fprintf(stderr, "member '%s' in category '%s' not found, ignoring.\n", member, category);
-		break;
-	}
-
-	if (!cat)
-		fprintf(stderr, "category '%s' not found! Can't mark '%s' as disabled.\n", category, member);
-}
-
-unsigned int enable_member(struct member *mem)
-{
-	struct reference *dep;
-	unsigned int can_enable = 1;
-
-	AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-		if (!dep->member)
-			continue;
-
-		if (!dep->member->enabled) {
-			if (dep->member->conflictsfailed != NO_FAILURE) {
-				can_enable = 0;
-				break;
-			}
-
-			if (dep->member->depsfailed == HARD_FAILURE) {
-				can_enable = 0;
-				break;
-			}
-
-			if (dep->member->explicitly_enabled_only) {
-				can_enable = 0;
-				break;
-			}
-
-			if (!(can_enable = enable_member(dep->member)))
-				break;
-		}
-	}
-
-	if ((mem->enabled = can_enable)) {
-		print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
-		while (calc_dep_failures(1, 0) || calc_conflict_failures(1, 0));
-	}
-
-	return can_enable;
-}
-
-void toggle_enabled(struct member *mem)
-{
-	if ((mem->depsfailed == HARD_FAILURE) || (mem->conflictsfailed == HARD_FAILURE) || (mem->is_separator))
-		return;
-
-	if (!mem->enabled)
-		enable_member(mem);
-	else
-		mem->enabled = 0;
-
-	print_debug("3- changed %s to %d\n", mem->name, mem->enabled);
-	mem->was_defaulted = 0;
-	changes_made++;
-
-	while (calc_dep_failures(1, 0) || calc_conflict_failures(1, 0));
-}
-
-/*! \brief Toggle a member of a category at the specified index to enabled/disabled */
-void toggle_enabled_index(struct category *cat, int index)
-{
-	struct member *mem;
-	int i = 0;
-
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-		if (i++ == index)
-			break;
-	}
-
-	if (!mem)
-		return;
-
-	toggle_enabled(mem);
-}
-
-static void set_member_enabled(struct member *mem)
-{
-	if ((mem->depsfailed == HARD_FAILURE) || (mem->conflictsfailed == HARD_FAILURE))
-		return;
-
-	if ((mem->enabled) || (mem->is_separator))
-		return;
-
-	enable_member(mem);
-	mem->was_defaulted = 0;
-	changes_made++;
-
-	while (calc_dep_failures(1, 0) || calc_conflict_failures(1, 0));
-}
-
-void set_enabled(struct category *cat, int index)
-{
-	struct member *mem;
-	int i = 0;
-
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-		if (mem->is_separator) {
-			continue;
-		}
-
-		if (i++ == index)
-			break;
-	}
-
-	if (!mem)
-		return;
-
-	set_member_enabled(mem);
-}
-
-static void clear_member_enabled(struct member *mem)
-{
-	if (!mem->enabled)
-		return;
-
-	mem->enabled = 0;
-	mem->was_defaulted = 0;
-	changes_made++;
-
-	while (calc_dep_failures(1, 0) || calc_conflict_failures(1, 0));
-}
-
-void clear_enabled(struct category *cat, int index)
-{
-	struct member *mem;
-	int i = 0;
-
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-		if (mem->is_separator) {
-			continue;
-		}
-
-		if (i++ == index)
-			break;
-	}
-
-	if (!mem)
-		return;
-
-	clear_member_enabled(mem);
-}
-
-/*! \brief Process a previously failed dependency
- *
- * If a module was previously disabled because of a failed dependency
- * or a conflict, and not because the user selected it to be that way,
- * then it needs to be re-enabled by default if the problem is no longer present.
- */
-static void process_prev_failed_deps(char *buf)
-{
-	const char *cat_name, *mem_name;
-	struct category *cat;
-	struct member *mem;
-
-	cat_name = strsep(&buf, "=");
-	mem_name = strsep(&buf, "\n");
-
-	if (!cat_name || !mem_name)
-		return;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (strcasecmp(cat->name, cat_name))
-			continue;
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if (strcasecmp(mem->name, mem_name))
-				continue;
-
-			if (!mem->depsfailed && !mem->conflictsfailed) {
-				mem->enabled = 1;
-				print_debug("Just set %s enabled to %d in processing of previously failed deps\n", mem->name, mem->enabled);
-				mem->was_defaulted = 0;
-			}
-
-			break;
-		}
-		break;
-	}
-
-	if (!cat || !mem)
-		fprintf(stderr, "Unable to find '%s' in category '%s'\n", mem_name, cat_name);
-}
-
-/*! \brief Parse an existing output makeopts file and enable members previously selected */
-static int parse_existing_config(const char *infile)
-{
-	FILE *f;
-	char buf[2048];
-	char *category, *parse, *member;
-	int lineno = 0;
-
-	if (!(f = fopen(infile, "r"))) {
-		/* This isn't really an error, so only print the message in debug mode */
-		print_debug("Unable to open '%s' for reading existing config.\n", infile);
-		return -1;
-	}
-
-	while (fgets(buf, sizeof(buf), f)) {
-		lineno++;
-
-		if (strlen_zero(buf))
-			continue;
-
-		/* skip lines that are not for this tool */
-		if (strncasecmp(buf, "MENUSELECT_", strlen("MENUSELECT_")))
-			continue;
-
-		if (!strncasecmp(buf, "MENUSELECT_DEPENDS_", strlen("MENUSELECT_DEPENDS_")))
-			continue;
-
-		if (!strncasecmp(buf, "MENUSELECT_BUILD_DEPS", strlen("MENUSELECT_BUILD_DEPS")))
-			continue;
-
-		parse = buf;
-		parse = skip_blanks(parse);
-		if (strlen_zero(parse))
-			continue;
-
-		/* Grab the category name */
-		category = strsep(&parse, "=");
-		if (!parse) {
-			fprintf(stderr, "Invalid string in '%s' at line '%d'!\n", output_makeopts, lineno);
-			continue;
-		}
-
-		parse = skip_blanks(parse);
-
-		if (!strcasecmp(category, "MENUSELECT_DEPSFAILED")) {
-			process_prev_failed_deps(parse);
-			continue;
-		}
-
-		while ((member = strsep(&parse, " \n"))) {
-			member = skip_blanks(member);
-			if (strlen_zero(member))
-				continue;
-			mark_as_present(member, category);
-		}
-	}
-
-	fclose(f);
-
-	return 0;
-}
-
-/*! \brief Create the output dependencies file */
-static int generate_makedeps_file(void)
-{
-	FILE *f;
-	struct category *cat;
-	struct member *mem;
-	struct reference *dep;
-	struct reference *use;
-	struct dep_file *dep_file;
-
-	if (!(f = fopen(output_makedeps, "w"))) {
-		fprintf(stderr, "Unable to open dependencies file (%s) for writing!\n", output_makedeps);
-		return -1;
-	}
-
-	/* Traverse all categories and members and mark which used packages were found,
-	 * skipping other members
-	 */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			AST_LIST_TRAVERSE(&mem->uses, use, list) {
-				if (use->member) {
-					use->met = 0;
-					continue;
-				}
-				AST_LIST_TRAVERSE(&deps_file, dep_file, list) {
-					if ((use->met = !strcasecmp(use->name, dep_file->name))) {
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	/* Traverse all categories and members and output dependencies for each member */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			unsigned char header_printed = 0;
-
-			if (AST_LIST_EMPTY(&mem->deps) && AST_LIST_EMPTY(&mem->uses))
-				continue;
-
-			AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-				const char *c;
-
-				if (dep->member) {
-					continue;
-				}
-
-				if (!header_printed) {
-					fprintf(f, "MENUSELECT_DEPENDS_%s=", mem->name);
-					header_printed = 1;
-				}
-
-				for (c = dep->name; *c; c++)
-					fputc(toupper(*c), f);
-				fputc(' ', f);
-			}
-			AST_LIST_TRAVERSE(&mem->uses, use, list) {
-				const char *c;
-
-				if (!use->met) {
-					continue;
-				}
-
-				if (!header_printed) {
-					fprintf(f, "MENUSELECT_DEPENDS_%s=", mem->name);
-					header_printed = 1;
-				}
-
-				for (c = use->name; *c; c++)
-					fputc(toupper(*c), f);
-				fputc(' ', f);
-			}
-
-			if (header_printed) {
-				fprintf(f, "\n");
-			}
-		}
-	}
-
-	fclose(f);
-
-	return 0;
-}
-
-/*! \brief Create the output makeopts file that results from the user's selections */
-static int generate_makeopts_file(void)
-{
-	FILE *f;
-	struct category *cat;
-	struct member *mem;
-	struct reference *dep;
-	struct reference *use;
-
-	if (!(f = fopen(output_makeopts, "w"))) {
-		fprintf(stderr, "Unable to open build configuration file (%s) for writing!\n", output_makeopts);
-		return -1;
-	}
-
-	/* Traverse all categories and members and output them as var/val pairs */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		fprintf(f, "%s=", cat->name);
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if ((!cat->positive_output && (!mem->enabled || mem->depsfailed || mem->conflictsfailed)) ||
-			    (cat->positive_output && mem->enabled && !mem->depsfailed && !mem->conflictsfailed))
-				fprintf(f, "%s ", mem->name);
-		}
-		fprintf(f, "\n");
-	}
-
-	/* Traverse all categories and members, and for every member that is not disabled,
-	   if it has internal dependencies (other members), list those members one time only
-	   in a special variable */
-	fprintf(f, "MENUSELECT_BUILD_DEPS=");
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if ((!cat->positive_output && (!mem->enabled || mem->depsfailed || mem->conflictsfailed)) ||
-			    (cat->positive_output && mem->enabled && !mem->depsfailed && !mem->conflictsfailed))
-				continue;
-
-			AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-				/* we only care about dependencies between members (internal, not external) */
-				if (!dep->member)
-					continue;
-				/* if this has already been output, continue */
-				if (dep->member->build_deps_output)
-					continue;
-				fprintf(f, "%s ", dep->member->name);
-				dep->member->build_deps_output = 1;
-			}
-			AST_LIST_TRAVERSE(&mem->uses, use, list) {
-				/* we only care about dependencies between members (internal, not external) */
-				if (!use->member)
-					continue;
-				/* if the dependency module is not going to be built, don't list it */
-				if (!use->member->enabled)
-					continue;
-				/* if this has already been output, continue */
-				if (use->member->build_deps_output)
-					continue;
-				fprintf(f, "%s ", use->member->name);
-				use->member->build_deps_output = 1;
-			}
-		}
-	}
-	fprintf(f, "\n");
-
-	/* Output which members were disabled because of failed dependencies or conflicts */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if (mem->depsfailed != HARD_FAILURE && mem->conflictsfailed != HARD_FAILURE)
-				continue;
-
-			if (!mem->defaultenabled || !strcasecmp(mem->defaultenabled, "yes"))
-				fprintf(f, "MENUSELECT_DEPSFAILED=%s=%s\n", cat->name, mem->name);
-		}
-	}
-
-	fclose(f);
-
-	/* there is no need to process remove_on_change rules if we did not have
-	   configuration information to start from
-	*/
-	if (!existing_config)
-		return 0;
-
-	/* Traverse all categories and members and remove any files that are supposed
-	   to be removed when an item has been changed */
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		unsigned int had_changes = 0;
-		char rmcommand[256] = "rm -rf ";
-		char touchcommand[256] = "touch -c ";
-		char *file, *buf;
-
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if ((mem->enabled == mem->was_enabled) && !mem->was_defaulted)
-				continue;
-
-			had_changes = 1;
-
-			if (mem->touch_on_change) {
-				for (buf = ast_strdupa(mem->touch_on_change), file = strsep(&buf, " ");
-				     file;
-				     file = strsep(&buf, " ")) {
-					strcpy(&touchcommand[9], file);
-					system(touchcommand);
-				}
-			}
-
-			if (mem->remove_on_change) {
-				for (buf = ast_strdupa(mem->remove_on_change), file = strsep(&buf, " ");
-				     file;
-				     file = strsep(&buf, " ")) {
-					strcpy(&rmcommand[7], file);
-					system(rmcommand);
-				}
-			}
-		}
-
-		if (cat->touch_on_change && had_changes) {
-			for (buf = ast_strdupa(cat->touch_on_change), file = strsep(&buf, " ");
-			     file;
-			     file = strsep(&buf, " ")) {
-				strcpy(&touchcommand[9], file);
-				system(touchcommand);
-			}
-		}
-
-		if (cat->remove_on_change && had_changes) {
-			for (buf = ast_strdupa(cat->remove_on_change), file = strsep(&buf, " ");
-			     file;
-			     file = strsep(&buf, " ")) {
-				strcpy(&rmcommand[7], file);
-				system(rmcommand);
-			}
-		}
-	}
-
-	return 0;
-}
-
-/*! \brief Print out all of the information contained in our tree */
-static void dump_member_list(void)
-{
-#ifdef MENUSELECT_DEBUG
-	struct category *cat;
-	struct member *mem;
-	struct reference *dep;
-	struct reference *cnf;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		fprintf(stderr, "Category: '%s'\n", cat->name);
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			fprintf(stderr, "   ==>> Member: '%s'  (%s)", mem->name, mem->enabled ? "Enabled" : "Disabled");
-			fprintf(stderr, "        Was %s\n", mem->was_enabled ? "Enabled" : "Disabled");
-			if (mem->defaultenabled)
-				fprintf(stderr, "        Defaults to %s\n", !strcasecmp(mem->defaultenabled, "yes") ? "Enabled" : "Disabled");
-			AST_LIST_TRAVERSE(&mem->deps, dep, list)
-				fprintf(stderr, "      --> Depends on: '%s'\n", dep->name);
-			if (!AST_LIST_EMPTY(&mem->deps))
-				fprintf(stderr, "      --> Dependencies Met: %s\n", mem->depsfailed ? "No" : "Yes");
-			AST_LIST_TRAVERSE(&mem->conflicts, cnf, list)
-				fprintf(stderr, "      --> Conflicts with: '%s'\n", cnf->name);
-			if (!AST_LIST_EMPTY(&mem->conflicts))
-				fprintf(stderr, "      --> Conflicts Found: %s\n", mem->conflictsfailed ? "Yes" : "No");
-		}
-	}
-#endif
-}
-
-/*! \brief Free all categories and their members */
-static void free_member_list(void)
-{
-	struct category *cat;
-	struct member *mem;
-	struct reference *dep;
-	struct reference *cnf;
-	struct reference *use;
-
-	while ((cat = AST_LIST_REMOVE_HEAD(&categories, list))) {
-		while ((mem = AST_LIST_REMOVE_HEAD(&cat->members, list))) {
-			while ((dep = AST_LIST_REMOVE_HEAD(&mem->deps, list)))
-				free(dep);
-			while ((cnf = AST_LIST_REMOVE_HEAD(&mem->conflicts, list)))
-				free(cnf);
-			while ((use = AST_LIST_REMOVE_HEAD(&mem->uses, list)))
-				free(use);
-			free(mem);
-		}
-		free(cat);
-	}
-}
-
-/*! \brief Free all of the XML trees */
-static void free_trees(void)
-{
-	struct tree *tree;
-
-	while ((tree = AST_LIST_REMOVE_HEAD(&trees, list))) {
-		mxmlDelete(tree->root);
-		free(tree);
-	}
-}
-
-/*! \brief Enable/Disable all members of a category as long as dependencies have been met and no conflicts are found */
-void set_all(struct category *cat, int val)
-{
-	struct member *mem;
-
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-		if (mem->enabled == val)
-			continue;
-
-		if (mem->is_separator)
-			continue;
-
-		if ((mem->depsfailed == HARD_FAILURE) || (mem->conflictsfailed == HARD_FAILURE))
-			continue;
-
-		if (val) {
-			enable_member(mem);
-		} else {
-			mem->enabled = 0;
-		}
-
-		mem->was_defaulted = 0;
-		changes_made++;
-	}
-
-	while (calc_dep_failures(1, 0) || calc_conflict_failures(1, 0));
-}
-
-int count_categories(void)
-{
-	struct category *cat;
-	int count = 0;
-
-	AST_LIST_TRAVERSE(&categories, cat, list)
-		count++;
-
-	return count;
-}
-
-int count_members(struct category *cat)
-{
-	struct member *mem;
-	int count = 0;
-
-	AST_LIST_TRAVERSE(&cat->members, mem, list)
-		count++;
-
-	return count;
-}
-
-static void print_sanity_dep_header(struct dep_file *dep_file, unsigned int *flag)
-{
-	fprintf(stderr, "\n"
-		"***********************************************************\n"
-		"  The '%s' dependency was previously satisfied but         \n"
-		"  is now unsatisfied.                                      \n",
-		dep_file->name);
-	*flag = 1;
-}
-
-/*! \brief Make sure an existing menuselect.makeopts disabled everything it should have */
-static int sanity_check(void)
-{
-	unsigned int insane = 0;
-	struct category *cat;
-	struct member *mem;
-	struct reference *dep;
-	struct reference *use;
-	struct dep_file *dep_file;
-	unsigned int dep_header_printed;
-	unsigned int group_header_printed;
-
-	AST_LIST_TRAVERSE(&deps_file, dep_file, list) {
-		if (!((dep_file->previously_met == DEP_FILE_MET) &&
-		      (dep_file->met == DEP_FILE_UNMET))) {
-			continue;
-		}
-
-		/* this dependency was previously met, but now is not, so
-		   warn the user about members that could be affected by it
-		*/
-
-		dep_header_printed = 0;
-
-		group_header_printed = 0;
-		AST_LIST_TRAVERSE(&categories, cat, list) {
-			AST_LIST_TRAVERSE(&cat->members, mem, list) {
-				if (mem->is_separator) {
-					continue;
-				}
-
-				if (!mem->enabled) {
-					continue;
-				}
-				AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-					if (strcasecmp(dep->name, dep_file->name)) {
-						continue;
-					}
-					if (!group_header_printed) {
-						if (!dep_header_printed) {
-							print_sanity_dep_header(dep_file, &dep_header_printed);
-						}
-						fprintf(stderr, "\n"
-							"  The following modules will no longer be available:\n");
-						group_header_printed = 1;
-					}
-					fprintf(stderr, "          %s\n", mem->name);
-					insane = 1;
-				}
-			}
-		}
-
-		group_header_printed = 0;
-		AST_LIST_TRAVERSE(&categories, cat, list) {
-			AST_LIST_TRAVERSE(&cat->members, mem, list) {
-				if (mem->is_separator) {
-					continue;
-				}
-
-				if (!mem->enabled) {
-					continue;
-				}
-				AST_LIST_TRAVERSE(&mem->uses, use, list) {
-					if (strcasecmp(use->name, dep_file->name)) {
-						continue;
-					}
-					if (!group_header_printed) {
-						if (!dep_header_printed) {
-							print_sanity_dep_header(dep_file, &dep_header_printed);
-						}
-						fprintf(stderr, "\n"
-							"  The functionality of the following modules will\n"
-							"  be affected:\n");
-						group_header_printed = 1;
-					}
-					fprintf(stderr, "          %s\n", mem->name);
-					insane = 1;
-				}
-			}
-		}
-
-		if (dep_header_printed) {
-			fprintf(stderr,
-				"***********************************************************\n");
-		}
-	}
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if ((mem->depsfailed || mem->conflictsfailed) && mem->enabled) {
-				fprintf(stderr, "\n"
-					"***********************************************************\n"
-					"  The existing menuselect.makeopts file did not specify    \n"
-					"  that '%s' should not be included.  However, either some  \n"
-					"  dependencies for this module were not found or a         \n"
-					"  conflict exists.                                         \n"
-					"                                                           \n"
-					"  Either run 'make menuselect' or remove the existing      \n"
-					"  menuselect.makeopts file to resolve this issue.          \n"
-					"***********************************************************\n"
-					"\n", mem->name);
-				insane = 1;
-			}
-		}
-	}
-
-	return insane ? -1 : 0;
-}
-
-/* \brief Set the forced default values if they exist */
-static void process_defaults(void)
-{
-	struct category *cat;
-	struct member *mem;
-
-	print_debug("Processing default values since config was not present\n");
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if (!mem->defaultenabled)
-				continue;
-
-			if (mem->depsfailed == HARD_FAILURE)
-				continue;
-
-			if (mem->conflictsfailed == HARD_FAILURE)
-				continue;
-
-			if (!strcasecmp(mem->defaultenabled, "yes")) {
-				mem->enabled = 1;
-				mem->was_defaulted = 1;
-			} else if (!strcasecmp(mem->defaultenabled, "no")) {
-				mem->enabled = 0;
-				mem->was_defaulted = 1;
-			} else
-				fprintf(stderr, "Invalid defaultenabled value for '%s' in category '%s'\n", mem->name, cat->name);
-		}
-	}
-
-}
-
-struct member *find_member(const char *name)
-{
-	struct category *cat;
-	struct member *mem;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (mem->is_separator) {
-				continue;
-			}
-
-			if (!strcasecmp(name, mem->name)) {
-				return mem;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-struct category *find_category(const char *name)
-{
-	struct category *cat;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (!strcasecmp(name, cat->name)) {
-			return cat;
-		}
-	}
-
-	return NULL;
-}
-
-static int usage(const char *argv0)
-{
-	fprintf(stderr, "Usage: %s [--enable <option>] [--disable <option>]\n", argv0);
-	fprintf(stderr, "   [--enable-category <category>] [--enable-all]\n");
-	fprintf(stderr, "   [--disable-category <category>] [--disable-all] [...]\n");
-	fprintf(stderr, "   [<config-file> [...]]\n");
-	fprintf(stderr, "Usage: %s { --check-deps | --list-options\n", argv0);
-	fprintf(stderr, "   | --list-category <category> | --category-list | --help }\n");
-	fprintf(stderr, "   [<config-file> [...]]\n");
-	return 0;
-}
-
-int main(int argc, char *argv[])
-{
-	int res = 0;
-	const char *list_group = NULL;
-	unsigned int x;
-	static struct option long_options[] = {
-		/*
-		 * The --check-deps option is used to ask this application to check to
-		 * see if that an existing menuselect.makeopts file contains all of the
-		 * modules that have dependencies that have not been met.  If this
-		 * is not the case, an informative message will be printed to the
-		 * user and the build will fail.
-		 */
-		{ "check-deps",       no_argument,       &check_deps,   1  },
-		{ "enable",           required_argument, 0,            'e' },
-		{ "enable-category",  required_argument, 0,            'E' },
-		{ "enable-all",       no_argument,       0,            'a' },
-		{ "disable",          required_argument, 0,            'd' },
-		{ "disable-category", required_argument, 0,            'D' },
-		{ "disable-all",      no_argument,       0,            'A' },
-		{ "list-options",     no_argument,       &list_options, 1  },
-		{ "list-category",    required_argument, 0,            'L' },
-		{ "category-list",    no_argument,       &list_groups,  1  },
-		{ "help",             no_argument,       0,            'h' },
-
-		{ 0, 0, 0, 0 },
-	};
-	int do_menu = 1, do_settings = 1;
-	int c, option_index = 0;
-
-	if (open_debug()) {
-		exit(1);
-	}
-
-	/* Parse the input XML files to build the list of available options */
-	if ((res = build_member_list()))
-		exit(res);
-
-	/* Load module dependencies */
-	if ((res = process_deps()))
-		exit(res);
-
-	while (calc_dep_failures(0, 1) || calc_conflict_failures(0, 1));
-
-	while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
-		switch (c) {
-		case 'L':
-			list_group = optarg;
-			do_settings = 0;
-			/* Fall-through */
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'd':
-		case 'D':
-			do_menu = 0;
-			break;
-		case 'h':
-			return usage(argv[0]);
-			break;
-		default:
-			break;
-		}
-	}
-
-	if (check_deps || list_options || list_groups) {
-		do_menu = 0;
-		do_settings = 0;
-	}
-
-	if (optind < argc) {
-		for (x = optind; x < argc; x++) {
-			res = parse_existing_config(argv[x]);
-			if (!res && !strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT))
-				existing_config = 1;
-			res = 0;
-		}
-	}
-
-	/* Dump the list produced by parsing the various input files */
-	dump_member_list();
-
-	while (calc_dep_failures(0, 0) || calc_conflict_failures(0, 0));
-
-	if (!existing_config)
-		process_defaults();
-	else if (check_deps)
-		res = sanity_check();
-
-	while (calc_dep_failures(0, 0) || calc_conflict_failures(0, 0));
-
-	print_debug("do_menu=%d, do_settings=%d\n", do_menu, do_settings);
-
-	if (do_menu && !res) {
-		res = run_menu();
-	} else if (!do_settings) {
-		if (list_groups) {
-			struct category *cat;
-			AST_LIST_TRAVERSE(&categories, cat, list) {
-				fprintf(stdout, "%s\n", cat->name);
-			}
-		} else if (list_options) {
-			struct category *cat;
-			struct member *mem;
-			AST_LIST_TRAVERSE(&categories, cat, list) {
-				AST_LIST_TRAVERSE(&cat->members, mem, list) {
-					if (mem->is_separator) {
-						continue;
-					}
-
-					fprintf(stdout, "%c %-30.30s %s\n", mem->enabled ? '+' : '-', mem->name, cat->name);
-				}
-			}
-		} else if (!strlen_zero(list_group)) {
-			struct category *cat;
-			struct member *mem;
-			if ((cat = find_category(list_group))) {
-				AST_LIST_TRAVERSE(&cat->members, mem, list) {
-					if (mem->is_separator) {
-						continue;
-					}
-
-					fprintf(stdout, "%c %s\n", mem->enabled ? '+' : '-', mem->name);
-				}
-			}
-		}
-	} else if (!do_menu && do_settings) {
-		struct member *mem;
-		struct category *cat;
-
-		print_debug("Doing settings with argc=%d\n", argc);
-
-		/* Reset options processing */
-		option_index = 0;
-		optind = 1;
-
-		while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
-			print_debug("Got option %c\n", c);
-			switch (c) {
-			case 'e':
-				if (!strlen_zero(optarg)) {
-					if ((mem = find_member(optarg))) {
-						set_member_enabled(mem);
-					} else {
-						fprintf(stderr, "'%s' not found\n", optarg);
-					}
-				}
-				break;
-			case 'E':
-				if (!strlen_zero(optarg)) {
-					if ((cat = find_category(optarg))) {
-						set_all(cat, 1);
-					} else {
-						fprintf(stderr, "'%s' not found\n", optarg);
-					}
-				}
-				break;
-			case 'a': /* enable-all */
-				AST_LIST_TRAVERSE(&categories, cat, list) {
-					set_all(cat, 1);
-				}
-				break;
-			case 'd':
-				if (!strlen_zero(optarg)) {
-					if ((mem = find_member(optarg))) {
-						clear_member_enabled(mem);
-					} else {
-						fprintf(stderr, "'%s' not found\n", optarg);
-					}
-				}
-				break;
-			case 'D':
-				if (!strlen_zero(optarg)) {
-					if ((cat = find_category(optarg))) {
-						set_all(cat, 0);
-					} else {
-						fprintf(stderr, "'%s' not found\n", optarg);
-					}
-				}
-				break;
-			case 'A': /* disable-all */
-				AST_LIST_TRAVERSE(&categories, cat, list) {
-					set_all(cat, 0);
-				}
-				break;
-			case '?':
-				break;
-			default:
-				break;
-			}
-		}
-		res = 0;
-	}
-
-	if (!res) {
-		res = generate_makeopts_file();
-	}
-
-	/* Always generate the dependencies file */
-	if (!res) {
-		generate_makedeps_file();
-	}
-
-	/* free everything we allocated */
-	free_deps_file();
-	free_trees();
-	free_member_list();
-
-	close_debug();
-
-	exit(res);
-}
diff --git a/menuselect/menuselect.h b/menuselect/menuselect.h
deleted file mode 100644
index 12a3666..0000000
--- a/menuselect/menuselect.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2005-2006, Russell Bryant
- *
- * Russell Bryant <russell at digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- *
- * \brief public data structures and defaults for menuselect
- *
- */
-
-#ifndef MENUSELECT_H
-#define MENUSELECT_H
-
-#include "linkedlists.h"
-
-#define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
-#define OUTPUT_MAKEDEPS_DEFAULT "menuselect.makedeps"
-#define MENUSELECT_DEPS         "build_tools/menuselect-deps"
-
-struct member;
-
-struct reference {
-	/*! the name of the dependency */
-	const char *name;
-	/*! the display name of the dependency */
-	const char *displayname;
-	/*! if this dependency is a member, not an external object */
-	struct member *member;
-	/*! if this package was found */
-	unsigned char met:1;
-	/*! for linking */
-	AST_LIST_ENTRY(reference) list;
-};
-
-enum failure_types {
-	NO_FAILURE = 0,
-	SOFT_FAILURE = 1,
-	HARD_FAILURE = 2,
-};
-
-struct member {
-	/*! What will be sent to the makeopts file */
-	const char *name;
-	/*! Display name if known */
-	const char *displayname;
-	/*! Default setting */
-	const char *defaultenabled;
-	/*! Delete these file(s) if this member changes */
-	const char *remove_on_change;
-	/*! Touch these file(s) if this member changes */
-	const char *touch_on_change;
-	const char *support_level;
-	const char *replacement;
-	/*! This module is currently selected */
-	unsigned int enabled:1;
-	/*! This module was enabled when the config was loaded */
-	unsigned int was_enabled:1;
-	/*! This module has failed dependencies */
-	unsigned int depsfailed:2;
-	/*! This module has failed conflicts */
-	unsigned int conflictsfailed:2;
-	/*! This module's 'enabled' flag was changed by a default only */
-	unsigned int was_defaulted:1;
-	/*! This module is a dependency, and if it is selected then
-	  we have included it in the MENUSELECT_BUILD_DEPS line
-	  in the output file */
-	unsigned int build_deps_output:1;
-	/*! This module should never be enabled automatically, but only
-	 * when explicitly set. */
-	unsigned int explicitly_enabled_only:1;
-	/*! This isn't actually a module!  It's a separator, and it should
-	 * be passed over for many of the usual purposes associated with members. */
-	unsigned int is_separator:1;
-	/*! dependencies of this module */
-	AST_LIST_HEAD_NOLOCK(, reference) deps;
-	/*! conflicts of this module */
-	AST_LIST_HEAD_NOLOCK(, reference) conflicts;
-	/*! optional packages used by this module */
-	AST_LIST_HEAD_NOLOCK(, reference) uses;
-	/*! for making a list of modules */
-	AST_LIST_ENTRY(member) list;
-};
-
-enum support_level_values {
-	SUPPORT_CORE = 0,
-	SUPPORT_EXTENDED = 1,
-	SUPPORT_DEPRECATED = 2,
-	SUPPORT_UNSPECIFIED = 3,
-	SUPPORT_COUNT = 4, /* Keep this item at the end of the list. Tracks total number of support levels. */
-};
-
-struct category {
-	struct member *separators[SUPPORT_COUNT];
-	/*! the Makefile variable */
-	const char *name;
-	/*! the name displayed in the menu */
-	const char *displayname;
-	/*! Delete these file(s) if anything in this category changes */
-	const char *remove_on_change;
-	/*! Touch these file(s) if anything in this category changes */
-	const char *touch_on_change;
-	/*! Output what is selected, as opposed to not selected */
-	unsigned int positive_output:1;
-	/*! All choices in this category are mutually exclusive */
-	unsigned int exclusive:1;
-	/*! the list of possible values to be set in this variable */
-	AST_LIST_HEAD_NOLOCK(, member) members;
-	/*! for linking */
-	AST_LIST_ENTRY(category) list;
-};
-
-extern AST_LIST_HEAD_NOLOCK(categories, category) categories;
-
-extern const char *menu_name;
-
-/*! This is implemented by the frontend */
-int run_menu(void);
-
-int count_categories(void);
-
-int count_members(struct category *cat);
-
-/*! \brief Toggle a member of a category at the specified index to enabled/disabled */
-void toggle_enabled_index(struct category *cat, int index);
-
-void toggle_enabled(struct member *mem);
-
-/*! \brief Set a member of a category at the specified index to enabled */
-void set_enabled(struct category *cat, int index);
-/*! \brief Set a member of a category at the specified index to not enabled */
-void clear_enabled(struct category *cat, int index);
-
-/*! \brief Enable/Disable all members of a category as long as dependencies have been met and no conflicts are found */
-void set_all(struct category *cat, int val);
-
-/*! \brief returns non-zero if the string is not defined, or has zero length */
-static inline int strlen_zero(const char *s)
-{
-	return (!s || (*s == '\0'));
-}
-
-#endif /* MENUSELECT_H */
diff --git a/menuselect/menuselect_curses.c b/menuselect/menuselect_curses.c
deleted file mode 100644
index 5afa996..0000000
--- a/menuselect/menuselect_curses.c
+++ /dev/null
@@ -1,1034 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2005 - 2006, Russell Bryant
- *
- * Russell Bryant <russell at digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*
- * \file
- *
- * \author Russell Bryant <russell at digium.com>
- * 
- * \brief curses frontend for selection maintenance
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-#include <curses.h>
-
-#include "menuselect.h"
-
-#define MENU_HELP	"Press 'h' for help."
-
-#define TITLE_HEIGHT	7
-
-#define MIN_X		80
-#define MIN_Y		27
-
-#define PAGE_OFFSET	10
-
-#define SCROLL_NONE     0
-#define SCROLL_DOWN     1
-
-#define SCROLL_DOWN_INDICATOR "... More ..."
-
-#define MIN(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); ((__a > __b) ? __b : __a);})
-#define MAX(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); ((__a < __b) ? __b : __a);})
-
-extern int changes_made;
-
-/*! Maximum number of characters horizontally */
-static int max_x = 0;
-/*! Maximum number of characters vertically */
-static int max_y = 0;
-
-static const char * const help_info[] = {
-	"scroll              => up/down arrows",
-	"toggle selection    => Enter",
-	"select              => y",
-	"deselect            => n",
-	"select all          => F8",
-	"deselect all        => F7",
-	"back                => left arrow",
-	"quit                => q",
-	"save and quit       => x",
-	"",
-	"XXX means dependencies have not been met",
-	"    or a conflict exists",
-	"",
-	"< > means a dependency has been deselected",
-	"    and will be automatically re-selected",
-	"    if this item is selected",
-	"",
-	"( ) means a conflicting item has been",
-	"    selected",
-};
-
-/*! \brief Handle a window resize in xterm */
-static void _winch_handler(int sig)
-{
-	getmaxyx(stdscr, max_y, max_x);
-
-	if (max_x < MIN_X || max_y < MIN_Y) {
-		fprintf(stderr, "Terminal must be at least %d x %d.\n", MIN_X, MIN_Y);
-		max_x = MIN_X - 1;
-		max_y = MIN_Y - 1;
-	}
-}
-
-static struct sigaction winch_handler = {
-	.sa_handler = _winch_handler,
-};
-
-/*! \brief Handle a SIGQUIT */
-static void _sigint_handler(int sig)
-{
-
-}
-
-static struct sigaction sigint_handler = {
-	.sa_handler = _sigint_handler,
-};
-
-/*! \brief Display help information */
-static void show_help(WINDOW *win)
-{
-	int i;
-
-	wclear(win);
-	for (i = 0; i < (sizeof(help_info) / sizeof(help_info[0])); i++) {
-		wmove(win, i, max_x / 2 - 15);
-		waddstr(win, (char *) help_info[i]);
-	}
-	wrefresh(win);
-	getch(); /* display the help until the user hits a key */
-}
-
-static int really_quit(WINDOW *win)
-{
-	int c;
-	wclear(win);
-	wmove(win, 2, max_x / 2 - 15);
-	waddstr(win, "ARE YOU SURE?");
-        wmove(win, 3, max_x / 2 - 12);
-	waddstr(win, "--- It appears you have made some changes, and");
-	wmove(win, 4, max_x / 2 - 12);
-	waddstr(win, "you have opted to Quit without saving these changes!");
-	wmove(win, 6, max_x / 2 - 12);
-	waddstr(win, "  Please Enter Y to exit without saving;");
-	wmove(win, 7, max_x / 2 - 12);
-	waddstr(win, "  Enter N to cancel your decision to quit,");
-	wmove(win, 8, max_x / 2 - 12);
-	waddstr(win, "     and keep working in menuselect, or");
-	wmove(win, 9, max_x / 2 - 12);
-	waddstr(win, "  Enter S to save your changes, and exit");
-	wmove(win, 10, max_x / 2 - 12);
-	wrefresh(win);
-	while ((c=getch())) {
-		if (c == 'Y' || c == 'y') {
-			c = 'q';
-			break;
-		}
-		if (c == 'S' || c == 's') {
-			c = 'S';
-			break;
-		}
-		if (c == 'N' || c == 'n') {
-			c = '%';
-			break;
-		}
-	}
-	return c;
-}
-
-static void draw_main_menu(WINDOW *menu, int curopt)
-{
-	struct category *cat;
-	char buf[64];
-	int i = 0;
-
-	wclear(menu);
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		wmove(menu, i++, max_x / 2 - 10);
-		snprintf(buf, sizeof(buf), " %s", strlen_zero(cat->displayname) ? cat->name : cat->displayname);
-		waddstr(menu, buf);
-	}
-
-	wmove(menu, curopt, (max_x / 2) - 15);
-	waddstr(menu, "--->");
-	wmove(menu, 0, 0);
-
-	wrefresh(menu);
-}
-
-static void display_mem_info(WINDOW *menu, struct member *mem, int start, int end)
-{
-	char buf[64];
-	struct reference *dep;
-	struct reference *con;
-	struct reference *use;
-
-	wmove(menu, end - start + 2, max_x / 2 - 16);
-	wclrtoeol(menu);
-	wmove(menu, end - start + 3, max_x / 2 - 16);
-	wclrtoeol(menu);
-	wmove(menu, end - start + 4, max_x / 2 - 16);
-	wclrtoeol(menu);
-	wmove(menu, end - start + 5, max_x / 2 - 16);
-	wclrtoeol(menu);
-	wmove(menu, end - start + 6, max_x / 2 - 16);
-	wclrtoeol(menu);
-
-	if (mem->displayname) {
-		wmove(menu, end - start + 2, max_x / 2 - 16);
-		waddstr(menu, (char *) mem->displayname);
-	}
-	if (!AST_LIST_EMPTY(&mem->deps)) {
-		wmove(menu, end - start + 3, max_x / 2 - 16);
-		strcpy(buf, "Depends on: ");
-		AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-			strncat(buf, dep->displayname, sizeof(buf) - strlen(buf) - 1);
-			strncat(buf, dep->member ? "(M)" : "(E)", sizeof(buf) - strlen(buf) - 1);
-			if (AST_LIST_NEXT(dep, list))
-				strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
-		}
-		waddstr(menu, buf);
-	}
-	if (!AST_LIST_EMPTY(&mem->uses)) {
-		wmove(menu, end - start + 4, max_x / 2 - 16);
-		strcpy(buf, "Can use: ");
-		AST_LIST_TRAVERSE(&mem->uses, use, list) {
-			strncat(buf, use->displayname, sizeof(buf) - strlen(buf) - 1);
-			strncat(buf, use->member ? "(M)" : "(E)", sizeof(buf) - strlen(buf) - 1);
-			if (AST_LIST_NEXT(use, list))
-				strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
-		}
-		waddstr(menu, buf);
-	}
-	if (!AST_LIST_EMPTY(&mem->conflicts)) {
-		wmove(menu, end - start + 5, max_x / 2 - 16);
-		strcpy(buf, "Conflicts with: ");
-		AST_LIST_TRAVERSE(&mem->conflicts, con, list) {
-			strncat(buf, con->displayname, sizeof(buf) - strlen(buf) - 1);
-			strncat(buf, con->member ? "(M)" : "(E)", sizeof(buf) - strlen(buf) - 1);
-			if (AST_LIST_NEXT(con, list))
-				strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
-		}
-		waddstr(menu, buf);
-	}
-
-	if (!mem->is_separator) { /* Separators lack support levels */
-		{ /* support level */
-			wmove(menu, end - start + 6, max_x / 2 - 16);
-			snprintf(buf, sizeof(buf), "Support Level: %s", mem->support_level);
-			if (mem->replacement && *mem->replacement) {
-				char buf2[64];
-				snprintf(buf2, sizeof(buf2), ", Replaced by: %s", mem->replacement);
-				strncat(buf, buf2, sizeof(buf) - strlen(buf) - 1);
-			}
-			waddstr(menu, buf);
-		}
-	}
-}
-
-static void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end, int curopt, int changed, int flags)
-{
-	int i = 0;
-	int j = 0;
-	struct member *mem;
-	char buf[64];
-
-	if (!changed) {
-		/* If all we have to do is move the cursor, 
-		 * then don't clear the screen and start over */
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			i++;
-			if (curopt + 1 == i) {
-				display_mem_info(menu, mem, start, end);
-				break;
-			}
-		}
-		wmove(menu, curopt - start, max_x / 2 - 9);
-		wrefresh(menu);
-		return;
-	}
-
-	wclear(menu);
-
-	i = 0;
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-		if (i < start) {
-			i++;
-			continue;
-		}
-		wmove(menu, j++, max_x / 2 - 10);
-		i++;
-		if ((mem->depsfailed == HARD_FAILURE) || (mem->conflictsfailed == HARD_FAILURE)) {
-			snprintf(buf, sizeof(buf), "XXX %s", mem->name);
-		} else if (mem->is_separator) {
-			snprintf(buf, sizeof(buf), "    --- %s ---", mem->name);
-		} else if (mem->depsfailed == SOFT_FAILURE) {
-			snprintf(buf, sizeof(buf), "<%s> %s", mem->enabled ? "*" : " ", mem->name);
-		} else if (mem->conflictsfailed == SOFT_FAILURE) {
-			snprintf(buf, sizeof(buf), "(%s) %s", mem->enabled ? "*" : " ", mem->name);
-		} else {
-			snprintf(buf, sizeof(buf), "[%s] %s", mem->enabled ? "*" : " ", mem->name);
-		}
-		waddstr(menu, buf);
-		
-		if (curopt + 1 == i)
-			display_mem_info(menu, mem, start, end);
-
-		if (i == end - (flags & SCROLL_DOWN ? 1 : 0))
-			break;
-	}
-
-	if (flags & SCROLL_DOWN) {
-		wmove(menu, j, max_x / 2 - sizeof(SCROLL_DOWN_INDICATOR) / 2);
-		waddstr(menu, SCROLL_DOWN_INDICATOR);
-	}
-
-	wmove(menu, curopt - start, max_x / 2 - 9);
-	wrefresh(menu);
-}
-
-static void play_space(void);
-
-static int move_up(int *current, int itemcount, int delta, int *start, int *end, int scroll)
-{
-	if (*current > 0) {
-		*current = MAX(*current - delta, 0);
-		if (*current < *start) {
-			int diff = *start - MAX(*start - delta, 0);
-			*start  -= diff;
-			*end    -= diff;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int move_down(int *current, int itemcount, int delta, int *start, int *end, int scroll)
-{
-	if (*current < itemcount) {
-		*current = MIN(*current + delta, itemcount);
-		if (*current > *end - 1 - (scroll & SCROLL_DOWN ? 1 : 0)) {
-			int diff = MIN(*end + delta - 1, itemcount) - *end + 1;
-			*start  += diff;
-			*end    += diff;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static int run_category_menu(WINDOW *menu, int cat_num)
-{
-	struct category *cat;
-	int i = 0;
-	int start = 0;
-	int end = max_y - TITLE_HEIGHT - 8;
-	int c;
-	int curopt = 0;
-	int maxopt;
-	int changed = 1;
-	int scroll = SCROLL_NONE;
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (i++ == cat_num)
-			break;
-	}
-	if (!cat)
-		return -1;
-
-	maxopt = count_members(cat) - 1;
-
-	if (maxopt > end) {
-		scroll = SCROLL_DOWN;
-	}
-
-	draw_category_menu(menu, cat, start, end, curopt, changed, scroll);
-
-	while ((c = getch())) {
-		changed = 0;
-		switch (c) {
-		case KEY_UP:
-			changed = move_up(&curopt, maxopt, 1, &start, &end, scroll);
-			break;
-		case KEY_DOWN:
-			changed = move_down(&curopt, maxopt, 1, &start, &end, scroll);
-			break;
-		case KEY_PPAGE:
-			changed = move_up(
-				&curopt,
-				maxopt,
-				MIN(PAGE_OFFSET, max_y - TITLE_HEIGHT - 6 - (scroll & SCROLL_DOWN ? 1 : 0)),
-				&start,
-				&end,
-				scroll);
-			break;
-		case KEY_NPAGE:
-			changed = move_down(
-				&curopt,
-				maxopt,
-				MIN(PAGE_OFFSET, max_y - TITLE_HEIGHT - 6 - (scroll & SCROLL_DOWN ? 1 : 0)),
-				&start,
-				&end,
-				scroll);
-			break;
-		case KEY_HOME:
-			changed = move_up(&curopt, maxopt, curopt, &start, &end, scroll);
-			break;
-		case KEY_END:
-			changed = move_down(&curopt, maxopt, maxopt - curopt, &start, &end, scroll);
-			break;
-		case KEY_LEFT:
-		case 27:	/* Esc key */
-			return 0;
-		case KEY_RIGHT:
-		case KEY_ENTER:
-		case '\n':
-		case ' ':
-			toggle_enabled_index(cat, curopt);
-			changed = 1;
-			break;
-		case 'y':
-		case 'Y':
-			set_enabled(cat, curopt);
-			changed = 1;
-			break;
-		case 'n':
-		case 'N':
-			clear_enabled(cat, curopt);
-			changed = 1;
-			break;
-		case 'h':
-		case 'H':
-			show_help(menu);
-			changed = 1;
-			break;
-		case KEY_F(7):
-			set_all(cat, 0);
-			changed = 1;
-			break;
-		case KEY_F(8):
-			set_all(cat, 1);
-			changed = 1;
-		default:
-			break;	
-		}
-		if (c == 'x' || c == 'X' || c == 'Q' || c == 'q')
-			break;
-
-		if (end <= maxopt) {
-			scroll |= SCROLL_DOWN;
-		} else {
-			scroll &= ~SCROLL_DOWN;
-		}
-
-		draw_category_menu(menu, cat, start, end, curopt, changed, scroll);
-	}
-
-	wrefresh(menu);
-
-	return c;
-}
-
-static void draw_title_window(WINDOW *title)
-{
-	char titlebar[strlen(menu_name) + 9];
-
-	memset(titlebar, '*', sizeof(titlebar) - 1);
-	titlebar[sizeof(titlebar) - 1] = '\0';
-	wclear(title);
-	wmove(title, 1, (max_x / 2) - (strlen(titlebar) / 2));
-	waddstr(title, titlebar);
-	wmove(title, 2, (max_x / 2) - (strlen(menu_name) / 2));
-	waddstr(title, (char *) menu_name);
-	wmove(title, 3, (max_x / 2) - (strlen(titlebar) / 2));
-	waddstr(title, titlebar);
-	wmove(title, 5, (max_x / 2) - (strlen(MENU_HELP) / 2));
-	waddstr(title, MENU_HELP);
-	wrefresh(title);
-}
-
-int run_menu(void)
-{
-	WINDOW *title;
-	WINDOW *menu;
-	int maxopt;
-	int curopt = 0;
-	int c;
-	int res = 0;
-
-	setenv("ESCDELAY", "0", 1); /* So that ESC is processed immediately */
-
-	initscr();
-	getmaxyx(stdscr, max_y, max_x);
-	sigaction(SIGWINCH, &winch_handler, NULL); /* handle window resizing in xterm */
-	sigaction(SIGINT, &sigint_handler, NULL); /* handle window resizing in xterm */
-
-	if (max_x < MIN_X || max_y < MIN_Y) {
-		fprintf(stderr, "Terminal must be at least %d x %d.\n", MIN_X, MIN_Y);
-		endwin();
-		return -1;
-	}
-
-	cbreak(); /* don't buffer input until the enter key is pressed */
-	noecho(); /* don't echo user input to the screen */
-	keypad(stdscr, TRUE); /* allow the use of arrow keys */
-	clear();
-	refresh();
-
-	maxopt = count_categories() - 1;
-	
-	/* We have two windows - the title window at the top, and the menu window gets the rest */
-	title = newwin(TITLE_HEIGHT, max_x, 0, 0);
-	menu = newwin(max_y - TITLE_HEIGHT, max_x, TITLE_HEIGHT, 0);
-	draw_title_window(title);	
-	draw_main_menu(menu, curopt);
-	
-	while ((c = getch())) {
-		switch (c) {
-		case KEY_UP:
-			if (curopt > 0)
-				curopt--;
-			break;
-		case KEY_DOWN:
-			if (curopt < maxopt)
-				curopt++;
-			break;
-		case KEY_HOME:
-			curopt = 0;
-			break;
-		case KEY_END:
-			curopt = maxopt;
-			break;
-		case KEY_RIGHT:
-		case KEY_ENTER:
-		case '\n':
-		case ' ':
-			c = run_category_menu(menu, curopt);
-			break;
-		case 'h':
-		case 'H':
-			show_help(menu);
-			break;
-		case 'i':
-		case 'I':
-			play_space();
-			draw_title_window(title);
-		default:
-			break;	
-		}
-		if (c == 'q' || c == 'Q' || c == 27 || c == 3) {
-			if (changes_made) {
-				c = really_quit(menu);
-				if (c == 'q') {
-					res = -1;
-					break;
-				}
-			} else {
-				res = -1;
-				break;
-			}
-		}
-		if (c == 'x' || c == 'X' || c == 's' || c == 'S')
-			break;	
-		draw_main_menu(menu, curopt);
-	}
-
-	endwin();
-
-	return res;
-}
-
-enum blip_type {
-	BLIP_TANK = 0,
-	BLIP_SHOT,
-	BLIP_BOMB,
-	BLIP_ALIEN,
-	BLIP_BARRIER,
-	BLIP_UFO
-};
-
-struct blip {
-	enum blip_type type;
-	int x;
-	int y;
-	int ox;
-	int oy;
-	int goingleft;
-	int health;
-	AST_LIST_ENTRY(blip) entry;
-};
-
-static AST_LIST_HEAD_NOLOCK(, blip) blips;
-
-static int respawn = 0;
-static int score = 0;
-static int num_aliens = 0;
-static int alien_sleeptime = 0;
-struct blip *ufo = NULL;
-struct blip *tank = NULL;
-
-/*! Probability of a bomb, out of 100 */
-#define BOMB_PROB   1
-
-static int add_barrier(int x, int y)
-{
-	struct blip *cur = NULL;
-
-	cur = calloc(1,sizeof(struct blip));
-	if(!cur) {
-		return -1;
-	}
-	cur->type=BLIP_BARRIER;
-	cur->x = x;
-	cur->y=max_y - y;
-	cur->health = 1;
-	AST_LIST_INSERT_HEAD(&blips, cur,entry);
-	return 0;
-}
-
-static int init_blips(void)
-{
-	int i, j;
-	struct blip *cur;
-	int offset = 4;
-
-	srandom(time(NULL) + getpid());
-
-	/* make tank */
-	cur = calloc(1, sizeof(struct blip));
-	if (!cur)
-		return -1;
-	cur->type = BLIP_TANK;
-	cur->x = max_x / 2;
-	cur->y = max_y - 1;
-	AST_LIST_INSERT_HEAD(&blips, cur, entry);
-	tank = cur;
-
-	/* 3 rows of 10 aliens */
-	num_aliens = 0;
-	for (i = 0; i < 3; i++) {
-		for (j = 0; j < 10; j++) {
-			cur = calloc(1, sizeof(struct blip));
-			if (!cur)
-				return -1;
-			cur->type = BLIP_ALIEN;
-			cur->x = (j * 2) + 1;
-			cur->y = (i * 2) + 2;
-			AST_LIST_INSERT_HEAD(&blips, cur, entry);
-			num_aliens++;
-		}
-	}
-	for(i=0; i < 4; i++) {
-		if (i > 0)
-			offset += 5 + ((max_x) -28) / 3;
-		add_barrier(offset + 1, 6);
-		add_barrier(offset + 2, 6);
-		add_barrier(offset + 3, 6);
-
-		add_barrier(offset, 5);
-		add_barrier(offset + 1, 5);
-		add_barrier(offset + 2, 5);
-		add_barrier(offset + 3, 5);
-		add_barrier(offset + 4, 5);
-
-		add_barrier(offset, 4);
-		add_barrier(offset + 1, 4);
-		add_barrier(offset + 3, 4);
-		add_barrier(offset + 4, 4);
-	}
-	return 0;
-}
-
-static inline chtype type2chtype(enum blip_type type)
-{
-	switch (type) {
-	case BLIP_TANK:
-		return 'A';
-	case BLIP_ALIEN:
-		return 'X';
-	case BLIP_SHOT:
-		return '|';
-	case BLIP_BOMB:
-		return 'o';
-	case BLIP_BARRIER:
-		return '*';
-	case BLIP_UFO:
-		return '@';
-	default:
-		break;
-	}
-	return '?';
-}
-
-static int repaint_screen(void)
-{
-	struct blip *cur;
-
-	wmove(stdscr, 0, 0);
-	wprintw(stdscr, "Score: %d", score);
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		if (cur->x != cur->ox || cur->y != cur->oy) {
-			wmove(stdscr, cur->oy, cur->ox);
-			waddch(stdscr, ' ');
-			wmove(stdscr, cur->y, cur->x);
-			waddch(stdscr, type2chtype(cur->type));	
-			cur->ox = cur->x;
-			cur->oy = cur->y;
-		}
-	}
-
-	wmove(stdscr, 0, max_x - 1);
-
-	wrefresh(stdscr);
-
-	return 0;
-}
-
-static int tank_move_left(void)
-{
-	if (tank->x > 0)
-		tank->x--;
-	
-	return 0;
-}
-
-static int tank_move_right(void)
-{
-	if (tank->x < (max_x - 1))
-		tank->x++;
-
-	return 0;
-}
-
-static int count_shots(void)
-{
-	struct blip *cur;
-	int count = 0;
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		if (cur->type == BLIP_SHOT)
-			count++;
-	}
-
-	return count;
-}
-
-static int tank_shoot(void)
-{
-	struct blip *shot;
-
-	if (count_shots() == 3)
-		return 0;
-
-	score--;
-
-	shot = calloc(1, sizeof(struct blip));
-	if (!shot)
-		return -1;
-	shot->type = BLIP_SHOT;
-	shot->x = tank->x;
-	shot->y = max_y - 2;
-	AST_LIST_INSERT_HEAD(&blips, shot, entry);
-
-	return 0;
-}
-
-static int remove_blip(struct blip *blip)
-{
-	if (!blip) {
-		return -1;
-	}
-
-	AST_LIST_REMOVE(&blips, blip, entry);
-
-	if (blip->type == BLIP_ALIEN) {
-		num_aliens--;
-	}
-	wmove(stdscr, blip->oy, blip->ox);
-	waddch(stdscr, ' ');
-	free(blip);
-
-	return 0;
-}
-
-static int move_aliens(void)
-{
-	struct blip *cur;
-	struct blip *current_barrier;
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		if (cur->type != BLIP_ALIEN) {
-			/* do nothing if it's not an alien */
-			continue;
-		}
-		if (cur->goingleft && (cur->x == 0)) {
-			cur->y++;
-			cur->goingleft = 0;
-		} else if (!cur->goingleft && cur->x == (max_x - 1)) {
-			cur->y++;
-			cur->goingleft = 1;
-		} else if (cur->goingleft) {
-			cur->x--;
-		} else {
-			cur->x++;
-		}
-		/* Alien into the tank == game over */
-		if (cur->x == tank->x && cur->y == tank->y)
-			return 1;
-		AST_LIST_TRAVERSE(&blips, current_barrier, entry){
-			if(current_barrier->type!=BLIP_BARRIER)
-				continue;
-			if(cur->y == current_barrier->y && cur->x == current_barrier -> x)
-				remove_blip(current_barrier);
-		}
-		if (random() % 100 < BOMB_PROB && cur->y != max_y) {
-			struct blip *bomb = calloc(1, sizeof(struct blip));
-			if (!bomb)
-				continue;
-			bomb->type = BLIP_BOMB;
-			bomb->x = cur->x;
-			bomb->y = cur->y + 1;
-			AST_LIST_INSERT_HEAD(&blips, bomb, entry);
-		}
-	}
-
-	return 0;
-}
-
-static int move_bombs(void)
-{
-	struct blip *cur;
-	struct blip *current_barrier;
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		int mark = 0;
-		if (cur->type != BLIP_BOMB)
-			continue;
-		cur->y++;
-		if (cur->x == tank->x && cur->y == tank->y) {
-			return 1;
-		}
-
-		AST_LIST_TRAVERSE(&blips, current_barrier, entry) {
-			if (current_barrier->type != BLIP_BARRIER)
-				continue;
-			if (cur->x == current_barrier->x && cur->y == current_barrier->y) {
-				mark = 1;
-				current_barrier->health--;
-				if (current_barrier->health == 0)
-					remove_blip(current_barrier);
-			}
-		}
-		if (mark){
-			remove_blip(cur);}
-	}
-
-	return 0;
-}
-
-static void move_shots(void)
-{
-	struct blip *cur;
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		if (cur->type != BLIP_SHOT)
-			continue;
-		cur->y--;
-	}
-}
-
-
-static int ufo_action()
-{
-	struct blip *cur;
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		if (cur->type != BLIP_UFO) {
-			continue;
-		}
-
-		cur->x--;
-
-		if (cur->x < 0) {
-			remove_blip(cur);
-			respawn += 1;
-		}
-
-	}
-
-	if (respawn == 7) {
-		respawn = 0;
-		/* make new mothership*/
-		cur = calloc(1, sizeof(struct blip));
-		if(!cur)
-			return -1;
-		cur->type = BLIP_UFO;
-		cur->x = max_x - 1;
-		cur->y = 1;
-		AST_LIST_INSERT_HEAD(&blips, cur, entry);
-	}
-
-	return 0;
-}
-
-static void game_over(int win)
-{
-	clear();
-
-	wmove(stdscr, max_y / 2, max_x / 2 - 10);
-	wprintw(stdscr, "Game over!  You %s!", win ? "win" : "lose");
-
-	wmove(stdscr, 0, max_x - 1);
-
-	wrefresh(stdscr);
-
-	sleep(1);
-
-	while (getch() != ' ');
-
-	return;
-}
-
-static int check_shot(struct blip *shot)
-{
-	struct blip *cur;
-
-	AST_LIST_TRAVERSE(&blips, cur, entry) {
-		if ((cur->type == BLIP_ALIEN || cur->type == BLIP_UFO) && cur->x == shot->x && cur->y == shot->y){
-			if (cur->type == BLIP_UFO) {
-				score += 80;
-			}
-			score += 20;
-			remove_blip(cur);
-			remove_blip(shot);
-			respawn += 1;
-			if (!num_aliens) {
-				if(alien_sleeptime < 101) {
-					game_over(1);
-					return 1;
-				} else {
-					alien_sleeptime = alien_sleeptime - 100;
-					return 1;
-				}
-			}
-			break;
-		}
-		if (cur->type == BLIP_BARRIER) {
-			if (shot->x == cur->x && shot->y == cur->y) {
-				remove_blip(cur);
-				remove_blip(shot);
-				break;
-			}
-		}
-	}
-
-	return 0;
-}
-
-static int check_placement(void)
-{
-	struct blip *cur;
-
-	AST_LIST_TRAVERSE_SAFE_BEGIN(&blips, cur, entry) {
-		if (cur->y <= 0 || cur->y >= max_y) {
-			AST_LIST_REMOVE_CURRENT(&blips, entry);
-			remove_blip(cur);
-		} else if (cur->type == BLIP_SHOT && check_shot(cur))
-			return 1;
-	}
-	AST_LIST_TRAVERSE_SAFE_END
-
-	return 0;
-}
-
-static void play_space(void)
-{
-	int c;
-	unsigned int jiffies = 1;
-	int quit = 0;
-	struct blip *blip;
-	alien_sleeptime = 1000;
-	score = 0;
-
-	while(alien_sleeptime > 100) {
-
-		jiffies = 1;
-		clear();
-		nodelay(stdscr, TRUE);
-		init_blips();
-		repaint_screen();
-
-		for (;;) {
-			c = getch();
-			switch (c) {
-			case ' ':
-				tank_shoot();
-				break;
-			case KEY_LEFT:
-				tank_move_left();
-				break;
-			case KEY_RIGHT:
-				tank_move_right();
-				break;
-			case 'x':
-			case 'X':
-			case 'q':
-			case 'Q':
-				quit = 1;
-			default:
-				/* ignore unknown input */
-				break;
-			}
-			if (quit) {
-				alien_sleeptime = 1;
-				break;
-			}
-			if (!(jiffies % 25)) {
-				if (move_aliens() || move_bombs() || ufo_action()) {
-					alien_sleeptime = 1;
-					game_over(0);
-					break;
-				}
-				if (check_placement())
-					break;
-			}
-			if (!(jiffies % 10)) {
-				move_shots();
-				if (check_placement())
-					break;
-			}
-			repaint_screen();
-			jiffies++;
-			usleep(alien_sleeptime);
-		}
-
-		while ((blip = AST_LIST_REMOVE_HEAD(&blips, entry)))
-			free(blip);
-	}
-
-	nodelay(stdscr, FALSE);
-}
diff --git a/menuselect/menuselect_gtk.c b/menuselect/menuselect_gtk.c
deleted file mode 100644
index cd31b35..0000000
--- a/menuselect/menuselect_gtk.c
+++ /dev/null
@@ -1,358 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "menuselect.h"
-
-enum {
-	/*! The row name */
-	COLUMN_NAME,
-	/*! Whether this row is enabled */
-	COLUMN_SELECTED,
-	/*! Dependencies */
-	COLUMN_DEPS,
-	/*! Optional dependencies */
-	COLUMN_USES,
-	/*! Conflicts */
-	COLUMN_CNFS,
-	/*! Number of columns, must be the last element in the enum */
-	NUM_COLUMNS,
-};
-
-static void handle_save(GtkWidget *w, gpointer data);
-static void handle_about(GtkWidget *w, gpointer data);
-static void handle_quit(GtkWidget *w, gpointer data);
-
-static GtkItemFactoryEntry menu_items[] = {
-  { "/_File",               NULL,         NULL,           0, "<Branch>" },
-  { "/File/_Save And Quit", "<control>S", handle_save, 0, "<StockItem>", GTK_STOCK_SAVE },
-  { "/File/sep1",           NULL,         NULL,           0, "<Separator>" },
-  { "/File/_Quit",          "<CTRL>Q",    handle_quit,  0, "<StockItem>", GTK_STOCK_QUIT },
-  { "/_Help",               NULL,         NULL,           0, "<LastBranch>" },
-  { "/_Help/About",         NULL,         handle_about,   0, "<Item>" },
-};
-
-static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
-
-static GtkTreeView *tree;
-static GtkWidget *window;
-
-/* 0, save ... non-zero, don't save */
-static int main_res = 1;
-static int change_made = 0;
-
-static void handle_save(GtkWidget *w, gpointer data)
-{
-	main_res = 0;
-	gtk_main_quit();
-}
-
-static void handle_about(GtkWidget *w, gpointer data)
-{
-	GtkWidget *dialog;
-
-	dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL,
-				GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
-				"GMenuselect - http://www.asterisk.org/\n"
-				"Russell Bryant <russell at digium.com>\n"
-				"Copyright (C) 2007\n");
-
-	gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy(dialog);
-}
-
-static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	return FALSE;
-}
-
-static void handle_quit(GtkWidget *widget, gpointer data)
-{
-	gtk_main_quit();
-}
-
-static void destroy(GtkWidget *widget, gpointer data)
-{
-	GtkWidget *dialog;
-	gint response;
-
-	if (!main_res || !change_made) {
-		gtk_main_quit();
-		return;
-	}
-
-	dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL,
-			GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "Save before quit?");
-	response = gtk_dialog_run(GTK_DIALOG(dialog));
-	gtk_widget_destroy(dialog);
-
-	if (response == GTK_RESPONSE_YES)
-		main_res = 0;
-
-	gtk_main_quit();
-}
-
-static void toggled_handler(GtkCellRendererToggle *renderer, gchar *path, gpointer data)
-{
-	gchar *cat_num_str, *mem_num_str;
-	int cat_num, mem_num;
-	int i = 0;
-	struct category *cat;
-	struct member *mem;
-	GtkTreeStore *store = data;
-	GtkTreeModel *model;
-	GtkTreeIter cat_iter, mem_iter;
-
-	mem_num_str = alloca(strlen(path)) + 1;
-	strcpy(mem_num_str, path);
-	cat_num_str = strsep(&mem_num_str, ":");
-
-	if (!mem_num_str || !*mem_num_str)
-		return;
-
-	cat_num = atoi(cat_num_str);
-	mem_num = atoi(mem_num_str);
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (i == cat_num)
-			break;
-		i++;
-	}
-	if (!cat)
-		return;
-
-	i = 0;
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-		if (i == mem_num)
-			break;
-		i++;
-	}
-	if (!mem)
-		return;
-
-	toggle_enabled(mem);
-
-	model = gtk_tree_view_get_model(tree);
-
-	gtk_tree_model_get_iter_first(model, &cat_iter);
-	for (i = 0; i < cat_num; i++) {
-		if (!gtk_tree_model_iter_next(model, &cat_iter))
-			break;
-	}
-	if (i != cat_num)
-		return;
-
-	if (!gtk_tree_model_iter_children(model, &mem_iter, &cat_iter))
-		return;
-
-	for (i = 0; i < mem_num; i++) {
-		if (!gtk_tree_model_iter_next(model, &mem_iter))
-			break;
-	}
-	if (i != mem_num)
-		return;
-
-	gtk_tree_store_set(store, &mem_iter, COLUMN_SELECTED, mem->enabled, -1);
-
-	change_made = 1;
-}
-
-static void row_activated_handler(GtkTreeView *treeview, GtkTreePath *path,
-	GtkTreeViewColumn *col, gpointer data)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	GtkTreeStore *store = data;
-	gchar *name;
-	struct category *cat;
-	struct member *mem;
-
-	model = gtk_tree_view_get_model(treeview);
-
-	if (!gtk_tree_model_get_iter(model, &iter, path))
-		return;
-
-	gtk_tree_model_get(model, &iter, COLUMN_NAME, &name, -1);
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			if (strcmp(name, mem->name))
-				continue;
-
-			toggle_enabled(mem);
-			gtk_tree_store_set(store, &iter, COLUMN_SELECTED, mem->enabled, -1);
-			change_made = 1;
-			break;
-		}
-		if (mem)
-			break;
-	}
-
-	g_free(name);
-}
-
-static GtkWidget *get_menubar_menu(GtkWidget *window)
-{
-	GtkItemFactory *item_factory;
-	GtkAccelGroup *accel_group;
-
-	/* Make an accelerator group (shortcut keys) */
-	accel_group = gtk_accel_group_new();
-
-	/* Make an ItemFactory (that makes a menubar) */
-	item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>",
-					accel_group);
-
-	/* This function generates the menu items. Pass the item factory,
-	   the number of items in the array, the array itself, and any
-	   callback data for the the menu items. */
-	gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL);
-
-	/* Attach the new accelerator group to the window. */
-	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
-
-	/* Finally, return the actual menu bar created by the item factory. */
-	return gtk_item_factory_get_widget(item_factory, "<main>");
-}
-
-int run_menu(void)
-{
-	int argc = 0;
-	char **argv = NULL;
-	GtkWidget *s_window;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-	GtkTreeStore *store;
-	struct category *cat;
-	struct member *mem;
-	GtkWidget *main_vbox;
-	GtkWidget *menubar;
-
-	gtk_init(&argc, &argv);
-   
-   	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_widget_set_size_request(window, 640, 480);
-	gtk_window_set_title(GTK_WINDOW(window), "GMenuselect");
-
-	main_vbox = gtk_vbox_new(FALSE, 1);
-	gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 1); 
-	gtk_container_add(GTK_CONTAINER(window), main_vbox);
-
-	menubar = get_menubar_menu(window);
-	gtk_box_pack_start(GTK_BOX(main_vbox), menubar, FALSE, FALSE, 0);
-
-	s_window = gtk_scrolled_window_new(NULL, NULL);
-
-	g_signal_connect(G_OBJECT(window), "delete_event",
-	                 G_CALLBACK(delete_event), NULL);
-	g_signal_connect(G_OBJECT(window), "destroy",
-	                 G_CALLBACK(destroy), NULL);
-
-	store = gtk_tree_store_new(NUM_COLUMNS,
-		G_TYPE_STRING,   /* COLUMN_NAME */
-		G_TYPE_BOOLEAN,  /* COLUMN_SELECTED */
-		G_TYPE_STRING,   /* COLUMN_DEPS */
-		G_TYPE_STRING,   /* COLUMN_USES */
-		G_TYPE_STRING);  /* COLUMN_CNFS */
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		GtkTreeIter iter, iter2;
-		gtk_tree_store_append(store, &iter, NULL);
-		gtk_tree_store_set(store, &iter,
-			COLUMN_NAME, cat->displayname,
-			COLUMN_SELECTED, TRUE,
-			-1);
-		AST_LIST_TRAVERSE(&cat->members, mem, list) {
-			char name_buf[64];
-			char dep_buf[64] = "";
-			char use_buf[64] = "";
-			char cnf_buf[64] = "";
-			struct reference *dep;
-			struct reference *use;
-			struct reference *cnf;
-
-			AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-				strncat(dep_buf, dep->displayname, sizeof(dep_buf) - strlen(dep_buf) - 1);
-				strncat(dep_buf, dep->member ? "(M)" : "(E)", sizeof(dep_buf) - strlen(dep_buf) - 1);
-				if (AST_LIST_NEXT(dep, list))
-					strncat(dep_buf, ", ", sizeof(dep_buf) - strlen(dep_buf) - 1);
-			}
-			AST_LIST_TRAVERSE(&mem->uses, use, list) {
-				strncat(use_buf, use->displayname, sizeof(use_buf) - strlen(use_buf) - 1);
-				if (AST_LIST_NEXT(use, list))
-					strncat(use_buf, ", ", sizeof(use_buf) - strlen(use_buf) - 1);
-			}
-			AST_LIST_TRAVERSE(&mem->conflicts, cnf, list) {
-				strncat(cnf_buf, cnf->displayname, sizeof(cnf_buf) - strlen(cnf_buf) - 1);
-				strncat(cnf_buf, cnf->member ? "(M)" : "(E)", sizeof(cnf_buf) - strlen(cnf_buf) - 1);
-				if (AST_LIST_NEXT(cnf, list))
-					strncat(cnf_buf, ", ", sizeof(cnf_buf) - strlen(cnf_buf) - 1);
-			}
-
-			if (mem->is_separator) {
-				snprintf(name_buf, sizeof(name_buf), "--- %s ---", mem->name);
-			} else {
-				snprintf(name_buf, sizeof(name_buf), "%s", mem->name);
-			}
-			if (mem->depsfailed == HARD_FAILURE)
-				strncat(name_buf, " (Failed Deps.)", sizeof(name_buf) - strlen(name_buf) - 1);
-			if (mem->conflictsfailed == HARD_FAILURE)
-				strncat(name_buf, " (In Conflict)", sizeof(name_buf) - strlen(name_buf) - 1);
-
-			gtk_tree_store_append(store, &iter2, &iter);
-			gtk_tree_store_set(store, &iter2,
-				COLUMN_NAME, name_buf,
-				COLUMN_SELECTED, mem->enabled,
-				COLUMN_DEPS, dep_buf,
-				COLUMN_USES, use_buf,
-				COLUMN_CNFS, cnf_buf,
-				-1);
-		}
-	}
-
-	tree = (GtkTreeView *) gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
-
-#if GTK_CHECK_VERSION(2,10,0)
-	gtk_tree_view_set_enable_tree_lines(tree, TRUE);
-	gtk_tree_view_set_grid_lines(tree, GTK_TREE_VIEW_GRID_LINES_BOTH);
-#endif
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes("Name",
-				renderer, "text", COLUMN_NAME, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-
-	renderer = gtk_cell_renderer_toggle_new();
-	column = gtk_tree_view_column_new_with_attributes("Selected",
-				renderer, "active", COLUMN_SELECTED, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-	g_signal_connect(renderer, "toggled", (GCallback) toggled_handler, store);
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes("Depends On",
-				renderer, "text", COLUMN_DEPS, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes("Can Use",
-				renderer, "text", COLUMN_USES, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes("Conflicts With",
-				renderer, "text", COLUMN_CNFS, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-	
-	g_signal_connect(tree, "row-activated", (GCallback) row_activated_handler, store);
-
-	gtk_container_add(GTK_CONTAINER(s_window), GTK_WIDGET(tree));
-
-	gtk_box_pack_end(GTK_BOX(main_vbox), s_window, TRUE, TRUE, 0);
-
-	gtk_widget_show_all(window);
-   
-	gtk_main();
-
-	return main_res;
-}
diff --git a/menuselect/menuselect_newt.c b/menuselect/menuselect_newt.c
deleted file mode 100644
index fca5587..0000000
--- a/menuselect/menuselect_newt.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2008 Sean Bright
- *
- * Sean Bright <sean.bright at gmail.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*
- * \file
- *
- * \author Sean Bright <sean.bright at gmail.com>
- *
- * \brief newt frontend for selection maintenance
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <newt.h>
-
-#include "menuselect.h"
-
-#define MIN_X 80
-#define MIN_Y 21
-
-#define MIN(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); ((__a > __b) ? __b : __a);})
-#define MAX(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); ((__a < __b) ? __b : __a);})
-
-extern int changes_made;
-
-static newtComponent rootOptions;
-static newtComponent subOptions;
-
-static newtComponent memberNameTextbox;
-static newtComponent dependsLabel;
-static newtComponent usesLabel;
-static newtComponent conflictsLabel;
-static newtComponent supportLevelLabel;
-static newtComponent dependsDataTextbox;
-static newtComponent usesDataTextbox;
-static newtComponent conflictsDataTextbox;
-static newtComponent supportLevelDataTextbox;
-
-static newtComponent exitButton;
-static newtComponent saveAndExitButton;
-
-static void build_members_menu(int overlay);
-static void root_menu_callback(newtComponent component, void *data);
-
-static void toggle_all_options(int select)
-{
-	struct category *cat = newtListboxGetCurrent(rootOptions);
-
-	set_all(cat, select);
-
-	/* Redraw */
-	build_members_menu(1);
-
-	return;
-}
-
-static void toggle_selected_option()
-{
-	int i;
-	struct member *mem = newtListboxGetCurrent(subOptions);
-
-	toggle_enabled(mem);
-
-	/* Redraw */
-	build_members_menu(1);
-
-	/* Select the next item in the list */
-	for (i = 0; i < newtListboxItemCount(subOptions); i++) {
-		struct member *cur;
-
-		newtListboxGetEntry(subOptions, i, NULL, (void **) &cur);
-
-		if (cur == mem) {
-			i = MIN(i + 1, newtListboxItemCount(subOptions) - 1);
-			break;
-		}
-	}
-
-	newtListboxSetCurrent(subOptions, i);
-
-	return;
-}
-
-static void reset_display()
-{
-	newtTextboxSetText(memberNameTextbox, "");
-	newtTextboxSetText(dependsDataTextbox, "");
-	newtTextboxSetText(usesDataTextbox, "");
-	newtTextboxSetText(conflictsDataTextbox, "");
-	newtTextboxSetText(supportLevelDataTextbox, "");
-	newtRefresh();
-}
-
-static void display_member_info(struct member *mem)
-{
-	char buffer[128] = { 0 };
-
-	struct reference *dep;
-	struct reference *con;
-	struct reference *uses;
-
-	reset_display();
-
-	if (mem->displayname) {
-		newtTextboxSetText(memberNameTextbox, mem->displayname);
-	}
-
-	if (AST_LIST_EMPTY(&mem->deps)) {
-		if (mem->is_separator) {
-			newtTextboxSetText(dependsDataTextbox, "");
-		} else {
-			newtTextboxSetText(dependsDataTextbox, "N/A");
-		}
-	} else {
-		strcpy(buffer, "");
-		AST_LIST_TRAVERSE(&mem->deps, dep, list) {
-			strncat(buffer, dep->displayname, sizeof(buffer) - strlen(buffer) - 1);
-			strncat(buffer, dep->member ? "(M)" : "(E)", sizeof(buffer) - strlen(buffer) - 1);
-			if (AST_LIST_NEXT(dep, list))
-				strncat(buffer, ", ", sizeof(buffer) - strlen(buffer) - 1);
-		}
-		newtTextboxSetText(dependsDataTextbox, buffer);
-	}
-
-	if (AST_LIST_EMPTY(&mem->uses)) {
-		if (mem->is_separator) {
-			newtTextboxSetText(usesDataTextbox, "");
-		} else {
-			newtTextboxSetText(usesDataTextbox, "N/A");
-		}
-	} else {
-		strcpy(buffer, "");
-		AST_LIST_TRAVERSE(&mem->uses, uses, list) {
-			strncat(buffer, uses->displayname, sizeof(buffer) - strlen(buffer) - 1);
-			strncat(buffer, uses->member ? "(M)" : "(E)", sizeof(buffer) - strlen(buffer) - 1);
-			if (AST_LIST_NEXT(uses, list))
-				strncat(buffer, ", ", sizeof(buffer) - strlen(buffer) - 1);
-		}
-		newtTextboxSetText(usesDataTextbox, buffer);
-	}
-
-	if (AST_LIST_EMPTY(&mem->conflicts)) {
-		if (!mem->is_separator) {
-			newtTextboxSetText(conflictsDataTextbox, "N/A");
-		} else {
-			newtTextboxSetText(conflictsDataTextbox, "");
-		}
-	} else {
-		strcpy(buffer, "");
-		AST_LIST_TRAVERSE(&mem->conflicts, con, list) {
-			strncat(buffer, con->displayname, sizeof(buffer) - strlen(buffer) - 1);
-			strncat(buffer, con->member ? "(M)" : "(E)", sizeof(buffer) - strlen(buffer) - 1);
-			if (AST_LIST_NEXT(con, list))
-				strncat(buffer, ", ", sizeof(buffer) - strlen(buffer) - 1);
-		}
-		newtTextboxSetText(conflictsDataTextbox, buffer);
-	}
-
-	{ /* Support Level */
-		snprintf(buffer, sizeof(buffer), "%s", mem->support_level);
-		if (mem->replacement && *mem->replacement) {
-			char buf2[64];
-			snprintf(buf2, sizeof(buf2), ", Replaced by: %s", mem->replacement);
-			strncat(buffer, buf2, sizeof(buffer) - strlen(buffer) - 1);
-		}
-		if (mem->is_separator) {
-			newtTextboxSetText(supportLevelDataTextbox, "");
-		} else {
-			newtTextboxSetText(supportLevelDataTextbox, buffer);
-		}
-	}
-}
-
-static void build_members_menu(int overlay)
-{
-	struct category *cat;
-	struct member *mem;
-	char buf[64];
-	int i = 0;
-
-	if (!overlay) {
-		reset_display();
-		newtListboxClear(subOptions);
-	}
-
-	cat = newtListboxGetCurrent(rootOptions);
-
-	AST_LIST_TRAVERSE(&cat->members, mem, list) {
-
-		if ((mem->depsfailed == HARD_FAILURE) || (mem->conflictsfailed == HARD_FAILURE)) {
-			snprintf(buf, sizeof(buf), "XXX %s", mem->name);
-		} else if (mem->is_separator) {
-			snprintf(buf, sizeof(buf), "    --- %s ---", mem->name);
-		} else if (mem->depsfailed == SOFT_FAILURE) {
-			snprintf(buf, sizeof(buf), "<%s> %s", mem->enabled ? "*" : " ", mem->name);
-		} else if (mem->conflictsfailed == SOFT_FAILURE) {
-			snprintf(buf, sizeof(buf), "(%s) %s", mem->enabled ? "*" : " ", mem->name);
-		} else {
-			snprintf(buf, sizeof(buf), "[%s] %s", mem->enabled ? "*" : " ", mem->name);
-		}
-
-		if (overlay) {
-			newtListboxSetEntry(subOptions, i, buf);
-		} else {
-			newtListboxAppendEntry(subOptions, buf, mem);
-		}
-
-		i++;
-	}
-
-	if (!overlay) {
-		display_member_info(AST_LIST_FIRST(&cat->members));
-	}
-
-	return;
-}
-
-static void build_main_menu()
-{
-	struct category *cat;
-	char buf[64];
-	int i = 1;
-
-	newtListboxClear(rootOptions);
-
-	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (!strlen_zero(cat->displayname))
-			snprintf(buf, sizeof(buf), " %s ", cat->displayname);
-		else
-			snprintf(buf, sizeof(buf), " %s ", cat->name);
-
-		newtListboxAppendEntry(rootOptions, buf, cat);
-
-		i++;
-	}
-}
-
-static void category_menu_callback(newtComponent component, void *data)
-{
-	display_member_info(newtListboxGetCurrent(subOptions));
-}
-
-static void root_menu_callback(newtComponent component, void *data)
-{
-	build_members_menu(0);
-}
-
-int run_confirmation_dialog(int *result)
-{
-	int res = newtWinTernary("Are You Sure?", "Discard changes & Exit", "Save & Exit", "Cancel",
-				   "It appears you have made some changes, and you have opted to Quit "
-				   "without saving these changes.  Please choose \"Discard changes & Exit\" to exit "
-				   "without saving; Choose \"Cancel\" to cancel your decision to quit, and keep "
-				   "working in menuselect, or choose \"Save & Exit\" to save your changes, and exit.");
-
-	switch (res) {
-	case 1:
-		/* Discard and exit */
-		*result = -1;
-		return 1;
-	case 2:
-		/* Save and exit */
-		*result = 0;
-		return 1;
-	case 3:
-		/* They either chose "No" or they hit F12 */
-	default:
-		*result = -1;
-		return 0;
-	}
-}
-
-int run_menu(void)
-{
-	struct newtExitStruct es;
-	newtComponent form;
-	int x = 0, y = 0, res = 0;
-
-	newtInit();
-	newtCls();
-	newtGetScreenSize(&x, &y);
-
-	if (x < MIN_X || y < MIN_Y) {
-		newtFinished();
-		fprintf(stderr, "Terminal must be at least %d x %d.\n", MIN_X, MIN_Y);
-		return -1;
-	}
-
-	newtPushHelpLine("  <ENTER> toggles selection | <F12> saves & exits | <ESC> exits without save");
-	newtRefresh();
-
-	newtCenteredWindow(x - 8, y - 7, menu_name);
-	form = newtForm(NULL, NULL, 0);
-
-	/* F8 for select all */
-	newtFormAddHotKey(form, NEWT_KEY_F8);
-
-	/* F7 for deselect all */
-	newtFormAddHotKey(form, NEWT_KEY_F7);
-
-	newtFormSetTimer(form, 200);
-
-	rootOptions = newtListbox(2, 1, y - 15, 0);
-	newtListboxSetWidth(rootOptions, 34);
-	newtFormAddComponent(form, rootOptions);
-	newtComponentAddCallback(rootOptions, root_menu_callback, NULL);
-
-	subOptions = newtListbox(38, 1, y - 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-	newtListboxSetWidth(subOptions, x - 47);
-	newtFormAddComponent(form, subOptions);
-	newtComponentAddCallback(subOptions, category_menu_callback, NULL);
-
-	memberNameTextbox       = newtTextbox(2, y - 13, x - 10, 1, 0);
-	dependsLabel            = newtLabel(2, y - 11, "    Depends on:");
-	usesLabel               = newtLabel(2, y - 10, "       Can use:");
-	conflictsLabel          = newtLabel(2, y - 9,  "Conflicts with:");
-	supportLevelLabel       = newtLabel(2, y - 8,  " Support Level:");
-	dependsDataTextbox      = newtTextbox(18, y - 11, x - 27, 1, 0);
-	usesDataTextbox         = newtTextbox(18, y - 10, x - 27, 1, 0);
-	conflictsDataTextbox    = newtTextbox(18, y - 9, x - 27, 1, 0);
-	supportLevelDataTextbox = newtTextbox(18, y - 8, x - 27, 1, 0);
-
-	exitButton = newtButton(x - 23, y - 11, "  Exit  ");
-	saveAndExitButton = newtButton(x - 43, y - 11, " Save & Exit ");
-
-	newtFormAddComponents(
-		form,
-		memberNameTextbox,
-		dependsLabel,
-		dependsDataTextbox,
-		usesLabel,
-		usesDataTextbox,
-		conflictsLabel,
-		conflictsDataTextbox,
-		supportLevelLabel,
-		supportLevelDataTextbox,
-		saveAndExitButton,
-		exitButton,
-		NULL);
-
-	build_main_menu();
-
-	root_menu_callback(rootOptions, AST_LIST_FIRST(&categories));
-
-	for (;;) {
-		do {
-			newtFormRun(form, &es);
-		} while (es.reason == NEWT_EXIT_TIMER);
-
-		if (es.reason == NEWT_EXIT_HOTKEY) {
-			int done = 1;
-
-			switch (es.u.key) {
-			case NEWT_KEY_F12:
-				res = 0;
-				break;
-			case NEWT_KEY_F7:
-				toggle_all_options(0);
-				done = 0;
-				break;
-			case NEWT_KEY_F8:
-				toggle_all_options(1);
-				done = 0;
-				break;
-			case NEWT_KEY_ESCAPE:
-				if (changes_made) {
-					done = run_confirmation_dialog(&res);
-				} else {
-					res = -1;
-				}
-				break;
-			default:
-				done = 0;
-				break;
-			}
-
-			if (done) {
-				break;
-			}
-		} else if (es.reason == NEWT_EXIT_COMPONENT) {
-			if (es.u.co == saveAndExitButton) {
-				res = 0;
-				break;
-			} else if (es.u.co == exitButton) {
-				int done = 1;
-
-				if (changes_made) {
-					done = run_confirmation_dialog(&res);
-				} else {
-					res = -1;
-				}
-
-				if (done) {
-					break;
-				}
-			} else if (es.u.co == subOptions) {
-				toggle_selected_option();
-			}
-		}
-	}
-
-	/* Cleanup */
-	reset_display();
-	newtFormDestroy(form);
-	newtPopWindow();
-	newtPopHelpLine();
-	newtCls();
-	newtFinished();
-
-	return res;
-}
diff --git a/menuselect/menuselect_stub.c b/menuselect/menuselect_stub.c
deleted file mode 100644
index 8d91c44..0000000
--- a/menuselect/menuselect_stub.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2005 - 2006, Russell Bryant
- *
- * Russell Bryant <russell at digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*
- * \file
- *
- * \author Russell Bryant <russell at digium.com>
- * 
- * \brief Menu stub
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "menuselect.h"
-
-int run_menu(void)
-{
-	fprintf(stderr, "**************************************************\n");
-	fprintf(stderr, "*** Install ncurses to use the menu interface! ***\n");
-	fprintf(stderr, "**************************************************\n");
-
-	return -1;
-}
diff --git a/menuselect/missing b/menuselect/missing
deleted file mode 100755
index 894e786..0000000
--- a/menuselect/missing
+++ /dev/null
@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake at gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/menuselect/mxml/ANNOUNCEMENT b/menuselect/mxml/ANNOUNCEMENT
deleted file mode 100644
index 7b49102..0000000
--- a/menuselect/mxml/ANNOUNCEMENT
+++ /dev/null
@@ -1,5 +0,0 @@
-Mini-XML 2.2.2 is now available for download from:
-
-    http://www.easysw.com/~mike/mxml/software.php
-
-Mini-XML 2.2.2 fixes a bug in the reading of custom data nodes.
diff --git a/menuselect/mxml/CHANGES b/menuselect/mxml/CHANGES
deleted file mode 100644
index fd92104..0000000
--- a/menuselect/mxml/CHANGES
+++ /dev/null
@@ -1,213 +0,0 @@
-CHANGES - 05/19/2005
---------------------
-
-CHANGES IN Mini-XML 2.2.2
-
-	- mxmlLoad*() did not treat custom data as opaque, so
-	  whitespace characters would be lost.
-
-
-CHANGES IN Mini-XML 2.2.1
-
-	- mxmlLoadFd(), mxmlLoadFile(), and mxmlLoadString() now
-	  correctly return NULL on error (STR #21)
-	- mxmlNewInteger(), mxmlNewOpaque(), mxmlNewReal(),
-	  mxmlNewText(), and mxmlNewTextf() incorrectly required
-	  a parent node (STR #22)
-	- Fixed an XML output bug in mxmldoc.
-	- The "make install" target now uses the install command
-	  to set the proper permissions on UNIX/Linux/OSX.
-	- Fixed a MingW/Cygwin compilation problem (STR #18)
-
-
-CHANGES IN Mini-XML 2.2
-
-	- Added shared library support (STR #17)
-	- mxmlLoad*() now returns an error when an XML stream
-	  contains illegal control characters (STR #10)
-	- mxmlLoad*() now returns an error when an element
-	  contains two attributes with the same name in
-	  conformance with the XML spec (STR #16)
-	- Added support for CDATA (STR #14, STR #15)
-	- Updated comment and processing instruction handling -
-	  no entity support per XML specification.
-	- Added checking for invalid comment termination ("--->"
-	  is not allowed)
-
-
-CHANGES IN Mini-XML 2.1
-
-	- Added support for custom data nodes (STR #6)
-	- Now treat UTF-8 sequences which are longer than
-	  necessary as an error (STR #4)
-	- Fixed entity number support (STR #8)
-	- Fixed mxmlLoadString() bug with UTF-8 (STR #7)
-	- Fixed entity lookup bug (STR #5)
-	- Added mxmlLoadFd() and mxmlSaveFd() functions.
-	- Fixed multi-word UTF-16 handling.
-
-
-CHANGES IN Mini-XML 2.0
-
-	- New programmers manual.
-	- Added Visual C++ project files for Microsoft Windows
-	  users.
-	- Added optimizations to mxmldoc, mxmlSaveFile(), and
-	  mxmlIndexNew() (STR #2)
-	- mxmlEntityAddCallback() now returns an integer status
-	  (STR #2)
-	- Added UTF-16 support (input only; all output is UTF-8)
-	- Added index functions to build a searchable index of
-	  XML nodes.
-	- Added character entity callback interface to support
-	  additional character entities beyond those defined in
-	  the XHTML specification.
-	- Added support for XHTML character entities.
-	- The mxmldoc utility now produces XML output which
-	  conforms to an updated XML schema, described in the file
-	  "doc/mxmldoc.xsd".
-	- Changed the whitespace callback interface to return
-	  strings instead of a single character, allowing for
-	  greater control over the formatting of XML files
-	  written using Mini-XML.  THIS CHANGE WILL REQUIRE
-	  CHANGES TO YOUR 1.x CODE IF YOU USE WHITESPACE
-	  CALLBACKS.
-	- The mxmldoc utility is now capable of documenting C++
-	  classes, functions, and structures, and correctly
-	  handles C++ comments.
-	- Added new modular tests for mxmldoc.
-	- Updated the mxmldoc output to be more compatible with
-	  embedding in manuals produced with HTMLDOC.
-	- The makefile incorrectly included a "/" separator
-	  between the destination path and install path.  This
-	  caused problems when building and installing with
-	  MingW.
-
-
-CHANGES IN Mini-XML 1.3
-
-	- Fixes for mxmldoc.
-	- Added support for reading standard HTML entity names.
-	- mxmlLoadString/File() did not decode character
-	  entities in element names, attribute names, or
-	  attribute values.
-	- mxmlLoadString/File() would crash when loading non-
-	  conformant XML data under an existing parent (top)
-	  node.
-	- Fixed several bugs in the mxmldoc utility.
-	- Added new error callback function to catch a variety
-	  of errors and log them to someplace other than stderr.
-	- The mxmlElementSetAttr() function now allows for NULL
-	  attribute values.
-	- The load and save functions now properly handle quoted
-	  element and attribute name strings properly, e.g. for
-	  !DOCTYPE declarations.
-
-
-CHANGES IN Mini-XML 1.2
-
-	- Added new "set" methods to set the value of a node.
-	- Added new formatted text methods mxmlNewTextf() and
-	  mxmlSetTextf() to create/set a text node value using
-	  printf-style formats.
-	- Added new standard callbacks for use with the mxmlLoad
-	  functions.
-	- Updated the HTML documentation to include examples of
-	  the walk and load function output.
-	- Added --with/without-ansi configure option to control
-	  the strdup() function check.
-	- Added --with/without-snprintf configure option to
-	  control the snprintf() and vsnprintf() function
-	  checks.
-
-
-CHANGES IN Mini-XML 1.1.2
-
-	- The mxml(3) man page wasn't updated for the string
-	  functions.
-	- mxmlSaveString() returned the wrong number of
-	  characters.
-	- mxml_add_char() updated the buffer pointer in the
-	  wrong place.
-
-
-CHANGES IN Mini-XML 1.1.1
-
-	- The private mxml_add_ch() function did not update the
-	  start-of-buffer pointer which could cause a crash when
-	  using mxmlSaveString().
-	- The private mxml_write_ws() function called putc()
-	  instead of using the proper callback which could cause
-	  a crash when using mxmlSaveString().
-	- Added a mxmlSaveAllocString() convenience function for
-	  saving an XML node tree to an allocated string.
-
-
-CHANGES IN Mini-XML 1.1
-
-	- The mxmlLoadFile() function now uses dynamically
-	  allocated string buffers for element names, attribute
-	  names, and attribute values.  Previously they were
-	  capped at 16383, 255, and 255 bytes, respectively.
-	- Added a new mxmlLoadString() function for loading an
-	  XML node tree from a string.
-	- Added a new mxmlSaveString() function for saving an
-	  XML node tree to a string.
-	- Add emulation of strdup() if the local platform does
-	  not provide the function.
-
-
-CHANGES IN Mini-XML 1.0
-
-	- The mxmldoc program now handles function arguments,
-	  structures, unions, enumerations, classes, and
-	  typedefs properly.
-	- Documentation provided via mxmldoc and more in-line
-	  comments in the code.
-	- Added man pages and packaging files.
-
-
-CHANGES IN Mini-XML 0.93
-
-	- New mxmldoc example program that is also used to
-	  create and update code documentation using XML and
-	  produce HTML reference pages.
-	- Added mxmlAdd() and mxmlRemove() functions to add and
-	  remove nodes from a tree.  This provides more
-	  flexibility over where the nodes are inserted and
-	  allows nodes to be moved within the tree as needed.
-	- mxmlLoadFile() now correctly handles comments.
-	- mxmlLoadFile() now supports the required "gt", "quot",
-	  and "nbsp" character entities.
-	- mxmlSaveFile() now uses newlines as whitespace
-	  when valid to do so.
-	- mxmlFindElement() now also takes attribute name and
-	  attribute value string arguments to limit the search
-	  to specific elements with attributes and/or values.
-	  NULL pointers can be used as "wildcards".
-	- Added uninstall target to makefile, and auto-reconfig
-	  if Makefile.in or configure.in are changed.
-	- mxmlFindElement(), mxmlWalkNext(), and mxmlWalkPrev()
-	  now all provide "descend" arguments to control whether
-	  they descend into child nodes in the tree.
-	- Fixed some whitespace issues in mxmlLoadFile().
-	- Fixed Unicode output and whitespace issues in
-	  mxmlSaveFile().
-	- mxmlSaveFile() now supports a whitespace callback to
-	  provide more human-readable XML output under program
-	  control.
-
-
-CHANGES IN Mini-XML 0.92
-
-	- mxmlSaveFile() didn't return a value on success.
-
-
-CHANGES IN Mini-XML 0.91
-
-	- mxmlWalkNext() would go into an infinite loop.
-
-
-CHANGES IN Mini-XML 0.9
-
-	- Initial public release.
diff --git a/menuselect/mxml/COPYING b/menuselect/mxml/COPYING
deleted file mode 100644
index 43433c4..0000000
--- a/menuselect/mxml/COPYING
+++ /dev/null
@@ -1,482 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-			 Version 2, June 1991
-
-	  Copyright (C) 1991 Free Software Foundation, Inc.
-       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-     Everyone is permitted to copy and distribute verbatim copies
-      of this license document, but changing it is not allowed.
-
-    [This is the first released version of the library GPL.  It is
-   numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			       Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-

-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-

-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/menuselect/mxml/Makefile.in b/menuselect/mxml/Makefile.in
deleted file mode 100644
index b669aab..0000000
--- a/menuselect/mxml/Makefile.in
+++ /dev/null
@@ -1,342 +0,0 @@
-#
-# "$Id: Makefile.in 23382 2006-04-29 15:44:02Z russell $"
-#
-# Makefile for Mini-XML, a small XML-like file parsing library.
-#
-# Copyright 2003-2005 by Michael Sweet.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-#
-# Compiler tools definitions...
-#
-
-AR		=	@AR@
-ARFLAGS		=	@ARFLAGS@
-CC		=	@CC@
-CFLAGS		=	$(OPTIM) @CFLAGS@ @CPPFLAGS@
-CP		=	@CP@
-DSO		=	@DSO@
-DSOFLAGS	=	@DSOFLAGS@
-LDFLAGS		=	$(OPTIM) @LDFLAGS@
-INSTALL		=	@INSTALL@
-LIBMXML		=	@LIBMXML@
-LN		=	@LN@ -s
-MKDIR		=	@MKDIR@
-OPTIM		=	@OPTIM@
-RANLIB		=	@RANLIB@
-RM		=	@RM@ -f
-SHELL		=	/bin/sh
-
-
-#
-# Configured directories...
-#
-
-prefix		=	@prefix@
-exec_prefix	=	@exec_prefix@
-bindir		=	@bindir@
-includedir	=	@includedir@
-libdir		=	@libdir@
-mandir		=	@mandir@
-docdir		=	@docdir@
-datarootdir =	@datarootdir@
-BUILDROOT	=	$(DSTROOT)
-
-
-#
-# Install commands...
-#
-
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
-INSTALL_DATA	=	$(INSTALL) -m 644
-INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
-INSTALL_MAN	=	$(INSTALL) -m 644
-INSTALL_SCRIPT	=	$(INSTALL) -m 755
-
-
-#
-# Rules...
-#
-
-.SUFFIXES:	.0 .1 .3 .c .man .o
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-.man.0 .man.1 .man.3:
-	$(RM) $@
-	$(NROFF) -man $< >$@
-
-
-#
-# Targets...
-#
-
-DOCFILES	=	doc/mxml.html doc/mxmldoc.xsd \
-			README COPYING CHANGES
-PUBLIBOBJS	=	mxml-attr.o mxml-entity.o mxml-file.o mxml-index.o \
-			mxml-node.o mxml-search.o mxml-set.o
-LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
-OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
-TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml
-
-
-#
-# Make everything...
-#
-
-all:		Makefile configure config.h $(TARGETS)
-
-
-#
-# Clean everything...
-#
-
-clean:
-	$(RM) $(OBJS) $(TARGETS)
-	$(RM) mxmldoc-static libmxml.a
-	$(RM) *.bck *.bak
-	$(RM) config.cache config.log config.status config.h
-	$(RM) -r autom4te*.cache
-
-distclean: clean
-	$(RM) mxml.list Makefile
-
-#
-# Install everything...
-#
-
-install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
-	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
-	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
-	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
-	for file in $(DOCFILES); do \
-		$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
-	done
-	$(INSTALL_DIR) $(BUILDROOT)$(includedir)
-	$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
-	$(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/cat1
-	$(INSTALL_MAN) doc/mxmldoc.$(CAT1EXT) $(BUILDROOT)$(mandir)/cat1/mxmldoc.$(CAT1EXT)
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/cat3
-	$(INSTALL_MAN) doc/mxml.$(CAT3EXT) $(BUILDROOT)$(mandir)/cat3/mxml.$(CAT3EXT)
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
-	$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.$(MAN1EXT)
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
-	$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.$(MAN3EXT)
-
-install-libmxml.a:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
-
-install-libmxml.so.1.0:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.so.1.0 $(BUILDROOT)$(libdir)
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so
-	$(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
-	$(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so.1
-
-install-libmxml.sl.1:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.sl.1 $(BUILDROOT)$(libdir)
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so
-	$(LN) libmxml.sl.1 $(BUILDROOT)$(libdir)/libmxml.sl
-
-install-libmxml.1.dylib:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.1.dylib $(BUILDROOT)$(libdir)
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.dylib
-	$(LN) libmxml.1.dylib $(BUILDROOT)$(libdir)/libmxml.dylib
-
-
-#
-# Uninstall everything...
-#
-
-uninstall: uninstall-$(LIBMXML) uninstall-libmxml.a
-	$(RM) $(BUILDROOT)$(bindir)/mxmldoc
-	$(RM) -r $(BUILDROOT)$(docdir)
-	$(RM) $(BUILDROOT)$(includedir)/mxml.h
-	$(RM) $(BUILDROOT)$(libdir)/pkgconfig/mxml.pc
-	$(RM) $(BUILDROOT)$(mandir)/cat1/mxmldoc.$(CAT1EXT)
-	$(RM) $(BUILDROOT)$(mandir)/cat3/mxml.$(CAT3EXT)
-	$(RM) $(BUILDROOT)$(mandir)/man1/mxmldoc.$(MAN1EXT)
-	$(RM) $(BUILDROOT)$(mandir)/man3/mxml.$(MAN3EXT)
-
-uninstall-libmxml.a:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.a
-
-uninstall-libmxml.so.1.0:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1.0
-
-uninstall-libmxml.sl.1:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.sl
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.sl.1
-
-uninstall-libmxml.1.dylib:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.dylib
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.1.dylib
-
-
-#
-# Make packages using EPM (http://www.easysw.com/epm/)
-#
-
-epm:	all
-	epm --output-dir dist -v -f native mxml
-	epm --output-dir dist -v -f portable mxml
-
-
-#
-# autoconf stuff...
-#
-
-Makefile:	Makefile.in
-	if test -f config.status; then \
-		./config.status --recheck; \
-		./config.status; \
-	else \
-		./configure; \
-	fi
-	touch config.h
-
-
-config.h:	configure config.h.in
-	if test -f config.status; then \
-		./config.status --recheck; \
-		./config.status; \
-	else \
-		./configure; \
-	fi
-	touch config.h
-
-
-#
-# libmxml.a
-#
-
-libmxml.a:	$(LIBOBJS)
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-$(LIBOBJS):	mxml.h
-
-
-#
-# libmxml.so.1.0
-#
-
-libmxml.so.1.0:	$(LIBOBJS)
-	$(DSO) $(DSOFLAGS) -o libmxml.so.1.0 $(LIBOBJS)
-	$(RM) libmxml.so libmxml.so.1
-	$(LN) libmxml.so.1.0 libmxml.so
-	$(LN) libmxml.so.1.0 libmxml.so.1
-
-
-#
-# libmxml.sl.1
-#
-
-libmxml.sl.1:	$(LIBOBJS)
-	$(DSO) $(DSOFLAGS) -o libmxml.sl.1 $(LIBOBJS)
-	$(RM) libmxml.sl libmxml.sl.1
-	$(LN) libmxml.sl.1 libmxml.sl
-
-
-#
-# libmxml.1.dylib
-#
-
-libmxml.1.dylib:	$(LIBOBJS)
-	$(DSO) $(DSOFLAGS) -o libmxml.1.dylib \
-		-install_name $(libdir)/libmxml.dylib \
-		-current_version 1.0.0 \
-		-compatibility_version 1.0.0 \
-		$(LIBOBJS)
-	$(RM) libmxml.dylib libmxml.1.dylib
-	$(LN) libmxml.1.dylib libmxml.dylib
-
-
-#
-# mxmldoc
-#
-
-mxmldoc:	$(LIBMXML) mxmldoc.o
-	$(CC) $(LDFLAGS) -o $@ mxmldoc.o -L. -lmxml
-
-mxmldoc-static:	libmxml.a mxmldoc.o
-	$(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a
-
-mxmldoc.o:	mxml.h
-
-
-#
-# testmxml
-#
-
-testmxml:	libmxml.a testmxml.o
-	$(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a
-	@echo Testing library...
-	./testmxml test.xml >temp1.xml 2>temp1s.xml
-	./testmxml temp1.xml >temp2.xml 2>temp2s.xml
-	@if cmp temp1.xml temp2.xml; then \
-		echo Stdio file test passed!; \
-		$(RM) temp2.xml temp2s.xml; \
-	else \
-		echo Stdio file test failed!; \
-	fi
-	@if cmp temp1.xml temp1s.xml; then \
-		echo String test passed!; \
-		$(RM) temp1.xml temp1s.xml; \
-	else \
-		echo String test failed!; \
-	fi
-	@if cmp test.xml test.xmlfd; then \
-		echo File descriptor test passed!; \
-		$(RM) test.xmlfd; \
-	else \
-		echo File descriptor test failed!; \
-	fi
-
-testmxml.o:	mxml.h
-
-
-#
-# mxml.xml
-#
-
-mxml.xml:	mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
-	$(RM) mxml.xml
-	./mxmldoc-static mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
-
-valgrind:	mxmldoc-static
-	$(RM) valgrind.xml
-	valgrind --tool=memcheck --leak-check=yes ./mxmldoc-static \
-		valgrind.xml mxml.h $(PUBLIBOBJS:.o=.c) \
-		>valgrind.html 2>valgrind.out
-
-
-#
-# All object files depend on the makefile...
-#
-
-$(OBJS):	Makefile config.h
-
-
-#
-# End of "$Id: Makefile.in 23382 2006-04-29 15:44:02Z russell $".
-#
diff --git a/menuselect/mxml/README b/menuselect/mxml/README
deleted file mode 100644
index 31a0266..0000000
--- a/menuselect/mxml/README
+++ /dev/null
@@ -1,204 +0,0 @@
-README - 05/19/2005
--------------------
-
-
-INTRODUCTION
-
-    This README file describes the Mini-XML library version
-    2.2.2.
-
-    Mini-XML is a small XML parsing library that you can use to
-    read XML and XML-like data files in your application without
-    requiring large non-standard libraries.  Mini-XML only
-    requires an ANSI C compatible compiler (GCC works, as do
-    most vendors' ANSI C compilers) and a "make" program.
-
-    Mini-XML provides the following functionality:
-
-	- Reading of UTF-8 and UTF-16 and writing of UTF-8
-	  encoded XML files and strings.
-	- Data is stored in a linked-list tree structure,
-	  preserving the XML data hierarchy.
-	- Supports arbitrary element names, attributes, and
-	  attribute values with no preset limits, just available
-	  memory.
-	- Supports integer, real, opaque ("cdata"), and text
-	  data types in "leaf" nodes.
-	- Functions for creating and managing trees of data.
-	- "Find" and "walk" functions for easily locating and
-	  navigating trees of data.
-
-    Mini-XML doesn't do validation or other types of processing
-    on the data based upon schema files or other sources of
-    definition information.
-
-
-BUILDING Mini-XML
-
-    Mini-XML comes with an autoconf-based configure script; just
-    type the following command to get things going:
-
-        ./configure
-
-    The default install prefix is /usr/local, which can be
-    overridden using the --prefix option:
-
-        ./configure --prefix=/foo
-
-    Other configure options can be found using the --help
-    option:
-
-        ./configure --help
-
-    Once you have configured the software, type "make" to do the
-    build and run the test program to verify that things are
-    working, as follows:
-
-        make
-
-    If you are using Mini-XML under Microsoft Windows with
-    Visual C++, use the included project files in the "vcnet"
-    subdirectory to build the library instead.
-
-
-INSTALLING Mini-XML
-
-    The "install" target will install Mini-XML in the lib and
-    include directories:
-
-        make install
-
-    Once you have installed it, use the "-lmxml" option to link
-    your application against it.
-
-
-DOCUMENTATION
-
-    The documentation is available in the "doc" subdirectory in
-    the files "mxml.html" (HTML) and "mxml.pdf" (PDF). You can
-    also look at the "testmxml.c" and "mxmldoc.c" source files
-    for examples of using Mini-XML.
-
-    Mini-XML provides a single header file which you include:
-
-        #include <mxml.h>
-
-    Nodes are defined by the "mxml_node_t" structure; the "type"
-    member defines the node type (element, integer, opaque,
-    real, or text) which determines which value you want to look
-    at in the "value" union.  New nodes can be created using the
-    "mxmlNewElement()", "mxmlNewInteger()", "mxmlNewOpaque()",
-    "mxmlNewReal()", and "mxmlNewText()" functions.  Only
-    elements can have child nodes, and the top node must be an
-    element, usually "?xml".
-
-    You load an XML file using the "mxmlLoadFile()" function:
-
-        FILE *fp;
-        mxml_node_t *tree;
-
-	fp = fopen("filename.xml", "r");
-	tree = mxmlLoadFile(NULL, fp, MXML_NO_CALLBACK);
-	fclose(fp);
-
-    Similarly, you save an XML file using the "mxmlSaveFile()"
-    function:
-
-        FILE *fp;
-        mxml_node_t *tree;
-
-	fp = fopen("filename.xml", "w");
-	mxmlSaveFile(tree, fp, MXML_NO_CALLBACK);
-	fclose(fp);
-
-    The "mxmlLoadString()", "mxmlSaveAllocString()", and
-    "mxmlSaveString()" functions load XML node trees from and
-    save XML node trees to strings:
-
-        char buffer[8192];
-	char *ptr;
-	mxml_node_t *tree;
-
-        ...
-	tree = mxmlLoadString(NULL, buffer, MXML_NO_CALLBACK);
-
-        ...
-        mxmlSaveString(tree, buffer, sizeof(buffer), MXML_NO_CALLBACK);
-
-        ...
-	ptr = mxmlSaveAllocString(tree, MXML_NO_CALLBACK);
-
-    You can find a named element/node using the
-    "mxmlFindElement()" function:
-
-        mxml_node_t *node = mxmlFindElement(tree, tree, "name", "attr",
-	                                    "value", MXML_DESCEND);
-
-    The "name", "attr", and "value" arguments can be passed as
-    NULL to act as wildcards, e.g.:
-
-        /* Find the first "a" element */
-        node = mxmlFindElement(tree, tree, "a", NULL, NULL, MXML_DESCEND);
-
-        /* Find the first "a" element with "href" attribute */
-        node = mxmlFindElement(tree, tree, "a", "href", NULL, MXML_DESCEND);
-
-        /* Find the first "a" element with "href" to a URL */
-        node = mxmlFindElement(tree, tree, "a", "href",
-	                       "http://www.easysw.com/~mike/mxml/",
-			       MXML_DESCEND);
-
-        /* Find the first element with a "src" attribute*/
-        node = mxmlFindElement(tree, tree, NULL, "src", NULL, MXML_DESCEND);
-
-        /* Find the first element with a "src" = "foo.jpg" */
-        node = mxmlFindElement(tree, tree, NULL, "src", "foo.jpg",
-	                       MXML_DESCEND);
-
-    You can also iterate with the same function:
-
-        mxml_node_t *node;
-
-	for (node = mxmlFindElement(tree, tree, "name", NULL, NULL,
-	                            MXML_DESCEND);
-	     node != NULL;
-	     node = mxmlFindElement(node, tree, "name", NULL, NULL,
-	                            MXML_DESCEND))
-        {
-	  ... do something ...
-	}
-
-    Finally, once you are done with the XML data, use the
-    "mxmlDelete()" function to recursively free the memory that
-    is used for a particular node or the entire tree:
-
-        mxmlDelete(tree);
-
-
-GETTING HELP AND REPORTING PROBLEMS
-
-    You can email me at "mxml at easysw.com" to report problems
-    and/or ask for help.  Just don't expect an instant response,
-    as I get a *lot* of email...
-
-
-LEGAL STUFF
-
-    The Mini-XML library is Copyright 2003-2005 by Michael Sweet.
-
-    This library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Library General
-    Public License as published by the Free Software Foundation;
-    either version 2 of the License, or (at your option) any
-    later version.
-
-    This library is distributed in the hope that it will be
-    useful, but WITHOUT ANY WARRANTY; without even the implied
-    warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU Library General Public License for
-    more details.
-
-    You should have received a copy of the GNU Library General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-    02139, USA.
diff --git a/menuselect/mxml/config.h.in b/menuselect/mxml/config.h.in
deleted file mode 100644
index 9008e23..0000000
--- a/menuselect/mxml/config.h.in
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * "$Id: config.h.in 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Configuration file for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
-
-
-/*
- * Version number...
- */
-
-#define MXML_VERSION	""
-
-
-/*
- * Do we have the vsnprintf() function?
- */
-
-#undef HAVE_VSNPRINTF
-
-
-/*
- * Do we have the strXXX() functions?
- */
-
-#undef HAVE_STRDUP
-
-
-/*
- * Define prototypes for string functions as needed...
- */
-
-#  ifndef HAVE_STRDUP
-extern char	*mxml_strdup(const char *);
-#    define strdup mxml_strdup
-#  endif /* !HAVE_STRDUP */
-
-extern char	*mxml_strdupf(const char *, va_list);
-
-#  ifndef HAVE_VSNPRINTF
-extern int	mxml_vsnprintf(char *, size_t, const char *, va_list);
-#    define vsnprintf mxml_vsnprintf
-#  endif /* !HAVE_VSNPRINTF */
-
-/*
- * End of "$Id: config.h.in 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/configure b/menuselect/mxml/configure
deleted file mode 100755
index f460c44..0000000
--- a/menuselect/mxml/configure
+++ /dev/null
@@ -1,5702 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="mxml.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-PC_LIBS
-PC_CFLAGS
-PICFLAG
-LIBMXML
-DSOFLAGS
-DSO
-PTHREAD_LIBS
-PTHREAD_FLAGS
-EGREP
-GREP
-CPP
-ARFLAGS
-RM
-MKDIR
-LN
-CP
-AR
-RANLIB
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-ac_ct_CXX
-CXXFLAGS
-CXX
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-CFLAGS
-CC
-ARCHFLAGS
-OPTIM
-LDFLAGS
-VERSION
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_ansi
-with_archflags
-enable_debug
-with_docdir
-with_vsnprintf
-enable_threads
-enable_shared
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CXX
-CXXFLAGS
-CCC
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-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 this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug          turn on debugging, default=no
-  --enable-threads        enable multi-threading support
-  --enable-shared         turn on shared libraries, default=no
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-ansi             set full ANSI C mode, default=no
-  --with-archflags        set additional architecture flags, default=none
-  --with-docdir           set directory for documentation, default=${prefix}/share/doc/mxml
-  --with-vsnprintf        use vsnprintf emulation functions, default=auto
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.65
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* 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 $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-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 $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-VERSION=2.2.2
-
-cat >>confdefs.h <<_ACEOF
-#define MXML_VERSION "Mini-XML v$VERSION"
-_ACEOF
-
-
-CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-LDFLAGS="${LDFLAGS:=}"
-
-OPTIM=""
-
-
-
-# Check whether --with-ansi was given.
-if test "${with_ansi+set}" = set; then :
-  withval=$with_ansi; use_ansi="$withval"
-else
-  use_ansi="no"
-fi
-
-
-
-# Check whether --with-archflags was given.
-if test "${with_archflags+set}" = set; then :
-  withval=$with_archflags; ARCHFLAGS="$withval"
-else
-  ARCHFLAGS=""
-fi
-
-
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then
- 	OPTIM="-g"
-fi
-fi
-
-
-
-# Check whether --with-docdir was given.
-if test "${with_docdir+set}" = set; then :
-  withval=$with_docdir; docdir="$withval"
-else
-  docdir="NONE"
-fi
-
-
-
-
-
-# Check whether --with-vsnprintf was given.
-if test "${with_vsnprintf+set}" = set; then :
-  withval=$with_vsnprintf; use_vsnprintf="$withval"
-else
-  use_vsnprintf="no"
-fi
-
-
-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
-if test x$uname = xIRIX64; then
-	uname="IRIX"
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-if test "$INSTALL" = "$ac_install_sh"; then
-	# Use full path to install-sh script...
-	INSTALL="`pwd`/install-sh -c"
-fi
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-for ac_prog in ar gar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $AR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AR="$AR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-AR=$ac_cv_path_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AR" && break
-done
-
-# Extract the first word of "cp", so it can be a program name with args.
-set dummy cp; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CP="$CP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CP=$ac_cv_path_CP
-if test -n "$CP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
-$as_echo "$CP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "ln", so it can be a program name with args.
-set dummy ln; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LN="$LN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-LN=$ac_cv_path_LN
-if test -n "$LN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
-$as_echo "$LN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "mkdir", so it can be a program name with args.
-set dummy mkdir; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MKDIR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MKDIR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MKDIR=$ac_cv_path_MKDIR
-if test -n "$MKDIR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
-$as_echo "$MKDIR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RM="$RM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RM=$ac_cv_path_RM
-if test -n "$RM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z $AR ; then
-	as_fn_error "'ar' binary is mandatory.  Please either install the 'ar' binary or provide the path to configure with --with-ar=/path/to/ar" "$LINENO" 5
-fi
-
-case "$uname" in
-        Darwin* | *BSD*)
-                ARFLAGS="-rcv"
-                ;;
-        *)
-                ARFLAGS="crvs"
-                ;;
-esac
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-
-if test "x$use_ansi" != xyes; then
-	for ac_func in strdup
-do :
-  ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRDUP 1
-_ACEOF
-
-fi
-done
-
-fi
-
-if test "x$use_vsnprintf" != xyes; then
-	for ac_func in snprintf vsnprintf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
-$as_echo_n "checking for long long int... " >&6; }
-if test "${ac_cv_c_long_long+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$GCC" = yes; then
-		ac_cv_c_long_long=yes
-	else
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-long long int i;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_long_long=yes
-else
-  ac_cv_c_long_long=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_long_long" >&5
-$as_echo "$ac_cv_c_long_long" >&6; }
-
-if test $ac_cv_c_long_long = yes; then
-	$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
-
-fi
-
-# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads;
-fi
-
-
-have_pthread=no
-PTHREAD_FLAGS=""
-PTHREAD_LIBS=""
-
-if test "x$enable_threads" != xno; then
-	ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
-  $as_echo "#define HAVE_PTHREAD_H 1" >>confdefs.h
-
-fi
-
-
-
-	if test x$ac_cv_header_pthread_h = xyes; then
-				for flag in -lpthreads -lpthread -pthread; do
-        		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create using $flag" >&5
-$as_echo_n "checking for pthread_create using $flag... " >&6; }
-			SAVELIBS="$LIBS"
-			LIBS="$flag $LIBS"
-        		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-pthread_create(0, 0, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_pthread=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread" >&5
-$as_echo "$have_pthread" >&6; }
-			LIBS="$SAVELIBS"
-
-			if test $have_pthread = yes; then
-				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-				PTHREAD_LIBS="$flag"
-
-				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
-				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
-					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
-				fi
-				break
-			fi
-		done
-	fi
-fi
-
-
-
-
-DSO="${DSO:=:}"
-DSOFLAGS="${DSOFLAGS:=}"
-
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared;
-fi
-
-
-if test x$enable_shared = xyes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library support" >&5
-$as_echo_n "checking for shared library support... " >&6; }
-	PICFLAG=1
-
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,libmxml.so.1 -G -R\$(libdir) \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -R\$(libdir)"
-                	;;
-
-		HP-UX*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.sl.1"
-			DSO="ld"
-			DSOFLAGS="$DSOFLAGS -b -z +h libmxml.sl.1 +s +b \$(libdir)"
-			LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
-			;;
-
-		IRIX)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)"
-			;;
-
-		OSF1* | Linux | GNU)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
-                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-			;;
-
-		*BSD*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
-                        ;;
-
-		Darwin*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.1.dylib"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
-			;;
-
-		*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: shared libraries not supported on this platform." >&5
-$as_echo "$as_me: WARNING: shared libraries not supported on this platform." >&2;}
-			PICFLAG=0
-			LIBMXML="libmxml.a"
-			;;
-	esac
-else
-	PICFLAG=0
-	LIBMXML="libmxml.a"
-fi
-
-
-
-
-
-
-if test -n "$GCC"; then
-	CFLAGS="-Wall $CFLAGS"
-
-	if test "x$OPTIM" = x; then
-		OPTIM="-Os -g"
-	fi
-
-	if test "x$use_ansi" = xyes; then
-		CFLAGS="-ansi -pedantic $CFLAGS"
-	fi
-
-	if test $PICFLAG = 1 -a $uname != AIX; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-else
-	case $uname in
-		HP-UX*)
-			CFLAGS="-Ae $CFLAGS"
-
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			OPTIM="+DAportable $OPTIM"
-
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-			;;
-
-		UNIX_SVR* | SunOS*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-
-		*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-			;;
-	esac
-fi
-
-if test "$prefix" = "NONE"; then
-	prefix="/usr/local"
-fi
-
-if test "$exec_prefix" = "NONE"; then
-	exec_prefix="$prefix"
-fi
-
-if test "$docdir" = "NONE"; then
-	docdir="$datadir/doc/mxml"
-fi
-
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"; then
-	case "$uname" in
-        	*BSD* | Darwin* | Linux*)
-        		# BSD, Darwin (MacOS X), and Linux
-        		mandir="/usr/share/man"
-        		;;
-        	IRIX*)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		;;
-        	*)
-        		# All others
-        		mandir="/usr/man"
-        		;;
-	esac
-fi
-
-if test "$includedir" != /usr/include; then
-	PC_CFLAGS="-I$includedir"
-else
-	PC_CFLAGS=""
-fi
-
-if test "$libdir" != /usr/lib; then
-	PC_LIBS="-L$libdir -lmxml"
-else
-	PC_LIBS="-lmxml"
-fi
-
-
-
-
-ac_config_files="$ac_config_files Makefile mxml.list mxml.pc"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.65,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "mxml.list") CONFIG_FILES="$CONFIG_FILES mxml.list" ;;
-    "mxml.pc") CONFIG_FILES="$CONFIG_FILES mxml.pc" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
-  fi
- ;;
-
-
-  esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
diff --git a/menuselect/mxml/configure.in b/menuselect/mxml/configure.in
deleted file mode 100644
index d3ffdfb..0000000
--- a/menuselect/mxml/configure.in
+++ /dev/null
@@ -1,343 +0,0 @@
-dnl
-dnl "$Id: configure.in 260 2010-04-27 19:11:06Z qwell $"
-dnl
-dnl Configuration script for Mini-XML, a small XML-like file parsing library.
-dnl
-dnl Copyright 2003-2009 by Michael Sweet.
-dnl
-dnl This program is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2, or (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-
-dnl Specify a source file from the distribution...
-AC_INIT(mxml.h)
-
-dnl Set the name of the config header file...
-AC_CONFIG_HEADER(config.h)
-
-dnl Version number...
-VERSION=2.2.2
-AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(MXML_VERSION, "Mini-XML v$VERSION")
-
-dnl Clear default debugging options and set normal optimization by
-dnl default unless the user asks for debugging specifically.
-CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-LDFLAGS="${LDFLAGS:=}"
-AC_SUBST(LDFLAGS)
-OPTIM=""
-AC_SUBST(OPTIM)
-
-AC_ARG_WITH(ansi, [  --with-ansi             set full ANSI C mode, default=no],
-	use_ansi="$withval",
-	use_ansi="no")
-
-AC_ARG_WITH(archflags, [  --with-archflags        set additional architecture flags, default=none],
-	ARCHFLAGS="$withval",
-	ARCHFLAGS="")
-AC_SUBST(ARCHFLAGS)
-
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
-if eval "test x$enable_debug = xyes"; then
- 	OPTIM="-g"
-fi)
-
-AC_ARG_WITH(docdir, [  --with-docdir           set directory for documentation, default=${prefix}/share/doc/mxml],
-	docdir="$withval",
-	docdir="NONE")
-
-AC_SUBST(docdir)
-
-AC_ARG_WITH(vsnprintf, [  --with-vsnprintf        use vsnprintf emulation functions, default=auto],
-	use_vsnprintf="$withval",
-	use_vsnprintf="no")
-
-dnl Get the operating system and version number...
-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
-if test x$uname = xIRIX64; then
-	uname="IRIX"
-fi
-
-dnl Checks for programs...
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-if test "$INSTALL" = "$ac_install_sh"; then
-	# Use full path to install-sh script...
-	INSTALL="`pwd`/install-sh -c"
-fi
-AC_PROG_RANLIB
-AC_PATH_PROGS(AR,ar gar)
-AC_PATH_PROG(CP,cp)
-AC_PATH_PROG(LN,ln)
-AC_PATH_PROG(MKDIR,mkdir)
-AC_PATH_PROG(RM,rm)
-if test -z $AR ; then
-	AC_MSG_ERROR('ar' binary is mandatory.  Please either install the 'ar' binary or provide the path to configure with --with-ar=/path/to/ar)
-fi
-
-dnl Flags for "ar" command...
-case "$uname" in
-        Darwin* | *BSD*)
-                ARFLAGS="-rcv"
-                ;;
-        *)
-                ARFLAGS="crvs"
-                ;;
-esac
-
-AC_SUBST(ARFLAGS)
-
-dnl Inline functions...
-AC_C_INLINE
-
-dnl Checks for string functions.
-if test "x$use_ansi" != xyes; then
-	AC_CHECK_FUNCS(strdup)
-fi
-
-if test "x$use_vsnprintf" != xyes; then
-	AC_CHECK_FUNCS(snprintf vsnprintf)
-fi
-
-dnl Check for "long long" support...
-AC_CACHE_CHECK(for long long int, ac_cv_c_long_long,
-	[if test "$GCC" = yes; then
-		ac_cv_c_long_long=yes
-	else
-		AC_TRY_COMPILE(,[long long int i;],
-			ac_cv_c_long_long=yes,
-			ac_cv_c_long_long=no)
-	fi])
-
-if test $ac_cv_c_long_long = yes; then
-	AC_DEFINE(HAVE_LONG_LONG)
-fi
-
-dnl Threading support
-AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])
-
-have_pthread=no
-PTHREAD_FLAGS=""
-PTHREAD_LIBS=""
-
-if test "x$enable_threads" != xno; then
-	AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H))
-
-	if test x$ac_cv_header_pthread_h = xyes; then
-		dnl Check various threading options for the platforms we support
-		for flag in -lpthreads -lpthread -pthread; do
-        		AC_MSG_CHECKING([for pthread_create using $flag])
-			SAVELIBS="$LIBS"
-			LIBS="$flag $LIBS"
-        		AC_TRY_LINK([#include <pthread.h>],
-				[pthread_create(0, 0, 0, 0);],
-        			have_pthread=yes)
-        		AC_MSG_RESULT([$have_pthread])
-			LIBS="$SAVELIBS"
-
-			if test $have_pthread = yes; then
-				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-				PTHREAD_LIBS="$flag"
-
-				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
-				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
-					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
-				fi
-				break
-			fi
-		done
-	fi
-fi
-
-AC_SUBST(PTHREAD_FLAGS)
-AC_SUBST(PTHREAD_LIBS)
-
-dnl Shared library support...
-DSO="${DSO:=:}"
-DSOFLAGS="${DSOFLAGS:=}"
-
-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=no])
-
-if test x$enable_shared = xyes; then
-	AC_MSG_CHECKING(for shared library support)
-	PICFLAG=1
-
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,libmxml.so.1 -G -R\$(libdir) \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -R\$(libdir)"
-                	;;
-
-		HP-UX*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.sl.1"
-			DSO="ld"
-			DSOFLAGS="$DSOFLAGS -b -z +h libmxml.sl.1 +s +b \$(libdir)"
-			LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
-			;;
-
-		IRIX)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)"
-			;;
-
-		OSF1* | Linux | GNU)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
-                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-			;;
-
-		*BSD*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
-                        ;;
-
-		Darwin*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.1.dylib"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
-			;;
-
-		*)
-			AC_MSG_RESULT(no)
-			AC_MSG_WARN(shared libraries not supported on this platform.)
-			PICFLAG=0
-			LIBMXML="libmxml.a"
-			;;
-	esac
-else
-	PICFLAG=0
-	LIBMXML="libmxml.a"
-fi
-
-AC_SUBST(DSO)
-AC_SUBST(DSOFLAGS)
-AC_SUBST(LIBMXML)
-AC_SUBST(PICFLAG)
-
-dnl Add -Wall for GCC...
-if test -n "$GCC"; then
-	CFLAGS="-Wall $CFLAGS"
-
-	if test "x$OPTIM" = x; then
-		OPTIM="-Os -g"
-	fi
-
-	if test "x$use_ansi" = xyes; then
-		CFLAGS="-ansi -pedantic $CFLAGS"
-	fi
-
-	if test $PICFLAG = 1 -a $uname != AIX; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-else
-	case $uname in
-		HP-UX*)
-			CFLAGS="-Ae $CFLAGS"
-
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			OPTIM="+DAportable $OPTIM"
-
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-			;;
-
-		UNIX_SVR* | SunOS*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-
-		*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-			;;
-	esac
-fi
-
-dnl Fix "prefix" variable if it hasn't been specified...
-if test "$prefix" = "NONE"; then
-	prefix="/usr/local"
-fi
-
-dnl Fix "exec_prefix" variable if it hasn't been specified...
-if test "$exec_prefix" = "NONE"; then
-	exec_prefix="$prefix"
-fi
-
-dnl Fix "docdir" variable if it hasn't been specified...
-if test "$docdir" = "NONE"; then
-	docdir="$datadir/doc/mxml"
-fi
-
-dnl Fix "mandir" variable if it hasn't been specified...
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"; then
-	case "$uname" in
-        	*BSD* | Darwin* | Linux*)
-        		# BSD, Darwin (MacOS X), and Linux
-        		mandir="/usr/share/man"
-        		;;
-        	IRIX*)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		;;
-        	*)
-        		# All others
-        		mandir="/usr/man"
-        		;;
-	esac
-fi
-
-dnl pkg-config stuff...
-if test "$includedir" != /usr/include; then
-	PC_CFLAGS="-I$includedir"
-else
-	PC_CFLAGS=""
-fi
-
-if test "$libdir" != /usr/lib; then
-	PC_LIBS="-L$libdir -lmxml"
-else
-	PC_LIBS="-lmxml"
-fi
-
-AC_SUBST(PC_CFLAGS)
-AC_SUBST(PC_LIBS)
-
-dnl Output the makefile, etc...
-AC_OUTPUT(Makefile mxml.list mxml.pc)
-
-dnl
-dnl End of "$Id: configure.in 260 2010-04-27 19:11:06Z qwell $".
-dnl
diff --git a/menuselect/mxml/install-sh b/menuselect/mxml/install-sh
deleted file mode 100755
index 398a88e..0000000
--- a/menuselect/mxml/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/menuselect/mxml/mxml-attr.c b/menuselect/mxml/mxml-attr.c
deleted file mode 100644
index 7aa7d1b..0000000
--- a/menuselect/mxml/mxml-attr.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * "$Id: mxml-attr.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Attribute support code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlElementGetAttr() - Get an attribute.
- *   mxmlElementSetAttr() - Set an attribute.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * 'mxmlElementGetAttr()' - Get an attribute.
- *
- * This function returns NULL if the node is not an element or the
- * named attribute does not exist.
- */
-
-const char *				/* O - Attribute value or NULL */
-mxmlElementGetAttr(mxml_node_t *node,	/* I - Element node */
-                   const char  *name)	/* I - Name of attribute */
-{
-  int	i;				/* Looping var */
-  mxml_attr_t	*attr;			/* Cirrent attribute */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlElementGetAttr(node=%p, name=\"%s\")\n",
-          node, name ? name : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_ELEMENT || !name)
-    return (NULL);
-
- /*
-  * Look for the attribute...
-  */
-
-  for (i = node->value.element.num_attrs, attr = node->value.element.attrs;
-       i > 0;
-       i --, attr ++)
-    if (!strcmp(attr->name, name))
-      return (attr->value);
-
- /*
-  * Didn't find attribute, so return NULL...
-  */
-
-  return (NULL);
-}
-
-
-/*
- * 'mxmlElementSetAttr()' - Set an attribute.
- *
- * If the named attribute already exists, the value of the attribute
- * is replaced by the new string value. The string value is copied
- * into the element node. This function does nothing if the node is
- * not an element.
- */
-
-void
-mxmlElementSetAttr(mxml_node_t *node,	/* I - Element node */
-                   const char  *name,	/* I - Name of attribute */
-                   const char  *value)	/* I - Attribute value */
-{
-  int		i;			/* Looping var */
-  mxml_attr_t	*attr;			/* New attribute */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlElementSetAttr(node=%p, name=\"%s\", value=\"%s\")\n",
-          node, name ? name : "(null)", value ? value : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_ELEMENT || !name)
-    return;
-
- /*
-  * Look for the attribute...
-  */
-
-  for (i = node->value.element.num_attrs, attr = node->value.element.attrs;
-       i > 0;
-       i --, attr ++)
-    if (!strcmp(attr->name, name))
-    {
-     /*
-      * Replace the attribute value and return...
-      */
-
-      if (attr->value)
-        free(attr->value);
-
-      if (value)
-      {
-	if ((attr->value = strdup(value)) == NULL)
-	  mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
-                     name, node->value.element.name);
-      }
-      else
-        attr->value = NULL;
-
-      return;
-    }
-
- /*
-  * Attribute not found, so add a new one...
-  */
-
-  if (node->value.element.num_attrs == 0)
-    attr = malloc(sizeof(mxml_attr_t));
-  else
-    attr = realloc(node->value.element.attrs,
-                   (node->value.element.num_attrs + 1) * sizeof(mxml_attr_t));
-
-  if (!attr)
-  {
-    mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
-               name, node->value.element.name);
-    return;
-  }
-
-  node->value.element.attrs = attr;
-  attr += node->value.element.num_attrs;
-
-  attr->name = strdup(name);
-  if (value)
-    attr->value = strdup(value);
-  else
-    attr->value = NULL;
-
-  if (!attr->name || (!attr->value && value))
-  {
-    if (attr->name)
-      free(attr->name);
-
-    if (attr->value)
-      free(attr->value);
-
-    mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
-               name, node->value.element.name);
-
-    return;
-  }
-    
-  node->value.element.num_attrs ++;
-}
-
-
-/*
- * End of "$Id: mxml-attr.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-entity.c b/menuselect/mxml/mxml-entity.c
deleted file mode 100644
index 08094c2..0000000
--- a/menuselect/mxml/mxml-entity.c
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * "$Id: mxml-entity.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Character entity support code for Mini-XML, a small XML-like
- * file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlEntityAddCallback()    - Add a callback to convert entities to
- *                                Unicode.
- *   mxmlEntityGetName()        - Get the name that corresponds to the
- *                                character value.
- *   mxmlEntityGetValue()       - Get the character corresponding to a named
- *                                entity.
- *   mxmlEntityRemoveCallback() - Remove a callback.
- *   default_callback()         - Lookup standard (X)HTML entities.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Local functions...
- */
-
-static int	default_callback(const char *name);
-
-
-/*
- * Callback array...
- */
-
-static int	num_callbacks = 1;
-static int	(*callbacks[100])(const char *name) =
-		{
-		  default_callback
-		};
-
-
-/*
- * 'mxmlEntityAddCallback()' - Add a callback to convert entities to Unicode.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlEntityAddCallback(int (*cb)(const char *name))
-					/* I - Callback function to add */
-{
-  if (num_callbacks < (int)(sizeof(callbacks) / sizeof(callbacks[0])))
-  {
-    callbacks[num_callbacks] = cb;
-    num_callbacks ++;
-
-    return (0);
-  }
-  else
-  {
-    mxml_error("Unable to add entity callback!");
-
-    return (-1);
-  }
-}
-
-
-/*
- * 'mxmlEntityGetName()' - Get the name that corresponds to the character value.
- *
- * If val does not need to be represented by a named entity, NULL is returned.
- */
-
-const char *				/* O - Entity name or NULL */
-mxmlEntityGetName(int val)		/* I - Character value */
-{
-  switch (val)
-  {
-    case '&' :
-        return ("amp");
-
-    case '<' :
-        return ("lt");
-
-    case '>' :
-        return ("gt");
-
-    case '\"' :
-        return ("quot");
-
-    default :
-        return (NULL);
-  }
-}
-
-
-/*
- * 'mxmlEntityGetValue()' - Get the character corresponding to a named entity.
- *
- * The entity name can also be a numeric constant. -1 is returned if the
- * name is not known.
- */
-
-int					/* O - Character value or -1 on error */
-mxmlEntityGetValue(const char *name)	/* I - Entity name */
-{
-  int	i;				/* Looping var */
-  int	ch;				/* Character value */
-
-
-  for (i = 0; i < num_callbacks; i ++)
-    if ((ch = (callbacks[i])(name)) >= 0)
-      return (ch);
-
-  return (-1);
-}
-
-
-/*
- * 'mxmlEntityRemoveCallback()' - Remove a callback.
- */
-
-void
-mxmlEntityRemoveCallback(int (*cb)(const char *name))
-					/* I - Callback function to remove */
-{
-  int	i;				/* Looping var */
-
-
-  for (i = 0; i < num_callbacks; i ++)
-    if (cb == callbacks[i])
-    {
-     /*
-      * Remove the callback...
-      */
-
-      num_callbacks --;
-
-      if (i < num_callbacks)
-        memmove(callbacks + i, callbacks + i + 1,
-	        (num_callbacks - i) * sizeof(callbacks[0]));
-
-      return;
-    }
-}
-
-
-/*
- * 'default_callback()' - Lookup standard (X)HTML entities.
- */
-
-static int				/* O - Unicode value or -1 */
-default_callback(const char *name)	/* I - Entity name */
-{
-  int	diff,				/* Difference between names */
-	current,			/* Current entity in search */
-	first,				/* First entity in search */
-	last;				/* Last entity in search */
-  static const struct
-  {
-    const char	*name;			/* Entity name */
-    int		val;			/* Character value */
-  }	entities[] =
-  {
-    { "AElig",		198 },
-    { "Aacute",		193 },
-    { "Acirc",		194 },
-    { "Agrave",		192 },
-    { "Alpha",		913 },
-    { "Aring",		197 },
-    { "Atilde",		195 },
-    { "Auml",		196 },
-    { "Beta",		914 },
-    { "Ccedil",		199 },
-    { "Chi",		935 },
-    { "Dagger",		8225 },
-    { "Delta",		916 },
-    { "Dstrok",		208 },
-    { "ETH",		208 },
-    { "Eacute",		201 },
-    { "Ecirc",		202 },
-    { "Egrave",		200 },
-    { "Epsilon",	917 },
-    { "Eta",		919 },
-    { "Euml",		203 },
-    { "Gamma",		915 },
-    { "Iacute",		205 },
-    { "Icirc",		206 },
-    { "Igrave",		204 },
-    { "Iota",		921 },
-    { "Iuml",		207 },
-    { "Kappa",		922 },
-    { "Lambda",		923 },
-    { "Mu",		924 },
-    { "Ntilde",		209 },
-    { "Nu",		925 },
-    { "OElig",		338 },
-    { "Oacute",		211 },
-    { "Ocirc",		212 },
-    { "Ograve",		210 },
-    { "Omega",		937 },
-    { "Omicron",	927 },
-    { "Oslash",		216 },
-    { "Otilde",		213 },
-    { "Ouml",		214 },
-    { "Phi",		934 },
-    { "Pi",		928 },
-    { "Prime",		8243 },
-    { "Psi",		936 },
-    { "Rho",		929 },
-    { "Scaron",		352 },
-    { "Sigma",		931 },
-    { "THORN",		222 },
-    { "Tau",		932 },
-    { "Theta",		920 },
-    { "Uacute",		218 },
-    { "Ucirc",		219 },
-    { "Ugrave",		217 },
-    { "Upsilon",	933 },
-    { "Uuml",		220 },
-    { "Xi",		926 },
-    { "Yacute",		221 },
-    { "Yuml",		376 },
-    { "Zeta",		918 },
-    { "aacute",		225 },
-    { "acirc",		226 },
-    { "acute",		180 },
-    { "aelig",		230 },
-    { "agrave",		224 },
-    { "alefsym",	8501 },
-    { "alpha",		945 },
-    { "amp",		'&' },
-    { "and",		8743 },
-    { "ang",		8736 },
-    { "aring",		229 },
-    { "asymp",		8776 },
-    { "atilde",		227 },
-    { "auml",		228 },
-    { "bdquo",		8222 },
-    { "beta",		946 },
-    { "brkbar",		166 },
-    { "brvbar",		166 },
-    { "bull",		8226 },
-    { "cap",		8745 },
-    { "ccedil",		231 },
-    { "cedil",		184 },
-    { "cent",		162 },
-    { "chi",		967 },
-    { "circ",		710 },
-    { "clubs",		9827 },
-    { "cong",		8773 },
-    { "copy",		169 },
-    { "crarr",		8629 },
-    { "cup",		8746 },
-    { "curren",		164 },
-    { "dArr",		8659 },
-    { "dagger",		8224 },
-    { "darr",		8595 },
-    { "deg",		176 },
-    { "delta",		948 },
-    { "diams",		9830 },
-    { "die",		168 },
-    { "divide",		247 },
-    { "eacute",		233 },
-    { "ecirc",		234 },
-    { "egrave",		232 },
-    { "empty",		8709 },
-    { "emsp",		8195 },
-    { "ensp",		8194 },
-    { "epsilon",	949 },
-    { "equiv",		8801 },
-    { "eta",		951 },
-    { "eth",		240 },
-    { "euml",		235 },
-    { "euro",		8364 },
-    { "exist",		8707 },
-    { "fnof",		402 },
-    { "forall",		8704 },
-    { "frac12",		189 },
-    { "frac14",		188 },
-    { "frac34",		190 },
-    { "frasl",		8260 },
-    { "gamma",		947 },
-    { "ge",		8805 },
-    { "gt",		'>' },
-    { "hArr",		8660 },
-    { "harr",		8596 },
-    { "hearts",		9829 },
-    { "hellip",		8230 },
-    { "hibar",		175 },
-    { "iacute",		237 },
-    { "icirc",		238 },
-    { "iexcl",		161 },
-    { "igrave",		236 },
-    { "image",		8465 },
-    { "infin",		8734 },
-    { "int",		8747 },
-    { "iota",		953 },
-    { "iquest",		191 },
-    { "isin",		8712 },
-    { "iuml",		239 },
-    { "kappa",		954 },
-    { "lArr",		8656 },
-    { "lambda",		955 },
-    { "lang",		9001 },
-    { "laquo",		171 },
-    { "larr",		8592 },
-    { "lceil",		8968 },
-    { "ldquo",		8220 },
-    { "le",		8804 },
-    { "lfloor",		8970 },
-    { "lowast",		8727 },
-    { "loz",		9674 },
-    { "lrm",		8206 },
-    { "lsaquo",		8249 },
-    { "lsquo",		8216 },
-    { "lt",		'<' },
-    { "macr",		175 },
-    { "mdash",		8212 },
-    { "micro",		181 },
-    { "middot",		183 },
-    { "minus",		8722 },
-    { "mu",		956 },
-    { "nabla",		8711 },
-    { "nbsp",		160 },
-    { "ndash",		8211 },
-    { "ne",		8800 },
-    { "ni",		8715 },
-    { "not",		172 },
-    { "notin",		8713 },
-    { "nsub",		8836 },
-    { "ntilde",		241 },
-    { "nu",		957 },
-    { "oacute",		243 },
-    { "ocirc",		244 },
-    { "oelig",		339 },
-    { "ograve",		242 },
-    { "oline",		8254 },
-    { "omega",		969 },
-    { "omicron",	959 },
-    { "oplus",		8853 },
-    { "or",		8744 },
-    { "ordf",		170 },
-    { "ordm",		186 },
-    { "oslash",		248 },
-    { "otilde",		245 },
-    { "otimes",		8855 },
-    { "ouml",		246 },
-    { "para",		182 },
-    { "part",		8706 },
-    { "permil",		8240 },
-    { "perp",		8869 },
-    { "phi",		966 },
-    { "pi",		960 },
-    { "piv",		982 },
-    { "plusmn",		177 },
-    { "pound",		163 },
-    { "prime",		8242 },
-    { "prod",		8719 },
-    { "prop",		8733 },
-    { "psi",		968 },
-    { "quot",		'\"' },
-    { "rArr",		8658 },
-    { "radic",		8730 },
-    { "rang",		9002 },
-    { "raquo",		187 },
-    { "rarr",		8594 },
-    { "rceil",		8969 },
-    { "rdquo",		8221 },
-    { "real",		8476 },
-    { "reg",		174 },
-    { "rfloor",		8971 },
-    { "rho",		961 },
-    { "rlm",		8207 },
-    { "rsaquo",		8250 },
-    { "rsquo",		8217 },
-    { "sbquo",		8218 },
-    { "scaron",		353 },
-    { "sdot",		8901 },
-    { "sect",		167 },
-    { "shy",		173 },
-    { "sigma",		963 },
-    { "sigmaf",		962 },
-    { "sim",		8764 },
-    { "spades",		9824 },
-    { "sub",		8834 },
-    { "sube",		8838 },
-    { "sum",		8721 },
-    { "sup",		8835 },
-    { "sup1",		185 },
-    { "sup2",		178 },
-    { "sup3",		179 },
-    { "supe",		8839 },
-    { "szlig",		223 },
-    { "tau",		964 },
-    { "there4",		8756 },
-    { "theta",		952 },
-    { "thetasym",	977 },
-    { "thinsp",		8201 },
-    { "thorn",		254 },
-    { "tilde",		732 },
-    { "times",		215 },
-    { "trade",		8482 },
-    { "uArr",		8657 },
-    { "uacute",		250 },
-    { "uarr",		8593 },
-    { "ucirc",		251 },
-    { "ugrave",		249 },
-    { "uml",		168 },
-    { "upsih",		978 },
-    { "upsilon",	965 },
-    { "uuml",		252 },
-    { "weierp",		8472 },
-    { "xi",		958 },
-    { "yacute",		253 },
-    { "yen",		165 },
-    { "yuml",		255 },
-    { "zeta",		950 },
-    { "zwj",		8205 },
-    { "zwnj",		8204 }
-  };
-
-
- /*
-  * Do a binary search for the named entity...
-  */
-
-  first = 0;
-  last  = (int)(sizeof(entities) / sizeof(entities[0]) - 1);
-
-  while ((last - first) > 1)
-  {
-    current = (first + last) / 2;
-
-    if ((diff = strcmp(name, entities[current].name)) == 0)
-      return (entities[current].val);
-    else if (diff < 0)
-      last = current;
-    else
-      first = current;
-  }
-
- /*
-  * If we get here, there is a small chance that there is still
-  * a match; check first and last...
-  */
-
-  if (!strcmp(name, entities[first].name))
-    return (entities[first].val);
-  else if (!strcmp(name, entities[last].name))
-    return (entities[last].val);
-  else
-    return (-1);
-}
-
-
-/*
- * End of "$Id: mxml-entity.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-file.c b/menuselect/mxml/mxml-file.c
deleted file mode 100644
index 04c658a..0000000
--- a/menuselect/mxml/mxml-file.c
+++ /dev/null
@@ -1,2844 +0,0 @@
-/*
- * "$Id: mxml-file.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * File loading code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlLoadFd()            - Load a file descriptor into an XML node tree.
- *   mxmlLoadFile()          - Load a file into an XML node tree.
- *   mxmlLoadString()        - Load a string into an XML node tree.
- *   mxmlSaveAllocString()   - Save an XML node tree to an allocated string.
- *   mxmlSaveFd()            - Save an XML tree to a file descriptor.
- *   mxmlSaveFile()          - Save an XML tree to a file.
- *   mxmlSaveString()        - Save an XML node tree to a string.
- *   mxmlSetCustomHandlers() - Set the handling functions for custom data.
- *   mxmlSetErrorCallback()  - Set the error message callback.
- *   mxml_add_char()         - Add a character to a buffer, expanding as needed.
- *   mxml_fd_getc()          - Read a character from a file descriptor.
- *   mxml_fd_putc()          - Write a character to a file descriptor.
- *   mxml_fd_read()          - Read a buffer of data from a file descriptor.
- *   mxml_fd_write()         - Write a buffer of data to a file descriptor.
- *   mxml_file_getc()        - Get a character from a file.
- *   mxml_file_putc()        - Write a character to a file.
- *   mxml_get_entity()       - Get the character corresponding to an entity...
- *   mxml_load_data()        - Load data into an XML node tree.
- *   mxml_parse_element()    - Parse an element for any attributes...
- *   mxml_string_getc()      - Get a character from a string.
- *   mxml_string_putc()      - Write a character to a string.
- *   mxml_write_name()       - Write a name string.
- *   mxml_write_node()       - Save an XML node to a file.
- *   mxml_write_string()     - Write a string, escaping & and < as needed.
- *   mxml_write_ws()         - Do whitespace callback...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#endif /* WIN32 */
-
-
-/*
- * Character encoding...
- */
-
-#define ENCODE_UTF8	0		/* UTF-8 */
-#define ENCODE_UTF16BE	1		/* UTF-16 Big-Endian */
-#define ENCODE_UTF16LE	2		/* UTF-16 Little-Endian */
-
-
-/*
- * Macro to test for a bad XML character...
- */
-
-#define mxml_bad_char(ch) ((ch) < ' ' && (ch) != '\n' && (ch) != '\r' && (ch) != '\t')
-
-
-/*
- * Structures...
- */
-
-typedef struct mxml_fdbuf_s		/**** File descriptor buffer (@private) ****/
-{
-  int		fd;			/* File descriptor */
-  unsigned char	*current,		/* Current position in buffer */
-		*end,			/* End of buffer */
-		buffer[8192];		/* Character buffer */
-} mxml_fdbuf_t;
-
-
-/*
- * Global error handler...
- */
-
-extern void	(*mxml_error_cb)(const char *);
-
-
-/*
- * Custom data handlers...
- */
-
-static mxml_custom_load_cb_t	mxml_custom_load_cb = NULL;
-static mxml_custom_save_cb_t	mxml_custom_save_cb = NULL;
-
-
-/*
- * Local functions...
- */
-
-static int		mxml_add_char(int ch, char **ptr, char **buffer,
-			              int *bufsize);
-static int		mxml_fd_getc(void *p, int *encoding);
-static int		mxml_fd_putc(int ch, void *p);
-static int		mxml_fd_read(mxml_fdbuf_t *buf);
-static int		mxml_fd_write(mxml_fdbuf_t *buf);
-static int		mxml_file_getc(void *p, int *encoding);
-static int		mxml_file_putc(int ch, void *p);
-static int		mxml_get_entity(mxml_node_t *parent, void *p,
-			                int *encoding,
-					int (*getc_cb)(void *, int *));
-static mxml_node_t	*mxml_load_data(mxml_node_t *top, void *p,
-			                mxml_type_t (*cb)(mxml_node_t *),
-			                int (*getc_cb)(void *, int *));
-static int		mxml_parse_element(mxml_node_t *node, void *p,
-			                   int *encoding,
-					   int (*getc_cb)(void *, int *));
-static int		mxml_string_getc(void *p, int *encoding);
-static int		mxml_string_putc(int ch, void *p);
-static int		mxml_write_name(const char *s, void *p,
-					int (*putc_cb)(int, void *));
-static int		mxml_write_node(mxml_node_t *node, void *p,
-			                const char *(*cb)(mxml_node_t *, int),
-					int col,
-					int (*putc_cb)(int, void *));
-static int		mxml_write_string(const char *s, void *p,
-					  int (*putc_cb)(int, void *));
-static int		mxml_write_ws(mxml_node_t *node, void *p, 
-			              const char *(*cb)(mxml_node_t *, int), int ws,
-				      int col, int (*putc_cb)(int, void *));
-
-
-/*
- * 'mxmlLoadFd()' - Load a file descriptor into an XML node tree.
- *
- * The nodes in the specified file are added to the specified top node.
- * If no top node is provided, the XML file MUST be well-formed with a
- * single parent node like <?xml> for the entire file. The callback
- * function returns the value type that should be used for child nodes.
- * If MXML_NO_CALLBACK is specified then all child nodes will be either
- * MXML_ELEMENT or MXML_TEXT nodes.
- *
- * The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
- * MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
- * child nodes of the specified type.
- */
-
-mxml_node_t *				/* O - First node or NULL if the file could not be read. */
-mxmlLoadFd(mxml_node_t *top,		/* I - Top node */
-           int         fd,		/* I - File descriptor to read from */
-           mxml_type_t (*cb)(mxml_node_t *node))
-					/* I - Callback function or MXML_NO_CALLBACK */
-{
-  mxml_fdbuf_t	buf;			/* File descriptor buffer */
-
-
- /*
-  * Initialize the file descriptor buffer...
-  */
-
-  buf.fd      = fd;
-  buf.current = buf.buffer;
-  buf.end     = buf.buffer;
-
- /*
-  * Read the XML data...
-  */
-
-  return (mxml_load_data(top, &buf, cb, mxml_fd_getc));
-}
-
-
-/*
- * 'mxmlLoadFile()' - Load a file into an XML node tree.
- *
- * The nodes in the specified file are added to the specified top node.
- * If no top node is provided, the XML file MUST be well-formed with a
- * single parent node like <?xml> for the entire file. The callback
- * function returns the value type that should be used for child nodes.
- * If MXML_NO_CALLBACK is specified then all child nodes will be either
- * MXML_ELEMENT or MXML_TEXT nodes.
- *
- * The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
- * MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
- * child nodes of the specified type.
- */
-
-mxml_node_t *				/* O - First node or NULL if the file could not be read. */
-mxmlLoadFile(mxml_node_t *top,		/* I - Top node */
-             FILE        *fp,		/* I - File to read from */
-             mxml_type_t (*cb)(mxml_node_t *node))
-					/* I - Callback function or MXML_NO_CALLBACK */
-{
- /*
-  * Read the XML data...
-  */
-
-  return (mxml_load_data(top, fp, cb, mxml_file_getc));
-}
-
-
-/*
- * 'mxmlLoadString()' - Load a string into an XML node tree.
- *
- * The nodes in the specified string are added to the specified top node.
- * If no top node is provided, the XML string MUST be well-formed with a
- * single parent node like <?xml> for the entire string. The callback
- * function returns the value type that should be used for child nodes.
- * If MXML_NO_CALLBACK is specified then all child nodes will be either
- * MXML_ELEMENT or MXML_TEXT nodes.
- *
- * The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
- * MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
- * child nodes of the specified type.
- */
-
-mxml_node_t *				/* O - First node or NULL if the string has errors. */
-mxmlLoadString(mxml_node_t *top,	/* I - Top node */
-               const char  *s,		/* I - String to load */
-               mxml_type_t (*cb)(mxml_node_t *node))
-					/* I - Callback function or MXML_NO_CALLBACK */
-{
- /*
-  * Read the XML data...
-  */
-
-  return (mxml_load_data(top, &s, cb, mxml_string_getc));
-}
-
-
-/*
- * 'mxmlSaveAllocString()' - Save an XML node tree to an allocated string.
- *
- * This function returns a pointer to a string containing the textual
- * representation of the XML node tree.  The string should be freed
- * using the free() function when you are done with it.  NULL is returned
- * if the node would produce an empty string or if the string cannot be
- * allocated.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-char *					/* O - Allocated string or NULL */
-mxmlSaveAllocString(mxml_node_t *node,	/* I - Node to write */
-                    const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int	bytes;				/* Required bytes */
-  char	buffer[8192];			/* Temporary buffer */
-  char	*s;				/* Allocated string */
-
-
- /*
-  * Write the node to the temporary buffer...
-  */
-
-  bytes = mxmlSaveString(node, buffer, sizeof(buffer), cb);
-
-  if (bytes <= 0)
-    return (NULL);
-
-  if (bytes < (int)(sizeof(buffer) - 1))
-  {
-   /*
-    * Node fit inside the buffer, so just duplicate that string and
-    * return...
-    */
-
-    return (strdup(buffer));
-  }
-
- /*
-  * Allocate a buffer of the required size and save the node to the
-  * new buffer...
-  */
-
-  if ((s = malloc(bytes + 1)) == NULL)
-    return (NULL);
-
-  mxmlSaveString(node, s, bytes + 1, cb);
-
- /*
-  * Return the allocated string...
-  */
-
-  return (s);
-}
-
-
-/*
- * 'mxmlSaveFd()' - Save an XML tree to a file descriptor.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-int					/* O - 0 on success, -1 on error. */
-mxmlSaveFd(mxml_node_t *node,		/* I - Node to write */
-           int         fd,		/* I - File descriptor to write to */
-	   const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int		col;			/* Final column */
-  mxml_fdbuf_t	buf;			/* File descriptor buffer */
-
-
- /*
-  * Initialize the file descriptor buffer...
-  */
-
-  buf.fd      = fd;
-  buf.current = buf.buffer;
-  buf.end     = buf.buffer + sizeof(buf.buffer) - 4;
-
- /*
-  * Write the node...
-  */
-
-  if ((col = mxml_write_node(node, &buf, cb, 0, mxml_fd_putc)) < 0)
-    return (-1);
-
-  if (col > 0)
-    if (mxml_fd_putc('\n', &buf) < 0)
-      return (-1);
-
- /*
-  * Flush and return...
-  */
-
-  return (mxml_fd_write(&buf));
-}
-
-
-/*
- * 'mxmlSaveFile()' - Save an XML tree to a file.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-int					/* O - 0 on success, -1 on error. */
-mxmlSaveFile(mxml_node_t *node,		/* I - Node to write */
-             FILE        *fp,		/* I - File to write to */
-	     const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int	col;				/* Final column */
-
-
- /*
-  * Write the node...
-  */
-
-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc)) < 0)
-    return (-1);
-
-  if (col > 0)
-    if (putc('\n', fp) < 0)
-      return (-1);
-
- /*
-  * Return 0 (success)...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSaveString()' - Save an XML node tree to a string.
- *
- * This function returns the total number of bytes that would be
- * required for the string but only copies (bufsize - 1) characters
- * into the specified buffer.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-int					/* O - Size of string */
-mxmlSaveString(mxml_node_t *node,	/* I - Node to write */
-               char        *buffer,	/* I - String buffer */
-               int         bufsize,	/* I - Size of string buffer */
-               const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int	col;				/* Final column */
-  char	*ptr[2];			/* Pointers for putc_cb */
-
-
- /*
-  * Write the node...
-  */
-
-  ptr[0] = buffer;
-  ptr[1] = buffer + bufsize;
-
-  if ((col = mxml_write_node(node, ptr, cb, 0, mxml_string_putc)) < 0)
-    return (-1);
-
-  if (col > 0)
-    mxml_string_putc('\n', ptr);
-
- /*
-  * Nul-terminate the buffer...
-  */
-
-  if (ptr[0] >= ptr[1])
-    buffer[bufsize - 1] = '\0';
-  else
-    ptr[0][0] = '\0';
-
- /*
-  * Return the number of characters...
-  */
-
-  return (ptr[0] - buffer);
-}
-
-
-/*
- * 'mxmlSetCustomHandlers()' - Set the handling functions for custom data.
- *
- * The load function accepts a node pointer and a data string and must
- * return 0 on success and non-zero on error.
- *
- * The save function accepts a node pointer and must return a malloc'd
- * string on success and NULL on error.
- * 
- */
-
-void
-mxmlSetCustomHandlers(mxml_custom_load_cb_t load,
-					/* I - Load function */
-                      mxml_custom_save_cb_t save)
-					/* I - Save function */
-{
-  mxml_custom_load_cb = load;
-  mxml_custom_save_cb = save;
-}
-
-
-/*
- * 'mxmlSetErrorCallback()' - Set the error message callback.
- */
-
-void
-mxmlSetErrorCallback(void (*cb)(const char *))
-					/* I - Error callback function */
-{
-  mxml_error_cb = cb;
-}
-
-
-/*
- * 'mxml_add_char()' - Add a character to a buffer, expanding as needed.
- */
-
-static int				/* O  - 0 on success, -1 on error */
-mxml_add_char(int  ch,			/* I  - Character to add */
-              char **bufptr,		/* IO - Current position in buffer */
-	      char **buffer,		/* IO - Current buffer */
-	      int  *bufsize)		/* IO - Current buffer size */
-{
-  char	*newbuffer;			/* New buffer value */
-
-
-  if (*bufptr >= (*buffer + *bufsize - 4))
-  {
-   /*
-    * Increase the size of the buffer...
-    */
-
-    if (*bufsize < 1024)
-      (*bufsize) *= 2;
-    else
-      (*bufsize) += 1024;
-
-    if ((newbuffer = realloc(*buffer, *bufsize)) == NULL)
-    {
-      free(*buffer);
-
-      mxml_error("Unable to expand string buffer to %d bytes!", *bufsize);
-
-      return (-1);
-    }
-
-    *bufptr = newbuffer + (*bufptr - *buffer);
-    *buffer = newbuffer;
-  }
-
-  if (ch < 0x80)
-  {
-   /*
-    * Single byte ASCII...
-    */
-
-    *(*bufptr)++ = ch;
-  }
-  else if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8...
-    */
-
-    *(*bufptr)++ = 0xc0 | (ch >> 6);
-    *(*bufptr)++ = 0x80 | (ch & 0x3f);
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8...
-    */
-
-    *(*bufptr)++ = 0xe0 | (ch >> 12);
-    *(*bufptr)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(*bufptr)++ = 0x80 | (ch & 0x3f);
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8...
-    */
-
-    *(*bufptr)++ = 0xf0 | (ch >> 18);
-    *(*bufptr)++ = 0x80 | ((ch >> 12) & 0x3f);
-    *(*bufptr)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(*bufptr)++ = 0x80 | (ch & 0x3f);
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_fd_getc()' - Read a character from a file descriptor.
- */
-
-static int				/* O  - Character or EOF */
-mxml_fd_getc(void *p,			/* I  - File descriptor buffer */
-             int  *encoding)		/* IO - Encoding */
-{
-  mxml_fdbuf_t	*buf;			/* File descriptor buffer */
-  int		ch,			/* Current character */
-		temp;			/* Temporary character */
-
-
- /*
-  * Grab the next character in the buffer...
-  */
-
-  buf = (mxml_fdbuf_t *)p;
-
-  if (buf->current >= buf->end)
-    if (mxml_fd_read(buf) < 0)
-      return (EOF);
-
-  ch = *(buf->current)++;
-
-  switch (*encoding)
-  {
-    case ENCODE_UTF8 :
-       /*
-	* Got a UTF-8 character; convert UTF-8 to Unicode and return...
-	*/
-
-	if (!(ch & 0x80))
-	{
-#if DEBUG > 1
-          printf("mxml_fd_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-
-	  return (ch);
-        }
-	else if (ch == 0xfe)
-	{
-	 /*
-	  * UTF-16 big-endian BOM?
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  ch = *(buf->current)++;
-          
-	  if (ch != 0xff)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16BE;
-
-	  return (mxml_fd_getc(p, encoding));
-	}
-	else if (ch == 0xff)
-	{
-	 /*
-	  * UTF-16 little-endian BOM?
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  ch = *(buf->current)++;
-          
-	  if (ch != 0xfe)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16LE;
-
-	  return (mxml_fd_getc(p, encoding));
-	}
-	else if ((ch & 0xe0) == 0xc0)
-	{
-	 /*
-	  * Two-byte value...
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x1f) << 6) | (temp & 0x3f);
-
-	  if (ch < 0x80)
-	    return (EOF);
-	}
-	else if ((ch & 0xf0) == 0xe0)
-	{
-	 /*
-	  * Three-byte value...
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x0f) << 6) | (temp & 0x3f);
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x800)
-	    return (EOF);
-	}
-	else if ((ch & 0xf8) == 0xf0)
-	{
-	 /*
-	  * Four-byte value...
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x07) << 6) | (temp & 0x3f);
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x10000)
-	    return (EOF);
-	}
-	else
-	  return (EOF);
-	break;
-
-    case ENCODE_UTF16BE :
-       /*
-        * Read UTF-16 big-endian char...
-	*/
-
-	if (buf->current >= buf->end)
-	  if (mxml_fd_read(buf) < 0)
-	    return (EOF);
-
-	temp = *(buf->current)++;
-
-	ch = (ch << 8) | temp;
-
-	if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  lch = *(buf->current)++;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  lch = (lch << 8) | temp;
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-
-    case ENCODE_UTF16LE :
-       /*
-        * Read UTF-16 little-endian char...
-	*/
-
-	if (buf->current >= buf->end)
-	  if (mxml_fd_read(buf) < 0)
-	    return (EOF);
-
-	temp = *(buf->current)++;
-
-	ch |= (temp << 8);
-
-        if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  lch = *(buf->current)++;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  lch |= (temp << 8);
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-  }
-
-#if DEBUG > 1
-  printf("mxml_fd_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-  return (ch);
-}
-
-
-/*
- * 'mxml_fd_putc()' - Write a character to a file descriptor.
- */
-
-static int				/* O - 0 on success, -1 on error */
-mxml_fd_putc(int  ch,			/* I - Character */
-             void *p)			/* I - File descriptor buffer */
-{
-  mxml_fdbuf_t	*buf;			/* File descriptor buffer */
-
-
- /*
-  * Flush the write buffer as needed - note above that "end" still leaves
-  * 4 characters at the end so that we can avoid a lot of extra tests...
-  */
-
-  buf = (mxml_fdbuf_t *)p;
-
-  if (buf->current >= buf->end)
-    if (mxml_fd_write(buf) < 0)
-      return (-1);
-
-  if (ch < 0x80)
-  {
-   /*
-    * Write ASCII character directly...
-    */
-
-    *(buf->current)++ = ch;
-  }
-  else if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8 character...
-    */
-
-    *(buf->current)++ = 0xc0 | (ch >> 6);
-    *(buf->current)++ = 0x80 | (ch & 0x3f);
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8 character...
-    */
-
-    *(buf->current)++ = 0xe0 | (ch >> 12);
-    *(buf->current)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(buf->current)++ = 0x80 | (ch & 0x3f);
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8 character...
-    */
-
-    *(buf->current)++ = 0xf0 | (ch >> 18);
-    *(buf->current)++ = 0x80 | ((ch >> 12) & 0x3f);
-    *(buf->current)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(buf->current)++ = 0x80 | (ch & 0x3f);
-  }
-
- /*
-  * Return successfully...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'mxml_fd_read()' - Read a buffer of data from a file descriptor.
- */
-
-static int				/* O - 0 on success, -1 on error */
-mxml_fd_read(mxml_fdbuf_t *buf)		/* I - File descriptor buffer */
-{
-  int	bytes;				/* Bytes read... */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!buf)
-    return (-1);
-
- /*
-  * Read from the file descriptor...
-  */
-
-  while ((bytes = read(buf->fd, buf->buffer, sizeof(buf->buffer))) < 0)
-    if (errno != EAGAIN && errno != EINTR)
-      return (-1);
-
-  if (bytes == 0)
-    return (-1);
-
- /*
-  * Update the pointers and return success...
-  */
-
-  buf->current = buf->buffer;
-  buf->end     = buf->buffer + bytes;
-
-  return (0);
-}
-
-
-/*
- * 'mxml_fd_write()' - Write a buffer of data to a file descriptor.
- */
-
-static int				/* O - 0 on success, -1 on error */
-mxml_fd_write(mxml_fdbuf_t *buf)	/* I - File descriptor buffer */
-{
-  int		bytes;			/* Bytes written */
-  unsigned char	*ptr;			/* Pointer into buffer */
-
-
- /*
-  * Range check...
-  */
-
-  if (!buf)
-    return (-1);
-
- /*
-  * Return 0 if there is nothing to write...
-  */
-
-  if (buf->current == buf->buffer)
-    return (0);
-
- /*
-  * Loop until we have written everything...
-  */
-
-  for (ptr = buf->buffer; ptr < buf->current; ptr += bytes)
-    if ((bytes = write(buf->fd, ptr, buf->current - ptr)) < 0)
-      return (-1);
-
- /*
-  * All done, reset pointers and return success...
-  */
-
-  buf->current = buf->buffer;
-
-  return (0);
-}
-
-
-/*
- * 'mxml_file_getc()' - Get a character from a file.
- */
-
-static int				/* O  - Character or EOF */
-mxml_file_getc(void *p,			/* I  - Pointer to file */
-               int  *encoding)		/* IO - Encoding */
-{
-  int	ch,				/* Character from file */
-	temp;				/* Temporary character */
-  FILE	*fp;				/* Pointer to file */
-
-
- /*
-  * Read a character from the file and see if it is EOF or ASCII...
-  */
-
-  fp = (FILE *)p;
-  ch = getc(fp);
-
-  if (ch == EOF)
-    return (EOF);
-
-  switch (*encoding)
-  {
-    case ENCODE_UTF8 :
-       /*
-	* Got a UTF-8 character; convert UTF-8 to Unicode and return...
-	*/
-
-	if (!(ch & 0x80))
-	{
-	  if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-
-#if DEBUG > 1
-          printf("mxml_file_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  return (ch);
-        }
-	else if (ch == 0xfe)
-	{
-	 /*
-	  * UTF-16 big-endian BOM?
-	  */
-
-          ch = getc(fp);
-	  if (ch != 0xff)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16BE;
-
-	  return (mxml_file_getc(p, encoding));
-	}
-	else if (ch == 0xff)
-	{
-	 /*
-	  * UTF-16 little-endian BOM?
-	  */
-
-          ch = getc(fp);
-	  if (ch != 0xfe)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16LE;
-
-	  return (mxml_file_getc(p, encoding));
-	}
-	else if ((ch & 0xe0) == 0xc0)
-	{
-	 /*
-	  * Two-byte value...
-	  */
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x1f) << 6) | (temp & 0x3f);
-
-	  if (ch < 0x80)
-	    return (EOF);
-	}
-	else if ((ch & 0xf0) == 0xe0)
-	{
-	 /*
-	  * Three-byte value...
-	  */
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x0f) << 6) | (temp & 0x3f);
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x800)
-	    return (EOF);
-	}
-	else if ((ch & 0xf8) == 0xf0)
-	{
-	 /*
-	  * Four-byte value...
-	  */
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x07) << 6) | (temp & 0x3f);
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x10000)
-	    return (EOF);
-	}
-	else
-	  return (EOF);
-	break;
-
-    case ENCODE_UTF16BE :
-       /*
-        * Read UTF-16 big-endian char...
-	*/
-
-	ch = (ch << 8) | getc(fp);
-
-	if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch = (getc(fp) << 8) | getc(fp);
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-
-    case ENCODE_UTF16LE :
-       /*
-        * Read UTF-16 little-endian char...
-	*/
-
-	ch |= (getc(fp) << 8);
-
-        if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch = getc(fp) | (getc(fp) << 8);
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-  }
-
-#if DEBUG > 1
-  printf("mxml_file_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-  return (ch);
-}
-
-
-/*
- * 'mxml_file_putc()' - Write a character to a file.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_file_putc(int  ch,			/* I - Character to write */
-               void *p)			/* I - Pointer to file */
-{
-  char	buffer[4],			/* Buffer for character */
-	*bufptr;			/* Pointer into buffer */
-  int	buflen;				/* Number of bytes to write */
-
-
-  if (ch < 0x80)
-    return (putc(ch, (FILE *)p) == EOF ? -1 : 0);
-
-  bufptr = buffer;
-
-  if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8 character...
-    */
-
-    *bufptr++ = 0xc0 | (ch >> 6);
-    *bufptr++ = 0x80 | (ch & 0x3f);
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8 character...
-    */
-
-    *bufptr++ = 0xe0 | (ch >> 12);
-    *bufptr++ = 0x80 | ((ch >> 6) & 0x3f);
-    *bufptr++ = 0x80 | (ch & 0x3f);
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8 character...
-    */
-
-    *bufptr++ = 0xf0 | (ch >> 18);
-    *bufptr++ = 0x80 | ((ch >> 12) & 0x3f);
-    *bufptr++ = 0x80 | ((ch >> 6) & 0x3f);
-    *bufptr++ = 0x80 | (ch & 0x3f);
-  }
-
-  buflen = bufptr - buffer;
-
-  return (fwrite(buffer, 1, buflen, (FILE *)p) < buflen ? -1 : 0);
-}
-
-
-/*
- * 'mxml_get_entity()' - Get the character corresponding to an entity...
- */
-
-static int				/* O  - Character value or EOF on error */
-mxml_get_entity(mxml_node_t *parent,	/* I  - Parent node */
-		void        *p,		/* I  - Pointer to source */
-		int         *encoding,	/* IO - Character encoding */
-                int         (*getc_cb)(void *, int *))
-					/* I  - Get character function */
-{
-  int	ch;				/* Current character */
-  char	entity[64],			/* Entity string */
-	*entptr;			/* Pointer into entity */
-
-
-  entptr = entity;
-
-  while ((ch = (*getc_cb)(p, encoding)) != EOF)
-    if (ch > 126 || (!isalnum(ch) && ch != '#'))
-      break;
-    else if (entptr < (entity + sizeof(entity) - 1))
-      *entptr++ = ch;
-    else
-    {
-      mxml_error("Entity name too long under parent <%s>!",
-	         parent ? parent->value.element.name : "null");
-      break;
-    }
-
-  *entptr = '\0';
-
-  if (ch != ';')
-  {
-    mxml_error("Character entity \"%s\" not terminated under parent <%s>!",
-	       entity, parent ? parent->value.element.name : "null");
-    return (EOF);
-  }
-
-  if (entity[0] == '#')
-  {
-    if (entity[1] == 'x')
-      ch = strtol(entity + 2, NULL, 16);
-    else
-      ch = strtol(entity + 1, NULL, 10);
-  }
-  else if ((ch = mxmlEntityGetValue(entity)) < 0)
-    mxml_error("Entity name \"%s;\" not supported under parent <%s>!",
-	       entity, parent ? parent->value.element.name : "null");
-
-  if (mxml_bad_char(ch))
-  {
-    mxml_error("Bad control character 0x%02x under parent <%s> not allowed by XML standard!",
-               ch, parent ? parent->value.element.name : "null");
-    return (EOF);
-  }
-
-  return (ch);
-}
-
-
-/*
- * 'mxml_load_data()' - Load data into an XML node tree.
- */
-
-static mxml_node_t *			/* O - First node or NULL if the file could not be read. */
-mxml_load_data(mxml_node_t *top,	/* I - Top node */
-               void        *p,		/* I - Pointer to data */
-               mxml_type_t (*cb)(mxml_node_t *),
-					/* I - Callback function or MXML_NO_CALLBACK */
-               int         (*getc_cb)(void *, int *))
-					/* I - Read function */
-{
-  mxml_node_t	*node,			/* Current node */
-		*first,			/* First node added */
-		*parent;		/* Current parent node */
-  int		ch,			/* Character from file */
-		whitespace;		/* Non-zero if whitespace seen */
-  char		*buffer,		/* String buffer */
-		*bufptr;		/* Pointer into buffer */
-  int		bufsize;		/* Size of buffer */
-  mxml_type_t	type;			/* Current node type */
-  int		encoding;		/* Character encoding */
-  static const char * const types[] =	/* Type strings... */
-		{
-		  "MXML_ELEMENT",	/* XML element with attributes */
-		  "MXML_INTEGER",	/* Integer value */
-		  "MXML_OPAQUE",	/* Opaque string */
-		  "MXML_REAL",		/* Real value */
-		  "MXML_TEXT",		/* Text fragment */
-		  "MXML_CUSTOM"		/* Custom data */
-		};
-
-
- /*
-  * Read elements and other nodes from the file...
-  */
-
-  if ((buffer = malloc(64)) == NULL)
-  {
-    mxml_error("Unable to allocate string buffer!");
-    return (NULL);
-  }
-
-  bufsize    = 64;
-  bufptr     = buffer;
-  parent     = top;
-  first      = NULL;
-  whitespace = 0;
-  encoding   = ENCODE_UTF8;
-
-  if (cb && parent)
-    type = (*cb)(parent);
-  else
-    type = MXML_TEXT;
-
-  while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-  {
-    if ((ch == '<' ||
-         (isspace(ch) && type != MXML_OPAQUE && type != MXML_CUSTOM)) &&
-        bufptr > buffer)
-    {
-     /*
-      * Add a new value node...
-      */
-
-      *bufptr = '\0';
-
-      switch (type)
-      {
-	case MXML_INTEGER :
-            node = mxmlNewInteger(parent, strtol(buffer, &bufptr, 0));
-	    break;
-
-	case MXML_OPAQUE :
-            node = mxmlNewOpaque(parent, buffer);
-	    break;
-
-	case MXML_REAL :
-            node = mxmlNewReal(parent, strtod(buffer, &bufptr));
-	    break;
-
-	case MXML_TEXT :
-            node = mxmlNewText(parent, whitespace, buffer);
-	    break;
-
-	case MXML_CUSTOM :
-	    if (mxml_custom_load_cb)
-	    {
-	     /*
-	      * Use the callback to fill in the custom data...
-	      */
-
-              node = mxmlNewCustom(parent, NULL, NULL);
-
-	      if ((*mxml_custom_load_cb)(node, buffer))
-	      {
-	        mxml_error("Bad custom value '%s' in parent <%s>!",
-		           buffer, parent ? parent->value.element.name : "null");
-		mxmlDelete(node);
-		node = NULL;
-	      }
-	      break;
-	    }
-
-        default : /* Should never happen... */
-	    node = NULL;
-	    break;
-      }	  
-
-      if (*bufptr)
-      {
-       /*
-        * Bad integer/real number value...
-	*/
-
-        mxml_error("Bad %s value '%s' in parent <%s>!",
-	           type == MXML_INTEGER ? "integer" : "real", buffer,
-		   parent ? parent->value.element.name : "null");
-	break;
-      }
-
-      bufptr     = buffer;
-      whitespace = isspace(ch) && type == MXML_TEXT;
-
-      if (!node)
-      {
-       /*
-	* Print error and return...
-	*/
-
-	mxml_error("Unable to add value node of type %s to parent <%s>!",
-	           types[type], parent ? parent->value.element.name : "null");
-	goto error;
-      }
-
-      if (!first)
-        first = node;
-    }
-    else if (isspace(ch) && type == MXML_TEXT)
-      whitespace = 1;
-
-   /*
-    * Add lone whitespace node if we have an element and existing
-    * whitespace...
-    */
-
-    if (ch == '<' && whitespace && type == MXML_TEXT)
-    {
-      mxmlNewText(parent, whitespace, "");
-      whitespace = 0;
-    }
-
-    if (ch == '<')
-    {
-     /*
-      * Start of open/close tag...
-      */
-
-      bufptr = buffer;
-
-      while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-        if (isspace(ch) || ch == '>' || (ch == '/' && bufptr > buffer))
-	  break;
-	else if (ch == '&')
-	{
-	  if ((ch = mxml_get_entity(parent, p, &encoding, getc_cb)) == EOF)
-	    goto error;
-
-	  if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-	else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	  goto error;
-	else if (((bufptr - buffer) == 1 && buffer[0] == '?') ||
-	         ((bufptr - buffer) == 3 && !strncmp(buffer, "!--", 3)) ||
-	         ((bufptr - buffer) == 8 && !strncmp(buffer, "![CDATA[", 8)))
-	  break;
-
-      *bufptr = '\0';
-
-      if (!strcmp(buffer, "!--"))
-      {
-       /*
-        * Gather rest of comment...
-	*/
-
-	while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-	{
-	  if (ch == '>' && bufptr > (buffer + 4) &&
-	      bufptr[-3] != '-' && bufptr[-2] == '-' && bufptr[-1] == '-')
-	    break;
-	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-
-       /*
-        * Error out if we didn't get the whole comment...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in comment node!");
-	  goto error;
-	}
-
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	if (!mxmlNewElement(parent, buffer))
-	{
-	 /*
-	  * Just print error for now...
-	  */
-
-	  mxml_error("Unable to add comment node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  break;
-	}
-      }
-      else if (!strcmp(buffer, "![CDATA["))
-      {
-       /*
-        * Gather CDATA section...
-	*/
-
-	while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-	{
-	  if (ch == '>' && !strncmp(bufptr - 2, "]]", 2))
-	    break;
-	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-
-       /*
-        * Error out if we didn't get the whole comment...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in CDATA node!");
-	  goto error;
-	}
-
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	if (!mxmlNewElement(parent, buffer))
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Unable to add CDATA node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-      }
-      else if (buffer[0] == '?')
-      {
-       /*
-        * Gather rest of processing instruction...
-	*/
-
-	while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-	{
-	  if (ch == '>' && bufptr > buffer && bufptr[-1] == '?')
-	    break;
-	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-
-       /*
-        * Error out if we didn't get the whole processing instruction...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in processing instruction node!");
-	  goto error;
-	}
-
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	if (!(parent = mxmlNewElement(parent, buffer)))
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Unable to add processing instruction node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-
-	if (cb)
-	  type = (*cb)(parent);
-      }
-      else if (buffer[0] == '!')
-      {
-       /*
-        * Gather rest of declaration...
-	*/
-
-	do
-	{
-	  if (ch == '>')
-	    break;
-	  else
-	  {
-            if (ch == '&')
-	      if ((ch = mxml_get_entity(parent, p, &encoding, getc_cb)) == EOF)
-		goto error;
-
-	    if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	      goto error;
-	  }
-	}
-        while ((ch = (*getc_cb)(p, &encoding)) != EOF);
-
-       /*
-        * Error out if we didn't get the whole declaration...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in declaration node!");
-	  goto error;
-	}
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	node = mxmlNewElement(parent, buffer);
-	if (!node)
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Unable to add declaration node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-
-       /*
-	* Descend into this node, setting the value type as needed...
-	*/
-
-	parent = node;
-
-	if (cb)
-	  type = (*cb)(parent);
-      }
-      else if (buffer[0] == '/')
-      {
-       /*
-        * Handle close tag...
-	*/
-
-        if (!parent || strcmp(buffer + 1, parent->value.element.name))
-	{
-	 /*
-	  * Close tag doesn't match tree; print an error for now...
-	  */
-
-	  mxml_error("Mismatched close tag <%s> under parent <%s>!",
-	             buffer, parent->value.element.name);
-          goto error;
-	}
-
-       /*
-        * Keep reading until we see >...
-	*/
-
-        while (ch != '>' && ch != EOF)
-	  ch = (*getc_cb)(p, &encoding);
-
-       /*
-	* Ascend into the parent and set the value type as needed...
-	*/
-
-	parent = parent->parent;
-
-	if (cb && parent)
-	  type = (*cb)(parent);
-      }
-      else
-      {
-       /*
-        * Handle open tag...
-	*/
-
-        node = mxmlNewElement(parent, buffer);
-
-	if (!node)
-	{
-	 /*
-	  * Just print error for now...
-	  */
-
-	  mxml_error("Unable to add element node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-
-        if (isspace(ch))
-          ch = mxml_parse_element(node, p, &encoding, getc_cb);
-        else if (ch == '/')
-	{
-	  if ((ch = (*getc_cb)(p, &encoding)) != '>')
-	  {
-	    mxml_error("Expected > but got '%c' instead for element <%s/>!",
-	               ch, buffer);
-            goto error;
-	  }
-
-	  ch = '/';
-	}
-
-	if (ch == EOF)
-	  break;
-
-        if (ch != '/')
-	{
-	 /*
-	  * Descend into this node, setting the value type as needed...
-	  */
-
-	  parent = node;
-
-	  if (cb && parent)
-	    type = (*cb)(parent);
-	}
-      }
-
-      bufptr  = buffer;
-    }
-    else if (ch == '&')
-    {
-     /*
-      * Add character entity to current buffer...
-      */
-
-      if ((ch = mxml_get_entity(parent, p, &encoding, getc_cb)) == EOF)
-	goto error;
-
-      if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	goto error;
-    }
-    else if (type == MXML_OPAQUE || type == MXML_CUSTOM || !isspace(ch))
-    {
-     /*
-      * Add character to current buffer...
-      */
-
-      if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	goto error;
-    }
-  }
-
- /*
-  * Free the string buffer - we don't need it anymore...
-  */
-
-  free(buffer);
-
- /*
-  * Find the top element and return it...
-  */
-
-  if (parent)
-  {
-    while (parent->parent != top && parent->parent)
-      parent = parent->parent;
-  }
-
-  return (parent);
-
- /*
-  * Common error return...
-  */
-
-error:
-
-  mxmlDelete(first);
-
-  free(buffer);
-
-  return (NULL);
-}
-
-
-/*
- * 'mxml_parse_element()' - Parse an element for any attributes...
- */
-
-static int				/* O  - Terminating character */
-mxml_parse_element(mxml_node_t *node,	/* I  - Element node */
-                   void        *p,	/* I  - Data to read from */
-		   int         *encoding,
-					/* IO - Encoding */
-                   int         (*getc_cb)(void *, int *))
-					/* I  - Data callback */
-{
-  int	ch,				/* Current character in file */
-	quote;				/* Quoting character */
-  char	*name,				/* Attribute name */
-	*value,				/* Attribute value */
-	*ptr;				/* Pointer into name/value */
-  int	namesize,			/* Size of name string */
-	valsize;			/* Size of value string */
-
-
-
-
- /*
-  * Initialize the name and value buffers...
-  */
-
-  if ((name = malloc(64)) == NULL)
-  {
-    mxml_error("Unable to allocate memory for name!");
-    return (EOF);
-  }
-
-  namesize = 64;
-
-  if ((value = malloc(64)) == NULL)
-  {
-    free(name);
-    mxml_error("Unable to allocate memory for value!");
-    return (EOF);
-  }
-
-  valsize = 64;
-
- /*
-  * Loop until we hit a >, /, ?, or EOF...
-  */
-
-  while ((ch = (*getc_cb)(p, encoding)) != EOF)
-  {
-#if DEBUG > 1
-    fprintf(stderr, "parse_element: ch='%c'\n", ch);
-#endif /* DEBUG > 1 */
-
-   /*
-    * Skip leading whitespace...
-    */
-
-    if (isspace(ch))
-      continue;
-
-   /*
-    * Stop at /, ?, or >...
-    */
-
-    if (ch == '/' || ch == '?')
-    {
-     /*
-      * Grab the > character and print an error if it isn't there...
-      */
-
-      quote = (*getc_cb)(p, encoding);
-
-      if (quote != '>')
-      {
-        mxml_error("Expected '>' after '%c' for element %s, but got '%c'!",
-	           ch, node->value.element.name, quote);
-        ch = EOF;
-      }
-
-      break;
-    }
-    else if (ch == '>')
-      break;
-
-   /*
-    * Read the attribute name...
-    */
-
-    name[0] = ch;
-    ptr     = name + 1;
-
-    if (ch == '\"' || ch == '\'')
-    {
-     /*
-      * Name is in quotes, so get a quoted string...
-      */
-
-      quote = ch;
-
-      while ((ch = (*getc_cb)(p, encoding)) != EOF)
-      {
-        if (ch == '&')
-	  if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	    goto error;
-
-	if (mxml_add_char(ch, &ptr, &name, &namesize))
-	  goto error;
-
-	if (ch == quote)
-          break;
-      }
-    }
-    else
-    {
-     /*
-      * Grab an normal, non-quoted name...
-      */
-
-      while ((ch = (*getc_cb)(p, encoding)) != EOF)
-	if (isspace(ch) || ch == '=' || ch == '/' || ch == '>' || ch == '?')
-          break;
-	else
-	{
-          if (ch == '&')
-	    if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	      goto error;
-
-	  if (mxml_add_char(ch, &ptr, &name, &namesize))
-	    goto error;
-	}
-    }
-
-    *ptr = '\0';
-
-    if (mxmlElementGetAttr(node, name))
-      goto error;
-
-    if (ch == '=')
-    {
-     /*
-      * Read the attribute value...
-      */
-
-      if ((ch = (*getc_cb)(p, encoding)) == EOF)
-      {
-        mxml_error("Missing value for attribute '%s' in element %s!",
-	           name, node->value.element.name);
-        free(value);
-        return (EOF);
-      }
-
-      if (ch == '\'' || ch == '\"')
-      {
-       /*
-        * Read quoted value...
-	*/
-
-        quote = ch;
-	ptr   = value;
-
-        while ((ch = (*getc_cb)(p, encoding)) != EOF)
-	  if (ch == quote)
-	    break;
-	  else
-	  {
-	    if (ch == '&')
-	      if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	        goto error;
-	      
-	    if (mxml_add_char(ch, &ptr, &value, &valsize))
-	      goto error;
-	  }
-
-        *ptr = '\0';
-      }
-      else
-      {
-       /*
-        * Read unquoted value...
-	*/
-
-	value[0] = ch;
-	ptr      = value + 1;
-
-	while ((ch = (*getc_cb)(p, encoding)) != EOF)
-	  if (isspace(ch) || ch == '=' || ch == '/' || ch == '>')
-            break;
-	  else
-	  {
-	    if (ch == '&')
-	      if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	        goto error;
-	      
-	    if (mxml_add_char(ch, &ptr, &value, &valsize))
-	      goto error;
-	  }
-
-        *ptr = '\0';
-      }
-
-     /*
-      * Set the attribute with the given string value...
-      */
-
-      mxmlElementSetAttr(node, name, value);
-    }
-    else
-    {
-     /*
-      * Set the attribute with a NULL value...
-      */
-
-      mxmlElementSetAttr(node, name, NULL);
-    }
-
-   /*
-    * Check the end character...
-    */
-
-    if (ch == '/' || ch == '?')
-    {
-     /*
-      * Grab the > character and print an error if it isn't there...
-      */
-
-      quote = (*getc_cb)(p, encoding);
-
-      if (quote != '>')
-      {
-        mxml_error("Expected '>' after '%c' for element %s, but got '%c'!",
-	           ch, node->value.element.name, quote);
-        ch = EOF;
-      }
-
-      break;
-    }
-    else if (ch == '>')
-      break;
-  }
-
- /*
-  * Free the name and value buffers and return...
-  */
-
-  free(name);
-  free(value);
-
-  return (ch);
-
- /*
-  * Common error return point...
-  */
-
-error:
-
-  free(name);
-  free(value);
-
-  return (EOF);
-}
-
-
-/*
- * 'mxml_string_getc()' - Get a character from a string.
- */
-
-static int				/* O  - Character or EOF */
-mxml_string_getc(void *p,		/* I  - Pointer to file */
-                 int  *encoding)	/* IO - Encoding */
-{
-  int		ch;			/* Character */
-  const char	**s;			/* Pointer to string pointer */
-
-
-  s = (const char **)p;
-
-  if ((ch = (*s)[0] & 255) != 0 || *encoding == ENCODE_UTF16LE)
-  {
-   /*
-    * Got character; convert UTF-8 to integer and return...
-    */
-
-    (*s)++;
-
-    switch (*encoding)
-    {
-      case ENCODE_UTF8 :
-	  if (!(ch & 0x80))
-	  {
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    if (mxml_bad_char(ch))
-	    {
-	      mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        		 ch);
-	      return (EOF);
-	    }
-
-	    return (ch);
-          }
-	  else if (ch == 0xfe)
-	  {
-	   /*
-	    * UTF-16 big-endian BOM?
-	    */
-
-            if (((*s)[0] & 255) != 0xff)
-	      return (EOF);
-
-	    *encoding = ENCODE_UTF16BE;
-	    (*s)++;
-
-	    return (mxml_string_getc(p, encoding));
-	  }
-	  else if (ch == 0xff)
-	  {
-	   /*
-	    * UTF-16 little-endian BOM?
-	    */
-
-            if (((*s)[0] & 255) != 0xfe)
-	      return (EOF);
-
-	    *encoding = ENCODE_UTF16LE;
-	    (*s)++;
-
-	    return (mxml_string_getc(p, encoding));
-	  }
-	  else if ((ch & 0xe0) == 0xc0)
-	  {
-	   /*
-	    * Two-byte value...
-	    */
-
-	    if (((*s)[0] & 0xc0) != 0x80)
-              return (EOF);
-
-	    ch = ((ch & 0x1f) << 6) | ((*s)[0] & 0x3f);
-
-	    (*s)++;
-
-	    if (ch < 0x80)
-	      return (EOF);
-
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    return (ch);
-	  }
-	  else if ((ch & 0xf0) == 0xe0)
-	  {
-	   /*
-	    * Three-byte value...
-	    */
-
-	    if (((*s)[0] & 0xc0) != 0x80 ||
-        	((*s)[1] & 0xc0) != 0x80)
-              return (EOF);
-
-	    ch = ((((ch & 0x0f) << 6) | ((*s)[0] & 0x3f)) << 6) | ((*s)[1] & 0x3f);
-
-	    (*s) += 2;
-
-	    if (ch < 0x800)
-	      return (EOF);
-
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    return (ch);
-	  }
-	  else if ((ch & 0xf8) == 0xf0)
-	  {
-	   /*
-	    * Four-byte value...
-	    */
-
-	    if (((*s)[0] & 0xc0) != 0x80 ||
-        	((*s)[1] & 0xc0) != 0x80 ||
-        	((*s)[2] & 0xc0) != 0x80)
-              return (EOF);
-
-	    ch = ((((((ch & 0x07) << 6) | ((*s)[0] & 0x3f)) << 6) |
-        	   ((*s)[1] & 0x3f)) << 6) | ((*s)[2] & 0x3f);
-
-	    (*s) += 3;
-
-	    if (ch < 0x10000)
-	      return (EOF);
-
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    return (ch);
-	  }
-	  else
-	    return (EOF);
-
-      case ENCODE_UTF16BE :
-	 /*
-          * Read UTF-16 big-endian char...
-	  */
-
-	  ch = (ch << 8) | ((*s)[0] & 255);
-	  (*s) ++;
-
-          if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-          else if (ch >= 0xd800 && ch <= 0xdbff)
-	  {
-	   /*
-	    * Multi-word UTF-16 char...
-	    */
-
-            int lch;			/* Lower word */
-
-
-            if (!(*s)[0])
-	      return (EOF);
-
-            lch = (((*s)[0] & 255) << 8) | ((*s)[1] & 255);
-	    (*s) += 2;
-
-            if (lch < 0xdc00 || lch >= 0xdfff)
-	      return (EOF);
-
-            ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	  }
-
-#if DEBUG > 1
-          printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  return (ch);
-
-      case ENCODE_UTF16LE :
-	 /*
-          * Read UTF-16 little-endian char...
-	  */
-
-	  ch = ch | (((*s)[0] & 255) << 8);
-
-	  if (!ch)
-	  {
-	    (*s) --;
-	    return (EOF);
-	  }
-
-	  (*s) ++;
-
-          if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-          else if (ch >= 0xd800 && ch <= 0xdbff)
-	  {
-	   /*
-	    * Multi-word UTF-16 char...
-	    */
-
-            int lch;			/* Lower word */
-
-
-            if (!(*s)[1])
-	      return (EOF);
-
-            lch = (((*s)[1] & 255) << 8) | ((*s)[0] & 255);
-	    (*s) += 2;
-
-            if (lch < 0xdc00 || lch >= 0xdfff)
-	      return (EOF);
-
-            ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	  }
-
-#if DEBUG > 1
-          printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  return (ch);
-    }
-  }
-
-  return (EOF);
-}
-
-
-/*
- * 'mxml_string_putc()' - Write a character to a string.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_string_putc(int  ch,		/* I - Character to write */
-                 void *p)		/* I - Pointer to string pointers */
-{
-  char	**pp;				/* Pointer to string pointers */
-
-
-  pp = (char **)p;
-
-  if (ch < 0x80)
-  {
-   /*
-    * Plain ASCII doesn't need special encoding...
-    */
-
-    if (pp[0] < pp[1])
-      pp[0][0] = ch;
-
-    pp[0] ++;
-  }
-  else if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8 character...
-    */
-
-    if ((pp[0] + 1) < pp[1])
-    {
-      pp[0][0] = 0xc0 | (ch >> 6);
-      pp[0][1] = 0x80 | (ch & 0x3f);
-    }
-
-    pp[0] += 2;
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8 character...
-    */
-
-    if ((pp[0] + 2) < pp[1])
-    {
-      pp[0][0] = 0xe0 | (ch >> 12);
-      pp[0][1] = 0x80 | ((ch >> 6) & 0x3f);
-      pp[0][2] = 0x80 | (ch & 0x3f);
-    }
-
-    pp[0] += 3;
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8 character...
-    */
-
-    if ((pp[0] + 2) < pp[1])
-    {
-      pp[0][0] = 0xf0 | (ch >> 18);
-      pp[0][1] = 0x80 | ((ch >> 12) & 0x3f);
-      pp[0][2] = 0x80 | ((ch >> 6) & 0x3f);
-      pp[0][3] = 0x80 | (ch & 0x3f);
-    }
-
-    pp[0] += 4;
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_write_name()' - Write a name string.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_write_name(const char *s,		/* I - Name to write */
-                void       *p,		/* I - Write pointer */
-		int        (*putc_cb)(int, void *))
-					/* I - Write callback */
-{
-  char		quote;			/* Quote character */
-  const char	*name;			/* Entity name */
-
-
-  if (*s == '\"' || *s == '\'')
-  {
-   /*
-    * Write a quoted name string...
-    */
-
-    if ((*putc_cb)(*s, p) < 0)
-      return (-1);
-
-    quote = *s++;
-
-    while (*s && *s != quote)
-    {
-      if ((name = mxmlEntityGetName(*s)) != NULL)
-      {
-	if ((*putc_cb)('&', p) < 0)
-          return (-1);
-
-        while (*name)
-	{
-	  if ((*putc_cb)(*name, p) < 0)
-            return (-1);
-
-          name ++;
-	}
-
-	if ((*putc_cb)(';', p) < 0)
-          return (-1);
-      }
-      else if ((*putc_cb)(*s, p) < 0)
-	return (-1);
-
-      s ++;
-    }
-
-   /*
-    * Write the end quote...
-    */
-
-    if ((*putc_cb)(quote, p) < 0)
-      return (-1);
-  }
-  else
-  {
-   /*
-    * Write a non-quoted name string...
-    */
-
-    while (*s)
-    {
-      if ((*putc_cb)(*s, p) < 0)
-	return (-1);
-
-      s ++;
-    }
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_write_node()' - Save an XML node to a file.
- */
-
-static int				/* O - Column or -1 on error */
-mxml_write_node(mxml_node_t *node,	/* I - Node to write */
-                void        *p,		/* I - File to write to */
-	        const char  *(*cb)(mxml_node_t *, int),
-					/* I - Whitespace callback */
-		int         col,	/* I - Current column */
-		int         (*putc_cb)(int, void *))
-{
-  int		i,			/* Looping var */
-		width;			/* Width of attr + value */
-  mxml_attr_t	*attr;			/* Current attribute */
-  char		s[255];			/* Temporary string */
-
-
-  while (node != NULL)
-  {
-   /*
-    * Print the node value...
-    */
-
-    switch (node->type)
-    {
-      case MXML_ELEMENT :
-          col = mxml_write_ws(node, p, cb, MXML_WS_BEFORE_OPEN, col, putc_cb);
-
-          if ((*putc_cb)('<', p) < 0)
-	    return (-1);
-          if (node->value.element.name[0] == '?' ||
-	      !strncmp(node->value.element.name, "!--", 3) ||
-	      !strncmp(node->value.element.name, "![CDATA[", 8))
-          {
-	   /*
-	    * Comments, CDATA, and processing instructions do not
-	    * use character entities.
-	    */
-
-	    const char	*ptr;		/* Pointer into name */
-
-
-	    for (ptr = node->value.element.name; *ptr; ptr ++)
-	      if ((*putc_cb)(*ptr, p) < 0)
-	        return (-1);
-
-           /*
-	    * Prefer a newline for whitespace after ?xml...
-	    */
-
-            if (!strncmp(node->value.element.name, "?xml", 4))
-              col = MXML_WRAP;
-	  }
-	  else if (mxml_write_name(node->value.element.name, p, putc_cb) < 0)
-	    return (-1);
-
-          col += strlen(node->value.element.name) + 1;
-
-	  for (i = node->value.element.num_attrs, attr = node->value.element.attrs;
-	       i > 0;
-	       i --, attr ++)
-	  {
-	    width = strlen(attr->name);
-
-	    if (attr->value)
-	      width += strlen(attr->value) + 3;
-
-	    if ((col + width) > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else
-	    {
-	      if ((*putc_cb)(' ', p) < 0)
-	        return (-1);
-
-	      col ++;
-	    }
-
-            if (mxml_write_name(attr->name, p, putc_cb) < 0)
-	      return (-1);
-
-	    if (attr->value)
-	    {
-              if ((*putc_cb)('=', p) < 0)
-		return (-1);
-              if ((*putc_cb)('\"', p) < 0)
-		return (-1);
-	      if (mxml_write_string(attr->value, p, putc_cb) < 0)
-		return (-1);
-              if ((*putc_cb)('\"', p) < 0)
-		return (-1);
-            }
-
-            col += width;
-	  }
-
-	  if (node->child)
-	  {
-           /*
-	    * Write children...
-	    */
-
-	    if ((*putc_cb)('>', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-
-            col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_OPEN, col, putc_cb);
-
-	    if ((col = mxml_write_node(node->child, p, cb, col, putc_cb)) < 0)
-	      return (-1);
-
-           /*
-	    * The ? and ! elements are special-cases and have no end tags...
-	    */
-
-            if (node->value.element.name[0] != '!' &&
-	        node->value.element.name[0] != '?')
-	    {
-              col = mxml_write_ws(node, p, cb, MXML_WS_BEFORE_CLOSE, col, putc_cb);
-
-              if ((*putc_cb)('<', p) < 0)
-		return (-1);
-              if ((*putc_cb)('/', p) < 0)
-		return (-1);
-              if (mxml_write_string(node->value.element.name, p, putc_cb) < 0)
-		return (-1);
-              if ((*putc_cb)('>', p) < 0)
-		return (-1);
-
-              col += strlen(node->value.element.name) + 3;
-
-              col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_CLOSE, col, putc_cb);
-	    }
-	  }
-	  else if (node->value.element.name[0] == '!' ||
-	           node->value.element.name[0] == '?')
-	  {
-           /*
-	    * The ? and ! elements are special-cases...
-	    */
-
-	    if ((*putc_cb)('>', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-
-            col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_OPEN, col, putc_cb);
-          }
-	  else
-	  {
-            if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-            if ((*putc_cb)('/', p) < 0)
-	      return (-1);
-            if ((*putc_cb)('>', p) < 0)
-	      return (-1);
-
-	    col += 3;
-
-            col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_OPEN, col, putc_cb);
-	  }
-          break;
-
-      case MXML_INTEGER :
-	  if (node->prev)
-	  {
-	    if (col > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-          }
-
-          sprintf(s, "%d", node->value.integer);
-	  if (mxml_write_string(s, p, putc_cb) < 0)
-	    return (-1);
-
-	  col += strlen(s);
-          break;
-
-      case MXML_OPAQUE :
-          if (mxml_write_string(node->value.opaque, p, putc_cb) < 0)
-	    return (-1);
-
-          col += strlen(node->value.opaque);
-          break;
-
-      case MXML_REAL :
-	  if (node->prev)
-	  {
-	    if (col > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-          }
-
-          sprintf(s, "%f", node->value.real);
-	  if (mxml_write_string(s, p, putc_cb) < 0)
-	    return (-1);
-
-	  col += strlen(s);
-          break;
-
-      case MXML_TEXT :
-	  if (node->value.text.whitespace && col > 0)
-	  {
-	    if (col > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-          }
-
-          if (mxml_write_string(node->value.text.string, p, putc_cb) < 0)
-	    return (-1);
-
-	  col += strlen(node->value.text.string);
-          break;
-
-      case MXML_CUSTOM :
-          if (mxml_custom_save_cb)
-	  {
-	    char	*data;		/* Custom data string */
-	    const char	*newline;	/* Last newline in string */
-
-
-            if ((data = (*mxml_custom_save_cb)(node)) == NULL)
-	      return (-1);
-
-            if (mxml_write_string(data, p, putc_cb) < 0)
-	      return (-1);
-
-            if ((newline = strrchr(data, '\n')) == NULL)
-	      col += strlen(data);
-	    else
-              col = strlen(newline);
-
-            free(data);
-	    break;
-	  }
-
-      default : /* Should never happen */
-          return (-1);
-    }
-
-   /*
-    * Next node...
-    */
-
-    node = node->next;
-  }
-
-  return (col);
-}
-
-
-/*
- * 'mxml_write_string()' - Write a string, escaping & and < as needed.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_write_string(const char *s,	/* I - String to write */
-                  void       *p,	/* I - Write pointer */
-		  int        (*putc_cb)(int, void *))
-					/* I - Write callback */
-{
-  const char	*name;			/* Entity name, if any */
-
-
-  while (*s)
-  {
-    if ((name = mxmlEntityGetName(*s)) != NULL)
-    {
-      if ((*putc_cb)('&', p) < 0)
-        return (-1);
-
-      while (*name)
-      {
-	if ((*putc_cb)(*name, p) < 0)
-          return (-1);
-        name ++;
-      }
-
-      if ((*putc_cb)(';', p) < 0)
-        return (-1);
-    }
-    else if ((*putc_cb)(*s, p) < 0)
-      return (-1);
-
-    s ++;
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_write_ws()' - Do whitespace callback...
- */
-
-static int				/* O - New column */
-mxml_write_ws(mxml_node_t *node,	/* I - Current node */
-              void        *p,		/* I - Write pointer */
-              const char  *(*cb)(mxml_node_t *, int),
-					/* I - Callback function */
-	      int         ws,		/* I - Where value */
-	      int         col,		/* I - Current column */
-              int         (*putc_cb)(int, void *))
-					/* I - Write callback */
-{
-  const char	*s;			/* Whitespace string */
-
-
-  if (cb && (s = (*cb)(node, ws)) != NULL)
-  {
-    while (*s)
-    {
-      if ((*putc_cb)(*s, p) < 0)
-	return (-1);
-      else if (*s == '\n')
-	col = 0;
-      else if (*s == '\t')
-      {
-	col += MXML_TAB;
-	col = col - (col % MXML_TAB);
-      }
-      else
-	col ++;
-
-      s ++;
-    }
-  }
-
-  return (col);
-}
-
-
-/*
- * End of "$Id: mxml-file.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-index.c b/menuselect/mxml/mxml-index.c
deleted file mode 100644
index aebb3d8..0000000
--- a/menuselect/mxml/mxml-index.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * "$Id: mxml-index.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Index support code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlIndexDelete()   - Delete an index.
- *   mxmlIndexEnum()     - Return the next node in the index.
- *   mxmlIndexFind()     - Find the next matching node.
- *   mxmlIndexNew()      - Create a new index.
- *   mxmlIndexReset()    - Reset the enumeration/find pointer in the index and
- *                         return the first node in the index.
- *   index_compare()     - Compare two nodes.
- *   index_find()        - Compare a node with index values.
- *   index_sort()        - Sort the nodes in the index...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Sort functions...
- */
-
-static int	index_compare(mxml_index_t *ind, mxml_node_t *first,
-		              mxml_node_t *second);
-static int	index_find(mxml_index_t *ind, const char *element,
-		           const char *value, mxml_node_t *node);
-static void	index_sort(mxml_index_t *ind, int left, int right);
-
-
-/*
- * 'mxmlIndexDelete()' - Delete an index.
- */
-
-void
-mxmlIndexDelete(mxml_index_t *ind)	/* I - Index to delete */
-{
- /*
-  * Range check input..
-  */
-
-  if (!ind)
-    return;
-
- /*
-  * Free memory...
-  */
-
-  if (ind->attr)
-    free(ind->attr);
-
-  if (ind->alloc_nodes)
-    free(ind->nodes);
-
-  free(ind);
-}
-
-
-/*
- * 'mxmlIndexEnum()' - Return the next node in the index.
- *
- * Nodes are returned in the sorted order of the index.
- */
-
-mxml_node_t *				/* O - Next node or NULL if there is none */
-mxmlIndexEnum(mxml_index_t *ind)	/* I - Index to enumerate */
-{
- /*
-  * Range check input...
-  */
-
-  if (!ind)
-    return (NULL);
-
- /*
-  * Return the next node...
-  */
-
-  if (ind->cur_node < ind->num_nodes)
-    return (ind->nodes[ind->cur_node ++]);
-  else
-    return (NULL);
-}
-
-
-/*
- * 'mxmlIndexFind()' - Find the next matching node.
- *
- * You should call mxmlIndexReset() prior to using this function for
- * the first time with a particular set of "element" and "value"
- * strings. Passing NULL for both "element" and "value" is equivalent
- * to calling mxmlIndexEnum().
- */
-
-mxml_node_t *				/* O - Node or NULL if none found */
-mxmlIndexFind(mxml_index_t *ind,	/* I - Index to search */
-              const char   *element,	/* I - Element name to find, if any */
-	      const char   *value)	/* I - Attribute value, if any */
-{
-  int		diff,			/* Difference between names */
-		current,		/* Current entity in search */
-		first,			/* First entity in search */
-		last;			/* Last entity in search */
-
-
-#ifdef DEBUG
-  printf("mxmlIndexFind(ind=%p, element=\"%s\", value=\"%s\")\n",
-         ind, element ? element : "(null)", value ? value : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!ind || (!ind->attr && value))
-  {
-#ifdef DEBUG
-    puts("    returning NULL...");
-    printf("    ind->attr=\"%s\"\n", ind->attr ? ind->attr : "(null)");
-#endif /* DEBUG */
-
-    return (NULL);
-  }
-
- /*
-  * If both element and value are NULL, just enumerate the nodes in the
-  * index...
-  */
-
-  if (!element && !value)
-    return (mxmlIndexEnum(ind));
-
- /*
-  * If there are no nodes in the index, return NULL...
-  */
-
-  if (!ind->num_nodes)
-  {
-#ifdef DEBUG
-    puts("    returning NULL...");
-    puts("    no nodes!");
-#endif /* DEBUG */
-
-    return (NULL);
-  }
-
- /*
-  * If cur_node == 0, then find the first matching node...
-  */
-
-  if (ind->cur_node == 0)
-  {
-   /*
-    * Find the first node using a modified binary search algorithm...
-    */
-
-    first = 0;
-    last  = ind->num_nodes - 1;
-
-#ifdef DEBUG
-    printf("    find first time, num_nodes=%d...\n", ind->num_nodes);
-#endif /* DEBUG */
-
-    while ((last - first) > 1)
-    {
-      current = (first + last) / 2;
-
-#ifdef DEBUG
-      printf("    first=%d, last=%d, current=%d\n", first, last, current);
-#endif /* DEBUG */
-
-      if ((diff = index_find(ind, element, value, ind->nodes[current])) == 0)
-      {
-       /*
-        * Found a match, move back to find the first...
-	*/
-
-#ifdef DEBUG
-        puts("    match!");
-#endif /* DEBUG */
-
-        while (current > 0 &&
-	       !index_find(ind, element, value, ind->nodes[current - 1]))
-	  current --;
-
-#ifdef DEBUG
-        printf("    returning first match=%d\n", current);
-#endif /* DEBUG */
-
-       /*
-        * Return the first match and save the index to the next...
-	*/
-
-        ind->cur_node = current + 1;
-
-	return (ind->nodes[current]);
-      }
-      else if (diff < 0)
-	last = current;
-      else
-	first = current;
-
-#ifdef DEBUG
-      printf("    diff=%d\n", diff);
-#endif /* DEBUG */
-    }
-
-   /*
-    * If we get this far, then we found exactly 0 or 1 matches...
-    */
-
-    for (current = first; current <= last; current ++)
-      if (!index_find(ind, element, value, ind->nodes[current]))
-      {
-       /*
-	* Found exactly one (or possibly two) match...
-	*/
-
-#ifdef DEBUG
-	printf("    returning only match %d...\n", current);
-#endif /* DEBUG */
-
-	ind->cur_node = current + 1;
-
-	return (ind->nodes[current]);
-      }
-
-   /*
-    * No matches...
-    */
-
-    ind->cur_node = ind->num_nodes;
-
-#ifdef DEBUG
-    puts("    returning NULL...");
-#endif /* DEBUG */
-
-    return (NULL);
-  }
-  else if (ind->cur_node < ind->num_nodes &&
-           !index_find(ind, element, value, ind->nodes[ind->cur_node]))
-  {
-   /*
-    * Return the next matching node...
-    */
-
-#ifdef DEBUG
-    printf("    returning next match %d...\n", ind->cur_node);
-#endif /* DEBUG */
-
-    return (ind->nodes[ind->cur_node ++]);
-  }
-
- /*
-  * If we get this far, then we have no matches...
-  */
-
-  ind->cur_node = ind->num_nodes;
-
-#ifdef DEBUG
-  puts("    returning NULL...");
-#endif /* DEBUG */
-
-  return (NULL);
-}
-
-
-/*
- * 'mxmlIndexNew()' - Create a new index.
- *
- * The index will contain all nodes that contain the named element and/or
- * attribute. If both "element" and "attr" are NULL, then the index will
- * contain a sorted list of the elements in the node tree.  Nodes are
- * sorted by element name and optionally by attribute value if the "attr"
- * argument is not NULL.
- */
-
-mxml_index_t *				/* O - New index */
-mxmlIndexNew(mxml_node_t *node,		/* I - XML node tree */
-             const char  *element,	/* I - Element to index or NULL for all */
-             const char  *attr)		/* I - Attribute to index or NULL for none */
-{
-  mxml_index_t	*ind;			/* New index */
-  mxml_node_t	*current,		/* Current node in index */
-  		**temp;			/* Temporary node pointer array */
-
-
- /*
-  * Range check input...
-  */
-
-#ifdef DEBUG
-  printf("mxmlIndexNew(node=%p, element=\"%s\", attr=\"%s\")\n",
-         node, element ? element : "(null)", attr ? attr : "(null)");
-#endif /* DEBUG */
-
-  if (!node)
-    return (NULL);
-
- /*
-  * Create a new index...
-  */
-
-  if ((ind = calloc(1, sizeof(mxml_index_t))) == NULL)
-  {
-    mxml_error("Unable to allocate %d bytes for index - %s",
-               sizeof(mxml_index_t), strerror(errno));
-    return (NULL);
-  }
-
-  if (attr)
-    ind->attr = strdup(attr);
-
-  if (!element && !attr)
-    current = node;
-  else
-    current = mxmlFindElement(node, node, element, attr, NULL, MXML_DESCEND);
-
-  while (current)
-  {
-    if (ind->num_nodes >= ind->alloc_nodes)
-    {
-      if (!ind->alloc_nodes)
-        temp = malloc(64 * sizeof(mxml_node_t *));
-      else
-        temp = realloc(ind->nodes, (ind->alloc_nodes + 64) * sizeof(mxml_node_t *));
-
-      if (!temp)
-      {
-       /*
-        * Unable to allocate memory for the index, so abort...
-	*/
-
-        mxml_error("Unable to allocate %d bytes for index: %s",
-	           (ind->alloc_nodes + 64) * sizeof(mxml_node_t *),
-		   strerror(errno));
-
-        mxmlIndexDelete(ind);
-	return (NULL);
-      }
-
-      ind->nodes       = temp;
-      ind->alloc_nodes += 64;
-    }
-
-    ind->nodes[ind->num_nodes ++] = current;
-
-    current = mxmlFindElement(current, node, element, attr, NULL, MXML_DESCEND);
-  }
-
- /*
-  * Sort nodes based upon the search criteria...
-  */
-
-#ifdef DEBUG
-  {
-    int i;				/* Looping var */
-
-
-    printf("%d node(s) in index.\n\n", ind->num_nodes);
-
-    if (attr)
-    {
-      printf("Node      Address   Element         %s\n", attr);
-      puts("--------  --------  --------------  ------------------------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %-14.14s  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name,
-	       mxmlElementGetAttr(ind->nodes[i], attr));
-    }
-    else
-    {
-      puts("Node      Address   Element");
-      puts("--------  --------  --------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name);
-    }
-
-    putchar('\n');
-  }
-#endif /* DEBUG */
-
-  if (ind->num_nodes > 1)
-    index_sort(ind, 0, ind->num_nodes - 1);
-
-#ifdef DEBUG
-  {
-    int i;				/* Looping var */
-
-
-    puts("After sorting:\n");
-
-    if (attr)
-    {
-      printf("Node      Address   Element         %s\n", attr);
-      puts("--------  --------  --------------  ------------------------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %-14.14s  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name,
-	       mxmlElementGetAttr(ind->nodes[i], attr));
-    }
-    else
-    {
-      puts("Node      Address   Element");
-      puts("--------  --------  --------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name);
-    }
-
-    putchar('\n');
-  }
-#endif /* DEBUG */
-
- /*
-  * Return the new index...
-  */
-
-  return (ind);
-}
-
-
-/*
- * 'mxmlIndexReset()' - Reset the enumeration/find pointer in the index and
- *                      return the first node in the index.
- *
- * This function should be called prior to using mxmlIndexEnum() or
- * mxmlIndexFind() for the first time.
- */
-
-mxml_node_t *				/* O - First node or NULL if there is none */
-mxmlIndexReset(mxml_index_t *ind)	/* I - Index to reset */
-{
-#ifdef DEBUG
-  printf("mxmlIndexReset(ind=%p)\n", ind);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!ind)
-    return (NULL);
-
- /*
-  * Set the index to the first element...
-  */
-
-  ind->cur_node = 0;
-
- /*
-  * Return the first node...
-  */
-
-  if (ind->num_nodes)
-    return (ind->nodes[0]);
-  else
-    return (NULL);
-}
-
-
-/*
- * 'index_compare()' - Compare two nodes.
- */
-
-static int				/* O - Result of comparison */
-index_compare(mxml_index_t *ind,	/* I - Index */
-              mxml_node_t  *first,	/* I - First node */
-              mxml_node_t  *second)	/* I - Second node */
-{
-  int	diff;				/* Difference */
-
-
- /*
-  * Check the element name...
-  */
-
-  if ((diff = strcmp(first->value.element.name,
-                     second->value.element.name)) != 0)
-    return (diff);
-
- /*
-  * Check the attribute value...
-  */
-
-  if (ind->attr)
-  {
-    if ((diff = strcmp(mxmlElementGetAttr(first, ind->attr),
-                       mxmlElementGetAttr(second, ind->attr))) != 0)
-      return (diff);
-  }
-
- /*
-  * No difference, return 0...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'index_find()' - Compare a node with index values.
- */
-
-static int				/* O - Result of comparison */
-index_find(mxml_index_t *ind,		/* I - Index */
-           const char   *element,	/* I - Element name or NULL */
-	   const char   *value,		/* I - Attribute value or NULL */
-           mxml_node_t  *node)		/* I - Node */
-{
-  int	diff;				/* Difference */
-
-
- /*
-  * Check the element name...
-  */
-
-  if (element)
-  {
-    if ((diff = strcmp(element, node->value.element.name)) != 0)
-      return (diff);
-  }
-
- /*
-  * Check the attribute value...
-  */
-
-  if (value)
-  {
-    if ((diff = strcmp(value, mxmlElementGetAttr(node, ind->attr))) != 0)
-      return (diff);
-  }
-
- /*
-  * No difference, return 0...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'index_sort()' - Sort the nodes in the index...
- *
- * This function implements the classic quicksort algorithm...
- */
-
-static void
-index_sort(mxml_index_t *ind,		/* I - Index to sort */
-           int          left,		/* I - Left node in partition */
-	   int          right)		/* I - Right node in partition */
-{
-  mxml_node_t	*pivot,			/* Pivot node */
-		*temp;			/* Swap node */
-  int		templ,			/* Temporary left node */
-		tempr;			/* Temporary right node */
-
-
- /*
-  * Loop until we have sorted all the way to the right...
-  */
-
-  do
-  {
-   /*
-    * Sort the pivot in the current partition...
-    */
-
-    pivot = ind->nodes[left];
-
-    for (templ = left, tempr = right; templ < tempr;)
-    {
-     /*
-      * Move left while left node <= pivot node...
-      */
-
-      while ((templ < right) &&
-             index_compare(ind, ind->nodes[templ], pivot) <= 0)
-	templ ++;
-
-     /*
-      * Move right while right node > pivot node...
-      */
-
-      while ((tempr > left) &&
-             index_compare(ind, ind->nodes[tempr], pivot) > 0)
-	tempr --;
-
-     /*
-      * Swap nodes if needed...
-      */
-
-      if (templ < tempr)
-      {
-	temp              = ind->nodes[templ];
-	ind->nodes[templ] = ind->nodes[tempr];
-	ind->nodes[tempr] = temp;
-      }
-    }
-
-   /*
-    * When we get here, the right (tempr) node is the new position for the
-    * pivot node...
-    */
-
-    if (index_compare(ind, pivot, ind->nodes[tempr]) > 0)
-    {
-      ind->nodes[left]  = ind->nodes[tempr];
-      ind->nodes[tempr] = pivot;
-    }
-
-   /*
-    * Recursively sort the left partition as needed...
-    */
-
-    if (left < (tempr - 1))
-      index_sort(ind, left, tempr - 1);
-  }
-  while (right > (left = tempr + 1));
-}
-
-
-/*
- * End of "$Id: mxml-index.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-node.c b/menuselect/mxml/mxml-node.c
deleted file mode 100644
index f4ab421..0000000
--- a/menuselect/mxml/mxml-node.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * "$Id: mxml-node.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Node support code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlAdd()        - Add a node to a tree.
- *   mxmlDelete()     - Delete a node and all of its children.
- *   mxmlNewElement() - Create a new element node.
- *   mxmlNewInteger() - Create a new integer node.
- *   mxmlNewOpaque()  - Create a new opaque string.
- *   mxmlNewReal()    - Create a new real number node.
- *   mxmlNewText()    - Create a new text fragment node.
- *   mxmlNewTextf()   - Create a new formatted text fragment node.
- *   mxmlRemove()     - Remove a node from its parent.
- *   mxml_new()       - Create a new node.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Local functions...
- */
-
-static mxml_node_t	*mxml_new(mxml_node_t *parent, mxml_type_t type);
-
-
-/*
- * 'mxmlAdd()' - Add a node to a tree.
- *
- * Adds the specified node to the parent. If the child argument is not
- * NULL, puts the new node before or after the specified child depending
- * on the value of the where argument. If the child argument is NULL,
- * puts the new node at the beginning of the child list (MXML_ADD_BEFORE)
- * or at the end of the child list (MXML_ADD_AFTER). The constant
- * MXML_ADD_TO_PARENT can be used to specify a NULL child pointer.
- */
-
-void
-mxmlAdd(mxml_node_t *parent,		/* I - Parent node */
-        int         where,		/* I - Where to add, MXML_ADD_BEFORE or MXML_ADD_AFTER */
-        mxml_node_t *child,		/* I - Child node for where or MXML_ADD_TO_PARENT */
-	mxml_node_t *node)		/* I - Node to add */
-{
-#ifdef DEBUG
-  fprintf(stderr, "mxmlAdd(parent=%p, where=%d, child=%p, node=%p)\n", parent,
-          where, child, node);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!parent || !node)
-    return;
-
-#if DEBUG > 1
-  fprintf(stderr, "    BEFORE: node->parent=%p\n", node->parent);
-  if (parent)
-  {
-    fprintf(stderr, "    BEFORE: parent->child=%p\n", parent->child);
-    fprintf(stderr, "    BEFORE: parent->last_child=%p\n", parent->last_child);
-    fprintf(stderr, "    BEFORE: parent->prev=%p\n", parent->prev);
-    fprintf(stderr, "    BEFORE: parent->next=%p\n", parent->next);
-  }
-#endif /* DEBUG > 1 */
-
- /*
-  * Remove the node from any existing parent...
-  */
-
-  if (node->parent)
-    mxmlRemove(node);
-
- /*
-  * Reset pointers...
-  */
-
-  node->parent = parent;
-
-  switch (where)
-  {
-    case MXML_ADD_BEFORE :
-        if (!child || child == parent->child || child->parent != parent)
-	{
-	 /*
-	  * Insert as first node under parent...
-	  */
-
-	  node->next = parent->child;
-
-	  if (parent->child)
-	    parent->child->prev = node;
-	  else
-	    parent->last_child = node;
-
-	  parent->child = node;
-	}
-	else
-	{
-	 /*
-	  * Insert node before this child...
-	  */
-
-	  node->next = child;
-	  node->prev = child->prev;
-
-	  if (child->prev)
-	    child->prev->next = node;
-	  else
-	    parent->child = node;
-
-	  child->prev = node;
-	}
-        break;
-
-    case MXML_ADD_AFTER :
-        if (!child || child == parent->last_child || child->parent != parent)
-	{
-	 /*
-	  * Insert as last node under parent...
-	  */
-
-	  node->parent = parent;
-	  node->prev   = parent->last_child;
-
-	  if (parent->last_child)
-	    parent->last_child->next = node;
-	  else
-	    parent->child = node;
-
-	  parent->last_child = node;
-        }
-	else
-	{
-	 /*
-	  * Insert node after this child...
-	  */
-
-	  node->prev = child;
-	  node->next = child->next;
-
-	  if (child->next)
-	    child->next->prev = node;
-	  else
-	    parent->last_child = node;
-
-	  child->next = node;
-	}
-        break;
-  }
-
-#if DEBUG > 1
-  fprintf(stderr, "    AFTER: node->parent=%p\n", node->parent);
-  if (parent)
-  {
-    fprintf(stderr, "    AFTER: parent->child=%p\n", parent->child);
-    fprintf(stderr, "    AFTER: parent->last_child=%p\n", parent->last_child);
-    fprintf(stderr, "    AFTER: parent->prev=%p\n", parent->prev);
-    fprintf(stderr, "    AFTER: parent->next=%p\n", parent->next);
-  }
-#endif /* DEBUG > 1 */
-}
-
-
-/*
- * 'mxmlDelete()' - Delete a node and all of its children.
- *
- * If the specified node has a parent, this function first removes the
- * node from its parent using the mxmlRemove() function.
- */
-
-void
-mxmlDelete(mxml_node_t *node)		/* I - Node to delete */
-{
-  int	i;				/* Looping var */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlDelete(node=%p)\n", node);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node)
-    return;
-
- /*
-  * Remove the node from its parent, if any...
-  */
-
-  mxmlRemove(node);
-
- /*
-  * Delete children...
-  */
-
-  while (node->child)
-    mxmlDelete(node->child);
-
- /*
-  * Now delete any node data...
-  */
-
-  switch (node->type)
-  {
-    case MXML_ELEMENT :
-        if (node->value.element.name)
-	  free(node->value.element.name);
-
-	if (node->value.element.num_attrs)
-	{
-	  for (i = 0; i < node->value.element.num_attrs; i ++)
-	  {
-	    if (node->value.element.attrs[i].name)
-	      free(node->value.element.attrs[i].name);
-	    if (node->value.element.attrs[i].value)
-	      free(node->value.element.attrs[i].value);
-	  }
-
-          free(node->value.element.attrs);
-	}
-        break;
-    case MXML_INTEGER :
-       /* Nothing to do */
-        break;
-    case MXML_OPAQUE :
-        if (node->value.opaque)
-	  free(node->value.opaque);
-        break;
-    case MXML_REAL :
-       /* Nothing to do */
-        break;
-    case MXML_TEXT :
-        if (node->value.text.string)
-	  free(node->value.text.string);
-        break;
-    case MXML_CUSTOM :
-        if (node->value.custom.data &&
-	    node->value.custom.destroy)
-	  (*(node->value.custom.destroy))(node->value.custom.data);
-	break;
-  }
-
- /*
-  * Free this node...
-  */
-
-  free(node);
-}
-
-
-/*
- * 'mxmlNewCustom()' - Create a new custom data node.
- *
- * The new custom node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * element node has no parent. NULL can be passed when the data in the
- * node is not dynamically allocated or is separately managed.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewCustom(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-              void        *data,	/* I - Pointer to data */
-	      void        (*destroy)(void *))
-					/* I - Function to destroy data */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewCustom(parent=%p, data=%p, destroy=%p)\n", parent,
-          data, destroy);
-#endif /* DEBUG */
-
- /*
-  * Create the node and set the value...
-  */
-
-  if ((node = mxml_new(parent, MXML_CUSTOM)) != NULL)
-  {
-    node->value.custom.data    = data;
-    node->value.custom.destroy = destroy;
-  }
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewElement()' - Create a new element node.
- *
- * The new element node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * element node has no parent.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewElement(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-               const char  *name)	/* I - Name of element */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewElement(parent=%p, name=\"%s\")\n", parent,
-          name ? name : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!name)
-    return (NULL);
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_ELEMENT)) != NULL)
-    node->value.element.name = strdup(name);
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewInteger()' - Create a new integer node.
- *
- * The new integer node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * integer node has no parent.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewInteger(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-               int         integer)	/* I - Integer value */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewInteger(parent=%p, integer=%d)\n", parent, integer);
-#endif /* DEBUG */
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_INTEGER)) != NULL)
-    node->value.integer = integer;
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewOpaque()' - Create a new opaque string.
- *
- * The new opaque node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * opaque node has no parent. The opaque string must be nul-terminated and
- * is copied into the new node.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewOpaque(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-              const char  *opaque)	/* I - Opaque string */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewOpaque(parent=%p, opaque=\"%s\")\n", parent,
-          opaque ? opaque : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!opaque)
-    return (NULL);
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_OPAQUE)) != NULL)
-    node->value.opaque = strdup(opaque);
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewReal()' - Create a new real number node.
- *
- * The new real number node is added to the end of the specified parent's
- * child list. The constant MXML_NO_PARENT can be used to specify that
- * the new real number node has no parent.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewReal(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-            double      real)		/* I - Real number value */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewReal(parent=%p, real=%g)\n", parent, real);
-#endif /* DEBUG */
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_REAL)) != NULL)
-    node->value.real = real;
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewText()' - Create a new text fragment node.
- *
- * The new text node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * text node has no parent. The whitespace parameter is used to specify
- * whether leading whitespace is present before the node. The text
- * string must be nul-terminated and is copied into the new node.  
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewText(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-            int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-	    const char  *string)	/* I - String */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewText(parent=%p, whitespace=%d, string=\"%s\")\n",
-          parent, whitespace, string ? string : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!string)
-    return (NULL);
-
- /*
-  * Create the node and set the text value...
-  */
-
-  if ((node = mxml_new(parent, MXML_TEXT)) != NULL)
-  {
-    node->value.text.whitespace = whitespace;
-    node->value.text.string     = strdup(string);
-  }
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewTextf()' - Create a new formatted text fragment node.
- *
- * The new text node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * text node has no parent. The whitespace parameter is used to specify
- * whether leading whitespace is present before the node. The format
- * string must be nul-terminated and is formatted into the new node.  
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewTextf(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-             int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-	     const char  *format,	/* I - Printf-style frmat string */
-	     ...)			/* I - Additional args as needed */
-{
-  mxml_node_t	*node;			/* New node */
-  va_list	ap;			/* Pointer to arguments */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewTextf(parent=%p, whitespace=%d, format=\"%s\", ...)\n",
-          parent, whitespace, format ? format : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!format)
-    return (NULL);
-
- /*
-  * Create the node and set the text value...
-  */
-
-  if ((node = mxml_new(parent, MXML_TEXT)) != NULL)
-  {
-    va_start(ap, format);
-
-    node->value.text.whitespace = whitespace;
-    node->value.text.string     = mxml_strdupf(format, ap);
-
-    va_end(ap);
-  }
-
-  return (node);
-}
-
-
-/*
- * 'mxmlRemove()' - Remove a node from its parent.
- *
- * Does not free memory used by the node - use mxmlDelete() for that.
- * This function does nothing if the node has no parent.
- */
-
-void
-mxmlRemove(mxml_node_t *node)		/* I - Node to remove */
-{
-#ifdef DEBUG
-  fprintf(stderr, "mxmlRemove(node=%p)\n", node);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node || !node->parent)
-    return;
-
- /*
-  * Remove from parent...
-  */
-
-#if DEBUG > 1
-  fprintf(stderr, "    BEFORE: node->parent=%p\n", node->parent);
-  if (node->parent)
-  {
-    fprintf(stderr, "    BEFORE: node->parent->child=%p\n", node->parent->child);
-    fprintf(stderr, "    BEFORE: node->parent->last_child=%p\n", node->parent->last_child);
-  }
-  fprintf(stderr, "    BEFORE: node->child=%p\n", node->child);
-  fprintf(stderr, "    BEFORE: node->last_child=%p\n", node->last_child);
-  fprintf(stderr, "    BEFORE: node->prev=%p\n", node->prev);
-  fprintf(stderr, "    BEFORE: node->next=%p\n", node->next);
-#endif /* DEBUG > 1 */
-
-  if (node->prev)
-    node->prev->next = node->next;
-  else
-    node->parent->child = node->next;
-
-  if (node->next)
-    node->next->prev = node->prev;
-  else
-    node->parent->last_child = node->prev;
-
-  node->parent = NULL;
-  node->prev   = NULL;
-  node->next   = NULL;
-
-#if DEBUG > 1
-  fprintf(stderr, "    AFTER: node->parent=%p\n", node->parent);
-  if (node->parent)
-  {
-    fprintf(stderr, "    AFTER: node->parent->child=%p\n", node->parent->child);
-    fprintf(stderr, "    AFTER: node->parent->last_child=%p\n", node->parent->last_child);
-  }
-  fprintf(stderr, "    AFTER: node->child=%p\n", node->child);
-  fprintf(stderr, "    AFTER: node->last_child=%p\n", node->last_child);
-  fprintf(stderr, "    AFTER: node->prev=%p\n", node->prev);
-  fprintf(stderr, "    AFTER: node->next=%p\n", node->next);
-#endif /* DEBUG > 1 */
-}
-
-
-/*
- * 'mxml_new()' - Create a new node.
- */
-
-static mxml_node_t *			/* O - New node */
-mxml_new(mxml_node_t *parent,		/* I - Parent node */
-         mxml_type_t type)		/* I - Node type */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#if DEBUG > 1
-  fprintf(stderr, "mxml_new(parent=%p, type=%d)\n", parent, type);
-#endif /* DEBUG > 1 */
-
- /*
-  * Allocate memory for the node...
-  */
-
-  if ((node = calloc(1, sizeof(mxml_node_t))) == NULL)
-  {
-#if DEBUG > 1
-    fputs("    returning NULL\n", stderr);
-#endif /* DEBUG > 1 */
-
-    return (NULL);
-  }
-
-#if DEBUG > 1
-  fprintf(stderr, "    returning %p\n", node);
-#endif /* DEBUG > 1 */
-
- /*
-  * Set the node type...
-  */
-
-  node->type = type;
-
- /*
-  * Add to the parent if present...
-  */
-
-  if (parent)
-    mxmlAdd(parent, MXML_ADD_AFTER, MXML_ADD_TO_PARENT, node);
-
- /*
-  * Return the new node...
-  */
-
-  return (node);
-}
-
-
-/*
- * End of "$Id: mxml-node.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-private.c b/menuselect/mxml/mxml-private.c
deleted file mode 100644
index 6d84013..0000000
--- a/menuselect/mxml/mxml-private.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * "$Id: mxml-private.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Private functions for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxml_error()      - Display an error message.
- *   mxml_integer_cb() - Default callback for integer values.
- *   mxml_opaque_cb()  - Default callback for opaque values.
- *   mxml_real_cb()    - Default callback for real number values.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Error callback function...
- */
-
-void	(*mxml_error_cb)(const char *) = NULL;
-
-
-/*
- * 'mxml_error()' - Display an error message.
- */
-
-void
-mxml_error(const char *format,		/* I - Printf-style format string */
-           ...)				/* I - Additional arguments as needed */
-{
-  va_list	ap;			/* Pointer to arguments */
-  char		*s;			/* Message string */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!format)
-    return;
-
- /*
-  * Format the error message string...
-  */
-
-  va_start(ap, format);
-
-  s = mxml_strdupf(format, ap);
-
-  va_end(ap);
-
- /*
-  * And then display the error message...
-  */
-
-  if (mxml_error_cb)
-    (*mxml_error_cb)(s);
-  else
-    fprintf(stderr, "mxml: %s\n", s);
-
- /*
-  * Free the string...
-  */
-
-  free(s);
-}
-
-
-/*
- * 'mxml_integer_cb()' - Default callback for integer values.
- */
-
-mxml_type_t				/* O - Node type */
-mxml_integer_cb(mxml_node_t *node)	/* I - Current node */
-{
-  (void)node;
-
-  return (MXML_INTEGER);
-}
-
-
-/*
- * 'mxml_opaque_cb()' - Default callback for opaque values.
- */
-
-mxml_type_t				/* O - Node type */
-mxml_opaque_cb(mxml_node_t *node)	/* I - Current node */
-{
-  (void)node;
-
-  return (MXML_OPAQUE);
-}
-
-
-/*
- * 'mxml_real_cb()' - Default callback for real number values.
- */
-
-mxml_type_t				/* O - Node type */
-mxml_real_cb(mxml_node_t *node)		/* I - Current node */
-{
-  (void)node;
-
-  return (MXML_REAL);
-}
-
-
-/*
- * End of "$Id: mxml-private.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-search.c b/menuselect/mxml/mxml-search.c
deleted file mode 100644
index cb4c086..0000000
--- a/menuselect/mxml/mxml-search.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * "$Id: mxml-search.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Search/navigation functions for Mini-XML, a small XML-like file
- * parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlFindElement() - Find the named element.
- *   mxmlWalkNext()    - Walk to the next logical node in the tree.
- *   mxmlWalkPrev()    - Walk to the previous logical node in the tree.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * 'mxmlFindElement()' - Find the named element.
- *
- * The search is constrained by the name, attribute name, and value; any
- * NULL names or values are treated as wildcards, so different kinds of
- * searches can be implemented by looking for all elements of a given name
- * or all elements with a specific attribute. The descend argument determines
- * whether the search descends into child nodes; normally you will use
- * MXML_DESCEND_FIRST for the initial search and MXML_NO_DESCEND to find
- * additional direct descendents of the node. The top node argument
- * constrains the search to a particular node's children.
- */
-
-mxml_node_t *				/* O - Element node or NULL */
-mxmlFindElement(mxml_node_t *node,	/* I - Current node */
-                mxml_node_t *top,	/* I - Top node */
-                const char  *name,	/* I - Element name or NULL for any */
-		const char  *attr,	/* I - Attribute name, or NULL for none */
-		const char  *value,	/* I - Attribute value, or NULL for any */
-		int         descend)	/* I - Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST */
-{
-  const char	*temp;			/* Current attribute value */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!node || !top || (!attr && value))
-    return (NULL);
-
- /*
-  * Start with the next node...
-  */
-
-  node = mxmlWalkNext(node, top, descend);
-
- /*
-  * Loop until we find a matching element...
-  */
-
-  while (node != NULL)
-  {
-   /*
-    * See if this node matches...
-    */
-
-    if (node->type == MXML_ELEMENT &&
-        node->value.element.name &&
-	(!name || !strcmp(node->value.element.name, name)))
-    {
-     /*
-      * See if we need to check for an attribute...
-      */
-
-      if (!attr)
-        return (node);			/* No attribute search, return it... */
-
-     /*
-      * Check for the attribute...
-      */
-
-      if ((temp = mxmlElementGetAttr(node, attr)) != NULL)
-      {
-       /*
-        * OK, we have the attribute, does it match?
-	*/
-
-	if (!value || !strcmp(value, temp))
-	  return (node);		/* Yes, return it... */
-      }
-    }
-
-   /*
-    * No match, move on to the next node...
-    */
-
-    if (descend == MXML_DESCEND)
-      node = mxmlWalkNext(node, top, MXML_DESCEND);
-    else
-      node = node->next;
-  }
-
-  return (NULL);
-}
-
-
-/*
- * 'mxmlWalkNext()' - Walk to the next logical node in the tree.
- *
- * The descend argument controls whether the first child is considered
- * to be the next node. The top node argument constrains the walk to
- * the node's children.
- */
-
-mxml_node_t *				/* O - Next node or NULL */
-mxmlWalkNext(mxml_node_t *node,		/* I - Current node */
-             mxml_node_t *top,		/* I - Top node */
-             int         descend)	/* I - Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST */
-{
-  if (!node)
-    return (NULL);
-  else if (node->child && descend)
-    return (node->child);
-  else if (node->next)
-    return (node->next);
-  else if (node->parent && node->parent != top)
-  {
-    node = node->parent;
-
-    while (!node->next)
-      if (node->parent == top || !node->parent)
-        return (NULL);
-      else
-        node = node->parent;
-
-    return (node->next);
-  }
-  else
-    return (NULL);
-}
-
-
-/*
- * 'mxmlWalkPrev()' - Walk to the previous logical node in the tree.
- *
- * The descend argument controls whether the previous node's last child
- * is considered to be the previous node. The top node argument constrains
- * the walk to the node's children.
- */
-
-mxml_node_t *				/* O - Previous node or NULL */
-mxmlWalkPrev(mxml_node_t *node,		/* I - Current node */
-             mxml_node_t *top,		/* I - Top node */
-             int         descend)	/* I - Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST */
-{
-  if (!node)
-    return (NULL);
-  else if (node->prev)
-  {
-    if (node->prev->last_child && descend)
-    {
-     /*
-      * Find the last child under the previous node...
-      */
-
-      node = node->prev->last_child;
-
-      while (node->last_child)
-        node = node->last_child;
-
-      return (node);
-    }
-    else
-      return (node->prev);
-  }
-  else if (node->parent != top)
-    return (node->parent);
-  else
-    return (NULL);
-}
-
-
-/*
- * End of "$Id: mxml-search.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-set.c b/menuselect/mxml/mxml-set.c
deleted file mode 100644
index ae18952..0000000
--- a/menuselect/mxml/mxml-set.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * "$Id: mxml-set.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Node set functions for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlSetElement() - Set the name of an element node.
- *   mxmlSetInteger() - Set the value of an integer node.
- *   mxmlSetOpaque()  - Set the value of an opaque node.
- *   mxmlSetReal()    - Set the value of a real number node.
- *   mxmlSetText()    - Set the value of a text node.
- *   mxmlSetTextf()   - Set the value of a text node to a formatted string.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * 'mxmlSetCustom()' - Set the data and destructor of a custom data node.
- *
- * The node is not changed if it is not a custom node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetCustom(mxml_node_t *node,	/* I - Node to set */
-              void        *data,	/* I - New data pointer */
-	      void        (*destroy)(void *))
-					/* I - New destructor function */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_CUSTOM)
-    return (-1);
-
- /*
-  * Free any old element value and set the new value...
-  */
-
-  if (node->value.custom.data && node->value.custom.destroy)
-    (*(node->value.custom.destroy))(node->value.custom.data);
-
-  node->value.custom.data    = data;
-  node->value.custom.destroy = destroy;
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetElement()' - Set the name of an element node.
- *
- * The node is not changed if it is not an element node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetElement(mxml_node_t *node,	/* I - Node to set */
-               const char  *name)	/* I - New name string */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_ELEMENT || !name)
-    return (-1);
-
- /*
-  * Free any old element value and set the new value...
-  */
-
-  if (node->value.element.name)
-    free(node->value.element.name);
-
-  node->value.element.name = strdup(name);
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetInteger()' - Set the value of an integer node.
- *
- * The node is not changed if it is not an integer node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetInteger(mxml_node_t *node,	/* I - Node to set */
-               int         integer)	/* I - Integer value */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_INTEGER)
-    return (-1);
-
- /*
-  * Set the new value and return...
-  */
-
-  node->value.integer = integer;
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetOpaque()' - Set the value of an opaque node.
- *
- * The node is not changed if it is not an opaque node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetOpaque(mxml_node_t *node,	/* I - Node to set */
-              const char  *opaque)	/* I - Opaque string */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_OPAQUE || !opaque)
-    return (-1);
-
- /*
-  * Free any old opaque value and set the new value...
-  */
-
-  if (node->value.opaque)
-    free(node->value.opaque);
-
-  node->value.opaque = strdup(opaque);
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetReal()' - Set the value of a real number node.
- *
- * The node is not changed if it is not a real number node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetReal(mxml_node_t *node,		/* I - Node to set */
-            double      real)		/* I - Real number value */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_REAL)
-    return (-1);
-
- /*
-  * Set the new value and return...
-  */
-
-  node->value.real = real;
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetText()' - Set the value of a text node.
- *
- * The node is not changed if it is not a text node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetText(mxml_node_t *node,		/* I - Node to set */
-            int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-	    const char  *string)	/* I - String */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_TEXT || !string)
-    return (-1);
-
- /*
-  * Free any old string value and set the new value...
-  */
-
-  if (node->value.text.string)
-    free(node->value.text.string);
-
-  node->value.text.whitespace = whitespace;
-  node->value.text.string     = strdup(string);
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetTextf()' - Set the value of a text node to a formatted string.
- *
- * The node is not changed if it is not a text node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetTextf(mxml_node_t *node,		/* I - Node to set */
-             int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-             const char  *format,	/* I - Printf-style format string */
-	     ...)			/* I - Additional arguments as needed */
-{
-  va_list	ap;			/* Pointer to arguments */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_TEXT || !format)
-    return (-1);
-
- /*
-  * Free any old string value and set the new value...
-  */
-
-  if (node->value.text.string)
-    free(node->value.text.string);
-
-  va_start(ap, format);
-
-  node->value.text.whitespace = whitespace;
-  node->value.text.string     = mxml_strdupf(format, ap);
-
-  va_end(ap);
-
-  return (0);
-}
-
-
-/*
- * End of "$Id: mxml-set.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml-string.c b/menuselect/mxml/mxml-string.c
deleted file mode 100644
index 5c03201..0000000
--- a/menuselect/mxml/mxml-string.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * "$Id: mxml-string.c 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * String functions for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxml_strdup()    - Duplicate a string.
- *   mxml_strdupf()   - Format and duplicate a string.
- *   mxml_vsnprintf() - Format a string into a fixed size buffer.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-
-
-/*
- * 'mxml_strdup()' - Duplicate a string.
- */
-
-#ifndef HAVE_STRDUP
-char 	*				/* O - New string pointer */
-mxml_strdup(const char *s)		/* I - String to duplicate */
-{
-  char	*t;				/* New string pointer */
-
-
-  if (s == NULL)
-    return (NULL);
-
-  if ((t = malloc(strlen(s) + 1)) == NULL)
-    return (NULL);
-
-  return (strcpy(t, s));
-}
-#endif /* !HAVE_STRDUP */
-
-
-/*
- * 'mxml_strdupf()' - Format and duplicate a string.
- */
-
-char *					/* O - New string pointer */
-mxml_strdupf(const char *format,	/* I - Printf-style format string */
-             va_list    ap)		/* I - Pointer to additional arguments */
-{
-  int	bytes;				/* Number of bytes required */
-  char	*buffer,			/* String buffer */
-	temp[256];			/* Small buffer for first vsnprintf */
-
-
- /*
-  * First format with a tiny buffer; this will tell us how many bytes are
-  * needed...
-  */
-
-  bytes = vsnprintf(temp, sizeof(temp), format, ap);
-
-  if (bytes < sizeof(temp))
-  {
-   /*
-    * Hey, the formatted string fits in the tiny buffer, so just dup that...
-    */
-
-    return (strdup(temp));
-  }
-
- /*
-  * Allocate memory for the whole thing and reformat to the new, larger
-  * buffer...
-  */
-
-  if ((buffer = calloc(1, bytes + 1)) != NULL)
-    vsnprintf(buffer, bytes + 1, format, ap);
-
- /*
-  * Return the new string...
-  */
-
-  return (buffer);
-}
-
-
-#ifndef HAVE_VSNPRINTF
-/*
- * 'mxml_vsnprintf()' - Format a string into a fixed size buffer.
- */
-
-int					/* O - Number of bytes formatted */
-mxml_vsnprintf(char       *buffer,	/* O - Output buffer */
-               size_t     bufsize,	/* O - Size of output buffer */
-	       const char *format,	/* I - Printf-style format string */
-	       va_list    ap)		/* I - Pointer to additional arguments */
-{
-  char		*bufptr,		/* Pointer to position in buffer */
-		*bufend,		/* Pointer to end of buffer */
-		sign,			/* Sign of format width */
-		size,			/* Size character (h, l, L) */
-		type;			/* Format type character */
-  const char	*bufformat;		/* Start of format */
-  int		width,			/* Width of field */
-		prec;			/* Number of characters of precision */
-  char		tformat[100],		/* Temporary format string for sprintf() */
-		temp[1024];		/* Buffer for formatted numbers */
-  char		*s;			/* Pointer to string */
-  int		slen;			/* Length of string */
-  int		bytes;			/* Total number of bytes needed */
-
-
- /*
-  * Loop through the format string, formatting as needed...
-  */
-
-  bufptr = buffer;
-  bufend = buffer + bufsize - 1;
-  bytes  = 0;
-
-  while (*format)
-  {
-    if (*format == '%')
-    {
-      bufformat = format;
-      format ++;
-
-      if (*format == '%')
-      {
-        *bufptr++ = *format++;
-	continue;
-      }
-      else if (strchr(" -+#\'", *format))
-        sign = *format++;
-      else
-        sign = 0;
-
-      width = 0;
-      while (isdigit(*format))
-        width = width * 10 + *format++ - '0';
-
-      if (*format == '.')
-      {
-        format ++;
-	prec = 0;
-
-	while (isdigit(*format))
-          prec = prec * 10 + *format++ - '0';
-      }
-      else
-        prec = -1;
-
-      if (*format == 'l' && format[1] == 'l')
-      {
-        size = 'L';
-	format += 2;
-      }
-      else if (*format == 'h' || *format == 'l' || *format == 'L')
-        size = *format++;
-
-      if (!*format)
-        break;
-
-      type = *format++;
-
-      switch (type)
-      {
-	case 'E' : /* Floating point formats */
-	case 'G' :
-	case 'e' :
-	case 'f' :
-	case 'g' :
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, double));
-
-            bytes += strlen(temp);
-
-            if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-
-        case 'B' : /* Integer formats */
-	case 'X' :
-	case 'b' :
-        case 'd' :
-	case 'i' :
-	case 'o' :
-	case 'u' :
-	case 'x' :
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, int));
-
-            bytes += strlen(temp);
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-	    
-	case 'p' : /* Pointer value */
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, void *));
-
-            bytes += strlen(temp);
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-
-        case 'c' : /* Character or character array */
-	    bytes += width;
-
-	    if (bufptr)
-	    {
-	      if (width <= 1)
-		*bufptr++ = va_arg(ap, int);
-	      else
-	      {
-		if ((bufptr + width) > bufend)
-	          width = bufend - bufptr;
-
-		memcpy(bufptr, va_arg(ap, char *), width);
-		bufptr += width;
-	      }
-	    }
-	    break;
-
-	case 's' : /* String */
-	    if ((s = va_arg(ap, char *)) == NULL)
-	      s = "(null)";
-
-	    slen = strlen(s);
-	    if (slen > width && prec != width)
-	      width = slen;
-
-            bytes += width;
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + width) > bufend)
-		width = bufend - bufptr;
-
-              if (slen > width)
-		slen = width;
-
-	      if (sign == '-')
-	      {
-		strncpy(bufptr, s, slen);
-		memset(bufptr + slen, ' ', width - slen);
-	      }
-	      else
-	      {
-		memset(bufptr, ' ', width - slen);
-		strncpy(bufptr + width - slen, s, slen);
-	      }
-
-	      bufptr += width;
-	    }
-	    break;
-
-	case 'n' : /* Output number of chars so far */
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, int));
-
-            bytes += strlen(temp);
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-      }
-    }
-    else
-    {
-      bytes ++;
-
-      if (bufptr && bufptr < bufend)
-	*bufptr++ = *format++;
-    }
-  }
-
- /*
-  * Nul-terminate the string and return the number of characters needed.
-  */
-
-  *bufptr = '\0';
-
-  return (bytes);
-}
-#endif /* !HAVE_VSNPRINTF */
-
-
-/*
- * End of "$Id: mxml-string.c 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml.h b/menuselect/mxml/mxml.h
deleted file mode 100644
index 8d14f88..0000000
--- a/menuselect/mxml/mxml.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * "$Id: mxml.h 22267 2006-04-24 17:11:45Z kpfleming $"
- *
- * Header file for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-/*
- * Prevent multiple inclusion...
- */
-
-#ifndef _mxml_h_
-#  define _mxml_h_
-
-/*
- * Include necessary headers...
- */
-
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <string.h>
-#  include <ctype.h>
-#  include <errno.h>
-
-
-/*
- * Constants...
- */
-
-#  define MXML_WRAP		72	/* Wrap XML output at this column position */
-#  define MXML_TAB		8	/* Tabs every N columns */
-
-#  define MXML_NO_CALLBACK	0	/* Don't use a type callback */
-#  define MXML_INTEGER_CALLBACK	mxml_integer_cb
-					/* Treat all data as integers */
-#  define MXML_OPAQUE_CALLBACK	mxml_opaque_cb
-					/* Treat all data as opaque */
-#  define MXML_REAL_CALLBACK	mxml_real_cb
-					/* Treat all data as real numbers */
-#  define MXML_TEXT_CALLBACK	0	/* Treat all data as text */
-
-#  define MXML_NO_PARENT	0	/* No parent for the node */
-
-#  define MXML_DESCEND		1	/* Descend when finding/walking */
-#  define MXML_NO_DESCEND	0	/* Don't descend when finding/walking */
-#  define MXML_DESCEND_FIRST	-1	/* Descend for first find */
-
-#  define MXML_WS_BEFORE_OPEN	0	/* Callback for before open tag */
-#  define MXML_WS_AFTER_OPEN	1	/* Callback for after open tag */
-#  define MXML_WS_BEFORE_CLOSE	2	/* Callback for before close tag */
-#  define MXML_WS_AFTER_CLOSE	3	/* Callback for after close tag */
-
-#  define MXML_ADD_BEFORE	0	/* Add node before specified node */
-#  define MXML_ADD_AFTER	1	/* Add node after specified node */
-#  define MXML_ADD_TO_PARENT	NULL	/* Add node relative to parent */
-
-
-/*
- * Data types...
- */
-
-typedef enum mxml_type_e		/**** The XML node type. ****/
-{
-  MXML_ELEMENT,				/* XML element with attributes */
-  MXML_INTEGER,				/* Integer value */
-  MXML_OPAQUE,				/* Opaque string */
-  MXML_REAL,				/* Real value */
-  MXML_TEXT,				/* Text fragment */
-  MXML_CUSTOM				/* Custom data */
-} mxml_type_t;
-
-typedef struct mxml_attr_s		/**** An XML element attribute value. ****/
-{
-  char			*name;		/* Attribute name */
-  char			*value;		/* Attribute value */
-} mxml_attr_t;
-
-typedef struct mxml_value_s		/**** An XML element value. ****/
-{
-  char			*name;		/* Name of element */
-  int			num_attrs;	/* Number of attributes */
-  mxml_attr_t		*attrs;		/* Attributes */
-} mxml_element_t;
-
-typedef struct mxml_text_s		/**** An XML text value. ****/
-{
-  int			whitespace;	/* Leading whitespace? */
-  char			*string;	/* Fragment string */
-} mxml_text_t;
-
-typedef struct mxml_custom_s		/**** An XML custom value. ****/
-{
-  void			*data;		/* Pointer to (allocated) custom data */
-  void			(*destroy)(void *);
-					/* Pointer to destructor function */
-} mxml_custom_t;
-
-typedef union mxml_value_u		/**** An XML node value. ****/
-{
-  mxml_element_t	element;	/* Element */
-  int			integer;	/* Integer number */
-  char			*opaque;	/* Opaque string */
-  double		real;		/* Real number */
-  mxml_text_t		text;		/* Text fragment */
-  mxml_custom_t		custom;		/* Custom data */
-} mxml_value_t;
-
-typedef struct mxml_node_s		/**** An XML node. ****/
-{
-  mxml_type_t		type;		/* Node type */
-  struct mxml_node_s	*next;		/* Next node under same parent */
-  struct mxml_node_s	*prev;		/* Previous node under same parent */
-  struct mxml_node_s	*parent;	/* Parent node */
-  struct mxml_node_s	*child;		/* First child node */
-  struct mxml_node_s	*last_child;	/* Last child node */
-  mxml_value_t		value;		/* Node value */
-} mxml_node_t;
-
-typedef struct mxml_index_s		/**** An XML node index. ****/
-{
-  char			*attr;		/* Attribute used for indexing or NULL */
-  int			num_nodes;	/* Number of nodes in index */
-  int			alloc_nodes;	/* Allocated nodes in index */
-  int			cur_node;	/* Current node */
-  mxml_node_t		**nodes;	/* Node array */
-} mxml_index_t;
-
-typedef int (*mxml_custom_load_cb_t)(mxml_node_t *, const char *);
-					/**** Custom data load callback function ****/
-
-typedef char *(*mxml_custom_save_cb_t)(mxml_node_t *);  
-					/**** Custom data save callback function ****/
-
-
-/*
- * C++ support...
- */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif /* __cplusplus */
-
-/*
- * Prototypes...
- */
-
-extern void		mxmlAdd(mxml_node_t *parent, int where,
-			        mxml_node_t *child, mxml_node_t *node);
-extern void		mxmlDelete(mxml_node_t *node);
-extern const char	*mxmlElementGetAttr(mxml_node_t *node, const char *name);
-extern void		mxmlElementSetAttr(mxml_node_t *node, const char *name,
-			                   const char *value);
-extern int		mxmlEntityAddCallback(int (*cb)(const char *name));
-extern const char	*mxmlEntityGetName(int val);
-extern int		mxmlEntityGetValue(const char *name);
-extern void		mxmlEntityRemoveCallback(int (*cb)(const char *name));
-extern mxml_node_t	*mxmlFindElement(mxml_node_t *node, mxml_node_t *top,
-			                 const char *name, const char *attr,
-					 const char *value, int descend);
-extern void		mxmlIndexDelete(mxml_index_t *ind);
-extern mxml_node_t	*mxmlIndexEnum(mxml_index_t *ind);
-extern mxml_node_t	*mxmlIndexFind(mxml_index_t *ind,
-			               const char *element,
-			               const char *value);
-extern mxml_index_t	*mxmlIndexNew(mxml_node_t *node, const char *element,
-			              const char *attr);
-extern mxml_node_t	*mxmlIndexReset(mxml_index_t *ind);
-extern mxml_node_t	*mxmlLoadFd(mxml_node_t *top, int fd,
-			            mxml_type_t (*cb)(mxml_node_t *));
-extern mxml_node_t	*mxmlLoadFile(mxml_node_t *top, FILE *fp,
-			              mxml_type_t (*cb)(mxml_node_t *));
-extern mxml_node_t	*mxmlLoadString(mxml_node_t *top, const char *s,
-			                mxml_type_t (*cb)(mxml_node_t *));
-extern mxml_node_t	*mxmlNewCustom(mxml_node_t *parent, void *data,
-			               void (*destroy)(void *));
-extern mxml_node_t	*mxmlNewElement(mxml_node_t *parent, const char *name);
-extern mxml_node_t	*mxmlNewInteger(mxml_node_t *parent, int integer);
-extern mxml_node_t	*mxmlNewOpaque(mxml_node_t *parent, const char *opaque);
-extern mxml_node_t	*mxmlNewReal(mxml_node_t *parent, double real);
-extern mxml_node_t	*mxmlNewText(mxml_node_t *parent, int whitespace,
-			             const char *string);
-extern mxml_node_t	*mxmlNewTextf(mxml_node_t *parent, int whitespace,
-			              const char *format, ...)
-#    ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 3, 4)))
-#    endif /* __GNUC__ */
-;
-extern void		mxmlRemove(mxml_node_t *node);
-extern char		*mxmlSaveAllocString(mxml_node_t *node,
-			        	     const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSaveFd(mxml_node_t *node, int fd,
-			           const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSaveFile(mxml_node_t *node, FILE *fp,
-			             const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSaveString(mxml_node_t *node, char *buffer,
-			               int bufsize,
-			               const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSetCustom(mxml_node_t *node, void *data,
-			              void (*destroy)(void *));
-extern void		mxmlSetCustomHandlers(mxml_custom_load_cb_t load,
-			                      mxml_custom_save_cb_t save);
-extern int		mxmlSetElement(mxml_node_t *node, const char *name);
-extern void		mxmlSetErrorCallback(void (*cb)(const char *));
-extern int		mxmlSetInteger(mxml_node_t *node, int integer);
-extern int		mxmlSetOpaque(mxml_node_t *node, const char *opaque);
-extern int		mxmlSetReal(mxml_node_t *node, double real);
-extern int		mxmlSetText(mxml_node_t *node, int whitespace,
-			            const char *string);
-extern int		mxmlSetTextf(mxml_node_t *node, int whitespace,
-			             const char *format, ...)
-#    ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 3, 4)))
-#    endif /* __GNUC__ */
-;
-extern mxml_node_t	*mxmlWalkNext(mxml_node_t *node, mxml_node_t *top,
-			              int descend);
-extern mxml_node_t	*mxmlWalkPrev(mxml_node_t *node, mxml_node_t *top,
-			              int descend);
-
-
-/*
- * Private functions...
- */
-
-extern void		mxml_error(const char *format, ...);
-extern mxml_type_t	mxml_integer_cb(mxml_node_t *node);
-extern mxml_type_t	mxml_opaque_cb(mxml_node_t *node);
-extern mxml_type_t	mxml_real_cb(mxml_node_t *node);
-
-
-/*
- * C++ support...
- */
-
-#  ifdef __cplusplus
-}
-#  endif /* __cplusplus */
-#endif /* !_mxml_h_ */
-
-
-/*
- * End of "$Id: mxml.h 22267 2006-04-24 17:11:45Z kpfleming $".
- */
diff --git a/menuselect/mxml/mxml.list.in b/menuselect/mxml/mxml.list.in
deleted file mode 100644
index 2e166e7..0000000
--- a/menuselect/mxml/mxml.list.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# "$Id: mxml.list.in 22267 2006-04-24 17:11:45Z kpfleming $"
-#
-# EPM software list file for Mini-XML, a small XML library.
-#
-# Copyright 2003-2005 by Michael Sweet.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-# Directories...
-$prefix=@prefix@
-$exec_prefix=@exec_prefix@
-$bindir=@bindir@
-$docdir=@docdir@
-$includedir=@includedir@
-$libdir=@libdir@
-$mandir=@mandir@
-$srcdir=@srcdir@
-$datarootdir=@datarootdir@
-
-$PICFLAG=@PICFLAG@
-
-# Product information
-%product mxml
-%copyright 2003-2005 by Michael Sweet
-%vendor Michael Sweet
-%license ${srcdir}/COPYING
-%readme ${srcdir}/README
-%version @VERSION@
-
-%description <<EOF
-Mini-XML is a small XML parsing library that you can use to read
-XML and XML-like data files in your application without
-requiring large non-standard libraries.  Mini-XML provides the
-following functionality:
-
-    - Reading of UTF-8 and UTF-16 and writing of UTF-8 encoded
-      XML files and strings.
-    - Data is stored in a linked-list tree structure, preserving
-      the XML data hierarchy.
-    - Supports arbitrary element names, attributes, and
-      attribute values with no preset limits, just available
-      memory.
-    - Supports integer, real, opaque ("cdata"), and text data
-      types in "leaf" nodes.
-    - Functions for creating and managing trees of data.
-    - "Find" and "walk" functions for easily locating and
-      navigating trees of data.
-
-Mini-XML doesn't do validation or other types of processing on
-the data based upon schema files or other sources of definition
-information, nor does it support character entities other than
-those required by the XML specification.
-EOF
-
-# Manpage extensions...
-$CAT1EXT=@CAT1EXT@
-$CAT3EXT=@CAT3EXT@
-$MAN1EXT=@MAN1EXT@
-$MAN3EXT=@MAN3EXT@
-
-# Executables
-f 0555 root sys ${bindir}/mxmldoc mxmldoc
-
-# Header files
-f 0444 root sys ${includedir}/mxml.h mxml.h
-
-# Libraries
-%if $PICFLAG
-%system hpux
-f 0555 root sys ${libdir}/libmxml.sl.1 libmxml.sl.1
-l 0555 root sys ${libdir}/libmxml.sl libmxml.sl.1
-
-%system dylib
-f 0555 root sys ${libdir}/libmxml.1.dylib libmxml.1.dylib
-l 0555 root sys ${libdir}/libmxml.dylib libmxml.1.dylib
-
-%system freebsd irix linux netbsd openbsd solaris tru64
-f 0555 root sys ${libdir}/libmxml.so.1.0 libmxml.so.1.0
-l 0555 root sys ${libdir}/libmxml.sl.1 libmxml.sl.1.0
-l 0555 root sys ${libdir}/libmxml.sl libmxml.sl.1.0
-
-%system all
-%endif
-
-f 0444 root sys ${libdir}/libmxml.a libmxml.a
-
-# pkg-config info
-f 0444 root sys $(libdir)/pkgconfig/mxml.pc mxml.pc
-
-# Documentation
-f 0444 root sys ${docdir}/README $srcdir/README
-f 0444 root sys ${docdir}/COPYING $srcdir/COPYING
-f 0444 root sys ${docdir}/CHANGES $srcdir/CHANGES
-f 0444 root sys ${docdir}/mxml.html $srcdir/doc/mxml.html
-f 0444 root sys ${docdir}/mxml.pdf $srcdir/doc/mxml.pdf
-
-# Man pages
-f 0444 root sys ${mandir}/cat1/mxmldoc.$CAT1EXT $srcdir/mxmldoc.$CAT1EXT
-f 0444 root sys ${mandir}/man1/mxmldoc.$MAN1EXT $srcdir/mxmldoc.man
-f 0444 root sys ${mandir}/cat3/mxml.$CAT3EXT $srcdir/mxml.$CAT3EXT
-f 0444 root sys ${mandir}/man3/mxml.$MAN3EXT $srcdir/mxml.man
-
-#
-# End of "$Id: mxml.list.in 22267 2006-04-24 17:11:45Z kpfleming $".
-#
diff --git a/menuselect/mxml/mxml.pc.in b/menuselect/mxml/mxml.pc.in
deleted file mode 100644
index 81f3bf5..0000000
--- a/menuselect/mxml/mxml.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Mini-XML
-Description: Lightweight XML support library
-Version: @VERSION@
-Libs: @PC_LIBS@
-Cflags: @PC_CFLAGS@
diff --git a/menuselect/strcompat.c b/menuselect/strcompat.c
deleted file mode 100644
index 81ce083..0000000
--- a/menuselect/strcompat.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2006, Digium, Inc.
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*! \file
- *
- * \brief Compatibility functions for strsep and strtoq missing on Solaris 
- */
-
-#include "autoconfig.h"
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#ifndef HAVE_STRSEP
-char *strsep(char **str, const char *delims)
-{
-    char *token;
-
-    if (!*str) {
-        /* No more tokens */
-        return NULL;
-    }
-
-    token = *str;
-    while (**str != '\0') {
-        if (strchr(delims, **str)) {
-            **str = '\0';
-            (*str)++;
-            return token;
-        }
-        (*str)++;
-    }
-
-    /* There is no other token */
-    *str = NULL;
-
-    return token;
-}
-#endif
-
-#ifndef HAVE_SETENV
-int setenv(const char *name, const char *value, int overwrite)
-{
-	unsigned char *buf;
-	int buflen;
-
-	buflen = strlen(name) + strlen(value) + 2;
-	buf = alloca(buflen);
-
-	if (!overwrite && getenv(name))
-		return 0;
-
-	snprintf(buf, buflen, "%s=%s", name, value);
-
-	return putenv(buf);
-}
-#endif
-
-#ifndef HAVE_UNSETENV
-int unsetenv(const char *name)
-{
-	return setenv(name, "", 0);
-}
-#endif
-
-#ifndef HAVE_STRCASESTR
-static char *upper(const char *orig, char *buf, int bufsize)
-{
-	int i = 0;
-
-	while (i < (bufsize - 1) && orig[i]) {
-		buf[i] = toupper(orig[i]);
-		i++;
-	}
-
-	buf[i] = '\0';
-
-	return buf;
-}
-
-char *strcasestr(const char *haystack, const char *needle)
-{
-	char *u1, *u2;
-	int u1len = strlen(haystack) + 1, u2len = strlen(needle) + 1;
-
-	u1 = alloca(u1len);
-	u2 = alloca(u2len);
-	if (u1 && u2) {
-		char *offset;
-		if (u2len > u1len) {
-			/* Needle bigger than haystack */
-			return NULL;
-		}
-		offset = strstr(upper(haystack, u1, u1len), upper(needle, u2, u2len));
-		if (offset) {
-			/* Return the offset into the original string */
-			return ((char *)((unsigned long)haystack + (unsigned long)(offset - u1)));
-		} else {
-			return NULL;
-		}
-	} else {
-		return NULL;
-	}
-}
-#endif /* !HAVE_STRCASESTR */
-
-#ifndef HAVE_STRNLEN
-size_t strnlen(const char *s, size_t n)
-{
-	size_t len;
-
-	for (len = 0; len < n; len++)
-		if (s[len] == '\0')
-			break;
-
-	return len;
-}
-#endif /* !HAVE_STRNLEN */
-
-#if !defined(HAVE_STRNDUP) && !defined(__AST_DEBUG_MALLOC)
-char *strndup(const char *s, size_t n)
-{
-	size_t len = strnlen(s, n);
-	char *new = malloc(len + 1);
-
-	if (!new)
-		return NULL;
-
-	new[len] = '\0';
-	return memcpy(new, s, len);
-}
-#endif /* !defined(HAVE_STRNDUP) && !defined(__AST_DEBUG_MALLOC) */
-
-#if !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC)
-int vasprintf(char **strp, const char *fmt, va_list ap)
-{
-	int size;
-	va_list ap2;
-	char s;
-
-	*strp = NULL;
-	va_copy(ap2, ap);
-	size = vsnprintf(&s, 1, fmt, ap2);
-	va_end(ap2);
-	*strp = malloc(size + 1);
-	if (!*strp)
-		return -1;
-	vsnprintf(*strp, size + 1, fmt, ap);
-
-	return size;
-}
-#endif /* !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC) */
-
-/*
- * Based on Code from bsd-asprintf from OpenSSH
- * Copyright (c) 2004 Darren Tucker.
- *
- * Based originally on asprintf.c from OpenBSD:
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller at courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#if !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC) 
-int asprintf(char **str, const char *fmt, ...)
-{
-        va_list ap;
-        int ret;
-
-        *str = NULL;
-        va_start(ap, fmt);
-        ret = vasprintf(str, fmt, ap);
-        va_end(ap);
-
-        return ret;
-}
-#endif /* !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC) */
-
-#ifndef HAVE_GETLOADAVG
-#ifdef linux
-/*! \brief Alternative method of getting load avg on Linux only */
-int getloadavg(double *list, int nelem)
-{
-	FILE *LOADAVG;
-	double avg[3] = { 0.0, 0.0, 0.0 };
-	int i, res = -1;
-
-	if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
-		fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
-		res = 0;
-		fclose(LOADAVG);
-	}
-
-	for (i = 0; (i < nelem) && (i < 3); i++) {
-		list[i] = avg[i];
-	}
-
-	return res;
-}
-#else /* !linux */
-/*! \brief Return something that won't cancel the call, but still return -1, in case
- * we correct the implementation to check return value */
-int getloadavg(double *list, int nelem)
-{
-	int i;
-
-	for (i = 0; i < nelem; i++) {
-		list[i] = 0.1;
-	}
-	return -1;
-}
-#endif /* linux */
-#endif /* !HAVE_GETLOADAVG */
diff --git a/menuselect/test/build_tools/menuselect-deps b/menuselect/test/build_tools/menuselect-deps
deleted file mode 100644
index a705549..0000000
--- a/menuselect/test/build_tools/menuselect-deps
+++ /dev/null
@@ -1,52 +0,0 @@
-ASOUND=1
-CRYPTO=1
-CURL=1
-DAHDI=1
-FREETDS=1
-GMIME=1
-GNU_LD=1
-GSM=1
-GTK2=1
-GTK=0
-H323=0
-HOARD=0
-ICONV=1
-IKSEMEL=1
-IMAP_TK=1
-ISDNNET=0
-IXJUSER=1
-JACK=1
-LDAP=1
-LTDL=1
-LUA=0
-MISDN=0
-NBS=0
-NETSNMP=0
-NEWT=1
-OGG=1
-OPENH323=0
-OSPTK=1
-OSSAUDIO=1
-PGSQL=1
-POPT=1
-PORTAUDIO=1
-PRI=0
-RESAMPLE=0
-AIS=0
-RADIUS=1
-SPANDSP=0
-SPEEX=1
-SPEEXDSP=1
-SPEEX_PREPROCESS=1
-SQLITE3=1
-SQLITE=1
-SS7=0
-SSL=1
-SUPPSERV=0
-TONEZONE=1
-UNIXODBC=1
-USB=1
-VORBIS=1
-VPBAPI=0
-WINARCH=0
-ZLIB=1
diff --git a/menuselect/test/menuselect-tree b/menuselect/test/menuselect-tree
deleted file mode 100644
index 999597a..0000000
--- a/menuselect/test/menuselect-tree
+++ /dev/null
@@ -1,716 +0,0 @@
-<?xml version="1.0"?>
-
-<menu name="Asterisk Module and Build Option Selection">
-<category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
-<member name="app_adsiprog" displayname="Asterisk ADSI Programming Application" remove_on_change="apps/app_adsiprog.o apps/app_adsiprog.so">
-	<depend>res_adsi</depend>
-</member>
-<member name="app_alarmreceiver" displayname="Alarm Receiver for Asterisk" remove_on_change="apps/app_alarmreceiver.o apps/app_alarmreceiver.so">
-</member>
-<member name="app_amd" displayname="Answering Machine Detection Application" remove_on_change="apps/app_amd.o apps/app_amd.so">
-</member>
-<member name="app_authenticate" displayname="Authentication Application" remove_on_change="apps/app_authenticate.o apps/app_authenticate.so">
-</member>
-<member name="app_cdr" displayname="Tell Asterisk to not maintain a CDR for the current call" remove_on_change="apps/app_cdr.o apps/app_cdr.so">
-</member>
-<member name="app_chanisavail" displayname="Check channel availability" remove_on_change="apps/app_chanisavail.o apps/app_chanisavail.so">
-</member>
-<member name="app_channelredirect" displayname="Redirects a given channel to a dialplan target" remove_on_change="apps/app_channelredirect.o apps/app_channelredirect.so">
-</member>
-<member name="app_chanspy" displayname="Listen to the audio of an active channel" remove_on_change="apps/app_chanspy.o apps/app_chanspy.so">
-</member>
-<member name="app_controlplayback" displayname="Control Playback Application" remove_on_change="apps/app_controlplayback.o apps/app_controlplayback.so">
-</member>
-<member name="app_dahdibarge" displayname="Barge in on DAHDI channel application" remove_on_change="apps/app_dahdibarge.o apps/app_dahdibarge.so">
-	<depend name="dahdi">DAHDI</depend>
-</member>
-<member name="app_dahdiras" displayname="DAHDI ISDN Remote Access Server" remove_on_change="apps/app_dahdiras.o apps/app_dahdiras.so">
-	<depend name="dahdi">DAHDI</depend>
-</member>
-<member name="app_dahdiscan" displayname="Scan DAHDI channels application" remove_on_change="apps/app_dahdiscan.o apps/app_dahdiscan.so">
-	<depend name="dahdi">DAHDI</depend>
-</member>
-<member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
-</member>
-<member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
-	<depend>chan_local</depend>
-</member>
-<member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
-</member>
-<member name="app_directed_pickup" displayname="Directed Call Pickup Application" remove_on_change="apps/app_directed_pickup.o apps/app_directed_pickup.so">
-</member>
-<member name="app_directory" displayname="Extension Directory" remove_on_change="apps/app_directory.o apps/app_directory.so">
-	<depend>app_voicemail</depend>
-</member>
-<member name="app_disa" displayname="DISA (Direct Inward System Access) Application" remove_on_change="apps/app_disa.o apps/app_disa.so">
-</member>
-<member name="app_dumpchan" displayname="Dump Info About The Calling Channel" remove_on_change="apps/app_dumpchan.o apps/app_dumpchan.so">
-</member>
-<member name="app_echo" displayname="Simple Echo Application" remove_on_change="apps/app_echo.o apps/app_echo.so">
-</member>
-<member name="app_exec" displayname="Executes dialplan applications" remove_on_change="apps/app_exec.o apps/app_exec.so">
-</member>
-<member name="app_externalivr" displayname="External IVR Interface Application" remove_on_change="apps/app_externalivr.o apps/app_externalivr.so">
-</member>
-<member name="app_fax" displayname="Simple FAX Application" remove_on_change="apps/app_fax.o apps/app_fax.so">
-	 <depend>spandsp</depend>
-</member>
-<member name="app_festival" displayname="Simple Festival Interface" remove_on_change="apps/app_festival.o apps/app_festival.so">
-</member>
-<member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
-	<depend name="dahdi">DAHDI</depend>
-</member>
-<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-	<depend>chan_local</depend>
-</member>
-<member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
-</member>
-<member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
-</member>
-<member name="app_ices" displayname="Encode and Stream via icecast and ices" remove_on_change="apps/app_ices.o apps/app_ices.so">
-</member>
-<member name="app_image" displayname="Image Transmission Application" remove_on_change="apps/app_image.o apps/app_image.so">
-</member>
-<member name="app_ivrdemo" displayname="IVR Demo Application" remove_on_change="apps/app_ivrdemo.o apps/app_ivrdemo.so">
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="app_jack" displayname="JACK Interface" remove_on_change="apps/app_jack.o apps/app_jack.so">
-	<depend>jack</depend>
-	<depend name="resample">libresample</depend>
-</member>
-<member name="app_macro" displayname="Extension Macros" remove_on_change="apps/app_macro.o apps/app_macro.so">
-</member>
-<member name="app_meetme" displayname="MeetMe conference bridge" remove_on_change="apps/app_meetme.o apps/app_meetme.so">
-	<depend>dahdi</depend>
-</member>
-<member name="app_milliwatt" displayname="Digital Milliwatt (mu-law) Test Application" remove_on_change="apps/app_milliwatt.o apps/app_milliwatt.so">
-	<depend>res_indications</depend>
-</member>
-<member name="app_minivm" displayname="Mini VoiceMail (A minimal Voicemail e-mail System)" remove_on_change="apps/app_minivm.o apps/app_minivm.so">
-</member>
-<member name="app_mixmonitor" displayname="Mixed Audio Monitoring Application" remove_on_change="apps/app_mixmonitor.o apps/app_mixmonitor.so">
-</member>
-<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
-</member>
-<member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
-</member>
-<member name="app_nbscat" displayname="Silly NBS Stream Application" remove_on_change="apps/app_nbscat.o apps/app_nbscat.so">
-</member>
-<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
-	<depend>osptk</depend>
-	<depend>ssl</depend>
-</member>
-<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
-	<depend name="dahdi">DAHDI</depend>
-	<depend>app_meetme</depend>
-</member>
-<member name="app_parkandannounce" displayname="Call Parking and Announce Application" remove_on_change="apps/app_parkandannounce.o apps/app_parkandannounce.so">
-</member>
-<member name="app_playback" displayname="Sound File Playback Application" remove_on_change="apps/app_playback.o apps/app_playback.so">
-</member>
-<member name="app_privacy" displayname="Require phone number to be entered, if no CallerID sent" remove_on_change="apps/app_privacy.o apps/app_privacy.so">
-</member>
-<member name="app_queue" displayname="True Call Queueing" remove_on_change="apps/app_queue.o apps/app_queue.so">
-	<depend>res_monitor</depend>
-</member>
-<member name="app_read" displayname="Read Variable Application" remove_on_change="apps/app_read.o apps/app_read.so">
-</member>
-<member name="app_readexten" displayname="Read and evaluate extension validity" remove_on_change="apps/app_readexten.o apps/app_readexten.so">
-</member>
-<member name="app_readfile" displayname="Stores output of file into a variable" remove_on_change="apps/app_readfile.o apps/app_readfile.so">
-</member>
-<member name="app_record" displayname="Trivial Record Application" remove_on_change="apps/app_record.o apps/app_record.so">
-</member>
-<member name="app_rpt" displayname="Radio Repeater/Remote Base Application" remove_on_change="apps/app_rpt.o apps/app_rpt.so">
-	<depend name="dahdi">DAHDI</depend>
-	<depend>tonezone</depend>
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="app_sayunixtime" displayname="Say time" remove_on_change="apps/app_sayunixtime.o apps/app_sayunixtime.so">
-</member>
-<member name="app_senddtmf" displayname="Send DTMF digits Application" remove_on_change="apps/app_senddtmf.o apps/app_senddtmf.so">
-</member>
-<member name="app_sendtext" displayname="Send Text Applications" remove_on_change="apps/app_sendtext.o apps/app_sendtext.so">
-</member>
-<member name="app_setcallerid" displayname="Set CallerID Presentation Application" remove_on_change="apps/app_setcallerid.o apps/app_setcallerid.so">
-</member>
-<member name="app_skel" displayname="Skeleton (sample) Application" remove_on_change="apps/app_skel.o apps/app_skel.so">
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="app_sms" displayname="SMS/PSTN handler" remove_on_change="apps/app_sms.o apps/app_sms.so">
-</member>
-<member name="app_softhangup" displayname="Hangs up the requested channel" remove_on_change="apps/app_softhangup.o apps/app_softhangup.so">
-</member>
-<member name="app_speech_utils" displayname="Dialplan Speech Applications" remove_on_change="apps/app_speech_utils.o apps/app_speech_utils.so">
-</member>
-<member name="app_stack" displayname="Dialplan subroutines (Gosub, Return, etc)" remove_on_change="apps/app_stack.o apps/app_stack.so">
-</member>
-<member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
-</member>
-<member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
-</member>
-<member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
-</member>
-<member name="app_transfer" displayname="Transfers a caller to another extension" remove_on_change="apps/app_transfer.o apps/app_transfer.so">
-</member>
-<member name="app_url" displayname="Send URL Applications" remove_on_change="apps/app_url.o apps/app_url.so">
-</member>
-<member name="app_userevent" displayname="Custom User Event Application" remove_on_change="apps/app_userevent.o apps/app_userevent.so">
-</member>
-<member name="app_verbose" displayname="Send verbose output" remove_on_change="apps/app_verbose.o apps/app_verbose.so">
-</member>
-<member name="app_voicemail" displayname="Comedian Mail (Voicemail System)" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so">
-	<depend>res_smdi</depend>
-</member>
-<member name="app_waitforring" displayname="Waits until first ring after time" remove_on_change="apps/app_waitforring.o apps/app_waitforring.so">
-</member>
-<member name="app_waitforsilence" displayname="Wait For Silence" remove_on_change="apps/app_waitforsilence.o apps/app_waitforsilence.so">
-</member>
-<member name="app_waituntil" displayname="Wait until specified time" remove_on_change="apps/app_waituntil.o apps/app_waituntil.so">
-</member>
-<member name="app_while" displayname="While Loops and Conditional Execution" remove_on_change="apps/app_while.o apps/app_while.so">
-</member>
-<member name="app_zapateller" displayname="Block Telemarketers with Special Information Tone" remove_on_change="apps/app_zapateller.o apps/app_zapateller.so">
-</member>
-</category>
-<category name="MENUSELECT_CDR" displayname="Call Detail Recording" remove_on_change="cdr/modules.link">
-<member name="cdr_adaptive_odbc" displayname="Adaptive ODBC CDR backend" remove_on_change="cdr/cdr_adaptive_odbc.o cdr/cdr_adaptive_odbc.so">
-	<depend name="unixODBC">unixodbc</depend>
-</member>
-<member name="cdr_csv" displayname="Comma Separated Values CDR Backend" remove_on_change="cdr/cdr_csv.o cdr/cdr_csv.so">
-</member>
-<member name="cdr_custom" displayname="Customizable Comma Separated Values CDR Backend" remove_on_change="cdr/cdr_custom.o cdr/cdr_custom.so">
-</member>
-<member name="cdr_manager" displayname="Asterisk Manager Interface CDR Backend" remove_on_change="cdr/cdr_manager.o cdr/cdr_manager.so">
-</member>
-<member name="cdr_odbc" displayname="ODBC CDR Backend" remove_on_change="cdr/cdr_odbc.o cdr/cdr_odbc.so">
-	<depend name="unixodbc">unixODBC</depend>
-	<depend name="ltdl">libtool-ltdl</depend>
-</member>
-<member name="cdr_pgsql" displayname="PostgreSQL CDR Backend" remove_on_change="cdr/cdr_pgsql.o cdr/cdr_pgsql.so">
-	<depend name="pgsql">PostgreSQL</depend>
-</member>
-<member name="cdr_radius" displayname="RADIUS CDR Backend" remove_on_change="cdr/cdr_radius.o cdr/cdr_radius.so">
-	<depend>radius</depend>
-</member>
-<member name="cdr_sqlite3_custom" displayname="SQLite3 Custom CDR Module" remove_on_change="cdr/cdr_sqlite3_custom.o cdr/cdr_sqlite3_custom.so">
-	<depend>sqlite3</depend>
-</member>
-<member name="cdr_sqlite" displayname="SQLite CDR Backend" remove_on_change="cdr/cdr_sqlite.o cdr/cdr_sqlite.so">
-	<depend>sqlite</depend>
-</member>
-<member name="cdr_tds" displayname="FreeTDS CDR Backend" remove_on_change="cdr/cdr_tds.o cdr/cdr_tds.so">
-	<depend name="freetds">FreeTDS</depend>
-</member>
-</category>
-<category name="MENUSELECT_CHANNELS" displayname="Channel Drivers" remove_on_change="channels/modules.link">
-<member name="chan_agent" displayname="Agent Proxy Channel" remove_on_change="channels/chan_agent.o channels/chan_agent.so">
-        <depend>chan_local</depend>
-</member>
-<member name="chan_alsa" displayname="ALSA Console Channel Driver" remove_on_change="channels/chan_alsa.o channels/chan_alsa.so">
-	<depend>asound</depend>
-</member>
-<member name="chan_console" displayname="Console Channel Driver" remove_on_change="channels/chan_console.o channels/chan_console.so">
-	<depend>portaudio</depend>
-</member>
-<member name="chan_dahdi" displayname="DAHDI Telephony" remove_on_change="channels/chan_dahdi.o channels/chan_dahdi.so">
-	<depend>res_smdi</depend>
-	<depend name="dahdi">DAHDI</depend>
-	<depend>tonezone</depend>
-	<use>pri</use>
-	<use>ss7</use>
-</member>
-<member name="chan_features" displayname="Feature Proxy Channel" remove_on_change="channels/chan_features.o channels/chan_features.so">
-        <defaultenabled>no</defaultenabled>
-</member>
-<member name="chan_gtalk" displayname="Gtalk Channel Driver" remove_on_change="channels/chan_gtalk.o channels/chan_gtalk.so">
-	<depend>iksemel</depend>
-	<depend>res_jabber</depend>
-	<use>openssl</use>
-</member>
-<member name="chan_h323" displayname="The NuFone Network's OpenH323 Channel Driver" remove_on_change="channels/chan_h323.o channels/chan_h323.so">
-	<depend>openh323</depend>
-	<defaultenabled>yes</defaultenabled>
-</member>
-<member name="chan_iax2" displayname="Inter Asterisk eXchange (Ver 2)" remove_on_change="channels/chan_iax2.o channels/chan_iax2.so">
-	<use>crypto</use>
-</member>
-<member name="chan_jingle" displayname="Jingle Channel Driver" remove_on_change="channels/chan_jingle.o channels/chan_jingle.so">
-	<depend>iksemel</depend>
-	<depend>res_jabber</depend>
-	<use>openssl</use>
-</member>
-<member name="chan_local" displayname="Local Proxy Channel (Note: used internally by other modules)" remove_on_change="channels/chan_local.o channels/chan_local.so">
-</member>
-<member name="chan_mgcp" displayname="Media Gateway Control Protocol (MGCP)" remove_on_change="channels/chan_mgcp.o channels/chan_mgcp.so">
-</member>
-<member name="chan_misdn" displayname="Channel driver for mISDN Support (BRI/PRI)" remove_on_change="channels/chan_misdn.o channels/chan_misdn.so">
-	<depend>isdnnet</depend>
-	<depend>misdn</depend>
-	<depend>suppserv</depend>
-</member>
-<member name="chan_nbs" displayname="Network Broadcast Sound Support" remove_on_change="channels/chan_nbs.o channels/chan_nbs.so">
-	<depend>nbs</depend>
-</member>
-<member name="chan_oss" displayname="OSS Console Channel Driver" remove_on_change="channels/chan_oss.o channels/chan_oss.so">
-	<depend>ossaudio</depend>
-</member>
-<member name="chan_phone" displayname="Linux Telephony API Support" remove_on_change="channels/chan_phone.o channels/chan_phone.so">
-	<depend>ixjuser</depend>
-</member>
-<member name="chan_sip" displayname="Session Initiation Protocol (SIP)" remove_on_change="channels/chan_sip.o channels/chan_sip.so">
-        <depend>chan_local</depend>
-</member>
-<member name="chan_skinny" displayname="Skinny Client Control Protocol (Skinny)" remove_on_change="channels/chan_skinny.o channels/chan_skinny.so">
-</member>
-<member name="chan_unistim" displayname="UNISTIM Protocol (USTM)" remove_on_change="channels/chan_unistim.o channels/chan_unistim.so">
-</member>
-<member name="chan_usbradio" displayname="usb Console Channel Driver" remove_on_change="channels/chan_usbradio.o channels/chan_usbradio.so">
-	<depend>ossaudio</depend>
-	<depend>usb</depend>
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="chan_vpb" displayname="Voicetronix API driver" remove_on_change="channels/chan_vpb.oo channels/chan_vpb.so">
-	<depend>vpbapi</depend>
-</member>
-</category>
-<category name="MENUSELECT_CODECS" displayname="Codec Translators" remove_on_change="codecs/modules.link">
-<member name="codec_adpcm" displayname="Adaptive Differential PCM Coder/Decoder" remove_on_change="codecs/codec_adpcm.o codecs/codec_adpcm.so">
-</member>
-<member name="codec_alaw" displayname="A-law Coder/Decoder" remove_on_change="codecs/codec_alaw.o codecs/codec_alaw.so">
-</member>
-<member name="codec_a_mu" displayname="A-law and Mulaw direct Coder/Decoder" remove_on_change="codecs/codec_a_mu.o codecs/codec_a_mu.so">
-</member>
-<member name="codec_dahdi" displayname="Generic DAHDI Transcoder Codec Translator" remove_on_change="codecs/codec_dahdi.o codecs/codec_dahdi.so">
-	<depend name="dahdi">DAHDI</depend>
-</member>
-<member name="codec_g722" displayname="ITU G.722-64kbps G722 Transcoder" remove_on_change="codecs/codec_g722.o codecs/codec_g722.so">
-</member>
-<member name="codec_g726" displayname="ITU G.726-32kbps G726 Transcoder" remove_on_change="codecs/codec_g726.o codecs/codec_g726.so">
-</member>
-<member name="codec_gsm" displayname="GSM Coder/Decoder" remove_on_change="codecs/codec_gsm.o codecs/codec_gsm.so">
-	<depend>gsm</depend>
-</member>
-<member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
-</member>
-<member name="codec_resample" displayname="SLIN Resampling Codec" remove_on_change="codecs/codec_resample.o codecs/codec_resample.so">
-	<depend>resample</depend>
-</member>
-<member name="codec_speex" displayname="Speex Coder/Decoder" remove_on_change="codecs/codec_speex.o codecs/codec_speex.so">
-	<depend>speex</depend>
-	<depend>speex_preprocess</depend>
-	<use>speexdsp</use>
-</member>
-<member name="codec_ulaw" displayname="mu-Law Coder/Decoder" remove_on_change="codecs/codec_ulaw.o codecs/codec_ulaw.so">
-</member>
-</category>
-<category name="MENUSELECT_FORMATS" displayname="Format Interpreters" remove_on_change="formats/modules.link">
-<member name="format_g723" displayname="G.723.1 Simple Timestamp File Format" remove_on_change="formats/format_g723.o formats/format_g723.so">
-</member>
-<member name="format_g726" displayname="Raw G.726 (16/24/32/40kbps) data" remove_on_change="formats/format_g726.o formats/format_g726.so">
-</member>
-<member name="format_g729" displayname="Raw G729 data" remove_on_change="formats/format_g729.o formats/format_g729.so">
-</member>
-<member name="format_gsm" displayname="Raw GSM data" remove_on_change="formats/format_gsm.o formats/format_gsm.so">
-</member>
-<member name="format_h263" displayname="Raw H.263 data" remove_on_change="formats/format_h263.o formats/format_h263.so">
-</member>
-<member name="format_h264" displayname="Raw H.264 data" remove_on_change="formats/format_h264.o formats/format_h264.so">
-</member>
-<member name="format_ilbc" displayname="Raw iLBC data" remove_on_change="formats/format_ilbc.o formats/format_ilbc.so">
-</member>
-<member name="format_jpeg" displayname="JPEG (Joint Picture Experts Group) Image Format" remove_on_change="formats/format_jpeg.o formats/format_jpeg.so">
-</member>
-<member name="format_ogg_vorbis" displayname="OGG/Vorbis audio" remove_on_change="formats/format_ogg_vorbis.o formats/format_ogg_vorbis.so">
-	<depend>vorbis</depend>
-	<depend>ogg</depend>
-</member>
-<member name="format_pcm" displayname="Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz" remove_on_change="formats/format_pcm.o formats/format_pcm.so">
-</member>
-<member name="format_sln16" displayname="Raw Signed Linear 16KHz Audio support (SLN16)" remove_on_change="formats/format_sln16.o formats/format_sln16.so">
-</member>
-<member name="format_sln" displayname="Raw Signed Linear Audio support (SLN)" remove_on_change="formats/format_sln.o formats/format_sln.so">
-</member>
-<member name="format_vox" displayname="Dialogic VOX (ADPCM) File Format" remove_on_change="formats/format_vox.o formats/format_vox.so">
-</member>
-<member name="format_wav" displayname="Microsoft WAV format (8000Hz Signed Linear)" remove_on_change="formats/format_wav.o formats/format_wav.so">
-</member>
-<member name="format_wav_gsm" displayname="Microsoft WAV format (Proprietary GSM)" remove_on_change="formats/format_wav_gsm.o formats/format_wav_gsm.so">
-</member>
-</category>
-<category name="MENUSELECT_FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/modules.link">
-<member name="func_base64" displayname="base64 encode/decode dialplan functions" remove_on_change="funcs/func_base64.o funcs/func_base64.so">
-</member>
-<member name="func_blacklist" displayname="Look up Caller*ID name/number from blacklist database" remove_on_change="funcs/func_blacklist.o funcs/func_blacklist.so">
-</member>
-<member name="func_callerid" displayname="Caller ID related dialplan functions" remove_on_change="funcs/func_callerid.o funcs/func_callerid.so">
-</member>
-<member name="func_cdr" displayname="Call Detail Record (CDR) dialplan function" remove_on_change="funcs/func_cdr.o funcs/func_cdr.so">
-</member>
-<member name="func_channel" displayname="Channel information dialplan functions" remove_on_change="funcs/func_channel.o funcs/func_channel.so">
-</member>
-<member name="func_config" displayname="Asterisk configuration file variable access" remove_on_change="funcs/func_config.o funcs/func_config.so">
-</member>
-<member name="func_curl" displayname="Load external URL" remove_on_change="funcs/func_curl.o funcs/func_curl.so">
-	<depend>curl</depend>
-</member>
-<member name="func_cut" displayname="Cut out information from a string" remove_on_change="funcs/func_cut.o funcs/func_cut.so">
-</member>
-<member name="func_db" displayname="Database (astdb) related dialplan functions" remove_on_change="funcs/func_db.o funcs/func_db.so">
-</member>
-<member name="func_devstate" displayname="Gets or sets a device state in the dialplan" remove_on_change="funcs/func_devstate.o funcs/func_devstate.so">
-</member>
-<member name="func_dialgroup" displayname="Dialgroup dialplan function" remove_on_change="funcs/func_dialgroup.o funcs/func_dialgroup.so">
-</member>
-<member name="func_dialplan" displayname="Dialplan Context/Extension/Priority Checking Functions" remove_on_change="funcs/func_dialplan.o funcs/func_dialplan.so">
-</member>
-<member name="func_enum" displayname="ENUM related dialplan functions" remove_on_change="funcs/func_enum.o funcs/func_enum.so">
-</member>
-<member name="func_env" displayname="Environment/filesystem dialplan functions" remove_on_change="funcs/func_env.o funcs/func_env.so">
-</member>
-<member name="func_extstate" displayname="Gets an extension's state in the dialplan" remove_on_change="funcs/func_extstate.o funcs/func_extstate.so">
-</member>
-<member name="func_global" displayname="Variable dialplan functions" remove_on_change="funcs/func_global.o funcs/func_global.so">
-</member>
-<member name="func_groupcount" displayname="Channel group dialplan functions" remove_on_change="funcs/func_groupcount.o funcs/func_groupcount.so">
-</member>
-<member name="func_iconv" displayname="Charset conversions" remove_on_change="funcs/func_iconv.o funcs/func_iconv.so">
-    <depend>iconv</depend>
-</member>
-<member name="func_lock" displayname="Dialplan mutexes" remove_on_change="funcs/func_lock.o funcs/func_lock.so">
-</member>
-<member name="func_logic" displayname="Logical dialplan functions" remove_on_change="funcs/func_logic.o funcs/func_logic.so">
-</member>
-<member name="func_math" displayname="Mathematical dialplan function" remove_on_change="funcs/func_math.o funcs/func_math.so">
-</member>
-<member name="func_md5" displayname="MD5 digest dialplan functions" remove_on_change="funcs/func_md5.o funcs/func_md5.so">
-</member>
-<member name="func_module" displayname="Checks if Asterisk module is loaded in memory" remove_on_change="funcs/func_module.o funcs/func_module.so">
-</member>
-<member name="func_odbc" displayname="ODBC lookups" remove_on_change="funcs/func_odbc.o funcs/func_odbc.so">
-	<depend>unixodbc</depend>
-	<depend>ltdl</depend>
-	<depend>res_odbc</depend>
-</member>
-<member name="func_rand" displayname="Random number dialplan function" remove_on_change="funcs/func_rand.o funcs/func_rand.so">
-</member>
-<member name="func_realtime" displayname="Read/Write/Store/Destroy values from a RealTime repository" remove_on_change="funcs/func_realtime.o funcs/func_realtime.so">
-</member>
-<member name="func_sha1" displayname="SHA-1 computation dialplan function" remove_on_change="funcs/func_sha1.o funcs/func_sha1.so">
-</member>
-<member name="func_shell" displayname="Returns the output of a shell command" remove_on_change="funcs/func_shell.o funcs/func_shell.so">
-</member>
-<member name="func_speex" displayname="Noise reduction and Automatic Gain Control (AGC)" remove_on_change="funcs/func_speex.o funcs/func_speex.so">
-	<depend>speex</depend>
-	<depend>speex_preprocess</depend>
-	<use>speexdsp</use>
-</member>
-<member name="func_strings" displayname="String handling dialplan functions" remove_on_change="funcs/func_strings.o funcs/func_strings.so">
-</member>
-<member name="func_sysinfo" displayname="System information related functions" remove_on_change="funcs/func_sysinfo.o funcs/func_sysinfo.so">
-</member>
-<member name="func_timeout" displayname="Channel timeout dialplan functions" remove_on_change="funcs/func_timeout.o funcs/func_timeout.so">
-</member>
-<member name="func_uri" displayname="URI encode/decode dialplan functions" remove_on_change="funcs/func_uri.o funcs/func_uri.so">
-</member>
-<member name="func_version" displayname="Get Asterisk Version/Build Info" remove_on_change="funcs/func_version.o funcs/func_version.so">
-</member>
-<member name="func_vmcount" displayname="Indicator for whether a voice mailbox has messages in a given folder." remove_on_change="funcs/func_vmcount.o funcs/func_vmcount.so">
-</member>
-<member name="func_volume" displayname="Technology independent volume control" remove_on_change="funcs/func_volume.o funcs/func_volume.so">
-</member>
-</category>
-<category name="MENUSELECT_PBX" displayname="PBX Modules" remove_on_change="pbx/modules.link">
-<member name="pbx_ael" displayname="Asterisk Extension Language Compiler" remove_on_change="pbx/pbx_ael.o pbx/pbx_ael.so">
-	<depend>res_ael_share</depend>
-</member>
-<member name="pbx_config" displayname="Text Extension Configuration" remove_on_change="pbx/pbx_config.o pbx/pbx_config.so">
-</member>
-<member name="pbx_dundi" displayname="Distributed Universal Number Discovery (DUNDi)" remove_on_change="pbx/pbx_dundi.o pbx/pbx_dundi.so">
-	<depend>zlib</depend>
-	<use>crypto</use>
-</member>
-<member name="pbx_gtkconsole" displayname="GTK Console" remove_on_change="pbx/pbx_gtkconsole.o pbx/pbx_gtkconsole.so">
-	<depend>gtk</depend>
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="pbx_loopback" displayname="Loopback Switch" remove_on_change="pbx/pbx_loopback.o pbx/pbx_loopback.so">
-</member>
-<member name="pbx_lua" displayname="Lua PBX Switch" remove_on_change="pbx/pbx_lua.o pbx/pbx_lua.so">
-	<depend>lua</depend>
-</member>
-<member name="pbx_realtime" displayname="Realtime Switch" remove_on_change="pbx/pbx_realtime.o pbx/pbx_realtime.so">
-</member>
-<member name="pbx_spool" displayname="Outgoing Spool Support" remove_on_change="pbx/pbx_spool.o pbx/pbx_spool.so">
-</member>
-</category>
-<category name="MENUSELECT_RES" displayname="Resource Modules" remove_on_change="res/modules.link">
-<member name="res_adsi" displayname="ADSI Resource" remove_on_change="res/res_adsi.o res/res_adsi.so">
-</member>
-<member name="res_ael_share" displayname="share-able code for AEL" remove_on_change="res/res_ael_share.o res/res_ael_share.so">
-</member>
-<member name="res_agi" displayname="Asterisk Gateway Interface (AGI)" remove_on_change="res/res_agi.o res/res_agi.so">
-</member>
-<member name="res_ais" displayname="SAForum AIS" remove_on_change="res/res_ais.o res/res_ais.so">
-	<depend>ais</depend>
-</member>
-<member name="res_clioriginate" displayname="Call origination from the CLI" remove_on_change="res/res_clioriginate.o res/res_clioriginate.so">
-</member>
-<member name="res_config_curl" displayname="Realtime Curl configuration" remove_on_change="res/res_config_curl.o res/res_config_curl.so">
-	<depend>curl</depend>
-</member>
-<member name="res_config_ldap" displayname="LDAP realtime interface" remove_on_change="res/res_config_ldap.o res/res_config_ldap.so">
-	<depend>ldap</depend>
-</member>
-<member name="res_config_odbc" displayname="Realtime ODBC configuration" remove_on_change="res/res_config_odbc.o res/res_config_odbc.so">
-	<depend>unixodbc</depend>
-	<depend>ltdl</depend>
-	<depend>res_odbc</depend>
-</member>
-<member name="res_config_pgsql" displayname="PostgreSQL RealTime Configuration Driver" remove_on_change="res/res_config_pgsql.o res/res_config_pgsql.so">
-	<depend>pgsql</depend>
-</member>
-<member name="res_config_sqlite" displayname="Realtime SQLite configuration" remove_on_change="res/res_config_sqlite.o res/res_config_sqlite.so">
-	<depend>sqlite</depend>
-</member>
-<member name="res_convert" displayname="File format conversion CLI command" remove_on_change="res/res_convert.o res/res_convert.so">
-</member>
-<member name="res_crypto" displayname="Cryptographic Digital Signatures" remove_on_change="res/res_crypto.o res/res_crypto.so">
-	<depend>ssl</depend>
-</member>
-<member name="res_curl" displayname="cURL Resource Module" remove_on_change="res/res_curl.o res/res_curl.so">
-	<depend>curl</depend>
-</member>
-<member name="res_http_post" displayname="HTTP POST support" remove_on_change="res/res_http_post.o res/res_http_post.so">
-	<depend>gmime</depend>
-</member>
-<member name="res_indications" displayname="Region-specific tones" remove_on_change="res/res_indications.o res/res_indications.so">
-</member>
-<member name="res_jabber" displayname="AJI - Asterisk Jabber Interface" remove_on_change="res/res_jabber.o res/res_jabber.so">
-	<depend>iksemel</depend>
-	<use>openssl</use>
-</member>
-<member name="res_limit" displayname="Resource limits" remove_on_change="res/res_limit.o res/res_limit.so">
-</member>
-<member name="res_monitor" displayname="Call Monitoring Resource" remove_on_change="res/res_monitor.o res/res_monitor.so">
-</member>
-<member name="res_musiconhold" displayname="Music On Hold Resource" remove_on_change="res/res_musiconhold.o res/res_musiconhold.so">
-	<conflict>win32</conflict>
-	<use>dahdi</use>
-</member>
-<member name="res_odbc" displayname="ODBC resource" remove_on_change="res/res_odbc.o res/res_odbc.so">
-	<depend>unixodbc</depend>
-	<depend>ltdl</depend>
-</member>
-<member name="res_phoneprov" displayname="HTTP Phone Provisioning" remove_on_change="res/res_phoneprov.o res/res_phoneprov.so">
-</member>
-<member name="res_realtime" displayname="Realtime Data Lookup/Rewrite" remove_on_change="res/res_realtime.o res/res_realtime.so">
-</member>
-<member name="res_smdi" displayname="Simplified Message Desk Interface (SMDI) Resource" remove_on_change="res/res_smdi.o res/res_smdi.so">
-</member>
-<member name="res_snmp" displayname="SNMP [Sub]Agent for Asterisk" remove_on_change="res/res_snmp.o res/res_snmp.so">
-	<depend>netsnmp</depend>
-</member>
-<member name="res_speech" displayname="Generic Speech Recognition API" remove_on_change="res/res_speech.o res/res_speech.so">
-</member>
-<member name="res_timing_dahdi" displayname="DAHDI Timing Interface" remove_on_change="res/res_timing_dahdi.o res/res_timing_dahdi.so">
-	<depend name="dahdi">DAHDI</depend>
-</member>
-<member name="res_timing_pthread" displayname="pthread Timing Interface" remove_on_change="res/res_timing_pthread.o res/res_timing_pthread.so">
-</member>
-</category>
-<category name="MENUSELECT_TEST" displayname="Test Modules" remove_on_change="tests/modules.link">
-<member name="test_dlinklists" displayname="Test Doubly-Linked Lists" remove_on_change="tests/test_dlinklists.o tests/test_dlinklists.so">
-	<defaultenabled>no</defaultenabled>
-</member>
-<member name="test_skel" displayname="Skeleton (sample) Test" remove_on_change="tests/test_skel.o tests/test_skel.so">
-	<defaultenabled>no</defaultenabled>
-</member>
-</category>
-	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
-		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
-		</member>
-		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
-		</member>
-		<member name="STATIC_BUILD" displayname="Build static binaries">
-		</member>
-		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
-			<defaultenabled>yes</defaultenabled>
-		</member>
-		<member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
-		</member>
-		<member name="USE_HOARD_ALLOCATOR" displayname="Use the Hoard Memory Allocator instead of the default system one">
-			<defaultenabled>no</defaultenabled>
-			<depend>hoard</depend>
-		</member>
-		<member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
-		</member>
-		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
-		</member>
-		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
-			<defaultenabled>yes</defaultenabled>
-			<depend>G711_NEW_ALGORITHM</depend>
-		</member>
-		<member name="TEST_CODING_TABLES" displayname="New ulaw/alaw codec, turn on table tests on init">
-			<depend>G711_NEW_ALGORITHM</depend>
-		</member>
-		<member name="TEST_TANDEM_TRANSCODING" displayname="New ulaw/alaw codec, turn on transcoding tests on init">
-			<depend>G711_NEW_ALGORITHM</depend>
-		</member>
-		<member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
-		</member>
-		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
-		</member>
-		<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
-			<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="BUSYDETECT_COMPARE_TONE_AND_SILENCE" displayname="Assume that tone and silence have the same duration">
-			<conflict>BUSYDETECT_TONEONLY</conflict>
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="BUSYDETECT_DEBUG" displayname="Enable additional busy detection debugging">
-			<defaultenabled>no</defaultenabled>
-		</member>
-		<member name="IAX_OLD_FIND" displayname="Use the old, slow method of searching for IAX callnos">
-		</member>
-		<member name="INTEGER_CALLERID" displayname="Use the (less accurate) integer-based method for decoding FSK tones (for embedded systems)">
-		</member>
-	</category>
-<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_directory.o">
-	<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
-		<depend>unixodbc</depend>
-		<depend>ltdl</depend>
-		<conflict>IMAP_STORAGE</conflict>
-		<defaultenabled>no</defaultenabled>
-	</member>
-	<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
-		<depend>imap_tk</depend>
-		<conflict>ODBC_STORAGE</conflict>
-		<use>ssl</use>
-		<defaultenabled>no</defaultenabled>
-	</member>
-</category>
-<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
-	<member name="RADIO_RTX" displayname="Build RTX/DTX Radio Programming">
-		<defaultenabled>no</defaultenabled>
-		<depend>chan_usbradio</depend>
-	</member>
-	<member name="RADIO_XPMRX" displayname="Build Experimental Radio Protocols">
-		<defaultenabled>no</defaultenabled>
-		<depend>chan_usbradio</depend>
-	</member>
-</category>
-	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
-		<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
-		</member>
-		<member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
-		</member>
-		<member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
-		</member>
-		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
-			<depend>DEBUG_THREADS</depend>
-		</member>
-		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
-		</member>
-		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
-		</member>
-		<member name="DO_CRASH" displayname="Crash on fatal errors">
-		</member>
-		<member name="THREAD_CRASH" displayname="Crash on mutex errors">
-		</member>
-		<member name="CHANNEL_TRACE" displayname="Enable CHANNEL(trace) function">
-		</member>
-	</category>
-	<category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
-		<member name="APPS" displayname="Applications" remove_on_change="apps/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a codecs/g722/libg722.a">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-		<member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
-			<depend>gnu_ld</depend>
-		</member>
-	</category>
-	<category name="MENUSELECT_CORE_SOUNDS" displayname="Core Sound Packages" positive_output="yes">
-		<member name="CORE-SOUNDS-EN-WAV" displayname="English, WAV format">
-		</member>
-		<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
-		</member>
-		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
-		</member>
-		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
-			<defaultenabled>yes</defaultenabled>
-		</member>
-		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
-		</member>
-		<member name="CORE-SOUNDS-EN-G722" displayname="English, G.722 format">
-		</member>
-		<member name="CORE-SOUNDS-EN-SLN16" displayname="English, Signed-linear 16kHz format">
-		</member>
-		<member name="CORE-SOUNDS-ES-WAV" displayname="Spanish, WAV format">
-		</member>
-		<member name="CORE-SOUNDS-ES-ULAW" displayname="Spanish, mu-Law format">
-		</member>
-		<member name="CORE-SOUNDS-ES-ALAW" displayname="Spanish, a-Law format">
-		</member>
-		<member name="CORE-SOUNDS-ES-GSM" displayname="Spanish, GSM format">
-		</member>
-		<member name="CORE-SOUNDS-ES-G729" displayname="Spanish, G.729 format">
-		</member>
-		<member name="CORE-SOUNDS-ES-G722" displayname="Spanish, G.722 format">
-		</member>
-		<member name="CORE-SOUNDS-ES-SLN16" displayname="Spanish, Signed-linear 16kHz format">
-		</member>
-		<member name="CORE-SOUNDS-FR-WAV" displayname="French, WAV format">
-		</member>
-		<member name="CORE-SOUNDS-FR-ULAW" displayname="French, mu-Law format">
-		</member>
-		<member name="CORE-SOUNDS-FR-ALAW" displayname="French, a-Law format">
-		</member>
-		<member name="CORE-SOUNDS-FR-GSM" displayname="French, GSM format">
-		</member>
-		<member name="CORE-SOUNDS-FR-G729" displayname="French, G.729 format">
-		</member>
-		<member name="CORE-SOUNDS-FR-G722" displayname="French, G.722 format">
-		</member>
-		<member name="CORE-SOUNDS-FR-SLN16" displayname="French, Signed-linear 16kHz format">
-		</member>
-	</category>
-	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
-		<member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM format" >
-		</member>
-		<member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729 format">
-		</member>
-		<member name="EXTRA-SOUNDS-EN-G722" displayname="English, G.722 format">
-		</member>
-	</category>
-</menu>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git



More information about the Pkg-voip-commits mailing list