- Update to 5.12

PR:		ports/66636
Submitted by:	Roman Neuhauser <neuhauser@chello.cz>
Approved by:	maintainer timeout (2 weeks)

7 files changed, 11 insertions, 10906 deletions

diff --git a/science/xmakemol/Makefile b/science/xmakemol/Makefile
index 3e4fed240d92..2c133f78cc00 100644
--- a/science/xmakemol/Makefile
+++ b/science/xmakemol/Makefile
@@ -5,10 +5,10 @@
 #
 
 PORTNAME=	xmakemol
-PORTVERSION=	4.40
-PORTREVISION=	1
+PORTVERSION=	5.12
 CATEGORIES=	science
-MASTER_SITES=	http://vegemite.chem.nottingham.ac.uk/~xmakemol/dists/
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	chizhang@uchicago.edu
 COMMENT=	Molecule Viewer Program Based on Motif Widget
@@ -18,10 +18,12 @@ USE_MOTIF=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
+MAN1=		xmakemol.1
+
 pre-configure:
 	cd ${WRKSRC}; ${CHMOD} 755 config.guess config.sub configure install-sh missing mkinstalldirs
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/xmakemol
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>
diff --git a/science/xmakemol/distinfo b/science/xmakemol/distinfo
index 17e60f15816d..0c146caf38a4 100644
--- a/science/xmakemol/distinfo
+++ b/science/xmakemol/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmakemol-4.40.tar.gz) = d12923759a431ede67afbdd09b369e0f
-SIZE (xmakemol-4.40.tar.gz) = 119653
+MD5 (xmakemol-5.12.tar.gz) = 0d532d6e25a2796a5019ac38e532c04d
+SIZE (xmakemol-5.12.tar.gz) = 253339
diff --git a/science/xmakemol/files/patch-aa b/science/xmakemol/files/patch-aa
deleted file mode 100644
index be01146de1cb..000000000000
--- a/science/xmakemol/files/patch-aa
+++ /dev/null
@@ -1,683 +0,0 @@
-Index: animate.c
-===================================================================
---- animate.c	2001/06/09 00:28:23	1.1.1.1
-+++ animate.c	2001/06/09 00:30:18
-@@ -19,10 +19,19 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#if HAVE_FTIME
- #include <sys/timeb.h>
-+#else
-+#include <sys/time.h>
-+#include <unistd.h>
-+#endif
- /* aro - use following headers if using timeval struct
-    and gettimeofday function below (in case compiler can't
-    find ftime() function).
-@@ -45,8 +54,8 @@
- #include <X11/xpm.h>
- #endif
- 
--#include "defs.h"
- #include "globals.h"
-+#include "defs.h"
- 
- void echo_to_message_area(char *);
- 
-@@ -254,9 +263,12 @@
-   double phi = rot_angle*PI/180.0, time, last_time = 0.0;
- 
-   XEvent event;
--
-+  
-+#ifdef HAVE_FTIME
-   static struct timeb tb;
--
-+#else
-+  struct timeval tv;
-+#endif
-   /* aro - if xmakemol fails to compile due to use of ftime function,
-      try uncommenting lines using struct timeval tv, and comment out lines
-      using struct timeb tb.  Also need to uncomment appropiate #include lines
-@@ -278,11 +290,16 @@
-     rotate_atoms(rot_axis,phi,1,True);
- 
-     /* Get the time  */
--
-+#ifdef HAVE_FTIME
-     ftime (&tb);
- 
-     time = tb.time + (tb.millitm / 1000.0);
-+#else
-+    gettimeofday(&tv,NULL);
-+
-+    time= tv.tv_sec + (tv.tv_usec / 1000000.0);
- 
-+#endif
-     /* gettimeofday(&tv, NULL);
-        time = tv.tv_sec + (tv.tv_usec / 1000000.0); */
- 
-Index: bbox.c
-===================================================================
-
-
-
---- bbox.c	2001/06/09 00:28:23	1.1.1.1
-+++ bbox.c	2001/06/09 00:30:18
-@@ -21,18 +21,22 @@
- 
- #define __BBOX_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
- 
- #include <Xm/Xm.h>
- 
-+#include "globals.h"
- #include "bbox.h"
- #include "defs.h"
- #ifdef GL
- #include "gl_funcs.h" /* aro - for visinfo */
- #endif /* GL */
--#include "globals.h"
- #include "view.h"
- 
- static int top_point_index;
-Index: canvas.c
-===================================================================
-
-
-
---- canvas.c	2001/06/09 00:28:23	1.1.1.1
-+++ canvas.c	2001/06/09 00:30:18
-@@ -19,19 +19,24 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
- 
- #include <Xm/Xm.h>
- 
-+#include "globals.h"
-+
- #include "bonds.h"
- #include "defs.h"
- #include "draw.h"
- #ifdef GL
- #include "gl_funcs.h" /* aro */
- #endif /* GL */
--#include "globals.h"
- #include "view.h"
- 
- #ifdef XPM
-Index: config.h
-===================================================================
-
-
-
---- config.h	2001/06/09 00:28:24	1.1.1.1
-+++ config.h	2001/06/09 00:30:18
-@@ -1,24 +1,107 @@
--/*
-+/* config.h.  Generated automatically by configure.  */
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
- 
--Copyright (C) 1999 Matthew P. Hodges
--This file is part of XMakemol.
-+/* Define if using alloca.c.  */
-+/* #undef C_ALLOCA */
- 
--XMakemol 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.
-+/* Define to empty if the keyword does not work.  */
-+/* #undef const */
- 
--XMakemol 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.
-+/* 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 */
- 
--You should have received a copy of the GNU General Public License
--along with XMakemol; see the file COPYING.  If not, write to the Free Software
--Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+/* Define if you have alloca, as a function or macro.  */
-+#define HAVE_ALLOCA 1
- 
--*/
-+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-+/* #undef HAVE_ALLOCA_H */
- 
--/* If usleep is available, define HAVE_USLEEP */
-+/* 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 run-time.
-+ 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 HAVE_USLEEP
-+/* Define if you have the ANSI C header files.  */
-+#define STDC_HEADERS 1
-+
-+/* Define if the X Window System is missing or not being used.  */
-+/* #undef X_DISPLAY_MISSING */
-+
-+/* #undef HAVE_LIBGEN */
-+#define HAVE_MOTIF 1
-+#define XPM 1
-+#define VERSION "4.40.2b"
-+/* #undef GL */
-+
-+/* Define if using alloca.c.  */
-+/* #undef C_ALLOCA */
-+
-+/* Define to empty if the keyword does not work.  */
-+/* #undef const */
-+
-+/* 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 if you have alloca, as a function or macro.  */
-+#define HAVE_ALLOCA 1
-+
-+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-+/* #undef HAVE_ALLOCA_H */
-+
-+/* 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 run-time.
-+ 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 if you have the ANSI C header files.  */
-+#define STDC_HEADERS 1
-+
-+/* Define if the X Window System is missing or not being used.  */
-+/* #undef X_DISPLAY_MISSING */
-+
-+/* Define if you have the ftime function.  */
-+/* #undef HAVE_FTIME */
-+
-+/* Define if you have the strstr function.  */
-+#define HAVE_STRSTR 1
-+
-+/* Define if you have the usleep function.  */
-+#define HAVE_USLEEP 1
-+
-+/* Define if you have the <X11/xpm.h> header file.  */
-+#define HAVE_X11_XPM_H 1
-+
-+/* Define if you have the <unistd.h> header file.  */
-+#define HAVE_UNISTD_H 1
-+
-+/* Name of package */
-+#define PACKAGE "xmakemol"
-+
-+/* Version number of package */
-+#define VERSION "4.40.2b"
-+
-+/* Define this to use OpenGL widget from <GL/GLwDrawA.h> */
-+/* #undef HAVE_GL_GLWDRAWA_H */
-+
-+/* Define this to use OpenGL widget from <X11/GLw/GLwDrawA.h> */
-+/* #undef HAVE_X11_GLW_GLWDRAWA_H */
-+
-+/* Define this to use OpenGL widget from <GL/GLwMDrawA.h> */
-+/* #undef HAVE_GL_GLWMDRAWA_H */
-+
-+/* Define this to use OpenGL widget from <X11/GLw/GLwMDrawA.h> */
-+/* #undef HAVE_X11_GLW_GLWMDRAWA_H */
-+
-+/* Define this to the Xt/Motif OpenGL widget class to use */
-+/* #undef XT_GLWIDGET */
-+
-Index: control.c
-===================================================================
-
-
-
---- control.c	2001/06/09 00:28:23	1.1.1.1
-+++ control.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: draw.c
-===================================================================
-
-
-
---- draw.c	2001/06/09 00:28:23	1.1.1.1
-+++ draw.c	2001/06/09 00:30:17
-@@ -21,6 +21,10 @@
- 
- #define __DRAW_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-Index: edit.c
-===================================================================
-
-
-
---- edit.c	2001/06/09 00:28:23	1.1.1.1
-+++ edit.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: file.c
-===================================================================
-
-
-
---- file.c	2001/06/09 00:28:23	1.1.1.1
-+++ file.c	2001/06/09 00:30:17
-@@ -21,7 +21,13 @@
- 
- #define __FILE_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#if HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
- #include <ctype.h> /* aro - needed for isalnum() */
- #include <locale.h>
- #include <math.h>
-@@ -40,13 +46,13 @@
- #include <Xm/TextF.h>    /* aro */
- #include <Xm/ToggleB.h>  /* aro */
- 
-+#include "globals.h"
- #include "bonds.h"
- #include "defs.h"
- #include "draw.h"
- #ifdef GL
- #include "gl_funcs.h" /* aro - for visinfo */
- #endif /* GL */
--#include "globals.h"
- #include "view.h"
- 
- #ifdef XPM
-Index: frames.c
-===================================================================
-
-
-
---- frames.c	2001/06/09 00:28:23	1.1.1.1
-+++ frames.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -38,7 +42,9 @@
- #include <X11/xpm.h>
- #endif
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "draw.h"
- #include "globals.h"
- 
-Index: gl_funcs.c
-===================================================================
-
-
-
---- gl_funcs.c	2001/06/09 00:28:23	1.1.1.1
-+++ gl_funcs.c	2001/06/09 00:30:17
-@@ -19,18 +19,23 @@
- 
- */
- 
--#ifdef GL
- 
- #define __GL_FUNCS_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <math.h>
- #include <Xm/Xm.h>
- 
-+#include "globals.h"
-+
-+#ifdef GL
- #include "bonds.h"
- #include "defs.h"
- #include "draw.h"
--#include "globals.h"
- #include "view.h"
- 
- #include "gl_funcs.h"
-@@ -271,8 +276,7 @@
-      XpmWriteFileFromPixmap is called and canvas_pm is used. */
- 
-   XCopyArea (display, XtWindow (canvas), canvas_pm, gc, 0, 0,
--             canvas_width, canvas_width, 0, 0);
--
-+	     canvas_width, canvas_width, 0, 0);
- }
- 
- void StereoProjection(float left, float right, float bottom, float top,
-Index: globals.h
-===================================================================
-
-
-
---- globals.h	2001/06/09 00:28:24	1.1.1.1
-+++ globals.h	2001/06/09 00:30:17
-@@ -19,6 +19,7 @@
- 
- */
- 
-+
- #ifndef __GLOBALS_H__
- #define __GLOBALS_H__
- 
-Index: help.c
-===================================================================
-
-
-
---- help.c	2001/06/09 00:28:23	1.1.1.1
-+++ help.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
-   
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-@@ -81,7 +85,7 @@
- 
-       if(about_string == NULL)
-         {
--          about_string = malloc(sizeof(ABOUT_MSG));          
-+          about_string = malloc(sizeof(ABOUT_MSG)+sizeof(VERSION));          
-         }
-       
-       sprintf(about_string, ABOUT_MSG, VERSION);
-Index: menus.c
-===================================================================
-
-
-
---- menus.c	2001/06/09 00:28:23	1.1.1.1
-+++ menus.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <Xm/Xm.h>
- 
- #include "globals.h"
-Index: region.c
-===================================================================
-
-
-
---- region.c	2001/06/09 00:28:23	1.1.1.1
-+++ region.c	2001/06/09 00:30:17
-@@ -24,6 +24,10 @@
- /* Functions to define a region on the canvas and to determine which
-    atoms lie inside it */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- 
-Index: rotate.c
-===================================================================
-
-
-
---- rotate.c	2001/06/09 00:28:23	1.1.1.1
-+++ rotate.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: sort.c
-===================================================================
-
-
-
---- sort.c	2001/06/09 00:28:23	1.1.1.1
-+++ sort.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: store.c
-===================================================================
-
-
-
---- store.c	2001/06/09 00:28:23	1.1.1.1
-+++ store.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: track.c
-===================================================================
-
-
-
---- track.c	2001/06/09 00:28:23	1.1.1.1
-+++ track.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: translate.c
-===================================================================
-
-
-
---- translate.c	2001/06/09 00:28:23	1.1.1.1
-+++ translate.c	2001/06/09 00:30:17
-@@ -19,6 +19,10 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-Index: utils.c
-===================================================================
-
-
-
---- utils.c	2001/06/09 00:28:23	1.1.1.1
-+++ utils.c	2001/06/09 00:30:17
-@@ -19,13 +19,19 @@
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
- 
- #include <Xm/MessageB.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "defs.h"
- #include "globals.h"
- 
-Index: vectors.c
-===================================================================
-
-
-
---- vectors.c	2001/06/09 00:28:24	1.1.1.1
-+++ vectors.c	2001/06/09 00:30:17
-@@ -21,6 +21,10 @@
- 
- #define __VECTORS_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-Index: view.c
-===================================================================
-
-
-
---- view.c	2001/06/09 00:28:23	1.1.1.1
-+++ view.c	2001/06/09 00:30:17
-@@ -21,6 +21,10 @@
- 
- #define __VIEW_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-Index: xmakemol.c
-===================================================================
-
-
-
---- xmakemol.c	2001/06/09 00:28:24	1.1.1.1
-+++ xmakemol.c	2001/06/09 00:30:18
-@@ -21,6 +21,10 @@
- 
- #define __XMAKEMOL_C__
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <locale.h>
- #include <math.h>
- #include <stdio.h>
-@@ -31,8 +35,8 @@
- #include <Xm/Label.h>
- #include <Xm/MainW.h>
- 
--#include "defs.h"
- #include "globals.h"
-+#include "defs.h"
- #include "view.h"
- 
- /* aro - might not be necessary if using mesa+linux */
diff --git a/science/xmakemol/files/patch-ab b/science/xmakemol/files/patch-ab
deleted file mode 100644
index 316fc111bfac..000000000000
--- a/science/xmakemol/files/patch-ab
+++ /dev/null
@@ -1,10209 +0,0 @@
-Index: Makefile.am
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ Makefile.am	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,16 @@
-+DATA_DIR=${prefix}/share/xmakemol
-+ELEM_FILE=$(DATA_DIR)/elements
-+ELEM = -DELEMENTS=\"${ELEM_FILE}\"
-+
-+bin_PROGRAMS = xmakemol
-+xmakemol_SOURCES = animate.c bbox.c canvas.c control.c draw.c edit.c file.c frames.c gl_funcs.c help.c menus.c region.c rotate.c sort.c store.c track.c translate.c utils.c vectors.c view.c xmakemol.c bbox.h config.h draw.h globals.h  view.h bonds.h  defs.h gl_funcs.h  vectors.h  xm_logo.h elements
-+xmakemol_LDADD = @XM_LIBS@ @XT_LIBS@ @XPM_LIBS@ @XEXT_LIBS@ @X11_LIBS@ @GL_LIBS@
-+
-+file.o: file.c bonds.h defs.h draw.h globals.h view.h
-+	$(COMPILE) -c ${ELEM} $<
-+install-binPROGRAMS:$(bin_PROGRAMS)
-+	$(INSTALL_PROGRAM) $(top_builddir)/xmakemol $(prefix)/bin
-+install-data:
-+	-mkdir -p $(DATA_DIR)
-+	$(INSTALL_DATA) $(top_srcdir)/elements ${DATA_DIR}
-+install:install-binPROGRAMS install-data
-Index: Makefile.in
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ Makefile.in	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,372 @@
-+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# This Makefile.in 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.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = .
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_alias = @build_alias@
-+build_triplet = @build@
-+host_alias = @host_alias@
-+host_triplet = @host@
-+target_alias = @target_alias@
-+target_triplet = @target@
-+CC = @CC@
-+GL_LIBS = @GL_LIBS@
-+MAKEINFO = @MAKEINFO@
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+X11_LIBS = @X11_LIBS@
-+XEXT_LIBS = @XEXT_LIBS@
-+XM_LIBS = @XM_LIBS@
-+XPM_LIBS = @XPM_LIBS@
-+XT_LIBS = @XT_LIBS@
-+X_LIBS = @X_LIBS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+
-+DATA_DIR = ${prefix}/share/xmakemol
-+ELEM_FILE = $(DATA_DIR)/elements
-+ELEM = -DELEMENTS=\"${ELEM_FILE}\"
-+
-+bin_PROGRAMS = xmakemol
-+xmakemol_SOURCES = animate.c bbox.c canvas.c control.c draw.c edit.c file.c frames.c gl_funcs.c help.c menus.c region.c rotate.c sort.c store.c track.c translate.c utils.c vectors.c view.c xmakemol.c bbox.h config.h draw.h globals.h  view.h bonds.h  defs.h gl_funcs.h  vectors.h  xm_logo.h elements
-+xmakemol_LDADD = @XM_LIBS@ @XT_LIBS@ @XPM_LIBS@ @XEXT_LIBS@ @X11_LIBS@ @GL_LIBS@
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES = 
-+PROGRAMS =  $(bin_PROGRAMS)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+X_CFLAGS = @X_CFLAGS@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+xmakemol_OBJECTS =  animate.o bbox.o canvas.o control.o draw.o edit.o \
-+file.o frames.o gl_funcs.o help.o menus.o region.o rotate.o sort.o \
-+store.o track.o translate.o utils.o vectors.o view.o xmakemol.o
-+xmakemol_DEPENDENCIES = 
-+xmakemol_LDFLAGS = 
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-+Makefile.am Makefile.in NEWS acconfig.h acinclude.m4 aclocal.m4 \
-+config.guess config.h.in config.sub configure configure.in install-sh \
-+missing mkinstalldirs
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+SOURCES = $(xmakemol_SOURCES)
-+OBJECTS = $(xmakemol_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .o .s
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+$(ACLOCAL_M4):  configure.in  acinclude.m4
-+	cd $(srcdir) && $(ACLOCAL)
-+
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+	cd $(srcdir) && $(AUTOCONF)
-+
-+config.h: stamp-h
-+	@if test ! -f $@; then \
-+		rm -f stamp-h; \
-+		$(MAKE) stamp-h; \
-+	else :; fi
-+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-+	     $(SHELL) ./config.status
-+	@echo timestamp > stamp-h 2> /dev/null
-+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-+	@if test ! -f $@; then \
-+		rm -f $(srcdir)/stamp-h.in; \
-+		$(MAKE) $(srcdir)/stamp-h.in; \
-+	else :; fi
-+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-+	cd $(top_srcdir) && $(AUTOHEADER)
-+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+
-+mostlyclean-hdr:
-+
-+clean-hdr:
-+
-+distclean-hdr:
-+	-rm -f config.h
-+
-+maintainer-clean-hdr:
-+
-+mostlyclean-binPROGRAMS:
-+
-+clean-binPROGRAMS:
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+
-+distclean-binPROGRAMS:
-+
-+maintainer-clean-binPROGRAMS:
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	done
-+
-+.c.o:
-+	$(COMPILE) -c $<
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+xmakemol: $(xmakemol_OBJECTS) $(xmakemol_DEPENDENCIES)
-+	@rm -f xmakemol
-+	$(LINK) $(xmakemol_LDFLAGS) $(xmakemol_OBJECTS) $(xmakemol_LDADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	-rm -rf $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-+	mkdir $(distdir)/=build
-+	mkdir $(distdir)/=inst
-+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-+	cd $(distdir)/=build \
-+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist
-+	-rm -rf $(distdir)
-+	@banner="$(distdir).tar.gz is ready for distribution"; \
-+	dashes=`echo "$$banner" | sed s/./=/g`; \
-+	echo "$$dashes"; \
-+	echo "$$banner"; \
-+	echo "$$dashes"
-+dist: distdir
-+	-chmod -R a+r $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+	-rm -rf $(distdir)
-+dist-all: distdir
-+	-chmod -R a+r $(distdir)
-+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+	-rm -rf $(distdir)
-+distdir: $(DISTFILES)
-+	-rm -rf $(distdir)
-+	mkdir $(distdir)
-+	-chmod 777 $(distdir)
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+all-recursive-am: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS) config.h
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-+		mostlyclean-compile mostlyclean-tags \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-+		clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-+		distclean-tags distclean-generic clean-am
-+
-+distclean: distclean-am
-+	-rm -f config.status
-+
-+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-+		maintainer-clean-compile maintainer-clean-tags \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f config.status
-+
-+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-+mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-+mostlyclean-compile distclean-compile clean-compile \
-+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-+check-am installcheck-am installcheck all-recursive-am install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+file.o: file.c bonds.h defs.h draw.h globals.h view.h
-+	$(COMPILE) -c ${ELEM} $<
-+install-binPROGRAMS:$(bin_PROGRAMS)
-+	$(INSTALL_PROGRAM) $(top_builddir)/xmakemol $(prefix)/bin
-+install-data:
-+	-mkdir -p $(DATA_DIR)
-+	$(INSTALL_DATA) $(top_srcdir)/elements ${DATA_DIR}
-+install:install-binPROGRAMS install-data
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-Index: NEWS
-===================================================================
-
-
-Index: acconfig.h
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ acconfig.h	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,283 @@
-+#undef HAVE_LIBGEN
-+#undef HAVE_MOTIF
-+#undef XPM
-+#undef VERSION
-+#undef GL
-+
-+/* acconfig.h
-+   This file is in the public domain.
-+
-+   Descriptive text for the C preprocessor macros that
-+   the distributed Autoconf macros can define.
-+   No software package will use all of them; autoheader copies the ones
-+   your configure.in uses into your configuration header file templates.
-+
-+   The entries are in sort -df order: alphabetical, case insensitive,
-+   ignoring punctuation (such as underscores).  Although this order
-+   can split up related entries, it makes it easier to check whether
-+   a given entry is in the file.
-+
-+   Leave the following blank line there!!  Autoheader needs it.  */
-+
-+
-+/* Define if on AIX 3.
-+   System headers sometimes define this.
-+   We just want to avoid a redefinition error message.  */
-+#ifndef _ALL_SOURCE
-+#undef _ALL_SOURCE
-+#endif
-+
-+/* Define if using alloca.c.  */
-+#undef C_ALLOCA
-+
-+/* Define if type char is unsigned and you are not using gcc.  */
-+#ifndef __CHAR_UNSIGNED__
-+#undef __CHAR_UNSIGNED__
-+#endif
-+
-+/* Define if the closedir function returns void instead of int.  */
-+#undef CLOSEDIR_VOID
-+
-+/* Define to empty if the keyword does not work.  */
-+#undef const
-+
-+/* 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 for DGUX with <sys/dg_sys_info.h>.  */
-+#undef DGUX
-+
-+/* Define if you have <dirent.h>.  */
-+#undef DIRENT
-+
-+/* Define to the type of elements in the array set by `getgroups'.
-+   Usually this is either `int' or `gid_t'.  */
-+#undef GETGROUPS_T
-+
-+/* Define if the `getloadavg' function needs to be run setuid or setgid.  */
-+#undef GETLOADAVG_PRIVILEGED
-+
-+/* Define if the `getpgrp' function takes no argument.  */
-+#undef GETPGRP_VOID
-+
-+/* Define to `int' if <sys/types.h> doesn't define.  */
-+#undef gid_t
-+
-+/* Define if you have alloca, as a function or macro.  */
-+#undef HAVE_ALLOCA
-+
-+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-+#undef HAVE_ALLOCA_H
-+
-+/* Define if you don't have vprintf but do have _doprnt.  */
-+#undef HAVE_DOPRNT
-+
-+/* Define if your system has a working fnmatch function.  */
-+#undef HAVE_FNMATCH
-+
-+/* Define if your system has its own `getloadavg' function.  */
-+#undef HAVE_GETLOADAVG
-+
-+/* Define if you have the getmntent function.  */
-+#undef HAVE_GETMNTENT
-+
-+/* Define if the `long double' type works.  */
-+#undef HAVE_LONG_DOUBLE
-+
-+/* Define if you support file names longer than 14 characters.  */
-+#undef HAVE_LONG_FILE_NAMES
-+
-+/* Define if you have a working `mmap' system call.  */
-+#undef HAVE_MMAP
-+
-+/* Define if system calls automatically restart after interruption
-+   by a signal.  */
-+#undef HAVE_RESTARTABLE_SYSCALLS
-+
-+/* Define if your struct stat has st_blksize.  */
-+#undef HAVE_ST_BLKSIZE
-+
-+/* Define if your struct stat has st_blocks.  */
-+#undef HAVE_ST_BLOCKS
-+
-+/* Define if you have the strcoll function and it is properly defined.  */
-+#undef HAVE_STRCOLL
-+
-+/* Define if your struct stat has st_rdev.  */
-+#undef HAVE_ST_RDEV
-+
-+/* Define if you have the strftime function.  */
-+#undef HAVE_STRFTIME
-+
-+/* Define if you have the ANSI # stringizing operator in cpp. */
-+#undef HAVE_STRINGIZE
-+
-+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-+#undef HAVE_SYS_WAIT_H
-+
-+/* Define if your struct tm has tm_zone.  */
-+#undef HAVE_TM_ZONE
-+
-+/* Define if you don't have tm_zone but do have the external array
-+   tzname.  */
-+#undef HAVE_TZNAME
-+
-+/* Define if you have <unistd.h>.  */
-+#undef HAVE_UNISTD_H
-+
-+/* Define if utime(file, NULL) sets file's timestamp to the present.  */
-+#undef HAVE_UTIME_NULL
-+
-+/* Define if you have <vfork.h>.  */
-+#undef HAVE_VFORK_H
-+
-+/* Define if you have the vprintf function.  */
-+#undef HAVE_VPRINTF
-+
-+/* Define if you have the wait3 system call.  */
-+#undef HAVE_WAIT3
-+
-+/* Define as __inline if that's what the C compiler calls it.  */
-+#undef inline
-+
-+/* Define if int is 16 bits instead of 32.  */
-+#undef INT_16_BITS
-+
-+/* Define if long int is 64 bits.  */
-+#undef LONG_64_BITS
-+
-+/* Define if major, minor, and makedev are declared in <mkdev.h>.  */
-+#undef MAJOR_IN_MKDEV
-+
-+/* Define if major, minor, and makedev are declared in <sysmacros.h>.  */
-+#undef MAJOR_IN_SYSMACROS
-+
-+/* Define if on MINIX.  */
-+#undef _MINIX
-+
-+/* Define to `int' if <sys/types.h> doesn't define.  */
-+#undef mode_t
-+
-+/* Define if you don't have <dirent.h>, but have <ndir.h>.  */
-+#undef NDIR
-+
-+/* Define if you have <memory.h>, and <string.h> doesn't declare the
-+   mem* functions.  */
-+#undef NEED_MEMORY_H
-+
-+/* Define if your struct nlist has an n_un member.  */
-+#undef NLIST_NAME_UNION
-+
-+/* Define if you have <nlist.h>.  */
-+#undef NLIST_STRUCT
-+
-+/* Define if your C compiler doesn't accept -c and -o together.  */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Define if your Fortran 77 compiler doesn't accept -c and -o together. */
-+#undef F77_NO_MINUS_C_MINUS_O
-+
-+/* Define to `long' if <sys/types.h> doesn't define.  */
-+#undef off_t
-+
-+/* Define to `int' if <sys/types.h> doesn't define.  */
-+#undef pid_t
-+
-+/* Define if the system does not provide POSIX.1 features except
-+   with this defined.  */
-+#undef _POSIX_1_SOURCE
-+
-+/* Define if you need to in order for stat and other things to work.  */
-+#undef _POSIX_SOURCE
-+
-+/* Define as the return type of signal handlers (int or void).  */
-+#undef RETSIGTYPE
-+
-+/* Define to the type of arg1 for select(). */
-+#undef SELECT_TYPE_ARG1
-+
-+/* Define to the type of args 2, 3 and 4 for select(). */
-+#undef SELECT_TYPE_ARG234
-+
-+/* Define to the type of arg5 for select(). */
-+#undef SELECT_TYPE_ARG5
-+
-+/* Define if the `setpgrp' function takes no argument.  */
-+#undef SETPGRP_VOID
-+
-+/* Define if the setvbuf function takes the buffering type as its second
-+   argument and the buffer pointer as the third, as on System V
-+   before release 3.  */
-+#undef SETVBUF_REVERSED
-+
-+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-+#undef size_t
-+
-+/* 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 run-time.
-+	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 if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-+#undef STAT_MACROS_BROKEN
-+
-+/* Define if you have the ANSI C header files.  */
-+#undef STDC_HEADERS
-+
-+/* Define on System V Release 4.  */
-+#undef SVR4
-+
-+/* Define if you don't have <dirent.h>, but have <sys/dir.h>.  */
-+#undef SYSDIR
-+
-+/* Define if you don't have <dirent.h>, but have <sys/ndir.h>.  */
-+#undef SYSNDIR
-+
-+/* Define if `sys_siglist' is declared by <signal.h>.  */
-+#undef SYS_SIGLIST_DECLARED
-+
-+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define if your <sys/time.h> declares struct tm.  */
-+#undef TM_IN_SYS_TIME
-+
-+/* Define to `int' if <sys/types.h> doesn't define.  */
-+#undef uid_t
-+
-+/* Define for Encore UMAX.  */
-+#undef UMAX
-+
-+/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
-+   instead of <sys/cpustats.h>.  */
-+#undef UMAX4_3
-+
-+/* Define if you do not have <strings.h>, index, bzero, etc..  */
-+#undef USG
-+
-+/* Define vfork as fork if vfork does not work.  */
-+#undef vfork
-+
-+/* Define if the closedir function returns void instead of int.  */
-+#undef VOID_CLOSEDIR
-+
-+/* Define if your processor stores words with the most significant
-+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-+#undef WORDS_BIGENDIAN
-+
-+/* Define if the X Window System is missing or not being used.  */
-+#undef X_DISPLAY_MISSING
-+
-+/* Define if lex declares yytext as a char * by default, not a char[].  */
-+#undef YYTEXT_POINTER
-+
-+
-+/* Leave that blank line there!!  Autoheader needs it.
-+   If you're adding to this file, keep in mind:
-+   The entries are in sort -df order: alphabetical, case insensitive,
-+   ignoring punctuation (such as underscores).  */
-Index: acinclude.m4
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ acinclude.m4	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,910 @@
-+dnl @(#)$Mu: mgv/acinclude.m4 1.5 1998/08/25 21:34:32 $
-+dnl
-+dnl acinclude.m4
-+dnl	local automake/autoconf/m4 fun for mgv.
-+dnl
-+dnl Copyright (C) 1998 Eric A. Howe
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (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 You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+dnl
-+dnl   Authors:	Eric A. Howe (mu@trends.net)
-+dnl
-+
-+dnl
-+dnl ICE_FIND_XPM
-+dnl ---------------
-+dnl
-+dnl Find Xpm libraries and headers.
-+dnl Put Xpm include directory in xpm_includes,
-+dnl put Xpm library directory in xpm_libraries,
-+dnl and add appropriate flags to X_CFLAGS and X_LIBS.
-+dnl
-+dnl Borrowed from DDD.
-+dnl
-+AC_DEFUN(ICE_FIND_XPM,
-+[
-+AC_REQUIRE([AC_PATH_XTRA])
-+xpm_includes=
-+xpm_libraries=
-+AC_ARG_WITH(xpm,
-+[  --without-xpm                    do not use the Xpm library])
-+dnl Treat --without-xpm like
-+dnl --without-xpm-includes --without-xpm-libraries.
-+if test "$with_xpm" = "no"
-+then
-+xpm_includes=no
-+xpm_libraries=no
-+fi
-+AC_ARG_WITH(xpm-includes,
-+[  --with-xpm-includes=DIR          Xpm include files are in DIR],
-+xpm_includes="$withval")
-+AC_ARG_WITH(xpm-libraries,
-+[  --with-xpm-libraries=DIR         Xpm libraries are in DIR],
-+xpm_libraries="$withval")
-+AC_MSG_CHECKING(for Xpm)
-+#
-+#
-+# Search the include files.  Note that XPM can come in <X11/xpm.h> (as
-+# in X11R6) or in <xpm.h> if installed locally.
-+#
-+if test "$xpm_includes" = ""; then
-+AC_CACHE_VAL(ice_cv_xpm_includes,
-+[
-+ice_xpm_save_LIBS="$LIBS"
-+ice_xpm_save_CFLAGS="$CFLAGS"
-+ice_xpm_save_CPPFLAGS="$CPPFLAGS"
-+ice_xpm_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+AC_TRY_COMPILE([
-+#include <X11/xpm.h>
-+],[int a;],
-+[
-+# X11/xpm.h is in the standard search path.
-+ice_cv_xpm_includes=
-+],
-+[
-+# X11/xpm.h is not in the standard search path.
-+# Locate it and put its directory in `xpm_includes'
-+#
-+# /usr/include/Motif* are used on HP-UX (Motif).
-+# /usr/include/X11* are used on HP-UX (X and Xaw).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Xaw).
-+# Other directories are just guesses.
-+for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
-+           /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \
-+           /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-+           /usr/dt/include /usr/openwin/include \
-+           /usr/dt/*/include /opt/*/include /usr/include/Motif* \
-+	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
-+	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
-+if test -f "$dir/X11/xpm.h" || test -f "$dir/xpm.h"; then
-+ice_cv_xpm_includes="$dir"
-+break
-+fi
-+done
-+])
-+#
-+LIBS="$ice_xpm_save_LIBS"
-+CFLAGS="$ice_xpm_save_CFLAGS"
-+CPPFLAGS="$ice_xpm_save_CPPFLAGS"
-+LDFLAGS="$ice_xpm_save_LDFLAGS"
-+])
-+xpm_includes="$ice_cv_xpm_includes"
-+fi
-+#
-+#
-+# Now for the libraries.
-+#
-+if test "$xpm_libraries" = ""; then
-+AC_CACHE_VAL(ice_cv_xpm_libraries,
-+[
-+ice_xpm_save_LIBS="$LIBS"
-+ice_xpm_save_CFLAGS="$CFLAGS"
-+ice_xpm_save_CPPFLAGS="$CPPFLAGS"
-+ice_xpm_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+#
-+# We use XtToolkitInitialize() here since it takes no arguments
-+# and thus also works with a C++ compiler.
-+AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <X11/xpm.h>
-+],[XtToolkitInitialize();],
-+[
-+# libxpm.a is in the standard search path.
-+ice_cv_xpm_libraries=
-+],
-+[
-+# libXpm.a is not in the standard search path.
-+# Locate it and put its directory in `xpm_libraries'
-+#
-+#
-+# /usr/lib/Motif* are used on HP-UX (Motif).
-+# /usr/lib/X11* are used on HP-UX (X and Xpm).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Xpm).
-+# Other directories are just guesses.
-+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
-+	   /usr/lib/Motif2.1 /usr/lib/Motif2.0 /usr/lib/Motif1.2 \
-+	   /usr/lib/Motif1.1 /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
-+	   /usr/lib/X11 /usr/dt/lib /usr/openwin/lib \
-+	   /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \
-+	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-+	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
-+if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then
-+ice_cv_xpm_libraries="$dir"
-+break
-+fi
-+done
-+])
-+#
-+LIBS="$ice_xpm_save_LIBS"
-+CFLAGS="$ice_xpm_save_CFLAGS"
-+CPPFLAGS="$ice_xpm_save_CPPFLAGS"
-+LDFLAGS="$ice_xpm_save_LDFLAGS"
-+])
-+#
-+xpm_libraries="$ice_cv_xpm_libraries"
-+fi
-+#
-+# Add Xpm definitions to X flags
-+#
-+if test "$xpm_includes" != "" && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no"
-+then
-+X_CFLAGS="-I$xpm_includes $X_CFLAGS"
-+fi
-+if test "$xpm_libraries" != "" && test "$xpm_libraries" != "$x_libraries" && test "$xpm_libraries" != "no"
-+then
-+case "$X_LIBS" in
-+  *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";;
-+  *-R*)   X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";;
-+  *)      X_LIBS="-L$xpm_libraries $X_LIBS";;
-+esac
-+fi
-+#
-+#
-+xpm_libraries_result="$xpm_libraries"
-+xpm_includes_result="$xpm_includes"
-+test "$xpm_libraries_result" = "" && 
-+  xpm_libraries_result="in default path"
-+test "$xpm_includes_result" = "" && 
-+  xpm_includes_result="in default path"
-+test "$xpm_libraries_result" = "no" && 
-+  xpm_libraries_result="(none)"
-+test "$xpm_includes_result" = "no" && 
-+  xpm_includes_result="(none)"
-+AC_MSG_RESULT(
-+  [libraries $xpm_libraries_result, headers $xpm_includes_result])
-+])dnl
-+
-+dnl
-+dnl ICE_FIND_MOTIF
-+dnl --------------
-+dnl
-+dnl Find Motif libraries and headers
-+dnl Put Motif include directory in motif_includes,
-+dnl put Motif library directory in motif_libraries,
-+dnl and add appropriate flags to X_CFLAGS and X_LIBS.
-+dnl
-+dnl Borrowed from DDD.
-+dnl
-+AC_DEFUN(ICE_FIND_MOTIF,
-+[
-+AC_REQUIRE([AC_PATH_XTRA])
-+motif_includes=
-+motif_libraries=
-+AC_ARG_WITH(motif-includes,
-+[  --with-motif-includes=DIR        Motif include files are in DIR],
-+motif_includes="$withval")
-+AC_ARG_WITH(motif-libraries,
-+[  --with-motif-libraries=DIR       Motif libraries are in DIR],
-+motif_libraries="$withval")
-+AC_MSG_CHECKING(for Motif)
-+#
-+#
-+# Search the include files.
-+#
-+if test "$motif_includes" = ""; then
-+AC_CACHE_VAL(ice_cv_motif_includes,
-+[
-+ice_motif_save_LIBS="$LIBS"
-+ice_motif_save_CFLAGS="$CFLAGS"
-+ice_motif_save_CPPFLAGS="$CPPFLAGS"
-+ice_motif_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+AC_TRY_COMPILE([#include <Xm/Xm.h>],[int a;],
-+[
-+# Xm/Xm.h is in the standard search path.
-+ice_cv_motif_includes=
-+],
-+[
-+# Xm/Xm.h is not in the standard search path.
-+# Locate it and put its directory in `motif_includes'
-+#
-+# /usr/include/Motif* are used on HP-UX (Motif).
-+# /usr/include/X11* are used on HP-UX (X and Athena).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Athena).
-+# Other directories are just guesses.
-+for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
-+           /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \
-+           /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-+           /usr/dt/include /usr/openwin/include \
-+           /usr/dt/*/include /opt/*/include /usr/include/Motif* \
-+	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
-+	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
-+if test -f "$dir/Xm/Xm.h"; then
-+ice_cv_motif_includes="$dir"
-+break
-+fi
-+done
-+if test "$ice_cv_motif_includes" = ""; then
-+ice_cv_motif_includes=no
-+fi
-+])
-+#
-+LIBS="$ice_motif_save_LIBS"
-+CFLAGS="$ice_motif_save_CFLAGS"
-+CPPFLAGS="$ice_motif_save_CPPFLAGS"
-+LDFLAGS="$ice_motif_save_LDFLAGS"
-+])
-+motif_includes="$ice_cv_motif_includes"
-+fi
-+#
-+#
-+# Now for the libraries.
-+#
-+if test "$motif_libraries" = ""; then
-+AC_CACHE_VAL(ice_cv_motif_libraries,
-+[
-+ice_motif_save_LIBS="$LIBS"
-+ice_motif_save_CFLAGS="$CFLAGS"
-+ice_motif_save_CPPFLAGS="$CPPFLAGS"
-+ice_motif_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+# We use XtToolkitInitialize() here since it takes no arguments
-+# and thus also works with a C++ compiler.
-+AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <Xm/Xm.h>
-+],[XtToolkitInitialize();],
-+[
-+# libXm.a is in the standard search path.
-+ice_cv_motif_libraries=
-+],
-+[
-+# libXm.a is not in the standard search path.
-+# Locate it and put its directory in `motif_libraries'
-+#
-+# /usr/lib/Motif* are used on HP-UX (Motif).
-+# /usr/lib/X11* are used on HP-UX (X and Athena).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/lesstif is used on Linux (Lesstif).
-+# /usr/openwin is used on Solaris (X and Athena).
-+# Other directories are just guesses.
-+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
-+	   /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \
-+	   /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \
-+           /usr/dt/lib /usr/openwin/lib \
-+	   /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \
-+           /usr/lesstif*/lib /usr/lib/Lesstif* \
-+	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-+	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
-+if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then
-+ice_cv_motif_libraries="$dir"
-+break
-+fi
-+done
-+if test "$ice_cv_motif_libraries" = ""; then
-+ice_cv_motif_libraries=no
-+fi
-+])
-+#
-+LIBS="$ice_motif_save_LIBS"
-+CFLAGS="$ice_motif_save_CFLAGS"
-+CPPFLAGS="$ice_motif_save_CPPFLAGS"
-+LDFLAGS="$ice_motif_save_LDFLAGS"
-+])
-+#
-+motif_libraries="$ice_cv_motif_libraries"
-+fi
-+# Add Motif definitions to X flags
-+#
-+if test "$motif_includes" != "" && test "$motif_includes" != "$x_includes" && test "$motif_includes" != "no"
-+then
-+X_CFLAGS="-I$motif_includes $X_CFLAGS"
-+fi
-+if test "$motif_libraries" != "" && test "$motif_libraries" != "$x_libraries" && test "$motif_libraries" != "no"
-+then
-+case "$X_LIBS" in
-+  *-R\ *) X_LIBS="-L$motif_libraries -R $motif_libraries $X_LIBS";;
-+  *-R*)   X_LIBS="-L$motif_libraries -R$motif_libraries $X_LIBS";;
-+  *)      X_LIBS="-L$motif_libraries $X_LIBS";;
-+esac
-+fi
-+#
-+#
-+motif_libraries_result="$motif_libraries"
-+motif_includes_result="$motif_includes"
-+test "$motif_libraries_result" = "" && 
-+  motif_libraries_result="in default path"
-+test "$motif_includes_result" = "" && 
-+  motif_includes_result="in default path"
-+test "$motif_libraries_result" = "no" && 
-+  motif_libraries_result="(none)"
-+test "$motif_includes_result" = "no" && 
-+  motif_includes_result="(none)"
-+AC_MSG_RESULT(
-+  [libraries $motif_libraries_result, headers $motif_includes_result])
-+])dnl
-+############################################################################
-+# Usage:
-+#  SIM_AC_CHECK_PTHREAD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to find the PTHREAD development system. If it is found, these
-+#  shell variables are set:
-+#
-+#    $sim_ac_pthread_cppflags (extra flags the compiler needs for pthread)
-+#    $sim_ac_pthread_ldflags  (extra flags the linker needs for pthread)
-+#    $sim_ac_pthread_libs     (link libraries the linker needs for pthread)
-+#
-+#  The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly.
-+#  In addition, the variable $sim_ac_pthread_avail is set to "yes" if the
-+#  pthread development system is found.
-+#
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN([SIM_AC_CHECK_PTHREAD], [
-+
-+AC_ARG_WITH(
-+  [pthread],
-+  [  --with-pthread          pthread installation directory],
-+  [],[with_pthread=yes])
-+
-+sim_ac_pthread_avail=no
-+
-+if test x"$with_pthread" != xno; then
-+  if test x"$with_pthread" != xyes; then
-+    sim_ac_pthread_cppflags="-I${with_pthread}/include"
-+    sim_ac_pthread_ldflags="-L${with_pthread}/lib"
-+  fi
-+  sim_ac_pthread_libs_first="-lpthread"
-+  sim_ac_pthread_libs_second="-pthread"
-+  sim_ac_pthread_libs_third="-lc_r"
-+  sim_ac_pthread_libs=""
-+# FreeBSD 4.x use "-pthread" or "-lc_r"
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  AC_CACHE_CHECK(
-+    [whether the pthread development system is available],
-+    sim_cv_lib_pthread_avail,
-+    [
-+	for sim_pthread_libs in $sim_ac_pthread_libs_first \
-+	$sim_ac_pthread_libs_second $sim_ac_pthread_libs_third ; do
-+	  if test x"$sim_cv_lib_pthread_avail" != x"yes" ; then
-+		CPPFLAGS="$CPPFLAGS $sim_ac_pthread_cppflags"
-+		LDFLAGS="$LDFLAGS $sim_ac_pthread_ldflags"
-+		LIBS="$sim_pthread_libs $LIBS"
-+		AC_TRY_LINK([#include <pthread.h>],
-+                 [(void)pthread_create(0L, 0L, 0L, 0L);],
-+                 [sim_cv_lib_pthread_avail=yes
-+	    	  sim_ac_pthread_libs="$sim_pthread_libs"
-+			],
-+                 [sim_cv_lib_pthread_avail=no])
-+	  fi
-+	  if test x"$sim_cv_lib_pthread_avail" != x"yes"; then
-+            CPPFLAGS=$sim_ac_save_cppflags
-+    	    LDFLAGS=$sim_ac_save_ldflags
-+    	    LIBS=$sim_ac_save_libs	
-+	  fi
-+	done
-+    ]
-+  )
-+
-+  if test x"$sim_cv_lib_pthread_avail" = xyes; then
-+    sim_ac_pthread_avail=yes
-+    $1
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    $2
-+  fi
-+fi
-+])
-+
-+############################################################################
-+# Usage:
-+#  SIM_AC_CHECK_OPENGL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to find an OpenGL development system, either a native
-+#  implementation or the OpenGL-compatible Mesa library. If
-+#  it is found, these shell variables are set:
-+#
-+#    $sim_ac_gl_cppflags (extra flags the compiler needs for OpenGL/Mesa)
-+#    $sim_ac_gl_ldflags  (extra flags the linker needs for OpenGL/Mesa)
-+#    $sim_ac_gl_libs     (link libraries the linker needs for OpenGL/Mesa)
-+#
-+#  The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly.
-+#  In addition, the variable $sim_ac_gl_avail is set to "yes" if an
-+#  OpenGL-compatible development system is found.
-+#
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN(SIM_AC_CHECK_OPENGL, [
-+
-+unset sim_ac_gl_cppflags
-+unset sim_ac_gl_ldflags
-+unset sim_ac_gl_libs
-+sim_ac_gl_avail=no
-+
-+AC_ARG_WITH(
-+  [mesa],
-+  [  --with-mesa             prefer MesaGL (if found) over OpenGL [[default=yes]]],
-+  [],[with_mesa=yes])
-+
-+# It's usually libGL.so on UNIX systems and opengl32.lib on MSWindows.
-+sim_ac_gl_glnames="-lGL -lopengl32"
-+sim_ac_gl_mesaglnames=-lMesaGL
-+GL_LIBS=""
-+
-+if test "x$with_mesa" = "xyes"; then
-+  sim_ac_gl_first=$sim_ac_gl_mesaglnames
-+  sim_ac_gl_second=$sim_ac_gl_glnames
-+else
-+  sim_ac_gl_first=$sim_ac_gl_glnames
-+  sim_ac_gl_second=$sim_ac_gl_mesaglnames
-+fi
-+
-+AC_ARG_WITH(
-+  [opengl],
-+  [  --with-opengl           OpenGL/Mesa installation directory],[],[with_opengl=yes])
-+
-+if test x"$with_opengl" != xno; then
-+  if test x"$with_opengl" != xyes; then
-+    sim_ac_gl_cppflags="-I${with_opengl}/include"
-+    sim_ac_gl_ldflags="-L${with_opengl}/lib"
-+  else
-+    # This is a common location for the OpenGL library on HPUX.
-+    sim_ac_gl_hpux=/opt/graphics/OpenGL
-+    if test -d $sim_ac_gl_hpux; then
-+      sim_ac_gl_cppflags=-I$sim_ac_gl_hpux/include
-+      sim_ac_gl_ldflags=-L$sim_ac_gl_hpux/lib
-+    fi
-+  fi
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  CPPFLAGS="$CPPFLAGS $sim_ac_gl_cppflags"
-+  LDFLAGS="$LDFLAGS $sim_ac_gl_ldflags"
-+
-+  AC_CACHE_CHECK(
-+    [whether OpenGL library is available],
-+    sim_cv_lib_gl,
-+    [sim_cv_lib_gl=UNRESOLVED
-+
-+    for sim_ac_gl_libcheck in $sim_ac_gl_first $sim_ac_gl_second; do
-+      if test "x$sim_cv_lib_gl" = "xUNRESOLVED"; then
-+        LIBS="$sim_ac_gl_libcheck $sim_ac_save_libs -lm"
-+        AC_TRY_LINK([
-+		#if HAVE_WINDOWS_H
-+		#include <windows.h>
-+		#endif /* HAVE_WINDOWS_H */
-+	 	#include <GL/gl.h>
-+		],
-+		[glPointSize(1.0f);],
-+       		[sim_cv_lib_gl="$sim_ac_gl_libcheck"],
-+		)
-+      fi
-+    done
-+  ])
-+
-+  LIBS="$sim_ac_save_libs"
-+
-+  if test "x$sim_cv_lib_gl" != "xUNRESOLVED"; then
-+    sim_ac_gl_libs="$sim_cv_lib_gl"
-+  else
-+    AC_MSG_WARN([couldn't compile or link with OpenGL library -- trying with pthread library in place...])
-+
-+    SIM_AC_CHECK_PTHREAD([
-+      sim_ac_gl_cppflags="$sim_ac_gl_cppflags $sim_ac_pthread_cppflags"
-+      sim_ac_gl_ldflags="$sim_ac_gl_ldflags $sim_ac_pthread_ldflags"],
-+      [AC_MSG_WARN([couldn't compile or link with pthread library])])
-+
-+    if test "x$sim_ac_pthread_avail" = "xyes"; then
-+      AC_CACHE_CHECK(
-+        [whether OpenGL library can be linked with pthread library],
-+        sim_cv_lib_gl_pthread,
-+        [sim_cv_lib_gl_pthread=UNRESOLVED
-+        for sim_ac_gl_libcheck in $sim_ac_gl_first $sim_ac_gl_second; do
-+          if test "x$sim_cv_lib_gl_pthread" = "xUNRESOLVED"; then
-+            LIBS="$sim_ac_gl_libcheck $sim_ac_pthread_libs $sim_ac_save_libs"
-+            AC_TRY_LINK([
-+#if  HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+],
-+                        [
-+glPointSize(1.0f);
-+],
-+                        [sim_cv_lib_gl_pthread="$sim_ac_gl_libcheck"])
-+          fi
-+        done
-+      ])
-+
-+      if test "x$sim_cv_lib_gl_pthread" != "xUNRESOLVED"; then
-+        sim_ac_gl_libs="$sim_cv_lib_gl_pthread $sim_ac_pthread_libs"
-+      fi
-+    fi
-+  fi
-+
-+
-+  if test "x$sim_ac_gl_libs" != "x"; then
-+    LIBS="$sim_ac_save_libs"
-+    GL_LIBS="$sim_ac_gl_libs"
-+    sim_ac_gl_avail=yes
-+    $1
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    $2
-+  fi
-+fi
-+])
-+
-+
-+############################################################################
-+# Usage:
-+#  SIM_AC_CHECK_GLU([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to use the OpenGL utility library; GLU. If it is found,
-+#  these shell variables are set:
-+#
-+#    $sim_ac_glu_cppflags (extra flags the compiler needs for GLU)
-+#    $sim_ac_glu_ldflags  (extra flags the linker needs for GLU)
-+#    $sim_ac_glu_libs     (link libraries the linker needs for GLU)
-+#
-+#  The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly.
-+#  In addition, the variable $sim_ac_gly_avail is set to "yes" if GLU
-+#  is found.
-+#
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN(SIM_AC_CHECK_GLU, [
-+
-+unset sim_ac_glu_cppflags
-+unset sim_ac_glu_ldflags
-+unset sim_ac_glu_libs
-+sim_ac_glu_avail=no
-+
-+# It's usually libGLU.so on UNIX systems and glu32.lib on MSWindows.
-+sim_ac_glu_names="-lGLU -lglu32"
-+sim_ac_glu_mesanames=-lMesaGLU
-+# with_mesa is set from the SIM_AC_CHECK_OPENGL macro.
-+if test "x$with_mesa" = "xyes"; then
-+  sim_ac_glu_first=$sim_ac_glu_mesanames
-+  sim_ac_glu_second=$sim_ac_glu_names
-+else
-+  sim_ac_glu_first=$sim_ac_glu_names
-+  sim_ac_glu_second=$sim_ac_glu_mesanames
-+fi
-+
-+AC_ARG_WITH(
-+  [glu],[  --with-glu		  use the OpenGL utility library [[default=yes]]],[],[with_glu=yes])
-+
-+if test x"$with_glu" != xno; then
-+  if test x"$with_glu" != xyes; then
-+    sim_ac_glu_cppflags="-I${with_glu}/include"
-+    sim_ac_glu_ldflags="-L${with_glu}/lib"
-+  fi
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  CPPFLAGS="$CPPFLAGS $sim_ac_glu_cppflags"
-+  LDFLAGS="$LDFLAGS $sim_ac_glu_ldflags"
-+
-+  AC_CACHE_CHECK(
-+    [whether GLU is available],
-+    sim_cv_lib_glu,
-+    [sim_cv_lib_glu=UNRESOLVED
-+
-+    # Some platforms (like BeOS) have the GLU functionality in the GL
-+    # library (and no GLU library present).
-+    for sim_ac_glu_libcheck in "" $sim_ac_glu_first $sim_ac_glu_second; do
-+      if test "x$sim_cv_lib_glu" = "xUNRESOLVED"; then
-+        LIBS="$sim_ac_glu_libcheck $sim_ac_save_libs $GL_LIBS"
-+        AC_TRY_LINK([
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+],
-+                    [
-+gluSphere(0L, 1.0, 1, 1);
-+],
-+                    [sim_cv_lib_glu="$sim_ac_glu_libcheck"])
-+      fi
-+    done
-+  ])
-+
-+  LIBS="$sim_ac_save_libs"
-+
-+  if test "x$sim_cv_lib_glu" != "xUNRESOLVED"; then
-+    sim_ac_glu_libs="$sim_cv_lib_glu"
-+    LIBS="$sim_ac_save_libs"
-+    GL_LIBS="$GL_LIBS $sim_ac_glu_libs"
-+    sim_ac_glu_avail=yes
-+    $1
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    $2
-+  fi
-+fi
-+])
-+
-+
-+# **************************************************************************
-+# SIM_AC_GLU_READY_IFELSE( [ACTION-IF-TRUE], [ACTION-IF-FALSE] )
-+
-+AC_DEFUN([SIM_AC_GLU_READY_IFELSE],
-+[AC_CACHE_CHECK(
-+  [if GLU is available as part of GL library],
-+  [sim_cv_glu_ready],
-+  [AC_TRY_LINK(
-+    [
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+],
-+    [
-+gluSphere(0L, 1.0, 1, 1);
-+],
-+    [sim_cv_glu_ready=true],
-+    [sim_cv_glu_ready=false])])
-+if ${sim_cv_glu_ready}; then
-+  ifelse([$1], , :, [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+]) # SIM_AC_GLU_READY_IFELSE()
-+
-+
-+############################################################################
-+# Usage:
-+#  SIM_AC_GLU_NURBSOBJECT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to find out whether the interface struct against the GLU
-+#  library NURBS functions is called "GLUnurbs" or "GLUnurbsObj".
-+#  (This seems to have changed somewhere between release 1.1 and
-+#  release 1.3 of GLU).
-+#
-+#  The variable $sim_ac_glu_nurbsobject is set to the correct name
-+#  if the nurbs structure is found.
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN(SIM_AC_GLU_NURBSOBJECT, [
-+AC_CACHE_CHECK(
-+  [what structure to use in the GLU NURBS interface],
-+  sim_cv_func_glu_nurbsobject,
-+  [sim_cv_func_glu_nurbsobject=NONE
-+   for sim_ac_glu_structname in GLUnurbs GLUnurbsObj; do
-+    if test "$sim_cv_func_glu_nurbsobject" = NONE; then
-+      AC_TRY_LINK([
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>],
-+                  [$sim_ac_glu_structname * hepp = gluNewNurbsRenderer();
-+                   gluDeleteNurbsRenderer(hepp)],
-+                  [sim_cv_func_glu_nurbsobject=$sim_ac_glu_structname])
-+    fi
-+  done
-+])
-+
-+if test $sim_cv_func_glu_nurbsobject = NONE; then
-+  sim_ac_glu_nurbsobject=
-+  $2
-+else
-+  sim_ac_glu_nurbsobject=$sim_cv_func_glu_nurbsobject
-+  $1
-+fi
-+])
-+
-+# **************************************************************************
-+# SIM_AC_HAVE_GLX_IFELSE( IF-FOUND, IF-NOT-FOUND )
-+#
-+# Check whether GLX is on the system.
-+
-+AC_DEFUN([SIM_AC_HAVE_GLX_IFELSE], [
-+AC_CACHE_CHECK(
-+  [whether GLX is on the system],
-+  sim_cv_have_glx,
-+  AC_TRY_LINK(
-+    [#include <GL/glx.h>],
-+    [(void)glXChooseVisual(0L, 0, 0L);],
-+    [sim_cv_have_glx=true],
-+    [sim_cv_have_glx=false]))
-+
-+if ${sim_cv_have_glx=false}; then
-+  ifelse([$1], , :, [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+]) # SIM_AC_HAVE_GLX_IFELSE()
-+
-+############################################################################
-+# Usage:
-+#   SIM_CHECK_MOTIF_GLWIDGET([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]])
-+#
-+# Description:
-+#   This macro checks for a GL widget that can be used with Xt/Motif.
-+#
-+# Variables:
-+#   $sim_cv_motif_glwidget         (cached)  class + header + library
-+#   $sim_cv_motif_glwidget_hdrloc  (cached)  GL | X11/GLw
-+#
-+#   $sim_ac_motif_glwidget_class             glwMDrawingAreaWidgetClass |
-+#                                            glwDrawingAreaWidgetClass
-+#   $sim_ac_motif_glwidget_header            GLwDrawA.h | GLwMDrawA.h
-+#   $sim_ac_motif_glwidget_library           GLwM | GLw | MesaGLwM | MesaGLw
-+#
-+#   $LIBS = -l$sim_ac_motif_glwidget_library $LIBS
-+#
-+# Defines:
-+#   XT_GLWIDGET                              $sim_ac_motif_glwidget_class
-+#   HAVE_GL_GLWDRAWA_H                       #include <GL/GLwDrawA.h>
-+#   HAVE_GL_GLWMDRAWA_H                      #include <GL/GLwMDrawA.h>
-+#   HAVE_X11_GWL_GLWDRAWA_H                  #include <X11/GLw/GLwDrawA.h>
-+#   HAVE_X11_GWL_GLWMDRAWA_H                 #include <X11/GLw/GLwMDrawA.h>
-+#
-+# Authors:
-+#   Lars J. Aas <larsa@sim.no>,
-+#   Loring Holden <lsh@cs.brown.edu>,
-+#   Morten Eriksen <mortene@sim.no>
-+#
-+ 
-+AC_DEFUN([SIM_CHECK_MOTIF_GLWIDGET], [
-+
-+AC_ARG_WITH(
-+[glw],[  --with-glw		  use the OpenGL widget Library [[default=yes]]], [], [with_glw=yes])
-+
-+if test x"$with_glw" != x"no" ; then 
-+  if test x"$with_glw" != x"yes" ; then
-+	sim_ac_glw_cppflags="-I${with_glw}/include"
-+	sim_ac_glw_ldflags="-L${with_glw}/lib"
-+  fi
-+
-+  SAVECPPFLAGS="$CPPFLAGS"
-+  SAVELDFLAGS="$LDFLAGS"
-+  SAVELIBS="$LIBS"
-+
-+  CPPFLAGS="$SAVECPPFLAGS $sim_ac_glw_cppflags"
-+  LDFLAGS="$SAVELDFLAGS $sim_ac_glw_ldflags"
-+  AC_CACHE_CHECK(
-+  [for a GL widget],
-+  sim_cv_motif_glwidget,
-+  [
-+	XWIDGETLIBS="$X_LIBS $X11_LIBS $XT_LIBS $X_LIBS $X_PRE_LIBS $XM_LIBS"
-+  	sim_cv_motif_glwidget=UNKNOWN
-+  	for lib in GLwM GLw MesaGLwM MesaGLw; do
-+    	  if test x"$sim_cv_motif_glwidget" = x"UNKNOWN"; then
-+      		LIBS="-l$lib $SAVELIBS $XWIDGETLIBS $GL_LIBS -lm"
-+      		AC_TRY_LINK(
-+        		[#include <X11/Intrinsic.h>
-+			 #include <GL/GLwMDrawA.h>
-+        		extern WidgetClass glwMDrawingAreaWidgetClass;],
-+        		[Widget glxManager = NULL;
-+        		Widget glxWidget = XtVaCreateManagedWidget("GLWidget",
-+          		glwMDrawingAreaWidgetClass, glxManager, NULL);],
-+        		[sim_cv_motif_glwidget="glwMDrawingAreaWidgetClass GLwMDrawA.h $lib"],
-+        		[sim_cv_motif_glwidget=UNKNOWN])
-+    	  fi
-+  	done
-+     LIBS=$SAVELIBS
-+  ])
-+ 
-+if test "x$sim_cv_motif_glwidget" = "xUNKNOWN"; then
-+  ifelse([$2], , :, [$2])
-+else
-+  sim_ac_motif_glwidget_class=`echo $sim_cv_motif_glwidget | cut -d" " -f1`
-+  sim_ac_motif_glwidget_header=`echo $sim_cv_motif_glwidget | cut -d" " -f2`
-+  sim_ac_motif_glwidget_library=`echo $sim_cv_motif_glwidget | cut -d" " -f3`
-+ 
-+  AC_CACHE_CHECK(
-+    [the $sim_ac_motif_glwidget_header header location],
-+    sim_cv_motif_glwidget_hdrloc,
-+    [sim_cv_motif_glwidget_hdrloc=UNKNOWN
-+    for location in X11/GLw GL; do
-+     if test "x$sim_cv_motif_glwidget_hdrloc" = "xUNKNOWN"; then
-+        AC_TRY_CPP(
-+          [#include <X11/Intrinsic.h>
-+          #include <$location/$sim_ac_motif_glwidget_header>],
-+          [sim_cv_motif_glwidget_hdrloc=$location],
-+          [sim_cv_motif_glwidget_hdrloc=UNKNOWN])
-+      fi
-+    done])
-+ 
-+  if test "x$sim_cv_motif_glwidget_hdrloc" = "xUNKNOWN"; then
-+    ifelse([$2], , :, [$2])
-+  else
-+    if test "x$sim_ac_motif_glwidget_header" = "xGLwDrawA.h"; then
-+      if test "x$sim_cv_motif_glwidget_hdrloc" = "xGL"; then
-+        AC_DEFINE(HAVE_GL_GLWDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <GL/GLwDrawA.h>])
-+      else
-+        AC_DEFINE(HAVE_X11_GLW_GLWDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <X11/GLw/GLwDrawA.h>])
-+      fi
-+    else
-+      if test "x$sim_cv_motif_glwidget_hdrloc" = "xGL"; then
-+        AC_DEFINE(HAVE_GL_GLWMDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <GL/GLwMDrawA.h>])
-+      else
-+        AC_DEFINE(HAVE_X11_GLW_GLWMDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <X11/GLw/GLwMDrawA.h>])
-+      fi
-+    fi
-+ 
-+    AC_DEFINE_UNQUOTED(XT_GLWIDGET, $sim_ac_motif_glwidget_class,
-+      [Define this to the Xt/Motif OpenGL widget class to use])
-+ 
-+    LIBS="$LIBS"
-+    GL_LIBS="$GL_LIBS -l$sim_ac_motif_glwidget_library"
-+    $1
-+  fi
-+fi
-+
-+fi
-+])
-Index: aclocal.m4
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ aclocal.m4	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,1033 @@
-+dnl aclocal.m4 generated automatically by aclocal 1.4
-+
-+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+
-+dnl @(#)$Mu: mgv/acinclude.m4 1.5 1998/08/25 21:34:32 $
-+dnl
-+dnl acinclude.m4
-+dnl	local automake/autoconf/m4 fun for mgv.
-+dnl
-+dnl Copyright (C) 1998 Eric A. Howe
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (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 You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+dnl
-+dnl   Authors:	Eric A. Howe (mu@trends.net)
-+dnl
-+
-+dnl
-+dnl ICE_FIND_XPM
-+dnl ---------------
-+dnl
-+dnl Find Xpm libraries and headers.
-+dnl Put Xpm include directory in xpm_includes,
-+dnl put Xpm library directory in xpm_libraries,
-+dnl and add appropriate flags to X_CFLAGS and X_LIBS.
-+dnl
-+dnl Borrowed from DDD.
-+dnl
-+AC_DEFUN(ICE_FIND_XPM,
-+[
-+AC_REQUIRE([AC_PATH_XTRA])
-+xpm_includes=
-+xpm_libraries=
-+AC_ARG_WITH(xpm,
-+[  --without-xpm                    do not use the Xpm library])
-+dnl Treat --without-xpm like
-+dnl --without-xpm-includes --without-xpm-libraries.
-+if test "$with_xpm" = "no"
-+then
-+xpm_includes=no
-+xpm_libraries=no
-+fi
-+AC_ARG_WITH(xpm-includes,
-+[  --with-xpm-includes=DIR          Xpm include files are in DIR],
-+xpm_includes="$withval")
-+AC_ARG_WITH(xpm-libraries,
-+[  --with-xpm-libraries=DIR         Xpm libraries are in DIR],
-+xpm_libraries="$withval")
-+AC_MSG_CHECKING(for Xpm)
-+#
-+#
-+# Search the include files.  Note that XPM can come in <X11/xpm.h> (as
-+# in X11R6) or in <xpm.h> if installed locally.
-+#
-+if test "$xpm_includes" = ""; then
-+AC_CACHE_VAL(ice_cv_xpm_includes,
-+[
-+ice_xpm_save_LIBS="$LIBS"
-+ice_xpm_save_CFLAGS="$CFLAGS"
-+ice_xpm_save_CPPFLAGS="$CPPFLAGS"
-+ice_xpm_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+AC_TRY_COMPILE([
-+#include <X11/xpm.h>
-+],[int a;],
-+[
-+# X11/xpm.h is in the standard search path.
-+ice_cv_xpm_includes=
-+],
-+[
-+# X11/xpm.h is not in the standard search path.
-+# Locate it and put its directory in `xpm_includes'
-+#
-+# /usr/include/Motif* are used on HP-UX (Motif).
-+# /usr/include/X11* are used on HP-UX (X and Xaw).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Xaw).
-+# Other directories are just guesses.
-+for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
-+           /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \
-+           /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-+           /usr/dt/include /usr/openwin/include \
-+           /usr/dt/*/include /opt/*/include /usr/include/Motif* \
-+	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
-+	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
-+if test -f "$dir/X11/xpm.h" || test -f "$dir/xpm.h"; then
-+ice_cv_xpm_includes="$dir"
-+break
-+fi
-+done
-+])
-+#
-+LIBS="$ice_xpm_save_LIBS"
-+CFLAGS="$ice_xpm_save_CFLAGS"
-+CPPFLAGS="$ice_xpm_save_CPPFLAGS"
-+LDFLAGS="$ice_xpm_save_LDFLAGS"
-+])
-+xpm_includes="$ice_cv_xpm_includes"
-+fi
-+#
-+#
-+# Now for the libraries.
-+#
-+if test "$xpm_libraries" = ""; then
-+AC_CACHE_VAL(ice_cv_xpm_libraries,
-+[
-+ice_xpm_save_LIBS="$LIBS"
-+ice_xpm_save_CFLAGS="$CFLAGS"
-+ice_xpm_save_CPPFLAGS="$CPPFLAGS"
-+ice_xpm_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+#
-+# We use XtToolkitInitialize() here since it takes no arguments
-+# and thus also works with a C++ compiler.
-+AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <X11/xpm.h>
-+],[XtToolkitInitialize();],
-+[
-+# libxpm.a is in the standard search path.
-+ice_cv_xpm_libraries=
-+],
-+[
-+# libXpm.a is not in the standard search path.
-+# Locate it and put its directory in `xpm_libraries'
-+#
-+#
-+# /usr/lib/Motif* are used on HP-UX (Motif).
-+# /usr/lib/X11* are used on HP-UX (X and Xpm).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Xpm).
-+# Other directories are just guesses.
-+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
-+	   /usr/lib/Motif2.1 /usr/lib/Motif2.0 /usr/lib/Motif1.2 \
-+	   /usr/lib/Motif1.1 /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
-+	   /usr/lib/X11 /usr/dt/lib /usr/openwin/lib \
-+	   /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \
-+	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-+	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
-+if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then
-+ice_cv_xpm_libraries="$dir"
-+break
-+fi
-+done
-+])
-+#
-+LIBS="$ice_xpm_save_LIBS"
-+CFLAGS="$ice_xpm_save_CFLAGS"
-+CPPFLAGS="$ice_xpm_save_CPPFLAGS"
-+LDFLAGS="$ice_xpm_save_LDFLAGS"
-+])
-+#
-+xpm_libraries="$ice_cv_xpm_libraries"
-+fi
-+#
-+# Add Xpm definitions to X flags
-+#
-+if test "$xpm_includes" != "" && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no"
-+then
-+X_CFLAGS="-I$xpm_includes $X_CFLAGS"
-+fi
-+if test "$xpm_libraries" != "" && test "$xpm_libraries" != "$x_libraries" && test "$xpm_libraries" != "no"
-+then
-+case "$X_LIBS" in
-+  *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";;
-+  *-R*)   X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";;
-+  *)      X_LIBS="-L$xpm_libraries $X_LIBS";;
-+esac
-+fi
-+#
-+#
-+xpm_libraries_result="$xpm_libraries"
-+xpm_includes_result="$xpm_includes"
-+test "$xpm_libraries_result" = "" && 
-+  xpm_libraries_result="in default path"
-+test "$xpm_includes_result" = "" && 
-+  xpm_includes_result="in default path"
-+test "$xpm_libraries_result" = "no" && 
-+  xpm_libraries_result="(none)"
-+test "$xpm_includes_result" = "no" && 
-+  xpm_includes_result="(none)"
-+AC_MSG_RESULT(
-+  [libraries $xpm_libraries_result, headers $xpm_includes_result])
-+])dnl
-+
-+dnl
-+dnl ICE_FIND_MOTIF
-+dnl --------------
-+dnl
-+dnl Find Motif libraries and headers
-+dnl Put Motif include directory in motif_includes,
-+dnl put Motif library directory in motif_libraries,
-+dnl and add appropriate flags to X_CFLAGS and X_LIBS.
-+dnl
-+dnl Borrowed from DDD.
-+dnl
-+AC_DEFUN(ICE_FIND_MOTIF,
-+[
-+AC_REQUIRE([AC_PATH_XTRA])
-+motif_includes=
-+motif_libraries=
-+AC_ARG_WITH(motif-includes,
-+[  --with-motif-includes=DIR        Motif include files are in DIR],
-+motif_includes="$withval")
-+AC_ARG_WITH(motif-libraries,
-+[  --with-motif-libraries=DIR       Motif libraries are in DIR],
-+motif_libraries="$withval")
-+AC_MSG_CHECKING(for Motif)
-+#
-+#
-+# Search the include files.
-+#
-+if test "$motif_includes" = ""; then
-+AC_CACHE_VAL(ice_cv_motif_includes,
-+[
-+ice_motif_save_LIBS="$LIBS"
-+ice_motif_save_CFLAGS="$CFLAGS"
-+ice_motif_save_CPPFLAGS="$CPPFLAGS"
-+ice_motif_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+AC_TRY_COMPILE([#include <Xm/Xm.h>],[int a;],
-+[
-+# Xm/Xm.h is in the standard search path.
-+ice_cv_motif_includes=
-+],
-+[
-+# Xm/Xm.h is not in the standard search path.
-+# Locate it and put its directory in `motif_includes'
-+#
-+# /usr/include/Motif* are used on HP-UX (Motif).
-+# /usr/include/X11* are used on HP-UX (X and Athena).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Athena).
-+# Other directories are just guesses.
-+for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
-+           /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \
-+           /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-+           /usr/dt/include /usr/openwin/include \
-+           /usr/dt/*/include /opt/*/include /usr/include/Motif* \
-+	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
-+	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
-+if test -f "$dir/Xm/Xm.h"; then
-+ice_cv_motif_includes="$dir"
-+break
-+fi
-+done
-+if test "$ice_cv_motif_includes" = ""; then
-+ice_cv_motif_includes=no
-+fi
-+])
-+#
-+LIBS="$ice_motif_save_LIBS"
-+CFLAGS="$ice_motif_save_CFLAGS"
-+CPPFLAGS="$ice_motif_save_CPPFLAGS"
-+LDFLAGS="$ice_motif_save_LDFLAGS"
-+])
-+motif_includes="$ice_cv_motif_includes"
-+fi
-+#
-+#
-+# Now for the libraries.
-+#
-+if test "$motif_libraries" = ""; then
-+AC_CACHE_VAL(ice_cv_motif_libraries,
-+[
-+ice_motif_save_LIBS="$LIBS"
-+ice_motif_save_CFLAGS="$CFLAGS"
-+ice_motif_save_CPPFLAGS="$CPPFLAGS"
-+ice_motif_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+# We use XtToolkitInitialize() here since it takes no arguments
-+# and thus also works with a C++ compiler.
-+AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <Xm/Xm.h>
-+],[XtToolkitInitialize();],
-+[
-+# libXm.a is in the standard search path.
-+ice_cv_motif_libraries=
-+],
-+[
-+# libXm.a is not in the standard search path.
-+# Locate it and put its directory in `motif_libraries'
-+#
-+# /usr/lib/Motif* are used on HP-UX (Motif).
-+# /usr/lib/X11* are used on HP-UX (X and Athena).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/lesstif is used on Linux (Lesstif).
-+# /usr/openwin is used on Solaris (X and Athena).
-+# Other directories are just guesses.
-+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
-+	   /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \
-+	   /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \
-+           /usr/dt/lib /usr/openwin/lib \
-+	   /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \
-+           /usr/lesstif*/lib /usr/lib/Lesstif* \
-+	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-+	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
-+if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then
-+ice_cv_motif_libraries="$dir"
-+break
-+fi
-+done
-+if test "$ice_cv_motif_libraries" = ""; then
-+ice_cv_motif_libraries=no
-+fi
-+])
-+#
-+LIBS="$ice_motif_save_LIBS"
-+CFLAGS="$ice_motif_save_CFLAGS"
-+CPPFLAGS="$ice_motif_save_CPPFLAGS"
-+LDFLAGS="$ice_motif_save_LDFLAGS"
-+])
-+#
-+motif_libraries="$ice_cv_motif_libraries"
-+fi
-+# Add Motif definitions to X flags
-+#
-+if test "$motif_includes" != "" && test "$motif_includes" != "$x_includes" && test "$motif_includes" != "no"
-+then
-+X_CFLAGS="-I$motif_includes $X_CFLAGS"
-+fi
-+if test "$motif_libraries" != "" && test "$motif_libraries" != "$x_libraries" && test "$motif_libraries" != "no"
-+then
-+case "$X_LIBS" in
-+  *-R\ *) X_LIBS="-L$motif_libraries -R $motif_libraries $X_LIBS";;
-+  *-R*)   X_LIBS="-L$motif_libraries -R$motif_libraries $X_LIBS";;
-+  *)      X_LIBS="-L$motif_libraries $X_LIBS";;
-+esac
-+fi
-+#
-+#
-+motif_libraries_result="$motif_libraries"
-+motif_includes_result="$motif_includes"
-+test "$motif_libraries_result" = "" && 
-+  motif_libraries_result="in default path"
-+test "$motif_includes_result" = "" && 
-+  motif_includes_result="in default path"
-+test "$motif_libraries_result" = "no" && 
-+  motif_libraries_result="(none)"
-+test "$motif_includes_result" = "no" && 
-+  motif_includes_result="(none)"
-+AC_MSG_RESULT(
-+  [libraries $motif_libraries_result, headers $motif_includes_result])
-+])dnl
-+# Usage:
-+#  SIM_AC_CHECK_PTHREAD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to find the PTHREAD development system. If it is found, these
-+#  shell variables are set:
-+#
-+#    $sim_ac_pthread_cppflags (extra flags the compiler needs for pthread)
-+#    $sim_ac_pthread_ldflags  (extra flags the linker needs for pthread)
-+#    $sim_ac_pthread_libs     (link libraries the linker needs for pthread)
-+#
-+#  The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly.
-+#  In addition, the variable $sim_ac_pthread_avail is set to "yes" if the
-+#  pthread development system is found.
-+#
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN([SIM_AC_CHECK_PTHREAD], [
-+
-+AC_ARG_WITH(
-+  [pthread],
-+  [  --with-pthread          pthread installation directory],
-+  [],[with_pthread=yes])
-+
-+sim_ac_pthread_avail=no
-+
-+if test x"$with_pthread" != xno; then
-+  if test x"$with_pthread" != xyes; then
-+    sim_ac_pthread_cppflags="-I${with_pthread}/include"
-+    sim_ac_pthread_ldflags="-L${with_pthread}/lib"
-+  fi
-+  sim_ac_pthread_libs_first="-lpthread"
-+  sim_ac_pthread_libs_second="-pthread"
-+  sim_ac_pthread_libs_third="-lc_r"
-+  sim_ac_pthread_libs=""
-+# FreeBSD 4.x use "-pthread" or "-lc_r"
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  AC_CACHE_CHECK(
-+    [whether the pthread development system is available],
-+    sim_cv_lib_pthread_avail,
-+    [
-+	for sim_pthread_libs in $sim_ac_pthread_libs_first \
-+	$sim_ac_pthread_libs_second $sim_ac_pthread_libs_third ; do
-+	  if test x"$sim_cv_lib_pthread_avail" != x"yes" ; then
-+		CPPFLAGS="$CPPFLAGS $sim_ac_pthread_cppflags"
-+		LDFLAGS="$LDFLAGS $sim_ac_pthread_ldflags"
-+		LIBS="$sim_pthread_libs $LIBS"
-+		AC_TRY_LINK([#include <pthread.h>],
-+                 [(void)pthread_create(0L, 0L, 0L, 0L);],
-+                 [sim_cv_lib_pthread_avail=yes
-+	    	  sim_ac_pthread_libs="$sim_pthread_libs"
-+			],
-+                 [sim_cv_lib_pthread_avail=no])
-+	  fi
-+	  if test x"$sim_cv_lib_pthread_avail" != x"yes"; then
-+            CPPFLAGS=$sim_ac_save_cppflags
-+    	    LDFLAGS=$sim_ac_save_ldflags
-+    	    LIBS=$sim_ac_save_libs	
-+	  fi
-+	done
-+    ]
-+  )
-+
-+  if test x"$sim_cv_lib_pthread_avail" = xyes; then
-+    sim_ac_pthread_avail=yes
-+    $1
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    $2
-+  fi
-+fi
-+])
-+
-+# Usage:
-+#  SIM_AC_CHECK_OPENGL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to find an OpenGL development system, either a native
-+#  implementation or the OpenGL-compatible Mesa library. If
-+#  it is found, these shell variables are set:
-+#
-+#    $sim_ac_gl_cppflags (extra flags the compiler needs for OpenGL/Mesa)
-+#    $sim_ac_gl_ldflags  (extra flags the linker needs for OpenGL/Mesa)
-+#    $sim_ac_gl_libs     (link libraries the linker needs for OpenGL/Mesa)
-+#
-+#  The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly.
-+#  In addition, the variable $sim_ac_gl_avail is set to "yes" if an
-+#  OpenGL-compatible development system is found.
-+#
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN(SIM_AC_CHECK_OPENGL, [
-+
-+unset sim_ac_gl_cppflags
-+unset sim_ac_gl_ldflags
-+unset sim_ac_gl_libs
-+sim_ac_gl_avail=no
-+
-+AC_ARG_WITH(
-+  [mesa],
-+  [  --with-mesa             prefer MesaGL (if found) over OpenGL [[default=yes]]],
-+  [],[with_mesa=yes])
-+
-+# It's usually libGL.so on UNIX systems and opengl32.lib on MSWindows.
-+sim_ac_gl_glnames="-lGL -lopengl32"
-+sim_ac_gl_mesaglnames=-lMesaGL
-+GL_LIBS=""
-+
-+if test "x$with_mesa" = "xyes"; then
-+  sim_ac_gl_first=$sim_ac_gl_mesaglnames
-+  sim_ac_gl_second=$sim_ac_gl_glnames
-+else
-+  sim_ac_gl_first=$sim_ac_gl_glnames
-+  sim_ac_gl_second=$sim_ac_gl_mesaglnames
-+fi
-+
-+AC_ARG_WITH(
-+  [opengl],
-+  [  --with-opengl           OpenGL/Mesa installation directory],[],[with_opengl=yes])
-+
-+if test x"$with_opengl" != xno; then
-+  if test x"$with_opengl" != xyes; then
-+    sim_ac_gl_cppflags="-I${with_opengl}/include"
-+    sim_ac_gl_ldflags="-L${with_opengl}/lib"
-+  else
-+    # This is a common location for the OpenGL library on HPUX.
-+    sim_ac_gl_hpux=/opt/graphics/OpenGL
-+    if test -d $sim_ac_gl_hpux; then
-+      sim_ac_gl_cppflags=-I$sim_ac_gl_hpux/include
-+      sim_ac_gl_ldflags=-L$sim_ac_gl_hpux/lib
-+    fi
-+  fi
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  CPPFLAGS="$CPPFLAGS $sim_ac_gl_cppflags"
-+  LDFLAGS="$LDFLAGS $sim_ac_gl_ldflags"
-+
-+  AC_CACHE_CHECK(
-+    [whether OpenGL library is available],
-+    sim_cv_lib_gl,
-+    [sim_cv_lib_gl=UNRESOLVED
-+
-+    for sim_ac_gl_libcheck in $sim_ac_gl_first $sim_ac_gl_second; do
-+      if test "x$sim_cv_lib_gl" = "xUNRESOLVED"; then
-+        LIBS="$sim_ac_gl_libcheck $sim_ac_save_libs -lm"
-+        AC_TRY_LINK([
-+		#if HAVE_WINDOWS_H
-+		#include <windows.h>
-+		#endif /* HAVE_WINDOWS_H */
-+	 	#include <GL/gl.h>
-+		],
-+		[glPointSize(1.0f);],
-+       		[sim_cv_lib_gl="$sim_ac_gl_libcheck"],
-+		)
-+      fi
-+    done
-+  ])
-+
-+  LIBS="$sim_ac_save_libs"
-+
-+  if test "x$sim_cv_lib_gl" != "xUNRESOLVED"; then
-+    sim_ac_gl_libs="$sim_cv_lib_gl"
-+  else
-+    AC_MSG_WARN([couldn't compile or link with OpenGL library -- trying with pthread library in place...])
-+
-+    SIM_AC_CHECK_PTHREAD([
-+      sim_ac_gl_cppflags="$sim_ac_gl_cppflags $sim_ac_pthread_cppflags"
-+      sim_ac_gl_ldflags="$sim_ac_gl_ldflags $sim_ac_pthread_ldflags"],
-+      [AC_MSG_WARN([couldn't compile or link with pthread library])])
-+
-+    if test "x$sim_ac_pthread_avail" = "xyes"; then
-+      AC_CACHE_CHECK(
-+        [whether OpenGL library can be linked with pthread library],
-+        sim_cv_lib_gl_pthread,
-+        [sim_cv_lib_gl_pthread=UNRESOLVED
-+        for sim_ac_gl_libcheck in $sim_ac_gl_first $sim_ac_gl_second; do
-+          if test "x$sim_cv_lib_gl_pthread" = "xUNRESOLVED"; then
-+            LIBS="$sim_ac_gl_libcheck $sim_ac_pthread_libs $sim_ac_save_libs"
-+            AC_TRY_LINK([
-+#if  HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+],
-+                        [
-+glPointSize(1.0f);
-+],
-+                        [sim_cv_lib_gl_pthread="$sim_ac_gl_libcheck"])
-+          fi
-+        done
-+      ])
-+
-+      if test "x$sim_cv_lib_gl_pthread" != "xUNRESOLVED"; then
-+        sim_ac_gl_libs="$sim_cv_lib_gl_pthread $sim_ac_pthread_libs"
-+      fi
-+    fi
-+  fi
-+
-+
-+  if test "x$sim_ac_gl_libs" != "x"; then
-+    LIBS="$sim_ac_save_libs"
-+    GL_LIBS="$sim_ac_gl_libs"
-+    sim_ac_gl_avail=yes
-+    $1
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    $2
-+  fi
-+fi
-+])
-+
-+
-+# Usage:
-+#  SIM_AC_CHECK_GLU([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to use the OpenGL utility library; GLU. If it is found,
-+#  these shell variables are set:
-+#
-+#    $sim_ac_glu_cppflags (extra flags the compiler needs for GLU)
-+#    $sim_ac_glu_ldflags  (extra flags the linker needs for GLU)
-+#    $sim_ac_glu_libs     (link libraries the linker needs for GLU)
-+#
-+#  The CPPFLAGS, LDFLAGS and LIBS flags will also be modified accordingly.
-+#  In addition, the variable $sim_ac_gly_avail is set to "yes" if GLU
-+#  is found.
-+#
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN(SIM_AC_CHECK_GLU, [
-+
-+unset sim_ac_glu_cppflags
-+unset sim_ac_glu_ldflags
-+unset sim_ac_glu_libs
-+sim_ac_glu_avail=no
-+
-+# It's usually libGLU.so on UNIX systems and glu32.lib on MSWindows.
-+sim_ac_glu_names="-lGLU -lglu32"
-+sim_ac_glu_mesanames=-lMesaGLU
-+# with_mesa is set from the SIM_AC_CHECK_OPENGL macro.
-+if test "x$with_mesa" = "xyes"; then
-+  sim_ac_glu_first=$sim_ac_glu_mesanames
-+  sim_ac_glu_second=$sim_ac_glu_names
-+else
-+  sim_ac_glu_first=$sim_ac_glu_names
-+  sim_ac_glu_second=$sim_ac_glu_mesanames
-+fi
-+
-+AC_ARG_WITH(
-+  [glu],[  --with-glu		  use the OpenGL utility library [[default=yes]]],[],[with_glu=yes])
-+
-+if test x"$with_glu" != xno; then
-+  if test x"$with_glu" != xyes; then
-+    sim_ac_glu_cppflags="-I${with_glu}/include"
-+    sim_ac_glu_ldflags="-L${with_glu}/lib"
-+  fi
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  CPPFLAGS="$CPPFLAGS $sim_ac_glu_cppflags"
-+  LDFLAGS="$LDFLAGS $sim_ac_glu_ldflags"
-+
-+  AC_CACHE_CHECK(
-+    [whether GLU is available],
-+    sim_cv_lib_glu,
-+    [sim_cv_lib_glu=UNRESOLVED
-+
-+    # Some platforms (like BeOS) have the GLU functionality in the GL
-+    # library (and no GLU library present).
-+    for sim_ac_glu_libcheck in "" $sim_ac_glu_first $sim_ac_glu_second; do
-+      if test "x$sim_cv_lib_glu" = "xUNRESOLVED"; then
-+        LIBS="$sim_ac_glu_libcheck $sim_ac_save_libs $GL_LIBS"
-+        AC_TRY_LINK([
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+],
-+                    [
-+gluSphere(0L, 1.0, 1, 1);
-+],
-+                    [sim_cv_lib_glu="$sim_ac_glu_libcheck"])
-+      fi
-+    done
-+  ])
-+
-+  LIBS="$sim_ac_save_libs"
-+
-+  if test "x$sim_cv_lib_glu" != "xUNRESOLVED"; then
-+    sim_ac_glu_libs="$sim_cv_lib_glu"
-+    LIBS="$sim_ac_save_libs"
-+    GL_LIBS="$GL_LIBS $sim_ac_glu_libs"
-+    sim_ac_glu_avail=yes
-+    $1
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    $2
-+  fi
-+fi
-+])
-+
-+
-+# **************************************************************************
-+# SIM_AC_GLU_READY_IFELSE( [ACTION-IF-TRUE], [ACTION-IF-FALSE] )
-+
-+AC_DEFUN([SIM_AC_GLU_READY_IFELSE],
-+[AC_CACHE_CHECK(
-+  [if GLU is available as part of GL library],
-+  [sim_cv_glu_ready],
-+  [AC_TRY_LINK(
-+    [
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+],
-+    [
-+gluSphere(0L, 1.0, 1, 1);
-+],
-+    [sim_cv_glu_ready=true],
-+    [sim_cv_glu_ready=false])])
-+if ${sim_cv_glu_ready}; then
-+  ifelse([$1], , :, [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+]) # SIM_AC_GLU_READY_IFELSE()
-+
-+
-+# Usage:
-+#  SIM_AC_GLU_NURBSOBJECT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-+#
-+#  Try to find out whether the interface struct against the GLU
-+#  library NURBS functions is called "GLUnurbs" or "GLUnurbsObj".
-+#  (This seems to have changed somewhere between release 1.1 and
-+#  release 1.3 of GLU).
-+#
-+#  The variable $sim_ac_glu_nurbsobject is set to the correct name
-+#  if the nurbs structure is found.
-+#
-+# Author: Morten Eriksen, <mortene@sim.no>.
-+
-+AC_DEFUN(SIM_AC_GLU_NURBSOBJECT, [
-+AC_CACHE_CHECK(
-+  [what structure to use in the GLU NURBS interface],
-+  sim_cv_func_glu_nurbsobject,
-+  [sim_cv_func_glu_nurbsobject=NONE
-+   for sim_ac_glu_structname in GLUnurbs GLUnurbsObj; do
-+    if test "$sim_cv_func_glu_nurbsobject" = NONE; then
-+      AC_TRY_LINK([
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>],
-+                  [$sim_ac_glu_structname * hepp = gluNewNurbsRenderer();
-+                   gluDeleteNurbsRenderer(hepp)],
-+                  [sim_cv_func_glu_nurbsobject=$sim_ac_glu_structname])
-+    fi
-+  done
-+])
-+
-+if test $sim_cv_func_glu_nurbsobject = NONE; then
-+  sim_ac_glu_nurbsobject=
-+  $2
-+else
-+  sim_ac_glu_nurbsobject=$sim_cv_func_glu_nurbsobject
-+  $1
-+fi
-+])
-+
-+# **************************************************************************
-+# SIM_AC_HAVE_GLX_IFELSE( IF-FOUND, IF-NOT-FOUND )
-+#
-+# Check whether GLX is on the system.
-+
-+AC_DEFUN([SIM_AC_HAVE_GLX_IFELSE], [
-+AC_CACHE_CHECK(
-+  [whether GLX is on the system],
-+  sim_cv_have_glx,
-+  AC_TRY_LINK(
-+    [#include <GL/glx.h>],
-+    [(void)glXChooseVisual(0L, 0, 0L);],
-+    [sim_cv_have_glx=true],
-+    [sim_cv_have_glx=false]))
-+
-+if ${sim_cv_have_glx=false}; then
-+  ifelse([$1], , :, [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+]) # SIM_AC_HAVE_GLX_IFELSE()
-+
-+# Usage:
-+#   SIM_CHECK_MOTIF_GLWIDGET([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]])
-+#
-+# Description:
-+#   This macro checks for a GL widget that can be used with Xt/Motif.
-+#
-+# Variables:
-+#   $sim_cv_motif_glwidget         (cached)  class + header + library
-+#   $sim_cv_motif_glwidget_hdrloc  (cached)  GL | X11/GLw
-+#
-+#   $sim_ac_motif_glwidget_class             glwMDrawingAreaWidgetClass |
-+#                                            glwDrawingAreaWidgetClass
-+#   $sim_ac_motif_glwidget_header            GLwDrawA.h | GLwMDrawA.h
-+#   $sim_ac_motif_glwidget_library           GLwM | GLw | MesaGLwM | MesaGLw
-+#
-+#   $LIBS = -l$sim_ac_motif_glwidget_library $LIBS
-+#
-+# Defines:
-+#   XT_GLWIDGET                              $sim_ac_motif_glwidget_class
-+#   HAVE_GL_GLWDRAWA_H                       #include <GL/GLwDrawA.h>
-+#   HAVE_GL_GLWMDRAWA_H                      #include <GL/GLwMDrawA.h>
-+#   HAVE_X11_GWL_GLWDRAWA_H                  #include <X11/GLw/GLwDrawA.h>
-+#   HAVE_X11_GWL_GLWMDRAWA_H                 #include <X11/GLw/GLwMDrawA.h>
-+#
-+# Authors:
-+#   Lars J. Aas <larsa@sim.no>,
-+#   Loring Holden <lsh@cs.brown.edu>,
-+#   Morten Eriksen <mortene@sim.no>
-+#
-+ 
-+AC_DEFUN([SIM_CHECK_MOTIF_GLWIDGET], [
-+
-+AC_ARG_WITH(
-+[glw],[  --with-glw		  use the OpenGL widget Library [[default=yes]]], [], [with_glw=yes])
-+
-+if test x"$with_glw" != x"no" ; then 
-+  if test x"$with_glw" != x"yes" ; then
-+	sim_ac_glw_cppflags="-I${with_glw}/include"
-+	sim_ac_glw_ldflags="-L${with_glw}/lib"
-+  fi
-+
-+  SAVECPPFLAGS="$CPPFLAGS"
-+  SAVELDFLAGS="$LDFLAGS"
-+  SAVELIBS="$LIBS"
-+
-+  CPPFLAGS="$SAVECPPFLAGS $sim_ac_glw_cppflags"
-+  LDFLAGS="$SAVELDFLAGS $sim_ac_glw_ldflags"
-+  AC_CACHE_CHECK(
-+  [for a GL widget],
-+  sim_cv_motif_glwidget,
-+  [
-+	XWIDGETLIBS="$X_LIBS $X11_LIBS $XT_LIBS $X_LIBS $X_PRE_LIBS $XM_LIBS"
-+  	sim_cv_motif_glwidget=UNKNOWN
-+  	for lib in GLwM GLw MesaGLwM MesaGLw; do
-+    	  if test x"$sim_cv_motif_glwidget" = x"UNKNOWN"; then
-+      		LIBS="-l$lib $SAVELIBS $XWIDGETLIBS $GL_LIBS -lm"
-+      		AC_TRY_LINK(
-+        		[#include <X11/Intrinsic.h>
-+			 #include <GL/GLwMDrawA.h>
-+        		extern WidgetClass glwMDrawingAreaWidgetClass;],
-+        		[Widget glxManager = NULL;
-+        		Widget glxWidget = XtVaCreateManagedWidget("GLWidget",
-+          		glwMDrawingAreaWidgetClass, glxManager, NULL);],
-+        		[sim_cv_motif_glwidget="glwMDrawingAreaWidgetClass GLwMDrawA.h $lib"],
-+        		[sim_cv_motif_glwidget=UNKNOWN])
-+    	  fi
-+  	done
-+     LIBS=$SAVELIBS
-+  ])
-+ 
-+if test "x$sim_cv_motif_glwidget" = "xUNKNOWN"; then
-+  ifelse([$2], , :, [$2])
-+else
-+  sim_ac_motif_glwidget_class=`echo $sim_cv_motif_glwidget | cut -d" " -f1`
-+  sim_ac_motif_glwidget_header=`echo $sim_cv_motif_glwidget | cut -d" " -f2`
-+  sim_ac_motif_glwidget_library=`echo $sim_cv_motif_glwidget | cut -d" " -f3`
-+ 
-+  AC_CACHE_CHECK(
-+    [the $sim_ac_motif_glwidget_header header location],
-+    sim_cv_motif_glwidget_hdrloc,
-+    [sim_cv_motif_glwidget_hdrloc=UNKNOWN
-+    for location in X11/GLw GL; do
-+     if test "x$sim_cv_motif_glwidget_hdrloc" = "xUNKNOWN"; then
-+        AC_TRY_CPP(
-+          [#include <X11/Intrinsic.h>
-+          #include <$location/$sim_ac_motif_glwidget_header>],
-+          [sim_cv_motif_glwidget_hdrloc=$location],
-+          [sim_cv_motif_glwidget_hdrloc=UNKNOWN])
-+      fi
-+    done])
-+ 
-+  if test "x$sim_cv_motif_glwidget_hdrloc" = "xUNKNOWN"; then
-+    ifelse([$2], , :, [$2])
-+  else
-+    if test "x$sim_ac_motif_glwidget_header" = "xGLwDrawA.h"; then
-+      if test "x$sim_cv_motif_glwidget_hdrloc" = "xGL"; then
-+        AC_DEFINE(HAVE_GL_GLWDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <GL/GLwDrawA.h>])
-+      else
-+        AC_DEFINE(HAVE_X11_GLW_GLWDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <X11/GLw/GLwDrawA.h>])
-+      fi
-+    else
-+      if test "x$sim_cv_motif_glwidget_hdrloc" = "xGL"; then
-+        AC_DEFINE(HAVE_GL_GLWMDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <GL/GLwMDrawA.h>])
-+      else
-+        AC_DEFINE(HAVE_X11_GLW_GLWMDRAWA_H, 1,
-+          [Define this to use OpenGL widget from <X11/GLw/GLwMDrawA.h>])
-+      fi
-+    fi
-+ 
-+    AC_DEFINE_UNQUOTED(XT_GLWIDGET, $sim_ac_motif_glwidget_class,
-+      [Define this to the Xt/Motif OpenGL widget class to use])
-+ 
-+    LIBS="$LIBS"
-+    GL_LIBS="$GL_LIBS -l$sim_ac_motif_glwidget_library"
-+    $1
-+  fi
-+fi
-+
-+fi
-+])
-+
-+# Do all the work for Automake.  This macro actually does too much --
-+# some checks are only needed if your package does certain things.
-+# But this isn't really a big deal.
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN(AM_INIT_AUTOMAKE,
-+[AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN(AM_SANITY_CHECK,
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "[$]*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "[$]*" != "X $srcdir/configure conftestfile" \
-+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "[$]2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN(AM_MISSING_PROG,
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+   $1=$2
-+   AC_MSG_RESULT(found)
-+else
-+   $1="$3/missing $2"
-+   AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+# Like AC_CONFIG_HEADER, but automatically create stamp file.
-+
-+AC_DEFUN(AM_CONFIG_HEADER,
-+[AC_PREREQ([2.12])
-+AC_CONFIG_HEADER([$1])
-+dnl When config.status generates a header, we must update the stamp-h file.
-+dnl This file resides in the same directory as the config header
-+dnl that is generated.  We must strip everything past the first ":",
-+dnl and everything past the last "/".
-+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-+<<am_indx=1
-+for am_file in <<$1>>; do
-+  case " <<$>>CONFIG_HEADERS " in
-+  *" <<$>>am_file "*<<)>>
-+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-+    ;;
-+  esac
-+  am_indx=`expr "<<$>>am_indx" + 1`
-+done<<>>dnl>>)
-+changequote([,]))])
-+
-Index: config.guess
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ config.guess	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,1183 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-+#   Free Software Foundation, Inc.
-+#
-+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.
-+
-+# Written by Per Bothner <bothner@cygnus.com>.
-+# Please send patches to <config-patches@gnu.org>.
-+#
-+# 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.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit system type (host/target name).
-+#
-+# Only a few systems have been added to this list; please add others
-+# (but try to keep the structure clean).
-+#
-+
-+# Use $HOST_CC if defined. $CC may point to a cross-compiler
-+if test x"$CC_FOR_BUILD" = x; then
-+  if test x"$HOST_CC" != x; then
-+    CC_FOR_BUILD="$HOST_CC"
-+  else
-+    if test x"$CC" != x; then
-+      CC_FOR_BUILD="$CC"
-+    else
-+      CC_FOR_BUILD=cc
-+    fi
-+  fi
-+fi
-+
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 8/24/94.)
-+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
-+
-+dummy=dummy-$$
-+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-+
-+# 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.
-+	# Determine the machine/vendor (is the vendor relevant).
-+	case "${UNAME_MACHINE}" in
-+	    amiga) machine=m68k-cbm ;;
-+	    arm32) machine=arm-unknown ;;
-+	    atari*) machine=m68k-atari ;;
-+	    sun3*) machine=m68k-sun ;;
-+	    mac68k) machine=m68k-apple ;;
-+	    macppc) machine=powerpc-apple ;;
-+	    hp3[0-9][05]) machine=m68k-hp ;;
-+	    ibmrt|romp-ibm) machine=romp-ibm ;;
-+	    *) machine=${UNAME_MACHINE}-unknown ;;
-+	esac
-+	# The Operating System including object format.
-+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+		| grep __ELF__ >/dev/null
-+	then
-+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+	    # Return netbsd for either.  FIX?
-+	    os=netbsd
-+	else
-+	    os=netbsdelf
-+	fi
-+	# The OS release
-+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+	# 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 0 ;;
-+    alpha:OSF1:*:*)
-+	if test $UNAME_RELEASE = "V4.0"; then
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+	fi
-+	# 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.
-+	cat <<EOF >$dummy.s
-+	.data
-+\$Lformat:
-+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-+
-+	.text
-+	.globl main
-+	.align 4
-+	.ent main
-+main:
-+	.frame \$30,16,\$26,0
-+	ldgp \$29,0(\$27)
-+	.prologue 1
-+	.long 0x47e03d80 # implver \$0
-+	lda \$2,-1
-+	.long 0x47e20c21 # amask \$2,\$1
-+	lda \$16,\$Lformat
-+	mov \$0,\$17
-+	not \$1,\$18
-+	jsr \$26,printf
-+	ldgp \$29,0(\$26)
-+	mov 0,\$16
-+	jsr \$26,exit
-+	.end main
-+EOF
-+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-+	if test "$?" = 0 ; then
-+		case `./$dummy` in
-+			0-0)
-+				UNAME_MACHINE="alpha"
-+				;;
-+			1-0)
-+				UNAME_MACHINE="alphaev5"
-+				;;
-+			1-1)
-+				UNAME_MACHINE="alphaev56"
-+				;;
-+			1-101)
-+				UNAME_MACHINE="alphapca56"
-+				;;
-+			2-303)
-+				UNAME_MACHINE="alphaev6"
-+				;;
-+			2-307)
-+				UNAME_MACHINE="alphaev67"
-+				;;
-+		esac
-+	fi
-+	rm -f $dummy.s $dummy
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit 0 ;;
-+    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 0 ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit 0 ;;
-+    Amiga*:UNIX_System_V:4.0:*)
-+	echo m68k-cbm-sysv4
-+	exit 0;;
-+    amiga:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit 0 ;;
-+    arc64:OpenBSD:*:*)
-+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    arc:OpenBSD:*:*)
-+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    hkmips:OpenBSD:*:*)
-+	echo mips-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    pmax:OpenBSD:*:*)
-+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sgi:OpenBSD:*:*)
-+	echo mips-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    wgrisc:OpenBSD:*:*)
-+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:OS/390:*:*)
-+	echo i370-ibm-openedition
-+	exit 0 ;;
-+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit 0;;
-+    SR2?01:HI-UX/MPP:*:*)
-+	echo hppa1.1-hitachi-hiuxmpp
-+	exit 0;;
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+	# akee@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 0 ;;
-+    NILE*:*:*:dcosx)
-+	echo pyramid-pyramid-svr4
-+	exit 0 ;;
-+    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    i86pc:SunOS:5.*:*)
-+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    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 0 ;;
-+    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 0 ;;
-+    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit 0 ;;
-+    sun*:*:4.2BSD:*)
-+	UNAME_RELEASE=`(head -1 /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 0 ;;
-+    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit 0 ;;
-+    atari*:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    # 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 0 ;;
-+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit 0 ;;
-+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    sun3*:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mac68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme88k:OpenBSD:*:*)
-+	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit 0 ;;
-+    RISC*:Mach:*:*)
-+	echo mips-dec-mach_bsd4.3
-+	exit 0 ;;
-+    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit 0 ;;
-+    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit 0 ;;
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit 0 ;;
-+    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	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 $dummy.c -o $dummy \
-+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+	  && rm $dummy.c $dummy && exit 0
-+	rm -f $dummy.c $dummy
-+	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit 0 ;;
-+    Night_Hawk:Power_UNIX:*:*)
-+	echo powerpc-harris-powerunix
-+	exit 0 ;;
-+    m88k:CX/UX:7*:*)
-+	echo m88k-harris-cxux7
-+	exit 0 ;;
-+    m88k:*:4*:R4*)
-+	echo m88k-motorola-sysv4
-+	exit 0 ;;
-+    m88k:*:3*:R3*)
-+	echo m88k-motorola-sysv3
-+	exit 0 ;;
-+    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 0 ;;
-+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-+	echo m88k-dolphin-sysv3
-+	exit 0 ;;
-+    M88*:*:R3*:*)
-+	# Delta 88k system running SVR3
-+	echo m88k-motorola-sysv3
-+	exit 0 ;;
-+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+	echo m88k-tektronix-sysv3
-+	exit 0 ;;
-+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+	echo m68k-tektronix-bsd
-+	exit 0 ;;
-+    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit 0 ;;
-+    ????????: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 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i?86:AIX:*:*)
-+	echo i386-ibm-aix
-+	exit 0 ;;
-+    *:AIX:2:3)
-+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		sed 's/^		//' << EOF >$dummy.c
-+		#include <sys/systemcfg.h>
-+
-+		main()
-+			{
-+			if (!__power_pc())
-+				exit(1);
-+			puts("powerpc-ibm-aix3.2.5");
-+			exit(0);
-+			}
-+EOF
-+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
-+		rm -f $dummy.c $dummy
-+		echo rs6000-ibm-aix3.2.5
-+	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 0 ;;
-+    *:AIX:*:4)
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -EHl ${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=4.${UNAME_RELEASE}
-+	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit 0 ;;
-+    *:AIX:*:*)
-+	echo rs6000-ibm-aix
-+	exit 0 ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+	echo romp-ibm-bsd4.4
-+	exit 0 ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+    *:BOSX:*:*)
-+	echo rs6000-bull-bosx
-+	exit 0 ;;
-+    DPX/2?00:B.O.S.:*:*)
-+	echo m68k-bull-sysv3
-+	exit 0 ;;
-+    9000/[34]??:4.3bsd:1.*:*)
-+	echo m68k-hp-bsd
-+	exit 0 ;;
-+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+	echo m68k-hp-bsd4.4
-+	exit 0 ;;
-+    9000/[34678]??:HP-UX:*:*)
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	    9000/[678][0-9][0-9])
-+              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 $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-+	rm -f $dummy.c $dummy
-+	esac
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit 0 ;;
-+    3050*:HI-UX:*:*)
-+	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 $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
-+	rm -f $dummy.c $dummy
-+	echo unknown-hitachi-hiuxwe2
-+	exit 0 ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+	echo hppa1.1-hp-bsd
-+	exit 0 ;;
-+    9000/8??:4.3bsd:*:*)
-+	echo hppa1.0-hp-bsd
-+	exit 0 ;;
-+    *9??*:MPE/iX:*:*)
-+	echo hppa1.0-hp-mpeix
-+	exit 0 ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+	echo hppa1.1-hp-osf
-+	exit 0 ;;
-+    hp8??:OSF1:*:*)
-+	echo hppa1.0-hp-osf
-+	exit 0 ;;
-+    i?86:OSF1:*:*)
-+	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
-+	fi
-+	exit 0 ;;
-+    parisc*:Lites*:*:*)
-+	echo hppa1.1-hp-lites
-+	exit 0 ;;
-+    hppa*:OpenBSD:*:*)
-+	echo hppa-unknown-openbsd
-+	exit 0 ;;
-+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+	echo c1-convex-bsd
-+        exit 0 ;;
-+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+        exit 0 ;;
-+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+	echo c34-convex-bsd
-+        exit 0 ;;
-+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+	echo c38-convex-bsd
-+        exit 0 ;;
-+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+	echo c4-convex-bsd
-+        exit 0 ;;
-+    CRAY*X-MP:*:*:*)
-+	echo xmp-cray-unicos
-+        exit 0 ;;
-+    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE}
-+	exit 0 ;;
-+    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-+	exit 0 ;;
-+    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY*T3E:*:*:*)
-+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY-2:*:*:*)
-+	echo cray2-cray-unicos
-+        exit 0 ;;
-+    F300:UNIX_System_V:*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit 0 ;;
-+    F301:UNIX_System_V:*:*)
-+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-+       exit 0 ;;
-+    hp300:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
-+    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:FreeBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
-+    *:OpenBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+	exit 0 ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit 0 ;;
-+    i*:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit 0 ;;
-+    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 i386-pc-interix
-+	exit 0 ;;
-+    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
-+	exit 0 ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit 0 ;;
-+    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    *:GNU:*:*)
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit 0 ;;
-+    *:Linux:*:*)
-+
-+	# The BFD linker knows what the default object file format is, so
-+	# first see if it will tell us. cd to the root directory to prevent
-+	# problems with other programs or directories called `ld' in the path.
-+	ld_help_string=`cd /; ld --help 2>&1`
-+	ld_supported_emulations=`echo $ld_help_string \
-+			 | sed -ne '/supported emulations:/!d
-+				    s/[ 	][ 	]*/ /g
-+				    s/.*supported emulations: *//
-+				    s/ .*//
-+				    p'`
-+        case "$ld_supported_emulations" in
-+	  *ia64)
-+		echo "${UNAME_MACHINE}-unknown-linux"
-+		exit 0
-+		;;
-+	  i?86linux)
-+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		exit 0
-+		;;
-+	  elf_i?86)
-+		echo "${UNAME_MACHINE}-pc-linux"
-+		exit 0
-+		;;
-+	  i?86coff)
-+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		exit 0
-+		;;
-+	  sparclinux)
-+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-+		exit 0
-+		;;
-+	  armlinux)
-+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-+		exit 0
-+		;;
-+	  elf32arm*)
-+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-+		exit 0
-+		;;
-+	  armelf_linux*)
-+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-+		exit 0
-+		;;
-+	  m68klinux)
-+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-+		exit 0
-+		;;
-+	  elf32ppc | elf32ppclinux)
-+		# Determine Lib Version
-+		cat >$dummy.c <<EOF
-+#include <features.h>
-+#if defined(__GLIBC__)
-+extern char __libc_version[];
-+extern char __libc_release[];
-+#endif
-+main(argc, argv)
-+     int argc;
-+     char *argv[];
-+{
-+#if defined(__GLIBC__)
-+  printf("%s %s\n", __libc_version, __libc_release);
-+#else
-+  printf("unkown\n");
-+#endif
-+  return 0;
-+}
-+EOF
-+		LIBC=""
-+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-+		if test "$?" = 0 ; then
-+			./$dummy | grep 1\.99 > /dev/null
-+			if test "$?" = 0 ; then
-+				LIBC="libc1"
-+			fi
-+		fi
-+		rm -f $dummy.c $dummy
-+		echo powerpc-unknown-linux-gnu${LIBC}
-+		exit 0
-+		;;
-+	esac
-+
-+	if test "${UNAME_MACHINE}" = "alpha" ; then
-+		cat <<EOF >$dummy.s
-+			.data
-+		\$Lformat:
-+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-+
-+			.text
-+			.globl main
-+			.align 4
-+			.ent main
-+		main:
-+			.frame \$30,16,\$26,0
-+			ldgp \$29,0(\$27)
-+			.prologue 1
-+			.long 0x47e03d80 # implver \$0
-+			lda \$2,-1
-+			.long 0x47e20c21 # amask \$2,\$1
-+			lda \$16,\$Lformat
-+			mov \$0,\$17
-+			not \$1,\$18
-+			jsr \$26,printf
-+			ldgp \$29,0(\$26)
-+			mov 0,\$16
-+			jsr \$26,exit
-+			.end main
-+EOF
-+		LIBC=""
-+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-+		if test "$?" = 0 ; then
-+			case `./$dummy` in
-+			0-0)
-+				UNAME_MACHINE="alpha"
-+				;;
-+			1-0)
-+				UNAME_MACHINE="alphaev5"
-+				;;
-+			1-1)
-+				UNAME_MACHINE="alphaev56"
-+				;;
-+			1-101)
-+				UNAME_MACHINE="alphapca56"
-+				;;
-+			2-303)
-+				UNAME_MACHINE="alphaev6"
-+				;;
-+			2-307)
-+				UNAME_MACHINE="alphaev67"
-+				;;
-+			esac
-+
-+			objdump --private-headers $dummy | \
-+			  grep ld.so.1 > /dev/null
-+			if test "$?" = 0 ; then
-+				LIBC="libc1"
-+			fi
-+		fi
-+		rm -f $dummy.s $dummy
-+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-+	elif test "${UNAME_MACHINE}" = "mips" ; then
-+	  cat >$dummy.c <<EOF
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+#ifdef __MIPSEB__
-+  printf ("%s-unknown-linux-gnu\n", argv[1]);
-+#endif
-+#ifdef __MIPSEL__
-+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-+#endif
-+  return 0;
-+}
-+EOF
-+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-+	  rm -f $dummy.c $dummy
-+	elif test "${UNAME_MACHINE}" = "s390"; then
-+	  echo s390-ibm-linux && exit 0
-+	else
-+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
-+	  # or one that does not give us useful --help.
-+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-+	  # If ld does not provide *any* "supported emulations:"
-+	  # that means it is gnuoldld.
-+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-+
-+	  case "${UNAME_MACHINE}" in
-+	  i?86)
-+	    VENDOR=pc;
-+	    ;;
-+	  *)
-+	    VENDOR=unknown;
-+	    ;;
-+	  esac
-+	  # Determine whether the default compiler is a.out or elf
-+	  cat >$dummy.c <<EOF
-+#include <features.h>
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+#ifdef __ELF__
-+# ifdef __GLIBC__
-+#  if __GLIBC__ >= 2
-+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-+#  else
-+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-+#  endif
-+# else
-+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-+# endif
-+#else
-+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-+#endif
-+  return 0;
-+}
-+EOF
-+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-+	  rm -f $dummy.c $dummy
-+	fi ;;
-+# 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.
-+    i?86:DYNIX/ptx:4*:*)
-+	echo i386-sequent-sysv4
-+	exit 0 ;;
-+    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 0 ;;
-+    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 0 ;;
-+    i?86:*:5:7*)
-+        # Fixed at (any) Pentium or better
-+        UNAME_MACHINE=i586
-+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-+	else
-+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-+	fi
-+	exit 0 ;;
-+    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|egrep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+			&& UNAME_MACHINE=i586
-+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
-+	fi
-+	exit 0 ;;
-+    i?86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit 0 ;;
-+    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 i386.
-+	echo i386-pc-msdosdjgpp
-+        exit 0 ;;
-+    Intel:Mach:3*:*)
-+	echo i386-pc-mach3
-+	exit 0 ;;
-+    paragon:*:*:*)
-+	echo i860-intel-osf1
-+	exit 0 ;;
-+    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 0 ;;
-+    mini*:CTIX:SYS*5:*)
-+	# "miniframe"
-+	echo m68010-convergent-sysv
-+	exit 0 ;;
-+    M68*:*:R3V[567]*:*)
-+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*: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 0
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && echo i486-ncr-sysv4 && exit 0 ;;
-+    m68*:LynxOS:2.*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    mc68030:UNIX_System_V:4.*:*)
-+	echo m68k-atari-sysv4
-+	exit 0 ;;
-+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit 0 ;;
-+    RM*:ReliantUNIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit 0 ;;
-+    RM*:SINIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit 0 ;;
-+    *: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 0 ;;
-+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-+        echo i586-unisys-sysv4
-+        exit 0 ;;
-+    *:UNIX_System_V:4*:FTX*)
-+	# From Gerald Hewes <hewes@openmarket.com>.
-+	# How about 
-+	echo hppa1.1-stratus-sysv4
-+	exit 0 ;;
-+    *:*:*:FTX*)
-+	# From seanf@swdc.stratus.com.
-+	echo i860-stratus-sysv4
-+	exit 0 ;;
-+    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit 0 ;;
-+    news*:NEWS-OS:*:6*)
-+	echo mips-sony-newsos6
-+	exit 0 ;;
-+    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 0 ;;
-+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-+	echo powerpc-be-beos
-+	exit 0 ;;
-+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-+	echo powerpc-apple-beos
-+	exit 0 ;;
-+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-beos
-+	exit 0 ;;
-+    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-+    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-+    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:Darwin:*:*)
-+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+	if test "${UNAME_MACHINE}" = "x86pc"; then
-+		UNAME_MACHINE=pc
-+	fi
-+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-+	exit 0 ;;
-+    *:QNX:*:4*)
-+	echo i386-pc-qnx
-+	exit 0 ;;
-+    NSR-W:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit 0 ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit 0 ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit 0 ;;
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+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"); 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)
-+  printf ("vax-dec-bsd\n"); exit (0);
-+#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 $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
-+rm -f $dummy.c $dummy
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+
-+# 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 0 ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit 0 ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit 0 ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit 0 ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit 0 ;;
-+    esac
-+fi
-+
-+#echo '(Unable to guess system type)' 1>&2
-+
-+exit 1
-Index: config.h.in
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ config.h.in	Fri Jun  8 19:30:18 2001
-@@ -0,0 +1,106 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-+
-+/* Define if using alloca.c.  */
-+#undef C_ALLOCA
-+
-+/* Define to empty if the keyword does not work.  */
-+#undef const
-+
-+/* 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 if you have alloca, as a function or macro.  */
-+#undef HAVE_ALLOCA
-+
-+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-+#undef HAVE_ALLOCA_H
-+
-+/* 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 run-time.
-+ 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 if you have the ANSI C header files.  */
-+#undef STDC_HEADERS
-+
-+/* Define if the X Window System is missing or not being used.  */
-+#undef X_DISPLAY_MISSING
-+
-+#undef HAVE_LIBGEN
-+#undef HAVE_MOTIF
-+#undef XPM
-+#undef VERSION
-+#undef GL
-+
-+/* Define if using alloca.c.  */
-+#undef C_ALLOCA
-+
-+/* Define to empty if the keyword does not work.  */
-+#undef const
-+
-+/* 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 if you have alloca, as a function or macro.  */
-+#undef HAVE_ALLOCA
-+
-+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-+#undef HAVE_ALLOCA_H
-+
-+/* 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 run-time.
-+ 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 if you have the ANSI C header files.  */
-+#undef STDC_HEADERS
-+
-+/* Define if the X Window System is missing or not being used.  */
-+#undef X_DISPLAY_MISSING
-+
-+/* Define if you have the ftime function.  */
-+#undef HAVE_FTIME
-+
-+/* Define if you have the strstr function.  */
-+#undef HAVE_STRSTR
-+
-+/* Define if you have the usleep function.  */
-+#undef HAVE_USLEEP
-+
-+/* Define if you have the <X11/xpm.h> header file.  */
-+#undef HAVE_X11_XPM_H
-+
-+/* Define if you have the <unistd.h> header file.  */
-+#undef HAVE_UNISTD_H
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define this to use OpenGL widget from <GL/GLwDrawA.h> */
-+#undef HAVE_GL_GLWDRAWA_H
-+
-+/* Define this to use OpenGL widget from <X11/GLw/GLwDrawA.h> */
-+#undef HAVE_X11_GLW_GLWDRAWA_H
-+
-+/* Define this to use OpenGL widget from <GL/GLwMDrawA.h> */
-+#undef HAVE_GL_GLWMDRAWA_H
-+
-+/* Define this to use OpenGL widget from <X11/GLw/GLwMDrawA.h> */
-+#undef HAVE_X11_GLW_GLWMDRAWA_H
-+
-+/* Define this to the Xt/Motif OpenGL widget class to use */
-+#undef XT_GLWIDGET
-+
-Index: config.sub
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ config.sub	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1,1268 @@
-+#! /bin/sh
-+# Configuration validation subroutine script, version 1.1.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-+#   Free Software Foundation, Inc.
-+#
-+# 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., 59 Temple Place - Suite 330,
-+# Boston, MA 02111-1307, 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.
-+
-+# Written by Per Bothner <bothner@cygnus.com>.
-+# Please send patches to <config-patches@gnu.org>.
-+#
-+# 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.
-+
-+# 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.
-+
-+if [ x$1 = x ]
-+then
-+	echo Configuration name missing. 1>&2
-+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-+	echo "or     $0 ALIAS" 1>&2
-+	echo where ALIAS is a recognized configuration type. 1>&2
-+	exit 1
-+fi
-+
-+# First pass through any local machine types.
-+case $1 in
-+	*local*)
-+		echo $1
-+		exit 0
-+		;;
-+	*)
-+	;;
-+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*)
-+    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)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-hiux*)
-+		os=-hiuxwe2
-+		;;
-+	-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/'`
-+		;;
-+	-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.
-+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-+		| 580 | i960 | h8300 \
-+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
-+		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-+		| hppa64 \
-+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-+		| alphaev6[78] \
-+		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-+		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
-+		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-+		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-+		| mips64vr5000 | miprs64vr5000el | mcore \
-+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-+		| thumb | d10v | fr30 | avr)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
-+		;;
-+
-+	# 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[34567]86)
-+	  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.
-+	# FIXME: clean up the formatting here.
-+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-+	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-+	      | xmp-* | ymp-* \
-+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
-+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-+	      | hppa2.0n-* | hppa64-* \
-+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-+	      | alphaev6[78]-* \
-+	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-+	      | clipper-* | orion-* \
-+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-+	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-+	      | mips64el-* | mips64orion-* | mips64orionel-* \
-+	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-+	      | mipstx39-* | mipstx39el-* | mcore-* \
-+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
-+	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-+	      | bs2000-*)
-+		;;
-+	# 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
-+		;;
-+	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
-+		;;
-+	amdahl)
-+		basic_machine=580-amdahl
-+		os=-sysv
-+		;;
-+	amiga | amiga-*)
-+		basic_machine=m68k-cbm
-+		;;
-+	amigaos | amigados)
-+		basic_machine=m68k-cbm
-+		os=-amigaos
-+		;;
-+	amigaunix | amix)
-+		basic_machine=m68k-cbm
-+		os=-sysv4
-+		;;
-+	apollo68)
-+		basic_machine=m68k-apollo
-+		os=-sysv
-+		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
-+	aux)
-+		basic_machine=m68k-apple
-+		os=-aux
-+		;;
-+	balance)
-+		basic_machine=ns32k-sequent
-+		os=-dynix
-+		;;
-+	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 | ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	cray2)
-+		basic_machine=cray2-cray
-+		os=-unicos
-+		;;
-+	[ctj]90-cray)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
-+	crds | unos)
-+		basic_machine=m68k-crds
-+		;;
-+	da30 | da30-*)
-+		basic_machine=m68k-da30
-+		;;
-+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+		basic_machine=mips-dec
-+		;;
-+	delta | 3300 | motorola-3300 | motorola-delta \
-+	      | 3300-motorola | delta-motorola)
-+		basic_machine=m68k-motorola
-+		;;
-+	delta88)
-+		basic_machine=m88k-motorola
-+		os=-sysv3
-+		;;
-+	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
-+		;;
-+	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[34567]86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv32
-+		;;
-+	i[34567]86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv4
-+		;;
-+	i[34567]86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv
-+		;;
-+	i[34567]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
-+		;;
-+	i386-go32 | go32)
-+		basic_machine=i386-unknown
-+		os=-go32
-+		;;
-+	i386-mingw32 | mingw32)
-+		basic_machine=i386-unknown
-+		os=-mingw32
-+		;;
-+	iris | iris4d)
-+		basic_machine=mips-sgi
-+		case $os in
-+		    -irix*)
-+			;;
-+		    *)
-+			os=-irix4
-+			;;
-+		esac
-+		;;
-+	isi68 | isi)
-+		basic_machine=m68k-isi
-+		os=-sysv
-+		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
-+	magnum | m3230)
-+		basic_machine=mips-mips
-+		os=-sysv
-+		;;
-+	merlin)
-+		basic_machine=ns32k-utek
-+		os=-sysv
-+		;;
-+	miniframe)
-+		basic_machine=m68000-convergent
-+		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+	mipsel*-linux*)
-+		basic_machine=mipsel-unknown
-+		os=-linux-gnu
-+		;;
-+	mips*-linux*)
-+		basic_machine=mips-unknown
-+		os=-linux-gnu
-+		;;
-+	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		;;
-+	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		;;
-+	mmix*)
-+		basic_machine=mmix-knuth
-+		os=-mmixware
-+		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	msdos)
-+		basic_machine=i386-unknown
-+		os=-msdos
-+		;;
-+	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
-+		;;
-+	np1)
-+		basic_machine=np1-gould
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	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
-+		;;
-+	pbd)
-+		basic_machine=sparc-tti
-+		;;
-+	pbb)
-+		basic_machine=m68k-tti
-+		;;
-+        pc532 | pc532-*)
-+		basic_machine=ns32k-pc532
-+		;;
-+	pentium | p5 | k5 | k6 | nexen)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexen-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumpro-* | p6-* | 6x86-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pn)
-+		basic_machine=pn-gould
-+		;;
-+	power)	basic_machine=rs6000-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/^[^-]*-//'`
-+		;;
-+	ps2)
-+		basic_machine=i386-ibm
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	rm[46]00)
-+		basic_machine=mips-siemens
-+		;;
-+	rtpc | rtpc-*)
-+		basic_machine=romp-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sequent)
-+		basic_machine=i386-sequent
-+		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
-+	sparclite-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=t3e-cray
-+		os=-unicos
-+		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	tower | tower-32)
-+		basic_machine=m68k-ncr
-+		;;
-+	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
-+		;;
-+	xmp)
-+		basic_machine=xmp-cray
-+		os=-unicos
-+		;;
-+        xps | xps100)
-+		basic_machine=xps100-honeywell
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-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
-+		;;
-+	mips)
-+		if [ x$os = x-linux-gnu ]; then
-+			basic_machine=mips-unknown
-+		else
-+			basic_machine=mips-mips
-+		fi
-+		;;
-+	romp)
-+		basic_machine=romp-ibm
-+		;;
-+	rs6000)
-+		basic_machine=rs6000-ibm
-+		;;
-+	vax)
-+		basic_machine=vax-dec
-+		;;
-+	pdp11)
-+		basic_machine=pdp11-dec
-+		;;
-+	we32k)
-+		basic_machine=we32k-att
-+		;;
-+	sparc | sparcv9)
-+		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
-+		;;
-+	c4x*)
-+		basic_machine=c4x-none
-+		os=-coff
-+		;;
-+	*)
-+		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.
-+	-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* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* \
-+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit*)
-+	# Remember, each alternative MUST END IN *, to match a version number.
-+		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i[34567]86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto*)
-+		os=-nto-qnx
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-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
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
-+	-utek*)
-+		os=-bsd
-+		;;
-+	-dynix*)
-+		os=-bsd
-+		;;
-+	-acis*)
-+		os=-aos
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
-+	-ctix* | -uts*)
-+		os=-sysv
-+		;;
-+	-ns2 )
-+	        os=-nextstep2
-+		;;
-+	-nsk)
-+		os=-nsk
-+		;;
-+	# Preserve the version number of sinix5.
-+	-sinix5.*)
-+		os=`echo $os | sed -e 's|sinix|sysv|'`
-+		;;
-+	-sinix*)
-+		os=-sysv4
-+		;;
-+	-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)
-+	        os=-mint
-+		;;
-+	-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
-+	*-acorn)
-+		os=-riscix1.2
-+		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
-+	arm*-semi)
-+		os=-aout
-+		;;
-+        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
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	*-tti)	# must be before sparc entry or we get the wrong os.
-+		os=-sysv3
-+		;;
-+	sparc-* | *-sun)
-+		os=-sunos4.1.1
-+		;;
-+	*-be)
-+		os=-beos
-+		;;
-+	*-ibm)
-+		os=-aix
-+		;;
-+	*-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
-+		;;
-+	f301-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
-+				;;
-+			-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
-+				;;
-+			-ptx*)
-+				vendor=sequent
-+				;;
-+			-vxsim* | -vxworks*)
-+				vendor=wrs
-+				;;
-+			-aux*)
-+				vendor=apple
-+				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -*MiNT)
-+				vendor=atari
-+				;;
-+		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		;;
-+esac
-+
-+echo $basic_machine$os
-Index: configure
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ configure	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1,4307 @@
-+#! /bin/sh
-+
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated automatically using autoconf version 2.13 
-+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+#
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+
-+# Defaults:
-+ac_help=
-+ac_default_prefix=/usr/local
-+# Any additions from configure.in:
-+ac_help="$ac_help
-+  --with-x                use the X Window System"
-+ac_help="$ac_help
-+  --with-motif-includes=DIR        Motif include files are in DIR"
-+ac_help="$ac_help
-+  --with-motif-libraries=DIR       Motif libraries are in DIR"
-+ac_help="$ac_help
-+  --without-xpm                    do not use the Xpm library"
-+ac_help="$ac_help
-+  --with-xpm-includes=DIR          Xpm include files are in DIR"
-+ac_help="$ac_help
-+  --with-xpm-libraries=DIR         Xpm libraries are in DIR"
-+ac_help="$ac_help
-+  --with-mesa             prefer MesaGL (if found) over OpenGL [[default=yes]]"
-+ac_help="$ac_help
-+  --with-opengl           OpenGL/Mesa installation directory"
-+ac_help="$ac_help
-+  --with-pthread          pthread installation directory"
-+ac_help="$ac_help
-+  --with-glu		  use the OpenGL utility library [[default=yes]]"
-+ac_help="$ac_help
-+  --with-glw		  use the OpenGL widget Library [[default=yes]]"
-+
-+# Initialize some variables set by options.
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+build=NONE
-+cache_file=./config.cache
-+exec_prefix=NONE
-+host=NONE
-+no_create=
-+nonopt=NONE
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+target=NONE
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datadir='${prefix}/share'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+libdir='${exec_prefix}/lib'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+infodir='${prefix}/info'
-+mandir='${prefix}/man'
-+
-+# Initialize some other variables.
-+subdirs=
-+MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+# Maximum number of lines to put in a shell here document.
-+ac_max_here_lines=12
-+
-+ac_prev=
-+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=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) ac_optarg= ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case "$ac_option" in
-+
-+  -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 ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build="$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" ;;
-+
-+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-+  | --da=*)
-+    datadir="$ac_optarg" ;;
-+
-+  -disable-* | --disable-*)
-+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-+    fi
-+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-+    eval "enable_${ac_feature}=no" ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-+    fi
-+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-+    case "$ac_option" in
-+      *=*) ;;
-+      *) ac_optarg=yes ;;
-+    esac
-+    eval "enable_${ac_feature}='$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)
-+    # 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 << EOF
-+Usage: configure [options] [host]
-+Options: [defaults in brackets after descriptions]
-+Configuration:
-+  --cache-file=FILE       cache test results in FILE
-+  --help                  print this message
-+  --no-create             do not create output files
-+  --quiet, --silent       do not print \`checking...' messages
-+  --version               print the version of autoconf that created configure
-+Directory and file names:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [same as prefix]
-+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-+  --datadir=DIR           read-only architecture-independent data in DIR
-+                          [PREFIX/share]
-+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-+                          [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-+  --includedir=DIR        C header files in DIR [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-+  --infodir=DIR           info documentation in DIR [PREFIX/info]
-+  --mandir=DIR            man documentation in DIR [PREFIX/man]
-+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-+  --program-prefix=PREFIX prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM
-+                          run sed PROGRAM on installed program names
-+EOF
-+    cat << EOF
-+Host type:
-+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-+  --host=HOST             configure for HOST [guessed]
-+  --target=TARGET         configure for TARGET [TARGET=HOST]
-+Features and packages:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --x-includes=DIR        X include files are in DIR
-+  --x-libraries=DIR       X library files are in DIR
-+EOF
-+    if test -n "$ac_help"; then
-+      echo "--enable and --with options recognized:$ac_help"
-+    fi
-+    exit 0 ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host="$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" ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst \
-+  | --locals | --local | --loca | --loc | --lo)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+    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)
-+    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" ;;
-+
-+  -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 ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target="$ac_optarg" ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers)
-+    echo "configure generated by autoconf version 2.13"
-+    exit 0 ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-+    fi
-+    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    case "$ac_option" in
-+      *=*) ;;
-+      *) ac_optarg=yes ;;
-+    esac
-+    eval "with_${ac_package}='$ac_optarg'" ;;
-+
-+  -without-* | --without-*)
-+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-+    # Reject names that are not valid shell variable names.
-+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-+    fi
-+    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    eval "with_${ac_package}=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" ;;
-+
-+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-+    ;;
-+
-+  *)
-+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-+      echo "configure: warning: $ac_option: invalid host type" 1>&2
-+    fi
-+    if test "x$nonopt" != xNONE; then
-+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-+    fi
-+    nonopt="$ac_option"
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-+fi
-+
-+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-+
-+# File descriptor usage:
-+# 0 standard input
-+# 1 file creation
-+# 2 errors and warnings
-+# 3 some systems may open it to /dev/tty
-+# 4 used on the Kubota Titan
-+# 6 checking for... messages and results
-+# 5 compiler messages saved in config.log
-+if test "$silent" = yes; then
-+  exec 6>/dev/null
-+else
-+  exec 6>&1
-+fi
-+exec 5>./config.log
-+
-+echo "\
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+" 1>&5
-+
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Also quote any args containing shell metacharacters.
-+ac_configure_args=
-+for ac_arg
-+do
-+  case "$ac_arg" in
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c) ;;
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-+  esac
-+done
-+
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo > confdefs.h
-+
-+# A filename unique to this package, relative to the directory that
-+# configure is in, which we can look for to find out if srcdir is correct.
-+ac_unique_file=xmakemol.c
-+
-+# 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 its parent.
-+  ac_prog=$0
-+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-+  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
-+  if test "$ac_srcdir_defaulted" = yes; then
-+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-+  else
-+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-+  fi
-+fi
-+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-+
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+  fi
-+fi
-+for ac_site_file in $CONFIG_SITE; do
-+  if test -r "$ac_site_file"; then
-+    echo "loading site script $ac_site_file"
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  echo "loading cache $cache_file"
-+  . $cache_file
-+else
-+  echo "creating cache $cache_file"
-+  > $cache_file
-+fi
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+ac_exeext=
-+ac_objext=o
-+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-+    ac_n= ac_c='
-+' ac_t='	'
-+  else
-+    ac_n=-n ac_c= ac_t=
-+  fi
-+else
-+  ac_n= ac_c='\c' ac_t=
-+fi
-+
-+
-+
-+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
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
-+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-+fi
-+ac_config_guess=$ac_aux_dir/config.guess
-+ac_config_sub=$ac_aux_dir/config.sub
-+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-+
-+
-+# Do some error checking and defaulting for the host and target type.
-+# The inputs are:
-+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-+#
-+# The rules are:
-+# 1. You are not allowed to specify --host, --target, and nonopt at the
-+#    same time.
-+# 2. Host defaults to nonopt.
-+# 3. If nonopt is not specified, then host defaults to the current host,
-+#    as determined by config.guess.
-+# 4. Target and build default to nonopt.
-+# 5. If nonopt is not specified, then target and build default to host.
-+
-+# The aliases save the names the user supplied, while $host etc.
-+# will get canonicalized.
-+case $host---$target---$nonopt in
-+NONE---*---* | *---NONE---* | *---*---NONE) ;;
-+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-+esac
-+
-+
-+# Make sure we can run config.sub.
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking host system type""... $ac_c" 1>&6
-+echo "configure:595: checking host system type" >&5
-+
-+host_alias=$host
-+case "$host_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE)
-+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-+    fi ;;
-+  *) host_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$host" 1>&6
-+
-+echo $ac_n "checking target system type""... $ac_c" 1>&6
-+echo "configure:616: checking target system type" >&5
-+
-+target_alias=$target
-+case "$target_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE) target_alias=$host_alias ;;
-+  *) target_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$target" 1>&6
-+
-+echo $ac_n "checking build system type""... $ac_c" 1>&6
-+echo "configure:634: checking build system type" >&5
-+
-+build_alias=$build
-+case "$build_alias" in
-+NONE)
-+  case $nonopt in
-+  NONE) build_alias=$host_alias ;;
-+  *) build_alias=$nonopt ;;
-+  esac ;;
-+esac
-+
-+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+echo "$ac_t""$build" 1>&6
-+
-+test "$host_alias" != "$target_alias" &&
-+  test "$program_prefix$program_suffix$program_transform_name" = \
-+    NONENONEs,x,x, &&
-+  program_prefix=${target_alias}-
-+
-+
-+# 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
-+# 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"
-+# ./install, which can be erroneously created by make from ./install.sh.
-+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+echo "configure:669: checking for a BSD compatible install" >&5
-+if test -z "$INSTALL"; then
-+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-+  for ac_dir in $PATH; do
-+    # Account for people who put trailing slashes in PATH elements.
-+    case "$ac_dir/" in
-+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/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
-+        if test -f $ac_dir/$ac_prog; then
-+	  if test $ac_prog = install &&
-+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  else
-+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-+	    break 2
-+	  fi
-+	fi
-+      done
-+      ;;
-+    esac
-+  done
-+  IFS="$ac_save_IFS"
-+
-+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.  We don't cache a
-+    # path for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the path is relative.
-+    INSTALL="$ac_install_sh"
-+  fi
-+fi
-+echo "$ac_t""$INSTALL" 1>&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_PROGRAM}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-+echo "configure:722: checking whether build environment is sane" >&5
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "$*" != "X $srcdir/configure conftestfile" \
-+      && test "$*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" 1>&2; exit 1; }
-+   fi
-+
-+   test "$2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   { echo "configure: error: newly created file is older than distributed files!
-+Check your system clock" 1>&2; exit 1; }
-+fi
-+rm -f conftest*
-+echo "$ac_t""yes" 1>&6
-+if test "$program_transform_name" = s,x,x,; then
-+  program_transform_name=
-+else
-+  # Double any \ or $.  echo might interpret backslashes.
-+  cat <<\EOF_SED > conftestsed
-+s,\\,\\\\,g; s,\$,$$,g
-+EOF_SED
-+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-+  rm -f conftestsed
-+fi
-+test "$program_prefix" != NONE &&
-+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-+
-+# sed with no file args requires a program.
-+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-+
-+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-+echo "configure:779: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftestmake <<\EOF
-+all:
-+	@echo 'ac_maketemp="${MAKE}"'
-+EOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-+if test -n "$ac_maketemp"; then
-+  eval ac_cv_prog_make_${ac_make}_set=yes
-+else
-+  eval ac_cv_prog_make_${ac_make}_set=no
-+fi
-+rm -f conftestmake
-+fi
-+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  SET_MAKE=
-+else
-+  echo "$ac_t""no" 1>&6
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+
-+PACKAGE=xmakemol
-+
-+VERSION=4.40.2b
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-+fi
-+cat >> confdefs.h <<EOF
-+#define PACKAGE "$PACKAGE"
-+EOF
-+
-+cat >> confdefs.h <<EOF
-+#define VERSION "$VERSION"
-+EOF
-+
-+
-+
-+missing_dir=`cd $ac_aux_dir && pwd`
-+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-+echo "configure:825: checking for working aclocal" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-+   ACLOCAL=aclocal
-+   echo "$ac_t""found" 1>&6
-+else
-+   ACLOCAL="$missing_dir/missing aclocal"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-+echo "configure:838: checking for working autoconf" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOCONF=autoconf
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOCONF="$missing_dir/missing autoconf"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working automake""... $ac_c" 1>&6
-+echo "configure:851: checking for working automake" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (automake --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOMAKE="$missing_dir/missing automake"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-+echo "configure:864: checking for working autoheader" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOHEADER=autoheader
-+   echo "$ac_t""found" 1>&6
-+else
-+   AUTOHEADER="$missing_dir/missing autoheader"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-+echo "configure:877: checking for working makeinfo" >&5
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-+   MAKEINFO=makeinfo
-+   echo "$ac_t""found" 1>&6
-+else
-+   MAKEINFO="$missing_dir/missing makeinfo"
-+   echo "$ac_t""missing" 1>&6
-+fi
-+
-+
-+
-+
-+
-+
-+
-+# Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:898: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="gcc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+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
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:928: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_prog_rejected=no
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-+        ac_prog_rejected=yes
-+	continue
-+      fi
-+      ac_cv_prog_CC="cc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_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 $# -gt 0; then
-+    # We chose a 
-+    # 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
-+    set dummy "$ac_dir/$ac_word" "$@"
-+    shift
-+    ac_cv_prog_CC="$@"
-+  fi
-+fi
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:979: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:1011: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+cat > conftest.$ac_ext << EOF
-+
-+#line 1022 "configure"
-+#include "confdefs.h"
-+
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  ac_cv_prog_cc_works=yes
-+  # If we can't run a trivial program, we are probably using a cross compiler.
-+  if (./conftest; exit) 2>/dev/null; then
-+    ac_cv_prog_cc_cross=no
-+  else
-+    ac_cv_prog_cc_cross=yes
-+  fi
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:1053: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+echo "configure:1058: checking whether we are using GNU C" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+  yes;
-+#endif
-+EOF
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+  ac_cv_prog_gcc=yes
-+else
-+  ac_cv_prog_gcc=no
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
-+if test $ac_cv_prog_gcc = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:1086: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  echo 'void f(){}' > conftest.c
-+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  ac_cv_prog_cc_g=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&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
-+
-+# 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
-+# 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"
-+# ./install, which can be erroneously created by make from ./install.sh.
-+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+echo "configure:1129: checking for a BSD compatible install" >&5
-+if test -z "$INSTALL"; then
-+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-+  for ac_dir in $PATH; do
-+    # Account for people who put trailing slashes in PATH elements.
-+    case "$ac_dir/" in
-+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/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
-+        if test -f $ac_dir/$ac_prog; then
-+	  if test $ac_prog = install &&
-+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  else
-+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-+	    break 2
-+	  fi
-+	fi
-+      done
-+      ;;
-+    esac
-+  done
-+  IFS="$ac_save_IFS"
-+
-+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.  We don't cache a
-+    # path for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the path is relative.
-+    INSTALL="$ac_install_sh"
-+  fi
-+fi
-+echo "$ac_t""$INSTALL" 1>&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_PROGRAM}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+
-+
-+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:1184: checking how to run the C preprocessor" >&5
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    # This must be in double quotes, not single quotes, because CPP may get
-+  # substituted into the Makefile and "${CC-cc}" will confuse make.
-+  CPP="${CC-cc} -E"
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp.
-+  cat > conftest.$ac_ext <<EOF
-+#line 1199 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -E -traditional-cpp"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1216 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1233 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP=/lib/cpp
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+  CPP="$ac_cv_prog_CPP"
-+else
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+echo "$ac_t""$CPP" 1>&6
-+
-+# If we find X, set shell vars x_includes and x_libraries to the
-+# paths, otherwise set no_x=yes.
-+# Uses ac_ vars as temps to allow command line to override cache and checks.
-+# --without-x overrides everything else, but does not touch the cache.
-+echo $ac_n "checking for X""... $ac_c" 1>&6
-+echo "configure:1268: checking for X" >&5
-+
-+# Check whether --with-x or --without-x was given.
-+if test "${with_x+set}" = set; then
-+  withval="$with_x"
-+  :
-+fi
-+
-+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-+if test "x$with_x" = xno; then
-+  # The user explicitly disabled X.
-+  have_x=disabled
-+else
-+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-+    # Both variables are already set.
-+    have_x=yes
-+  else
-+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  # One or both of the vars are not set, and there is no cached value.
-+ac_x_includes=NO ac_x_libraries=NO
-+rm -fr conftestdir
-+if mkdir conftestdir; then
-+  cd conftestdir
-+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-+  cat > Imakefile <<'EOF'
-+acfindx:
-+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+EOF
-+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-+    for ac_extension in a so sl; do
-+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-+        test -f $ac_im_libdir/libX11.$ac_extension; then
-+        ac_im_usrlibdir=$ac_im_libdir; break
-+      fi
-+    done
-+    # Screen out bogus values from the imake configuration.  They are
-+    # bogus both because they are the default anyway, and because
-+    # using them would break gcc on systems where it needs fixed includes.
-+    case "$ac_im_incroot" in
-+	/usr/include) ;;
-+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
-+    esac
-+    case "$ac_im_usrlibdir" in
-+	/usr/lib | /lib) ;;
-+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
-+    esac
-+  fi
-+  cd ..
-+  rm -fr conftestdir
-+fi
-+
-+if test "$ac_x_includes" = NO; then
-+  # Guess where to find include files, by looking for this one X11 .h file.
-+  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-+
-+  # First, try using that file with no special directory specified.
-+cat > conftest.$ac_ext <<EOF
-+#line 1330 "configure"
-+#include "confdefs.h"
-+#include <$x_direct_test_include>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  # We can compile using X headers with no special include directory.
-+ac_x_includes=
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  # Look for the header file in a standard set of common directories.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+  for ac_dir in               \
-+    /usr/X11/include          \
-+    /usr/X11R6/include        \
-+    /usr/X11R5/include        \
-+    /usr/X11R4/include        \
-+                              \
-+    /usr/include/X11          \
-+    /usr/include/X11R6        \
-+    /usr/include/X11R5        \
-+    /usr/include/X11R4        \
-+                              \
-+    /usr/local/X11/include    \
-+    /usr/local/X11R6/include  \
-+    /usr/local/X11R5/include  \
-+    /usr/local/X11R4/include  \
-+                              \
-+    /usr/local/include/X11    \
-+    /usr/local/include/X11R6  \
-+    /usr/local/include/X11R5  \
-+    /usr/local/include/X11R4  \
-+                              \
-+    /usr/X386/include         \
-+    /usr/x386/include         \
-+    /usr/XFree86/include/X11  \
-+                              \
-+    /usr/include              \
-+    /usr/local/include        \
-+    /usr/unsupported/include  \
-+    /usr/athena/include       \
-+    /usr/local/x11r5/include  \
-+    /usr/lpp/Xamples/include  \
-+                              \
-+    /usr/openwin/include      \
-+    /usr/openwin/share/include \
-+    ; \
-+  do
-+    if test -r "$ac_dir/$x_direct_test_include"; then
-+      ac_x_includes=$ac_dir
-+      break
-+    fi
-+  done
-+fi
-+rm -f conftest*
-+fi # $ac_x_includes = NO
-+
-+if test "$ac_x_libraries" = NO; then
-+  # Check for the libraries.
-+
-+  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-+  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-+
-+  # See if we find them without any special options.
-+  # Don't add to $LIBS permanently.
-+  ac_save_LIBS="$LIBS"
-+  LIBS="-l$x_direct_test_library $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1404 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+${x_direct_test_function}()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  LIBS="$ac_save_LIBS"
-+# We can link X programs with no special library path.
-+ac_x_libraries=
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  LIBS="$ac_save_LIBS"
-+# First see if replacing the include by lib works.
-+# Check X11 before X11Rn because it is often a symlink to the current release.
-+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-+    /usr/X11/lib          \
-+    /usr/X11R6/lib        \
-+    /usr/X11R5/lib        \
-+    /usr/X11R4/lib        \
-+                          \
-+    /usr/lib/X11          \
-+    /usr/lib/X11R6        \
-+    /usr/lib/X11R5        \
-+    /usr/lib/X11R4        \
-+                          \
-+    /usr/local/X11/lib    \
-+    /usr/local/X11R6/lib  \
-+    /usr/local/X11R5/lib  \
-+    /usr/local/X11R4/lib  \
-+                          \
-+    /usr/local/lib/X11    \
-+    /usr/local/lib/X11R6  \
-+    /usr/local/lib/X11R5  \
-+    /usr/local/lib/X11R4  \
-+                          \
-+    /usr/X386/lib         \
-+    /usr/x386/lib         \
-+    /usr/XFree86/lib/X11  \
-+                          \
-+    /usr/lib              \
-+    /usr/local/lib        \
-+    /usr/unsupported/lib  \
-+    /usr/athena/lib       \
-+    /usr/local/x11r5/lib  \
-+    /usr/lpp/Xamples/lib  \
-+    /lib/usr/lib/X11	  \
-+                          \
-+    /usr/openwin/lib      \
-+    /usr/openwin/share/lib \
-+    ; \
-+do
-+  for ac_extension in a so sl; do
-+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+      ac_x_libraries=$ac_dir
-+      break 2
-+    fi
-+  done
-+done
-+fi
-+rm -f conftest*
-+fi # $ac_x_libraries = NO
-+
-+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
-+  # Didn't find X anywhere.  Cache the known absence of X.
-+  ac_cv_have_x="have_x=no"
-+else
-+  # Record where we found X for the cache.
-+  ac_cv_have_x="have_x=yes \
-+	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-+fi
-+fi
-+  fi
-+  eval "$ac_cv_have_x"
-+fi # $with_x != no
-+
-+if test "$have_x" != yes; then
-+  echo "$ac_t""$have_x" 1>&6
-+  no_x=yes
-+else
-+  # If each of the values was on the command line, it overrides each guess.
-+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-+  # Update the cache value to reflect the command line values.
-+  ac_cv_have_x="have_x=yes \
-+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-+  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-+fi
-+
-+if test "$no_x" = yes; then
-+  # Not all programs may use this symbol, but it does not hurt to define it.
-+  cat >> confdefs.h <<\EOF
-+#define X_DISPLAY_MISSING 1
-+EOF
-+
-+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-+else
-+  if test -n "$x_includes"; then
-+    X_CFLAGS="$X_CFLAGS -I$x_includes"
-+  fi
-+
-+  # It would also be nice to do this for all -L options, not just this one.
-+  if test -n "$x_libraries"; then
-+    X_LIBS="$X_LIBS -L$x_libraries"
-+    # For Solaris; some versions of Sun CC require a space after -R and
-+    # others require no space.  Words are not sufficient . . . .
-+    case "`(uname -sr) 2>/dev/null`" in
-+    "SunOS 5"*)
-+      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-+echo "configure:1517: checking whether -R must be followed by a space" >&5
-+      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-+      cat > conftest.$ac_ext <<EOF
-+#line 1520 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  ac_R_nospace=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_R_nospace=no
-+fi
-+rm -f conftest*
-+      if test $ac_R_nospace = yes; then
-+	echo "$ac_t""no" 1>&6
-+	X_LIBS="$X_LIBS -R$x_libraries"
-+      else
-+	LIBS="$ac_xsave_LIBS -R $x_libraries"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1543 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  ac_R_space=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_R_space=no
-+fi
-+rm -f conftest*
-+	if test $ac_R_space = yes; then
-+	  echo "$ac_t""yes" 1>&6
-+	  X_LIBS="$X_LIBS -R $x_libraries"
-+	else
-+	  echo "$ac_t""neither works" 1>&6
-+	fi
-+      fi
-+      LIBS="$ac_xsave_LIBS"
-+    esac
-+  fi
-+
-+  # Check for system-dependent libraries X programs must link with.
-+  # Do this before checking for the system-independent R6 libraries
-+  # (-lICE), since we may need -lsocket or whatever for X linking.
-+
-+  if test "$ISC" = yes; then
-+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-+  else
-+    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-+    # libraries were built with DECnet support.  And karl@cs.umb.edu says
-+    # the Alpha needs dnet_stub (dnet does not exist).
-+    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-+echo "configure:1582: checking for dnet_ntoa in -ldnet" >&5
-+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldnet  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1590 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dnet_ntoa();
-+
-+int main() {
-+dnet_ntoa()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-+echo "configure:1623: checking for dnet_ntoa in -ldnet_stub" >&5
-+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldnet_stub  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1631 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dnet_ntoa();
-+
-+int main() {
-+dnet_ntoa()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    fi
-+
-+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-+    # to get the SysV transport functions.
-+    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-+    # needs -lnsl.
-+    # The nsl library prevents programs from opening the X display
-+    # on Irix 5.2, according to dickey@clark.net.
-+    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-+echo "configure:1671: checking for gethostbyname" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1676 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char gethostbyname(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char gethostbyname();
-+
-+int main() {
-+
-+/* 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_gethostbyname) || defined (__stub___gethostbyname)
-+choke me
-+#else
-+gethostbyname();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_gethostbyname=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_gethostbyname=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  :
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    if test $ac_cv_func_gethostbyname = no; then
-+      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-+echo "configure:1720: checking for gethostbyname in -lnsl" >&5
-+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lnsl  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1728 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char gethostbyname();
-+
-+int main() {
-+gethostbyname()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    fi
-+
-+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-+    # socket/setsockopt and other routines are undefined under SCO ODT
-+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-+    # on later versions), says simon@lia.di.epfl.ch: it contains
-+    # gethostby* variants that don't use the nameserver (or something).
-+    # -lsocket must be given before -lnsl if both are needed.
-+    # We assume that if connect needs -lnsl, so does gethostbyname.
-+    echo $ac_n "checking for connect""... $ac_c" 1>&6
-+echo "configure:1769: checking for connect" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1774 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char connect(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char connect();
-+
-+int main() {
-+
-+/* 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_connect) || defined (__stub___connect)
-+choke me
-+#else
-+connect();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_connect=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_connect=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  :
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    if test $ac_cv_func_connect = no; then
-+      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-+echo "configure:1818: checking for connect in -lsocket" >&5
-+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1826 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char connect();
-+
-+int main() {
-+connect()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    fi
-+
-+    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-+    echo $ac_n "checking for remove""... $ac_c" 1>&6
-+echo "configure:1861: checking for remove" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1866 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char remove(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char remove();
-+
-+int main() {
-+
-+/* 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_remove) || defined (__stub___remove)
-+choke me
-+#else
-+remove();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_remove=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_remove=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  :
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    if test $ac_cv_func_remove = no; then
-+      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-+echo "configure:1910: checking for remove in -lposix" >&5
-+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lposix  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1918 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char remove();
-+
-+int main() {
-+remove()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    fi
-+
-+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-+echo "configure:1953: checking for shmat" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1958 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shmat(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shmat();
-+
-+int main() {
-+
-+/* 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_shmat) || defined (__stub___shmat)
-+choke me
-+#else
-+shmat();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_shmat=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_shmat=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  :
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    if test $ac_cv_func_shmat = no; then
-+      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-+echo "configure:2002: checking for shmat in -lipc" >&5
-+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lipc  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2010 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shmat();
-+
-+int main() {
-+shmat()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+    fi
-+  fi
-+
-+  # Check for libraries that X11R6 Xt/Xaw programs need.
-+  ac_save_LDFLAGS="$LDFLAGS"
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+  # check for ICE first), but we must link in the order -lSM -lICE or
-+  # we get undefined symbols.  So assume we have SM if we have ICE.
-+  # These have to be linked with before -lX11, unlike the other
-+  # libraries we check for below, so use a 
-+  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-+  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-+echo "configure:2054: checking for IceConnectionNumber in -lICE" >&5
-+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2062 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char IceConnectionNumber();
-+
-+int main() {
-+IceConnectionNumber()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  LDFLAGS="$ac_save_LDFLAGS"
-+
-+fi
-+
-+
-+
-+motif_includes=
-+motif_libraries=
-+# Check whether --with-motif-includes or --without-motif-includes was given.
-+if test "${with_motif_includes+set}" = set; then
-+  withval="$with_motif_includes"
-+  motif_includes="$withval"
-+fi
-+
-+# Check whether --with-motif-libraries or --without-motif-libraries was given.
-+if test "${with_motif_libraries+set}" = set; then
-+  withval="$with_motif_libraries"
-+  motif_libraries="$withval"
-+fi
-+
-+echo $ac_n "checking for Motif""... $ac_c" 1>&6
-+echo "configure:2114: checking for Motif" >&5
-+#
-+#
-+# Search the include files.
-+#
-+if test "$motif_includes" = ""; then
-+if eval "test \"`echo '$''{'ice_cv_motif_includes'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+ice_motif_save_LIBS="$LIBS"
-+ice_motif_save_CFLAGS="$CFLAGS"
-+ice_motif_save_CPPFLAGS="$CPPFLAGS"
-+ice_motif_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+cat > conftest.$ac_ext <<EOF
-+#line 2135 "configure"
-+#include "confdefs.h"
-+#include <Xm/Xm.h>
-+int main() {
-+int a;
-+; return 0; }
-+EOF
-+if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  
-+# Xm/Xm.h is in the standard search path.
-+ice_cv_motif_includes=
-+
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  
-+# Xm/Xm.h is not in the standard search path.
-+# Locate it and put its directory in `motif_includes'
-+#
-+# /usr/include/Motif* are used on HP-UX (Motif).
-+# /usr/include/X11* are used on HP-UX (X and Athena).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Athena).
-+# Other directories are just guesses.
-+for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
-+           /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \
-+           /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-+           /usr/dt/include /usr/openwin/include \
-+           /usr/dt/*/include /opt/*/include /usr/include/Motif* \
-+	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
-+	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
-+if test -f "$dir/Xm/Xm.h"; then
-+ice_cv_motif_includes="$dir"
-+break
-+fi
-+done
-+if test "$ice_cv_motif_includes" = ""; then
-+ice_cv_motif_includes=no
-+fi
-+
-+fi
-+rm -f conftest*
-+#
-+LIBS="$ice_motif_save_LIBS"
-+CFLAGS="$ice_motif_save_CFLAGS"
-+CPPFLAGS="$ice_motif_save_CPPFLAGS"
-+LDFLAGS="$ice_motif_save_LDFLAGS"
-+
-+fi
-+
-+motif_includes="$ice_cv_motif_includes"
-+fi
-+#
-+#
-+# Now for the libraries.
-+#
-+if test "$motif_libraries" = ""; then
-+if eval "test \"`echo '$''{'ice_cv_motif_libraries'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+ice_motif_save_LIBS="$LIBS"
-+ice_motif_save_CFLAGS="$CFLAGS"
-+ice_motif_save_CPPFLAGS="$CPPFLAGS"
-+ice_motif_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+# We use XtToolkitInitialize() here since it takes no arguments
-+# and thus also works with a C++ compiler.
-+cat > conftest.$ac_ext <<EOF
-+#line 2211 "configure"
-+#include "confdefs.h"
-+
-+#include <X11/Intrinsic.h>
-+#include <Xm/Xm.h>
-+
-+int main() {
-+XtToolkitInitialize();
-+; return 0; }
-+EOF
-+if { (eval echo configure:2221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  
-+# libXm.a is in the standard search path.
-+ice_cv_motif_libraries=
-+
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  
-+# libXm.a is not in the standard search path.
-+# Locate it and put its directory in `motif_libraries'
-+#
-+# /usr/lib/Motif* are used on HP-UX (Motif).
-+# /usr/lib/X11* are used on HP-UX (X and Athena).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/lesstif is used on Linux (Lesstif).
-+# /usr/openwin is used on Solaris (X and Athena).
-+# Other directories are just guesses.
-+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
-+	   /usr/lib/Motif2.0 /usr/lib/Motif1.2 /usr/lib/Motif1.1 \
-+	   /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 /usr/lib/X11 \
-+           /usr/dt/lib /usr/openwin/lib \
-+	   /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \
-+           /usr/lesstif*/lib /usr/lib/Lesstif* \
-+	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-+	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
-+if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then
-+ice_cv_motif_libraries="$dir"
-+break
-+fi
-+done
-+if test "$ice_cv_motif_libraries" = ""; then
-+ice_cv_motif_libraries=no
-+fi
-+
-+fi
-+rm -f conftest*
-+#
-+LIBS="$ice_motif_save_LIBS"
-+CFLAGS="$ice_motif_save_CFLAGS"
-+CPPFLAGS="$ice_motif_save_CPPFLAGS"
-+LDFLAGS="$ice_motif_save_LDFLAGS"
-+
-+fi
-+
-+#
-+motif_libraries="$ice_cv_motif_libraries"
-+fi
-+# Add Motif definitions to X flags
-+#
-+if test "$motif_includes" != "" && test "$motif_includes" != "$x_includes" && test "$motif_includes" != "no"
-+then
-+X_CFLAGS="-I$motif_includes $X_CFLAGS"
-+fi
-+if test "$motif_libraries" != "" && test "$motif_libraries" != "$x_libraries" && test "$motif_libraries" != "no"
-+then
-+case "$X_LIBS" in
-+  *-R\ *) X_LIBS="-L$motif_libraries -R $motif_libraries $X_LIBS";;
-+  *-R*)   X_LIBS="-L$motif_libraries -R$motif_libraries $X_LIBS";;
-+  *)      X_LIBS="-L$motif_libraries $X_LIBS";;
-+esac
-+fi
-+#
-+#
-+motif_libraries_result="$motif_libraries"
-+motif_includes_result="$motif_includes"
-+test "$motif_libraries_result" = "" && 
-+  motif_libraries_result="in default path"
-+test "$motif_includes_result" = "" && 
-+  motif_includes_result="in default path"
-+test "$motif_libraries_result" = "no" && 
-+  motif_libraries_result="(none)"
-+test "$motif_includes_result" = "no" && 
-+  motif_includes_result="(none)"
-+echo "$ac_t""libraries $motif_libraries_result, headers $motif_includes_result" 1>&6
-+
-+
-+
-+xpm_includes=
-+xpm_libraries=
-+# Check whether --with-xpm or --without-xpm was given.
-+if test "${with_xpm+set}" = set; then
-+  withval="$with_xpm"
-+  :
-+fi
-+
-+if test "$with_xpm" = "no"
-+then
-+xpm_includes=no
-+xpm_libraries=no
-+fi
-+# Check whether --with-xpm-includes or --without-xpm-includes was given.
-+if test "${with_xpm_includes+set}" = set; then
-+  withval="$with_xpm_includes"
-+  xpm_includes="$withval"
-+fi
-+
-+# Check whether --with-xpm-libraries or --without-xpm-libraries was given.
-+if test "${with_xpm_libraries+set}" = set; then
-+  withval="$with_xpm_libraries"
-+  xpm_libraries="$withval"
-+fi
-+
-+echo $ac_n "checking for Xpm""... $ac_c" 1>&6
-+echo "configure:2327: checking for Xpm" >&5
-+#
-+#
-+# Search the include files.  Note that XPM can come in <X11/xpm.h> (as
-+# in X11R6) or in <xpm.h> if installed locally.
-+#
-+if test "$xpm_includes" = ""; then
-+if eval "test \"`echo '$''{'ice_cv_xpm_includes'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+ice_xpm_save_LIBS="$LIBS"
-+ice_xpm_save_CFLAGS="$CFLAGS"
-+ice_xpm_save_CPPFLAGS="$CPPFLAGS"
-+ice_xpm_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+cat > conftest.$ac_ext <<EOF
-+#line 2349 "configure"
-+#include "confdefs.h"
-+
-+#include <X11/xpm.h>
-+
-+int main() {
-+int a;
-+; return 0; }
-+EOF
-+if { (eval echo configure:2358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  
-+# X11/xpm.h is in the standard search path.
-+ice_cv_xpm_includes=
-+
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  
-+# X11/xpm.h is not in the standard search path.
-+# Locate it and put its directory in `xpm_includes'
-+#
-+# /usr/include/Motif* are used on HP-UX (Motif).
-+# /usr/include/X11* are used on HP-UX (X and Xaw).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Xaw).
-+# Other directories are just guesses.
-+for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
-+           /usr/include/Motif2.0 /usr/include/Motif1.2 /usr/include/Motif1.1 \
-+           /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-+           /usr/dt/include /usr/openwin/include \
-+           /usr/dt/*/include /opt/*/include /usr/include/Motif* \
-+	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
-+	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
-+if test -f "$dir/X11/xpm.h" || test -f "$dir/xpm.h"; then
-+ice_cv_xpm_includes="$dir"
-+break
-+fi
-+done
-+
-+fi
-+rm -f conftest*
-+#
-+LIBS="$ice_xpm_save_LIBS"
-+CFLAGS="$ice_xpm_save_CFLAGS"
-+CPPFLAGS="$ice_xpm_save_CPPFLAGS"
-+LDFLAGS="$ice_xpm_save_LDFLAGS"
-+
-+fi
-+
-+xpm_includes="$ice_cv_xpm_includes"
-+fi
-+#
-+#
-+# Now for the libraries.
-+#
-+if test "$xpm_libraries" = ""; then
-+if eval "test \"`echo '$''{'ice_cv_xpm_libraries'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+ice_xpm_save_LIBS="$LIBS"
-+ice_xpm_save_CFLAGS="$CFLAGS"
-+ice_xpm_save_CPPFLAGS="$CPPFLAGS"
-+ice_xpm_save_LDFLAGS="$LDFLAGS"
-+#
-+LIBS="$X_PRE_LIBS -lXpm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
-+CFLAGS="$X_CFLAGS $CFLAGS"
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-+LDFLAGS="$X_LIBS $LDFLAGS"
-+#
-+#
-+# We use XtToolkitInitialize() here since it takes no arguments
-+# and thus also works with a C++ compiler.
-+cat > conftest.$ac_ext <<EOF
-+#line 2425 "configure"
-+#include "confdefs.h"
-+
-+#include <X11/Intrinsic.h>
-+#include <X11/xpm.h>
-+
-+int main() {
-+XtToolkitInitialize();
-+; return 0; }
-+EOF
-+if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  
-+# libxpm.a is in the standard search path.
-+ice_cv_xpm_libraries=
-+
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  
-+# libXpm.a is not in the standard search path.
-+# Locate it and put its directory in `xpm_libraries'
-+#
-+#
-+# /usr/lib/Motif* are used on HP-UX (Motif).
-+# /usr/lib/X11* are used on HP-UX (X and Xpm).
-+# /usr/dt is used on Solaris (Motif).
-+# /usr/openwin is used on Solaris (X and Xpm).
-+# Other directories are just guesses.
-+for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
-+	   /usr/lib/Motif2.1 /usr/lib/Motif2.0 /usr/lib/Motif1.2 \
-+	   /usr/lib/Motif1.1 /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
-+	   /usr/lib/X11 /usr/dt/lib /usr/openwin/lib \
-+	   /usr/dt/*/lib /opt/*/lib /usr/lib/Motif* \
-+	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-+	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
-+if test -d "$dir" && test "`ls $dir/libXpm.* 2> /dev/null`" != ""; then
-+ice_cv_xpm_libraries="$dir"
-+break
-+fi
-+done
-+
-+fi
-+rm -f conftest*
-+#
-+LIBS="$ice_xpm_save_LIBS"
-+CFLAGS="$ice_xpm_save_CFLAGS"
-+CPPFLAGS="$ice_xpm_save_CPPFLAGS"
-+LDFLAGS="$ice_xpm_save_LDFLAGS"
-+
-+fi
-+
-+#
-+xpm_libraries="$ice_cv_xpm_libraries"
-+fi
-+#
-+# Add Xpm definitions to X flags
-+#
-+if test "$xpm_includes" != "" && test "$xpm_includes" != "$x_includes" && test "$xpm_includes" != "no"
-+then
-+X_CFLAGS="-I$xpm_includes $X_CFLAGS"
-+fi
-+if test "$xpm_libraries" != "" && test "$xpm_libraries" != "$x_libraries" && test "$xpm_libraries" != "no"
-+then
-+case "$X_LIBS" in
-+  *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";;
-+  *-R*)   X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";;
-+  *)      X_LIBS="-L$xpm_libraries $X_LIBS";;
-+esac
-+fi
-+#
-+#
-+xpm_libraries_result="$xpm_libraries"
-+xpm_includes_result="$xpm_includes"
-+test "$xpm_libraries_result" = "" && 
-+  xpm_libraries_result="in default path"
-+test "$xpm_includes_result" = "" && 
-+  xpm_includes_result="in default path"
-+test "$xpm_libraries_result" = "no" && 
-+  xpm_libraries_result="(none)"
-+test "$xpm_includes_result" = "no" && 
-+  xpm_includes_result="(none)"
-+echo "$ac_t""libraries $xpm_libraries_result, headers $xpm_includes_result" 1>&6
-+
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-+LDFLAGS="$LDFLAGS $X_LIBS"
-+ 
-+X11_LIBS=""
-+echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-+echo "configure:2517: checking for XOpenDisplay in -lX11" >&5
-+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lX11 ${X_PRE_LIBS} $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2525 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char XOpenDisplay();
-+
-+int main() {
-+XOpenDisplay()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  X11_LIBS="-lX11"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test "$X11_LIBS" = ""; then
-+{ echo "configure: error: The X11 library '-lX11' could not be found.
-+                Please use the configure options '--x-includes=DIR'
-+                and '--x-libraries=DIR' to specify the X location.
-+                See the 'config.log' file for further diagnostics." 1>&2; exit 1; }
-+fi
-+
-+
-+
-+ 
-+XEXT_LIBS=""
-+echo $ac_n "checking for XShapeQueryVersion in -lXext""... $ac_c" 1>&6
-+echo "configure:2568: checking for XShapeQueryVersion in -lXext" >&5
-+ac_lib_var=`echo Xext'_'XShapeQueryVersion | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lXext ${X_PRE_LIBS} ${X11_LIBS} $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2576 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char XShapeQueryVersion();
-+
-+int main() {
-+XShapeQueryVersion()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  XEXT_LIBS="-lXext"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+ 
-+XT_LIBS=""
-+echo $ac_n "checking for XtToolkitInitialize in -lXt""... $ac_c" 1>&6
-+echo "configure:2611: checking for XtToolkitInitialize in -lXt" >&5
-+ac_lib_var=`echo Xt'_'XtToolkitInitialize | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lXt ${X_PRE_LIBS} ${X11_LIBS} $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2619 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char XtToolkitInitialize();
-+
-+int main() {
-+XtToolkitInitialize()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  XT_LIBS="-lXt"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test "$XT_LIBS" = ""; then
-+{ echo "configure: error: The X toolkit library '-lXt' could not be found.
-+                Please use the configure iptions '--x-includes=DIR'
-+                and '--x-libraries=DIR' to specify the X location.
-+                See the 'config.log' file for further diagnostics." 1>&2; exit 1; }
-+fi
-+
-+ 
-+XPM_LIBS=""
-+echo $ac_n "checking for XpmCreatePixmapFromXpmImage in -lXpm""... $ac_c" 1>&6
-+echo "configure:2660: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
-+ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromXpmImage | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lXpm ${X_PRE_LIBS} ${X11_LIBS} $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2668 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char XpmCreatePixmapFromXpmImage();
-+
-+int main() {
-+XpmCreatePixmapFromXpmImage()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  XPM_LIBS="-lXpm"
-+        cat >> confdefs.h <<\EOF
-+#define XPM 1
-+EOF
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test "$XPM_LIBS" != ""; then
-+for ac_hdr in X11/xpm.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2708: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2713 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+fi
-+
-+ 
-+XM_LIBS=""
-+echo $ac_n "checking for XmRepTypeInstallTearOffModelConverter in -lXm""... $ac_c" 1>&6
-+echo "configure:2749: checking for XmRepTypeInstallTearOffModelConverter in -lXm" >&5
-+ac_lib_var=`echo Xm'_'XmRepTypeInstallTearOffModelConverter | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lXm ${X_PRE_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${XEXT_LIBS} ${X11_LIBS} $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2757 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char XmRepTypeInstallTearOffModelConverter();
-+
-+int main() {
-+XmRepTypeInstallTearOffModelConverter()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  XM_LIBS="-lXm"
-+        cat >> confdefs.h <<\EOF
-+#define HAVE_MOTIF 1
-+EOF
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+cat >> confdefs.h <<\EOF
-+#define HAVE_MOTIF 0
-+EOF
-+
-+fi
-+
-+if test "$XM_LIBS" = ""; then
-+{ echo "configure: error: The Motif library '-lXm' could not be found.
-+                Please use the configure options '--with-motif-includes=DIR'
-+                and '--with-motif-libraries=DIR' to specify the Xm location.
-+                See the 'config.log' file for further diagnostics." 1>&2; exit 1; }
-+fi
-+
-+
-+
-+GL_LIBS=""
-+echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
-+echo "configure:2807: checking for pow in -lm" >&5
-+ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lm  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 2815 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char pow();
-+
-+int main() {
-+pow()
-+; return 0; }
-+EOF
-+if { (eval echo configure:2826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  MATHLIB="true"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test x"$MATHLIB" != x"true"; then
-+	{ echo "configure: error: the math library '-lm' could not be found!
-+			Please check the installation of math library" 1>&2; exit 1; }
-+fi
-+if test x"$MATHLIB" = x"true"; then
-+  LIBS="$LIBS -lm"
-+  
-+
-+unset sim_ac_gl_cppflags
-+unset sim_ac_gl_ldflags
-+unset sim_ac_gl_libs
-+sim_ac_gl_avail=no
-+
-+# Check whether --with-mesa or --without-mesa was given.
-+if test "${with_mesa+set}" = set; then
-+  withval="$with_mesa"
-+  :
-+else
-+  with_mesa=yes
-+fi
-+
-+
-+# It's usually libGL.so on UNIX systems and opengl32.lib on MSWindows.
-+sim_ac_gl_glnames="-lGL -lopengl32"
-+sim_ac_gl_mesaglnames=-lMesaGL
-+GL_LIBS=""
-+
-+if test "x$with_mesa" = "xyes"; then
-+  sim_ac_gl_first=$sim_ac_gl_mesaglnames
-+  sim_ac_gl_second=$sim_ac_gl_glnames
-+else
-+  sim_ac_gl_first=$sim_ac_gl_glnames
-+  sim_ac_gl_second=$sim_ac_gl_mesaglnames
-+fi
-+
-+# Check whether --with-opengl or --without-opengl was given.
-+if test "${with_opengl+set}" = set; then
-+  withval="$with_opengl"
-+  :
-+else
-+  with_opengl=yes
-+fi
-+
-+
-+if test x"$with_opengl" != xno; then
-+  if test x"$with_opengl" != xyes; then
-+    sim_ac_gl_cppflags="-I${with_opengl}/include"
-+    sim_ac_gl_ldflags="-L${with_opengl}/lib"
-+  else
-+    # This is a common location for the OpenGL library on HPUX.
-+    sim_ac_gl_hpux=/opt/graphics/OpenGL
-+    if test -d $sim_ac_gl_hpux; then
-+      sim_ac_gl_cppflags=-I$sim_ac_gl_hpux/include
-+      sim_ac_gl_ldflags=-L$sim_ac_gl_hpux/lib
-+    fi
-+  fi
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  CPPFLAGS="$CPPFLAGS $sim_ac_gl_cppflags"
-+  LDFLAGS="$LDFLAGS $sim_ac_gl_ldflags"
-+
-+  echo $ac_n "checking whether OpenGL library is available""... $ac_c" 1>&6
-+echo "configure:2911: checking whether OpenGL library is available" >&5
-+if eval "test \"`echo '$''{'sim_cv_lib_gl'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  sim_cv_lib_gl=UNRESOLVED
-+
-+    for sim_ac_gl_libcheck in $sim_ac_gl_first $sim_ac_gl_second; do
-+      if test "x$sim_cv_lib_gl" = "xUNRESOLVED"; then
-+        LIBS="$sim_ac_gl_libcheck $sim_ac_save_libs -lm"
-+        cat > conftest.$ac_ext <<EOF
-+#line 2921 "configure"
-+#include "confdefs.h"
-+
-+		#if HAVE_WINDOWS_H
-+		#include <windows.h>
-+		#endif /* HAVE_WINDOWS_H */
-+	 	#include <GL/gl.h>
-+		
-+int main() {
-+glPointSize(1.0f);
-+; return 0; }
-+EOF
-+if { (eval echo configure:2933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  sim_cv_lib_gl="$sim_ac_gl_libcheck"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+      fi
-+    done
-+  
-+fi
-+
-+echo "$ac_t""$sim_cv_lib_gl" 1>&6
-+
-+  LIBS="$sim_ac_save_libs"
-+
-+  if test "x$sim_cv_lib_gl" != "xUNRESOLVED"; then
-+    sim_ac_gl_libs="$sim_cv_lib_gl"
-+  else
-+    echo "configure: warning: couldn't compile or link with OpenGL library -- trying with pthread library in place..." 1>&2
-+
-+    
-+
-+# Check whether --with-pthread or --without-pthread was given.
-+if test "${with_pthread+set}" = set; then
-+  withval="$with_pthread"
-+  :
-+else
-+  with_pthread=yes
-+fi
-+
-+
-+sim_ac_pthread_avail=no
-+
-+if test x"$with_pthread" != xno; then
-+  if test x"$with_pthread" != xyes; then
-+    sim_ac_pthread_cppflags="-I${with_pthread}/include"
-+    sim_ac_pthread_ldflags="-L${with_pthread}/lib"
-+  fi
-+  sim_ac_pthread_libs_first="-lpthread"
-+  sim_ac_pthread_libs_second="-pthread"
-+  sim_ac_pthread_libs_third="-lc_r"
-+  sim_ac_pthread_libs=""
-+# FreeBSD 4.x use "-pthread" or "-lc_r"
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  echo $ac_n "checking whether the pthread development system is available""... $ac_c" 1>&6
-+echo "configure:2984: checking whether the pthread development system is available" >&5
-+if eval "test \"`echo '$''{'sim_cv_lib_pthread_avail'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+	for sim_pthread_libs in $sim_ac_pthread_libs_first \
-+	$sim_ac_pthread_libs_second $sim_ac_pthread_libs_third ; do
-+	  if test x"$sim_cv_lib_pthread_avail" != x"yes" ; then
-+		CPPFLAGS="$CPPFLAGS $sim_ac_pthread_cppflags"
-+		LDFLAGS="$LDFLAGS $sim_ac_pthread_ldflags"
-+		LIBS="$sim_pthread_libs $LIBS"
-+		cat > conftest.$ac_ext <<EOF
-+#line 2996 "configure"
-+#include "confdefs.h"
-+#include <pthread.h>
-+int main() {
-+(void)pthread_create(0L, 0L, 0L, 0L);
-+; return 0; }
-+EOF
-+if { (eval echo configure:3003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  sim_cv_lib_pthread_avail=yes
-+	    	  sim_ac_pthread_libs="$sim_pthread_libs"
-+			
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  sim_cv_lib_pthread_avail=no
-+fi
-+rm -f conftest*
-+	  fi
-+	  if test x"$sim_cv_lib_pthread_avail" != x"yes"; then
-+            CPPFLAGS=$sim_ac_save_cppflags
-+    	    LDFLAGS=$sim_ac_save_ldflags
-+    	    LIBS=$sim_ac_save_libs	
-+	  fi
-+	done
-+    
-+  
-+fi
-+
-+echo "$ac_t""$sim_cv_lib_pthread_avail" 1>&6
-+
-+  if test x"$sim_cv_lib_pthread_avail" = xyes; then
-+    sim_ac_pthread_avail=yes
-+    
-+      sim_ac_gl_cppflags="$sim_ac_gl_cppflags $sim_ac_pthread_cppflags"
-+      sim_ac_gl_ldflags="$sim_ac_gl_ldflags $sim_ac_pthread_ldflags"
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    echo "configure: warning: couldn't compile or link with pthread library" 1>&2
-+  fi
-+fi
-+
-+
-+    if test "x$sim_ac_pthread_avail" = "xyes"; then
-+      echo $ac_n "checking whether OpenGL library can be linked with pthread library""... $ac_c" 1>&6
-+echo "configure:3044: checking whether OpenGL library can be linked with pthread library" >&5
-+if eval "test \"`echo '$''{'sim_cv_lib_gl_pthread'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  sim_cv_lib_gl_pthread=UNRESOLVED
-+        for sim_ac_gl_libcheck in $sim_ac_gl_first $sim_ac_gl_second; do
-+          if test "x$sim_cv_lib_gl_pthread" = "xUNRESOLVED"; then
-+            LIBS="$sim_ac_gl_libcheck $sim_ac_pthread_libs $sim_ac_save_libs"
-+            cat > conftest.$ac_ext <<EOF
-+#line 3053 "configure"
-+#include "confdefs.h"
-+
-+#if  HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+
-+int main() {
-+
-+glPointSize(1.0f);
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  sim_cv_lib_gl_pthread="$sim_ac_gl_libcheck"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+          fi
-+        done
-+      
-+fi
-+
-+echo "$ac_t""$sim_cv_lib_gl_pthread" 1>&6
-+
-+      if test "x$sim_cv_lib_gl_pthread" != "xUNRESOLVED"; then
-+        sim_ac_gl_libs="$sim_cv_lib_gl_pthread $sim_ac_pthread_libs"
-+      fi
-+    fi
-+  fi
-+
-+
-+  if test "x$sim_ac_gl_libs" != "x"; then
-+    LIBS="$sim_ac_save_libs"
-+    GL_LIBS="$sim_ac_gl_libs"
-+    sim_ac_gl_avail=yes
-+    OPENGLLIB="true"
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    
-+  fi
-+fi
-+
-+  if test x"$OPENGLLIB" = x"true" ; then
-+    
-+
-+unset sim_ac_glu_cppflags
-+unset sim_ac_glu_ldflags
-+unset sim_ac_glu_libs
-+sim_ac_glu_avail=no
-+
-+# It's usually libGLU.so on UNIX systems and glu32.lib on MSWindows.
-+sim_ac_glu_names="-lGLU -lglu32"
-+sim_ac_glu_mesanames=-lMesaGLU
-+# with_mesa is set from the SIM_AC_CHECK_OPENGL macro.
-+if test "x$with_mesa" = "xyes"; then
-+  sim_ac_glu_first=$sim_ac_glu_mesanames
-+  sim_ac_glu_second=$sim_ac_glu_names
-+else
-+  sim_ac_glu_first=$sim_ac_glu_names
-+  sim_ac_glu_second=$sim_ac_glu_mesanames
-+fi
-+
-+# Check whether --with-glu or --without-glu was given.
-+if test "${with_glu+set}" = set; then
-+  withval="$with_glu"
-+  :
-+else
-+  with_glu=yes
-+fi
-+
-+
-+if test x"$with_glu" != xno; then
-+  if test x"$with_glu" != xyes; then
-+    sim_ac_glu_cppflags="-I${with_glu}/include"
-+    sim_ac_glu_ldflags="-L${with_glu}/lib"
-+  fi
-+
-+  sim_ac_save_cppflags=$CPPFLAGS
-+  sim_ac_save_ldflags=$LDFLAGS
-+  sim_ac_save_libs=$LIBS
-+
-+  CPPFLAGS="$CPPFLAGS $sim_ac_glu_cppflags"
-+  LDFLAGS="$LDFLAGS $sim_ac_glu_ldflags"
-+
-+  echo $ac_n "checking whether GLU is available""... $ac_c" 1>&6
-+echo "configure:3145: checking whether GLU is available" >&5
-+if eval "test \"`echo '$''{'sim_cv_lib_glu'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  sim_cv_lib_glu=UNRESOLVED
-+
-+    # Some platforms (like BeOS) have the GLU functionality in the GL
-+    # library (and no GLU library present).
-+    for sim_ac_glu_libcheck in "" $sim_ac_glu_first $sim_ac_glu_second; do
-+      if test "x$sim_cv_lib_glu" = "xUNRESOLVED"; then
-+        LIBS="$sim_ac_glu_libcheck $sim_ac_save_libs $GL_LIBS"
-+        cat > conftest.$ac_ext <<EOF
-+#line 3157 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_WINDOWS_H
-+#include <windows.h>
-+#endif /* HAVE_WINDOWS_H */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+
-+int main() {
-+
-+gluSphere(0L, 1.0, 1, 1);
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  sim_cv_lib_glu="$sim_ac_glu_libcheck"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+      fi
-+    done
-+  
-+fi
-+
-+echo "$ac_t""$sim_cv_lib_glu" 1>&6
-+
-+  LIBS="$sim_ac_save_libs"
-+
-+  if test "x$sim_cv_lib_glu" != "xUNRESOLVED"; then
-+    sim_ac_glu_libs="$sim_cv_lib_glu"
-+    LIBS="$sim_ac_save_libs"
-+    GL_LIBS="$GL_LIBS $sim_ac_glu_libs"
-+    sim_ac_glu_avail=yes
-+    GLULIB="true"
-+  else
-+    CPPFLAGS=$sim_ac_save_cppflags
-+    LDFLAGS=$sim_ac_save_ldflags
-+    LIBS=$sim_ac_save_libs
-+    
-+  fi
-+fi
-+
-+    if test x"$GLULIB" = x"true" ; then
-+	
-+
-+# Check whether --with-glw or --without-glw was given.
-+if test "${with_glw+set}" = set; then
-+  withval="$with_glw"
-+  :
-+else
-+  with_glw=yes
-+fi
-+
-+
-+if test x"$with_glw" != x"no" ; then 
-+  if test x"$with_glw" != x"yes" ; then
-+	sim_ac_glw_cppflags="-I${with_glw}/include"
-+	sim_ac_glw_ldflags="-L${with_glw}/lib"
-+  fi
-+
-+  SAVECPPFLAGS="$CPPFLAGS"
-+  SAVELDFLAGS="$LDFLAGS"
-+  SAVELIBS="$LIBS"
-+
-+  CPPFLAGS="$SAVECPPFLAGS $sim_ac_glw_cppflags"
-+  LDFLAGS="$SAVELDFLAGS $sim_ac_glw_ldflags"
-+  echo $ac_n "checking for a GL widget""... $ac_c" 1>&6
-+echo "configure:3228: checking for a GL widget" >&5
-+if eval "test \"`echo '$''{'sim_cv_motif_glwidget'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+	XWIDGETLIBS="$X_LIBS $X11_LIBS $XT_LIBS $X_LIBS $X_PRE_LIBS $XM_LIBS"
-+  	sim_cv_motif_glwidget=UNKNOWN
-+  	for lib in GLwM GLw MesaGLwM MesaGLw; do
-+    	  if test x"$sim_cv_motif_glwidget" = x"UNKNOWN"; then
-+      		LIBS="-l$lib $SAVELIBS $XWIDGETLIBS $GL_LIBS -lm"
-+      		cat > conftest.$ac_ext <<EOF
-+#line 3239 "configure"
-+#include "confdefs.h"
-+#include <X11/Intrinsic.h>
-+			 #include <GL/GLwMDrawA.h>
-+        		extern WidgetClass glwMDrawingAreaWidgetClass;
-+int main() {
-+Widget glxManager = NULL;
-+        		Widget glxWidget = XtVaCreateManagedWidget("GLWidget",
-+          		glwMDrawingAreaWidgetClass, glxManager, NULL);
-+; return 0; }
-+EOF
-+if { (eval echo configure:3250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  sim_cv_motif_glwidget="glwMDrawingAreaWidgetClass GLwMDrawA.h $lib"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  sim_cv_motif_glwidget=UNKNOWN
-+fi
-+rm -f conftest*
-+    	  fi
-+  	done
-+     LIBS=$SAVELIBS
-+  
-+fi
-+
-+echo "$ac_t""$sim_cv_motif_glwidget" 1>&6
-+ 
-+if test "x$sim_cv_motif_glwidget" = "xUNKNOWN"; then
-+  GL_LIBS=""
-+else
-+  sim_ac_motif_glwidget_class=`echo $sim_cv_motif_glwidget | cut -d" " -f1`
-+  sim_ac_motif_glwidget_header=`echo $sim_cv_motif_glwidget | cut -d" " -f2`
-+  sim_ac_motif_glwidget_library=`echo $sim_cv_motif_glwidget | cut -d" " -f3`
-+ 
-+  echo $ac_n "checking the $sim_ac_motif_glwidget_header header location""... $ac_c" 1>&6
-+echo "configure:3276: checking the $sim_ac_motif_glwidget_header header location" >&5
-+if eval "test \"`echo '$''{'sim_cv_motif_glwidget_hdrloc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  sim_cv_motif_glwidget_hdrloc=UNKNOWN
-+    for location in X11/GLw GL; do
-+     if test "x$sim_cv_motif_glwidget_hdrloc" = "xUNKNOWN"; then
-+        cat > conftest.$ac_ext <<EOF
-+#line 3284 "configure"
-+#include "confdefs.h"
-+#include <X11/Intrinsic.h>
-+          #include <$location/$sim_ac_motif_glwidget_header>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:3290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  sim_cv_motif_glwidget_hdrloc=$location
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  sim_cv_motif_glwidget_hdrloc=UNKNOWN
-+fi
-+rm -f conftest*
-+      fi
-+    done
-+fi
-+
-+echo "$ac_t""$sim_cv_motif_glwidget_hdrloc" 1>&6
-+ 
-+  if test "x$sim_cv_motif_glwidget_hdrloc" = "xUNKNOWN"; then
-+    GL_LIBS=""
-+  else
-+    if test "x$sim_ac_motif_glwidget_header" = "xGLwDrawA.h"; then
-+      if test "x$sim_cv_motif_glwidget_hdrloc" = "xGL"; then
-+        cat >> confdefs.h <<\EOF
-+#define HAVE_GL_GLWDRAWA_H 1
-+EOF
-+
-+      else
-+        cat >> confdefs.h <<\EOF
-+#define HAVE_X11_GLW_GLWDRAWA_H 1
-+EOF
-+
-+      fi
-+    else
-+      if test "x$sim_cv_motif_glwidget_hdrloc" = "xGL"; then
-+        cat >> confdefs.h <<\EOF
-+#define HAVE_GL_GLWMDRAWA_H 1
-+EOF
-+
-+      else
-+        cat >> confdefs.h <<\EOF
-+#define HAVE_X11_GLW_GLWMDRAWA_H 1
-+EOF
-+
-+      fi
-+    fi
-+ 
-+    cat >> confdefs.h <<EOF
-+#define XT_GLWIDGET $sim_ac_motif_glwidget_class
-+EOF
-+
-+ 
-+    LIBS="$LIBS"
-+    GL_LIBS="$GL_LIBS -l$sim_ac_motif_glwidget_library"
-+    GLWIDGETLIB="true" cat >> confdefs.h <<\EOF
-+#define GL 1
-+EOF
-+
-+  fi
-+fi
-+
-+fi
-+
-+    fi
-+  fi
-+fi
-+
-+	
-+
-+
-+echo $ac_n "checking for basename in -lgen""... $ac_c" 1>&6
-+echo "configure:3362: checking for basename in -lgen" >&5
-+ac_lib_var=`echo gen'_'basename | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lgen  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 3370 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char basename();
-+
-+int main() {
-+basename()
-+; return 0; }
-+EOF
-+if { (eval echo configure:3381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_LIBGEN 1
-+EOF
-+ LIBS="${LIBS} -lgen"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-+echo "configure:3406: checking for ANSI C header files" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3411 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:3419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  ac_cv_header_stdc=yes
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+cat > conftest.$ac_ext <<EOF
-+#line 3436 "configure"
-+#include "confdefs.h"
-+#include <string.h>
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  rm -rf conftest*
-+  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 <<EOF
-+#line 3454 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "free" >/dev/null 2>&1; then
-+  :
-+else
-+  rm -rf conftest*
-+  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 <<EOF
-+#line 3475 "configure"
-+#include "confdefs.h"
-+#include <ctype.h>
-+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#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)) exit(2);
-+exit (0); }
-+
-+EOF
-+if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  :
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  ac_cv_header_stdc=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_header_stdc" 1>&6
-+if test $ac_cv_header_stdc = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define STDC_HEADERS 1
-+EOF
-+
-+fi
-+
-+for ac_hdr in unistd.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:3513: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3518 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:3523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:3551: checking for working const" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3556 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+/* Ultrix mips cc rejects this.  */
-+typedef int charset[2]; const charset x;
-+/* SunOS 4.1.1 cc rejects this.  */
-+char const *const *ccp;
-+char **p;
-+/* NEC SVR4.0.2 mips cc rejects this.  */
-+struct point {int x, y;};
-+static struct point const zero = {0,0};
-+/* AIX XL C 1.02.0.0 rejects this.
-+   It does not let you subtract one const X* pointer from another in an arm
-+   of an if-expression whose if-part is not a constant expression */
-+const char *g = "string";
-+ccp = &g + (g ? g-g : 0);
-+/* HPUX 7.0 cc rejects these. */
-+++ccp;
-+p = (char**) ccp;
-+ccp = (char const *const *) p;
-+{ /* SCO 3.2v4 cc rejects this.  */
-+  char *t;
-+  char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+  *t++ = 0;
-+}
-+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+  int x[] = {25, 17};
-+  const int *foo = &x[0];
-+  ++foo;
-+}
-+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+  typedef const int *iptr;
-+  iptr p = 0;
-+  ++p;
-+}
-+{ /* AIX XL C 1.02.0.0 rejects this saying
-+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+  struct s { int j; const int *ap[3]; };
-+  struct s *b; b->j = 5;
-+}
-+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+  const int foo = 10;
-+}
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:3605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_c_const=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_c_const=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_c_const" 1>&6
-+if test $ac_cv_c_const = no; then
-+  cat >> confdefs.h <<\EOF
-+#define const 
-+EOF
-+
-+fi
-+
-+
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments.  Useless!
-+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-+echo "configure:3629: checking for working alloca.h" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3634 "configure"
-+#include "confdefs.h"
-+#include <alloca.h>
-+int main() {
-+char *p = alloca(2 * sizeof(int));
-+; return 0; }
-+EOF
-+if { (eval echo configure:3641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  ac_cv_header_alloca_h=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_header_alloca_h=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-+if test $ac_cv_header_alloca_h = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_ALLOCA_H 1
-+EOF
-+
-+fi
-+
-+echo $ac_n "checking for alloca""... $ac_c" 1>&6
-+echo "configure:3662: checking for alloca" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3667 "configure"
-+#include "confdefs.h"
-+
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+#  include <malloc.h>
-+#  define alloca _alloca
-+# else
-+#  if 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);
-+; return 0; }
-+EOF
-+if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  ac_cv_func_alloca_works=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_func_alloca_works=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-+if test $ac_cv_func_alloca_works = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_ALLOCA 1
-+EOF
-+
-+fi
-+
-+if test $ac_cv_func_alloca_works = no; then
-+  # 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=alloca.${ac_objext}
-+  cat >> confdefs.h <<\EOF
-+#define C_ALLOCA 1
-+EOF
-+
-+
-+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-+echo "configure:3727: checking whether alloca needs Cray hooks" >&5
-+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3732 "configure"
-+#include "confdefs.h"
-+#if defined(CRAY) && ! defined(CRAY2)
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "webecray" >/dev/null 2>&1; then
-+  rm -rf conftest*
-+  ac_cv_os_cray=yes
-+else
-+  rm -rf conftest*
-+  ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_os_cray" 1>&6
-+if test $ac_cv_os_cray = yes; then
-+for ac_func in _getb67 GETB67 getb67; do
-+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:3757: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3762 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* 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
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  cat >> confdefs.h <<EOF
-+#define CRAY_STACKSEG_END $ac_func
-+EOF
-+
-+  break
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+done
-+fi
-+
-+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-+echo "configure:3812: checking stack direction for C alloca" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  ac_cv_c_stack_direction=0
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3820 "configure"
-+#include "confdefs.h"
-+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;
-+}
-+main ()
-+{
-+  exit (find_stack_direction() < 0);
-+}
-+EOF
-+if { (eval echo configure:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  ac_cv_c_stack_direction=1
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  ac_cv_c_stack_direction=-1
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-+cat >> confdefs.h <<EOF
-+#define STACK_DIRECTION $ac_cv_c_stack_direction
-+EOF
-+
-+fi
-+
-+for ac_func in ftime strstr usleep
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:3863: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3868 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* 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
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+trap '' 1 2 15
-+cat > confcache <<\EOF
-+# 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.  It is not useful on other systems.
-+# If it contains results you don't want to keep, you may remove or edit it.
-+#
-+# By default, configure uses ./config.cache as the cache file,
-+# creating it if it does not exist already.  You can give configure
-+# the --cache-file=FILE option to use a 
-+# what configure does when it calls configure scripts in
-+# subdirectories, so they share the cache.
-+# Giving --cache-file=/dev/null disables caching, for debugging configure.
-+# config.status only pays attention to the cache file if you give it the
-+# --recheck option to rerun configure.
-+#
-+EOF
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
-+# 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.
-+(set) 2>&1 |
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+  *ac_space=\ *)
-+    # `set' does not quote correctly, so add quotes (double-quote substitution
-+    # turns \\\\ into \\, and sed turns \\ into \).
-+    sed -n \
-+      -e "s/'/'\\\\''/g" \
-+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-+    ;;
-+  *)
-+    # `set' quotes correctly as required by POSIX, so do not add quotes.
-+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-+    ;;
-+  esac >> confcache
-+if cmp -s $cache_file confcache; then
-+  :
-+else
-+  if test -w $cache_file; then
-+    echo "updating cache $cache_file"
-+    cat confcache > $cache_file
-+  else
-+    echo "not updating unwritable cache $cache_file"
-+  fi
-+fi
-+rm -f confcache
-+
-+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+# Any assignment to VPATH causes Sun make to only execute
-+# the first set of double-colon rules, so remove it if not needed.
-+# If there is a colon in the path, we need to keep it.
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-+fi
-+
-+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+# Without the "./", some shells look in PATH for config.status.
-+: ${CONFIG_STATUS=./config.status}
-+
-+echo creating $CONFIG_STATUS
-+rm -f $CONFIG_STATUS
-+cat > $CONFIG_STATUS <<EOF
-+#! /bin/sh
-+# Generated automatically by configure.
-+# Run this file to recreate the current configuration.
-+# This directory was configured as follows,
-+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+#
-+# $0 $ac_configure_args
-+#
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in ./config.log if it exists.
-+
-+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-+for ac_option
-+do
-+  case "\$ac_option" in
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-+    exit 0 ;;
-+  -help | --help | --hel | --he | --h)
-+    echo "\$ac_cs_usage"; exit 0 ;;
-+  *) echo "\$ac_cs_usage"; exit 1 ;;
-+  esac
-+done
-+
-+ac_given_srcdir=$srcdir
-+ac_given_INSTALL="$INSTALL"
-+
-+trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+
-+# Protect against being on the right side of a sed subst in config.status.
-+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-+$ac_vpsub
-+$extrasub
-+s%@SHELL@%$SHELL%g
-+s%@CFLAGS@%$CFLAGS%g
-+s%@CPPFLAGS@%$CPPFLAGS%g
-+s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
-+s%@DEFS@%$DEFS%g
-+s%@LDFLAGS@%$LDFLAGS%g
-+s%@LIBS@%$LIBS%g
-+s%@exec_prefix@%$exec_prefix%g
-+s%@prefix@%$prefix%g
-+s%@program_transform_name@%$program_transform_name%g
-+s%@bindir@%$bindir%g
-+s%@sbindir@%$sbindir%g
-+s%@libexecdir@%$libexecdir%g
-+s%@datadir@%$datadir%g
-+s%@sysconfdir@%$sysconfdir%g
-+s%@sharedstatedir@%$sharedstatedir%g
-+s%@localstatedir@%$localstatedir%g
-+s%@libdir@%$libdir%g
-+s%@includedir@%$includedir%g
-+s%@oldincludedir@%$oldincludedir%g
-+s%@infodir@%$infodir%g
-+s%@mandir@%$mandir%g
-+s%@host@%$host%g
-+s%@host_alias@%$host_alias%g
-+s%@host_cpu@%$host_cpu%g
-+s%@host_vendor@%$host_vendor%g
-+s%@host_os@%$host_os%g
-+s%@target@%$target%g
-+s%@target_alias@%$target_alias%g
-+s%@target_cpu@%$target_cpu%g
-+s%@target_vendor@%$target_vendor%g
-+s%@target_os@%$target_os%g
-+s%@build@%$build%g
-+s%@build_alias@%$build_alias%g
-+s%@build_cpu@%$build_cpu%g
-+s%@build_vendor@%$build_vendor%g
-+s%@build_os@%$build_os%g
-+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-+s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@PACKAGE@%$PACKAGE%g
-+s%@VERSION@%$VERSION%g
-+s%@ACLOCAL@%$ACLOCAL%g
-+s%@AUTOCONF@%$AUTOCONF%g
-+s%@AUTOMAKE@%$AUTOMAKE%g
-+s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@MAKEINFO@%$MAKEINFO%g
-+s%@SET_MAKE@%$SET_MAKE%g
-+s%@CC@%$CC%g
-+s%@CPP@%$CPP%g
-+s%@X_CFLAGS@%$X_CFLAGS%g
-+s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-+s%@X_LIBS@%$X_LIBS%g
-+s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-+s%@X11_LIBS@%$X11_LIBS%g
-+s%@XEXT_LIBS@%$XEXT_LIBS%g
-+s%@XT_LIBS@%$XT_LIBS%g
-+s%@XPM_LIBS@%$XPM_LIBS%g
-+s%@XM_LIBS@%$XM_LIBS%g
-+s%@GL_LIBS@%$GL_LIBS%g
-+s%@ALLOCA@%$ALLOCA%g
-+
-+CEOF
-+EOF
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+  if test $ac_beg -gt 1; then
-+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-+  else
-+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-+  fi
-+  if test ! -s conftest.s$ac_file; then
-+    ac_more_lines=false
-+    rm -f conftest.s$ac_file
-+  else
-+    if test -z "$ac_sed_cmds"; then
-+      ac_sed_cmds="sed -f conftest.s$ac_file"
-+    else
-+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+    fi
-+    ac_file=`expr $ac_file + 1`
-+    ac_beg=$ac_end
-+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-+  fi
-+done
-+if test -z "$ac_sed_cmds"; then
-+  ac_sed_cmds=cat
-+fi
-+EOF
-+
-+cat >> $CONFIG_STATUS <<EOF
-+
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  case "$ac_file" in
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+  *) ac_file_in="${ac_file}.in" ;;
-+  esac
-+
-+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-+
-+  # Remove last slash and all that follows it.  Not all systems have dirname.
-+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+    # The file is in a subdirectory.
-+    test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-+    # A "../" for each directory in $ac_dir_suffix.
-+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-+  else
-+    ac_dir_suffix= ac_dots=
-+  fi
-+
-+  case "$ac_given_srcdir" in
-+  .)  srcdir=.
-+      if test -z "$ac_dots"; then top_srcdir=.
-+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-+  *) # Relative path.
-+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+  esac
-+
-+  case "$ac_given_INSTALL" in
-+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+  esac
-+
-+  echo creating "$ac_file"
-+  rm -f "$ac_file"
-+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-+  case "$ac_file" in
-+  *Makefile*) ac_comsub="1i\\
-+# $configure_input" ;;
-+  *) ac_comsub= ;;
-+  esac
-+
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  sed -e "$ac_comsub
-+s%@configure_input@%$configure_input%g
-+s%@srcdir@%$srcdir%g
-+s%@top_srcdir@%$top_srcdir%g
-+s%@INSTALL@%$INSTALL%g
-+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-+fi; done
-+rm -f conftest.s*
-+
-+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-+# NAME is the cpp macro being defined and VALUE is the value it is being given.
-+#
-+# ac_d sets the value in "#define NAME VALUE" lines.
-+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-+ac_dC='\3'
-+ac_dD='%g'
-+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_uB='\([ 	]\)%\1#\2define\3'
-+ac_uC=' '
-+ac_uD='\4%g'
-+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-+ac_eB='$%\1#\2define\3'
-+ac_eC=' '
-+ac_eD='%g'
-+
-+if test "${CONFIG_HEADERS+set}" != set; then
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+  CONFIG_HEADERS="config.h"
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+fi
-+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  case "$ac_file" in
-+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+  *) ac_file_in="${ac_file}.in" ;;
-+  esac
-+
-+  echo creating $ac_file
-+
-+  rm -f conftest.frag conftest.in conftest.out
-+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-+  cat $ac_file_inputs > conftest.in
-+
-+EOF
-+
-+# Transform confdefs.h into a sed script conftest.vals that substitutes
-+# the proper values into config.h.in to produce config.h.  And first:
-+# Protect against being on the right side of a sed subst in config.status.
-+# Protect against being in an unquoted here document in config.status.
-+rm -f conftest.vals
-+cat > conftest.hdr <<\EOF
-+s/[\\&%]/\\&/g
-+s%[\\$`]%\\&%g
-+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-+s%ac_d%ac_u%gp
-+s%ac_u%ac_e%gp
-+EOF
-+sed -n -f conftest.hdr confdefs.h > conftest.vals
-+rm -f conftest.hdr
-+
-+# This sed command replaces #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.
-+cat >> conftest.vals <<\EOF
-+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-+EOF
-+
-+# Break up conftest.vals because some shells have a limit on
-+# the size of here documents, and old seds have small limits too.
-+
-+rm -f conftest.tail
-+while :
-+do
-+  ac_lines=`grep -c . conftest.vals`
-+  # grep -c gives empty output for an empty file on some AIX systems.
-+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-+  # Write a limited-size here document to conftest.frag.
-+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-+  echo 'CEOF
-+  sed -f conftest.frag conftest.in > conftest.out
-+  rm -f conftest.in
-+  mv conftest.out conftest.in
-+' >> $CONFIG_STATUS
-+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-+  rm -f conftest.vals
-+  mv conftest.tail conftest.vals
-+done
-+rm -f conftest.vals
-+
-+cat >> $CONFIG_STATUS <<\EOF
-+  rm -f conftest.frag conftest.h
-+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-+  cat conftest.in >> conftest.h
-+  rm -f conftest.in
-+  if cmp -s $ac_file conftest.h 2>/dev/null; then
-+    echo "$ac_file is unchanged"
-+    rm -f conftest.h
-+  else
-+    # Remove last slash and all that follows it.  Not all systems have dirname.
-+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+      # The file is in a subdirectory.
-+      test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    fi
-+    rm -f $ac_file
-+    mv conftest.h $ac_file
-+  fi
-+fi; done
-+
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
-+
-+
-+EOF
-+cat >> $CONFIG_STATUS <<\EOF
-+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-+
-+exit 0
-+EOF
-+chmod +x $CONFIG_STATUS
-+rm -fr confdefs* $ac_clean_files
-+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-+
-Index: configure.in
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ configure.in	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1,147 @@
-+/* configure.in for xmakemol:
-+   Copyright (C) 2001 Chi Zhang
-+   acincluce.m4 gives detailed description of local routines below:
-+	ICE_FIND_MOTIF  -- borrowed from mgv
-+	ICE_FIND_XPM    -- borrowed from mgv
-+	SIM_AC_CHECK_OPENGL  -- derived from coin3d
-+	SIM_AC_CHECK_GLU  -- derived from coin3d
-+	SIM_CHECK_MOTIF_GLWIDGET --derived from coin3d
-+*/
-+dnl Process this file with autoconf to produce a configure script.
-+AC_INIT(xmakemol.c)
-+
-+dnl Checks for system
-+AC_CANONICAL_SYSTEM
-+
-+AM_INIT_AUTOMAKE(xmakemol,4.40.2b)
-+AM_CONFIG_HEADER(config.h)
-+
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+
-+dnl Configs from ac_opengl package
-+dnl AC_CONFIG_AUX_DIR(config)
-+
-+dnl Checks for libraries.
-+dnl ==========================================================================
-+dnl Checks for libraries.
-+dnl ==========================================================================
-+AC_PATH_X
-+AC_PATH_XTRA
-+ICE_FIND_MOTIF
-+ICE_FIND_XPM
-+LIBS="$LIBS $X_EXTRA_LIBS"
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-+LDFLAGS="$LDFLAGS $X_LIBS"
-+ 
-+dnl ==========================================================================
-+dnl Check for X11.
-+dnl ==========================================================================
-+X11_LIBS=""
-+AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS})
-+if test "$X11_LIBS" = ""; then
-+AC_MSG_ERROR([The X11 library '-lX11' could not be found.
-+                Please use the configure options '--x-includes=DIR'
-+                and '--x-libraries=DIR' to specify the X location.
-+                See the 'config.log' file for further diagnostics.])
-+fi
-+AC_SUBST(X_LIBS)
-+AC_SUBST(X11_LIBS)
-+AC_SUBST(X_PRE_LIBS)
-+ 
-+dnl ==========================================================================
-+dnl Check for Xext, Xpm usually needs the shape extensions.
-+dnl We don't crap out if we can't find it though.
-+dnl ==========================================================================
-+XEXT_LIBS=""
-+AC_CHECK_LIB(Xext, XShapeQueryVersion, XEXT_LIBS="-lXext",,
-+        ${X_PRE_LIBS} ${X11_LIBS})
-+AC_SUBST(XEXT_LIBS)
-+ 
-+dnl ==========================================================================
-+dnl Check for Xt
-+dnl ==========================================================================
-+XT_LIBS=""
-+AC_CHECK_LIB(Xt, XtToolkitInitialize, XT_LIBS="-lXt",,
-+        ${X_PRE_LIBS} ${X11_LIBS})
-+if test "$XT_LIBS" = ""; then
-+AC_MSG_ERROR([The X toolkit library '-lXt' could not be found.
-+                Please use the configure iptions '--x-includes=DIR'
-+                and '--x-libraries=DIR' to specify the X location.
-+                See the 'config.log' file for further diagnostics.])
-+fi
-+AC_SUBST(XT_LIBS)
-+ 
-+dnl ==========================================================================
-+dnl Check for Xpm
-+dnl ==========================================================================
-+XPM_LIBS=""
-+AC_CHECK_LIB(Xpm, XpmCreatePixmapFromXpmImage,
-+        XPM_LIBS="-lXpm"
-+        AC_DEFINE(XPM, 1),,
-+        ${X_PRE_LIBS} ${X11_LIBS})
-+if test "$XPM_LIBS" != ""; then
-+AC_CHECK_HEADERS(X11/xpm.h)
-+fi
-+AC_SUBST(XPM_LIBS)
-+ 
-+dnl ==========================================================================
-+dnl Check for Motif
-+dnl I couldn't resist using the most hideously named function in the Motif
-+dnl API in this test, sorry if I've frightened anyone.
-+dnl ==========================================================================
-+XM_LIBS=""
-+AC_CHECK_LIB(Xm, XmRepTypeInstallTearOffModelConverter,
-+        XM_LIBS="-lXm"
-+        AC_DEFINE(HAVE_MOTIF, 1), AC_DEFINE(HAVE_MOTIF, 0),
-+        ${X_PRE_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${XEXT_LIBS} ${X11_LIBS})
-+if test "$XM_LIBS" = ""; then
-+AC_MSG_ERROR([The Motif library '-lXm' could not be found.
-+                Please use the configure options '--with-motif-includes=DIR'
-+                and '--with-motif-libraries=DIR' to specify the Xm location.
-+                See the 'config.log' file for further diagnostics.])
-+fi
-+AC_SUBST(XM_LIBS)
-+
-+dnl
-+dnl Check for OpenGL
-+dnl
-+
-+GL_LIBS=""
-+AC_CHECK_LIB(m,pow,[MATHLIB="true"])
-+if test x"$MATHLIB" != x"true"; then
-+	AC_MSG_ERROR([the math library '-lm' could not be found!
-+			Please check the installation of math library])
-+fi
-+if test x"$MATHLIB" = x"true"; then
-+  LIBS="$LIBS -lm"
-+  SIM_AC_CHECK_OPENGL([OPENGLLIB="true"])
-+  if test x"$OPENGLLIB" = x"true" ; then
-+    SIM_AC_CHECK_GLU([GLULIB="true"])
-+    if test x"$GLULIB" = x"true" ; then
-+	SIM_CHECK_MOTIF_GLWIDGET([GLWIDGETLIB="true" AC_DEFINE(GL,1)],GL_LIBS="")
-+    fi
-+  fi
-+fi
-+
-+AC_SUBST(GL_LIBS)	
-+
-+dnl Checks for other libraries
-+
-+AC_CHECK_LIB(gen,basename,[AC_DEFINE(HAVE_LIBGEN,1) LIBS="${LIBS} -lgen"],)
-+
-+dnl Checks for other header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(unistd.h)
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+
-+dnl Checks for library functions.
-+AC_FUNC_ALLOCA
-+AC_CHECK_FUNCS(ftime strstr usleep)
-+
-+AC_OUTPUT(Makefile)
-Index: install-sh
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ install-sh	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1,251 @@
-+#!/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
-+	true
-+fi
-+
-+if [ x"$dir_arg" != x ]; then
-+	dst=$src
-+	src=""
-+	
-+	if [ -d $dst ]; then
-+		instcmd=:
-+		chmodcmd=""
-+	else
-+		instcmd=mkdir
-+	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
-+		true
-+	else
-+		echo "install:  $src does not exist"
-+		exit 1
-+	fi
-+	
-+	if [ x"$dst" = x ]
-+	then
-+		echo "install:	no destination specified"
-+		exit 1
-+	else
-+		true
-+	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
-+		true
-+	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
-+		true
-+	fi
-+
-+	pathcomp="${pathcomp}/"
-+done
-+fi
-+
-+if [ x"$dir_arg" != x ]
-+then
-+	$doit $instcmd $dst &&
-+
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; 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
-+		true
-+	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 true;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+
-+# Now rename the file to the real destination.
-+
-+	$doit $rmcmd -f $dstdir/$dstfile &&
-+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+
-+fi &&
-+
-+
-+exit 0
-Index: missing
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ missing	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1,190 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-+# Franc,ois Pinard <pinard@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., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+if test $# -eq 0; then
-+  echo 1>&2 "Try \`$0 --help' for more information"
-+  exit 1
-+fi
-+
-+case "$1" in
-+
-+  -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
-+
-+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
-+  lex          create \`lex.yy.c', if possible, from existing .c
-+  makeinfo     touch the output file
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-+    ;;
-+
-+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing - GNU libit 0.0"
-+    ;;
-+
-+  -*)
-+    echo 1>&2 "$0: Unknown \`$1' option"
-+    echo 1>&2 "Try \`$0 --help' for more information"
-+    exit 1
-+    ;;
-+
-+  aclocal)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  You should only need it if
-+         you modified \`acinclude.m4' or \`configure.in'.  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 missing on your system.  You should only need it if
-+         you modified \`configure.in'.  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 missing on your system.  You should only need it if
-+         you modified \`acconfig.h' or \`configure.in'.  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.in`
-+    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 missing on your system.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
-+         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
-+    ;;
-+
-+  bison|yacc)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  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 missing on your system.  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
-+    ;;
-+
-+  makeinfo)
-+    echo 1>&2 "\
-+WARNING: \`$1' is missing on your system.  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."
-+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    if test -z "$file"; then
-+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+    fi
-+    touch $file
-+    ;;
-+
-+  *)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+         system.  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 prerequirements 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
-Index: mkinstalldirs
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ mkinstalldirs	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1,40 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-+
-+errstatus=0
-+
-+for file
-+do
-+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+   shift
-+
-+   pathcomp=
-+   for d
-+   do
-+     pathcomp="$pathcomp$d"
-+     case "$pathcomp" in
-+       -* ) pathcomp=./$pathcomp ;;
-+     esac
-+
-+     if test ! -d "$pathcomp"; then
-+        echo "mkdir $pathcomp"
-+
-+        mkdir "$pathcomp" || lasterr=$?
-+
-+        if test ! -d "$pathcomp"; then
-+  	  errstatus=$lasterr
-+        fi
-+     fi
-+
-+     pathcomp="$pathcomp/"
-+   done
-+done
-+
-+exit $errstatus
-+
-+# mkinstalldirs ends here
-Index: stamp-h.in
-===================================================================
-
-
---- /dev/null	Fri Jun  8 19:07:45 2001
-+++ stamp-h.in	Fri Jun  8 19:30:17 2001
-@@ -0,0 +1 @@
-+timestamp
diff --git a/science/xmakemol/files/patch-ac b/science/xmakemol/files/patch-ac
deleted file mode 100644
index 9785d0d1db94..000000000000
--- a/science/xmakemol/files/patch-ac
+++ /dev/null
@@ -1,6 +0,0 @@
-Index: NEWS
-===================================================================
---- NEWS	2001/06/09 00:31:56	1.1
-+++ NEWS	2001/06/09 00:44:46
-@@ -0,0 +1 @@
-+Dummy file now
diff --git a/science/xmakemol/pkg-descr b/science/xmakemol/pkg-descr
index f7a16b40282f..ec8b55ee3acb 100644
--- a/science/xmakemol/pkg-descr
+++ b/science/xmakemol/pkg-descr
@@ -18,7 +18,7 @@ XMakemol can also produce a series of xpm files which can be translated into an
 gmake_anim.pl). The one above is an animation of the "viagra" molecule 
 (sidenafil).
 
-WWW: http://vegemite.chem.nottingham.ac.uk/~xmakemol/
+WWW: http://www.nongnu.org/xmakemol/
 
 Chi Zhang
 chizhang@uchicago.edu
diff --git a/science/xmakemol/pkg-plist b/science/xmakemol/pkg-plist
index e6cc3ab457c6..c3b3e805a8a5 100644
--- a/science/xmakemol/pkg-plist
+++ b/science/xmakemol/pkg-plist
@@ -1,3 +1,4 @@
 share/xmakemol/elements
+bin/xmake_anim.pl
 bin/xmakemol
 @dirrm share/xmakemol