diff -crN ./libIDL/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/Makefile.in
*** ./libIDL/Makefile.in	Mon May 26 18:12:50 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/Makefile.in	Thu Dec 18 19:46:31 2003
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999, 2001 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.
--- 1,8 ----
! # Makefile.in generated by automake 1.7.1 from Makefile.am.
! # @configure_input@
  
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # 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.
***************
*** 10,80 ****
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
! # -*- mode: makefile -*-
! #
! # libIDL Makefile.am
! #
! 
! 
! 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 = :
- host_alias = @host_alias@
  host_triplet = @host@
! AS = @AS@
  CC = @CC@
  CPP = @CPP@
! DLLTOOL = @DLLTOOL@
  ECHO = @ECHO@
  EXEEXT = @EXEEXT@
  HAVE_WCHAR_H = @HAVE_WCHAR_H@
  HAVE_WCSTR_H = @HAVE_WCSTR_H@
  HAVE_YACC = @HAVE_YACC@
  IDL_LL = @IDL_LL@
  LEX = @LEX@
  LFLAGS = @LFLAGS@
  LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
  LIBIDL_LIBS = @LIBIDL_LIBS@
--- 12,75 ----
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
! @SET_MAKE@
  
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
  NORMAL_INSTALL = :
  PRE_INSTALL = :
  POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
  host_triplet = @host@
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
! AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
! AWK = @AWK@
  CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
  CPP = @CPP@
! CPPFLAGS = @CPPFLAGS@
! CYGPATH_W = @CYGPATH_W@
! DEFS = @DEFS@
! DEPDIR = @DEPDIR@
  ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
  EXEEXT = @EXEEXT@
  HAVE_WCHAR_H = @HAVE_WCHAR_H@
  HAVE_WCSTR_H = @HAVE_WCSTR_H@
  HAVE_YACC = @HAVE_YACC@
  IDL_LL = @IDL_LL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
  LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LFLAGS = @LFLAGS@
  LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
  LIBIDL_LIBS = @LIBIDL_LIBS@
***************
*** 82,102 ****
  LIBIDL_MICRO_VERSION = @LIBIDL_MICRO_VERSION@
  LIBIDL_MINOR_VERSION = @LIBIDL_MINOR_VERSION@
  LIBIDL_VERSION = @LIBIDL_VERSION@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
  LT_VERSION = @LT_VERSION@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
- OBJDUMP = @OBJDUMP@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  PKG_CONFIG = @PKG_CONFIG@
  RANLIB = @RANLIB@
  STRIP = @STRIP@
  VERSION = @VERSION@
  WARN_CFLAGS = @WARN_CFLAGS@
  YACC = @YACC@
  
  INCLUDES = \
  	-DYYDEBUG=1                    \
  	-DYYERROR_VERBOSE=1            \
--- 77,146 ----
  LIBIDL_MICRO_VERSION = @LIBIDL_MICRO_VERSION@
  LIBIDL_MINOR_VERSION = @LIBIDL_MINOR_VERSION@
  LIBIDL_VERSION = @LIBIDL_VERSION@
+ LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
  LT_VERSION = @LT_VERSION@
  MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
  RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
  STRIP = @STRIP@
  VERSION = @VERSION@
  WARN_CFLAGS = @WARN_CFLAGS@
  YACC = @YACC@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
+ # -*- mode: makefile -*-
+ #
+ # libIDL Makefile.am
+ #
  INCLUDES = \
  	-DYYDEBUG=1                    \
  	-DYYERROR_VERBOSE=1            \
***************
*** 130,280 ****
  libIDL_2_la_SOURCES = parser.c parser.h lexer.c \
  			  ns.c util.c util.h rename.h
  
! libIDL_2_la_LDFLAGS = -version-info $(LT_VERSION) $(LIBIDL_LIBS) -no-undefined
  
  tstidl_SOURCES = tstidl.c
  tstidl_LDADD = libIDL-2.la $(LIBIDL_LIBS)
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libIDL-2.0.pc
! 
! CLEANFILES = $(BUILT_SOURCES)
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES =  Makefile.msc libIDL-config-2 libIDL.m4 libIDL.spec \
! libIDL-2.0.pc IDL.h.new
! LTLIBRARIES =  $(lib_LTLIBRARIES)
! 
! 
! DEFS = @DEFS@ -I. -I$(srcdir) 
! CPPFLAGS = @CPPFLAGS@
! LDFLAGS = @LDFLAGS@
! LIBS = @LIBS@
! libIDL_2_la_LIBADD = 
! libIDL_2_la_OBJECTS =  parser.lo lexer.lo ns.lo util.lo
! noinst_PROGRAMS =  tstidl$(EXEEXT)
! PROGRAMS =  $(noinst_PROGRAMS)
! 
! tstidl_OBJECTS =  tstidl.$(OBJEXT)
! tstidl_DEPENDENCIES =  libIDL-2.la
! tstidl_LDFLAGS = 
! SCRIPTS =  $(bin_SCRIPTS)
! 
! CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! TEXI2DVI = texi2dvi
  INFO_DEPS = libIDL2.info
  DVIS = libIDL2.dvi
  TEXINFOS = libIDL2.texi
! DATA =  $(pkgconfig_DATA)
! 
! HEADERS =  $(libIDLinclude_HEADERS)
! 
! DIST_COMMON =  README AUTHORS COPYING ChangeLog IDL.h.new.in INSTALL \
! Makefile.am Makefile.in Makefile.msc.in NEWS acinclude.m4 aclocal.m4 \
! config.guess config.sub configure configure.in install-sh \
! libIDL-2.0.pc.in libIDL-config-2.in libIDL.m4.in libIDL.spec.in \
! ltmain.sh missing mkinstalldirs texinfo.tex
! 
  
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = gtar
! GZIP_ENV = --best
  SOURCES = $(libIDL_2_la_SOURCES) $(tstidl_SOURCES)
- OBJECTS = $(libIDL_2_la_OBJECTS) $(tstidl_OBJECTS)
  
! all: all-redirect
  .SUFFIXES:
! .SUFFIXES: .S .c .dvi .info .lo .o .obj .ps .s .texi .texinfo .txi
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ 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): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
! 	cd $(srcdir) && $(ACLOCAL)
  
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
  Makefile.msc: $(top_builddir)/config.status Makefile.msc.in
! 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  libIDL-config-2: $(top_builddir)/config.status libIDL-config-2.in
! 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  libIDL.m4: $(top_builddir)/config.status libIDL.m4.in
! 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  libIDL.spec: $(top_builddir)/config.status libIDL.spec.in
! 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  libIDL-2.0.pc: $(top_builddir)/config.status libIDL-2.0.pc.in
! 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  IDL.h.new: $(top_builddir)/config.status IDL.h.new.in
! 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! 
! mostlyclean-libLTLIBRARIES:
! 
! clean-libLTLIBRARIES:
! 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
! 
! distclean-libLTLIBRARIES:
! 
! maintainer-clean-libLTLIBRARIES:
! 
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
! 	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
! 	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
  	  else :; fi; \
  	done
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
! 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
  	done
  
! .c.o:
! 	$(COMPILE) -c $<
! 
! # FIXME: We should only use cygpath when building on Windows,
! # and only if it is available.
! .c.obj:
! 	$(COMPILE) -c `cygpath -w $<`
  
! .s.o:
! 	$(COMPILE) -c $<
  
! .S.o:
! 	$(COMPILE) -c $<
  
  mostlyclean-compile:
! 	-rm -f *.o core *.core
! 	-rm -f *.$(OBJEXT)
! 
! clean-compile:
  
  distclean-compile:
  	-rm -f *.tab.c
  
! maintainer-clean-compile:
! 
! .c.lo:
! 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
  
! .s.lo:
! 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
  
! .S.lo:
! 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
  
  mostlyclean-libtool:
  	-rm -f *.lo
--- 174,343 ----
  libIDL_2_la_SOURCES = parser.c parser.h lexer.c \
  			  ns.c util.c util.h rename.h
  
! libIDL_2_la_LDFLAGS = -version-info $(LT_VERSION) $(LIBIDL_LIBS)
  
  tstidl_SOURCES = tstidl.c
  tstidl_LDADD = libIDL-2.la $(LIBIDL_LIBS)
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libIDL-2.0.pc
! subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_CLEAN_FILES = Makefile.msc libIDL-config-2 libIDL.m4 libIDL.spec \
! 	libIDL-2.0.pc IDL.h.new
! LTLIBRARIES = $(lib_LTLIBRARIES)
! 
! libIDL_2_la_LIBADD =
! am_libIDL_2_la_OBJECTS = parser.lo lexer.lo ns.lo util.lo
! libIDL_2_la_OBJECTS = $(am_libIDL_2_la_OBJECTS)
! noinst_PROGRAMS = tstidl$(EXEEXT)
! PROGRAMS = $(noinst_PROGRAMS)
! 
! am_tstidl_OBJECTS = tstidl.$(OBJEXT)
! tstidl_OBJECTS = $(am_tstidl_OBJECTS)
! tstidl_DEPENDENCIES = libIDL-2.la
! tstidl_LDFLAGS =
! SCRIPTS = $(bin_SCRIPTS)
! 
! 
! DEFAULT_INCLUDES =  -I. -I$(srcdir)
! depcomp =
! am__depfiles_maybe =
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
! 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(libIDL_2_la_SOURCES) $(tstidl_SOURCES)
! am__TEXINFO_TEX_DIR = $(srcdir)
  INFO_DEPS = libIDL2.info
  DVIS = libIDL2.dvi
+ PDFS = libIDL2.pdf
+ PSS = libIDL2.ps
  TEXINFOS = libIDL2.texi
! DATA = $(pkgconfig_DATA)
  
! HEADERS = $(libIDLinclude_HEADERS)
  
! DIST_COMMON = README $(libIDLinclude_HEADERS) AUTHORS COPYING ChangeLog \
! 	IDL.h.new.in INSTALL Makefile.am Makefile.in Makefile.msc.in \
! 	NEWS acinclude.m4 aclocal.m4 config.guess config.sub configure \
! 	configure.in install-sh libIDL-2.0.pc.in libIDL-config-2.in \
! 	libIDL.m4.in libIDL.spec.in ltmain.sh missing mkinstalldirs \
! 	texinfo.tex
  SOURCES = $(libIDL_2_la_SOURCES) $(tstidl_SOURCES)
  
! all: $(BUILT_SOURCES)
! 	$(MAKE) $(AM_MAKEFLAGS) all-am
! 
  .SUFFIXES:
! .SUFFIXES: .c .dvi .info .lo .o .obj .pdf .ps .texi
  
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
!  configure.lineno
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
! 	cd $(top_srcdir) && \
! 	  $(AUTOMAKE) --gnu  --ignore-deps Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
  
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
+ 
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  Makefile.msc: $(top_builddir)/config.status Makefile.msc.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  libIDL-config-2: $(top_builddir)/config.status libIDL-config-2.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  libIDL.m4: $(top_builddir)/config.status libIDL.m4.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  libIDL.spec: $(top_builddir)/config.status libIDL.spec.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  libIDL-2.0.pc: $(top_builddir)/config.status libIDL-2.0.pc.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
  IDL.h.new: $(top_builddir)/config.status IDL.h.new.in
! 	cd $(top_builddir) && $(SHELL) ./config.status $@
! libLTLIBRARIES_INSTALL = $(INSTALL)
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
! 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
! 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
  	  else :; fi; \
  	done
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
! 	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
! 	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
  	done
  
! clean-libLTLIBRARIES:
! 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
! 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
! 	  test "$$dir" = "$$p" && dir=.; \
! 	  echo "rm -f \"$${dir}/so_locations\""; \
! 	  rm -f "$${dir}/so_locations"; \
! 	done
! libIDL-2.la: $(libIDL_2_la_OBJECTS) $(libIDL_2_la_DEPENDENCIES) 
! 	$(LINK) -rpath $(libdir) $(libIDL_2_la_LDFLAGS) $(libIDL_2_la_OBJECTS) $(libIDL_2_la_LIBADD) $(LIBS)
  
! clean-noinstPROGRAMS:
! 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
! 	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! 	  echo " rm -f $$p $$f"; \
! 	  rm -f $$p $$f ; \
! 	done
! tstidl$(EXEEXT): $(tstidl_OBJECTS) $(tstidl_DEPENDENCIES) 
! 	@rm -f tstidl$(EXEEXT)
! 	$(LINK) $(tstidl_LDFLAGS) $(tstidl_OBJECTS) $(tstidl_LDADD) $(LIBS)
! binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
! install-binSCRIPTS: $(bin_SCRIPTS)
! 	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(bindir)
! 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  if test -f $$d$$p; then \
! 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
! 	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
! 	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
! 	  else :; fi; \
! 	done
  
! uninstall-binSCRIPTS:
! 	@$(NORMAL_UNINSTALL)
! 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
! 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! 	  rm -f $(DESTDIR)$(bindir)/$$f; \
! 	done
  
  mostlyclean-compile:
! 	-rm -f *.$(OBJEXT) core *.core
  
  distclean-compile:
  	-rm -f *.tab.c
  
! .c.o:
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  
! .c.obj:
! 	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
  
! .c.lo:
! 	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  mostlyclean-libtool:
  	-rm -f *.lo
***************
*** 283,658 ****
  	-rm -rf .libs _libs
  
  distclean-libtool:
! 
! maintainer-clean-libtool:
! 
! libIDL-2.la: $(libIDL_2_la_OBJECTS) $(libIDL_2_la_DEPENDENCIES)
! 	$(LINK) -rpath $(libdir) $(libIDL_2_la_LDFLAGS) $(libIDL_2_la_OBJECTS) $(libIDL_2_la_LIBADD) $(LIBS)
! 
! mostlyclean-noinstPROGRAMS:
! 
! clean-noinstPROGRAMS:
! 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
! 
! distclean-noinstPROGRAMS:
! 
! maintainer-clean-noinstPROGRAMS:
! 
! tstidl$(EXEEXT): $(tstidl_OBJECTS) $(tstidl_DEPENDENCIES)
! 	@rm -f tstidl$(EXEEXT)
! 	$(LINK) $(tstidl_LDFLAGS) $(tstidl_OBJECTS) $(tstidl_LDADD) $(LIBS)
! 
! install-binSCRIPTS: $(bin_SCRIPTS)
! 	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(bindir)
! 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  if test -f $$p; then \
! 	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
! 	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	  else if test -f $(srcdir)/$$p; then \
! 	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
! 	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	  else :; fi; fi; \
! 	done
! 
! uninstall-binSCRIPTS:
! 	@$(NORMAL_UNINSTALL)
! 	list='$(bin_SCRIPTS)'; for p in $$list; do \
! 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
! 	done
! 
! libIDL2.info: libIDL2.texi
! libIDL2.dvi: libIDL2.texi
! 
! 
! DVIPS = dvips
  
  .texi.info:
! 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	cd $(srcdir) \
! 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
! 	TEXINPUTS=.:$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
  
! .texi:
! 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	cd $(srcdir) \
! 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
! 
! .texinfo.info:
! 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	cd $(srcdir) \
! 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
! 
! .texinfo:
! 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	cd $(srcdir) \
! 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
! 
! .texinfo.dvi:
! 	TEXINPUTS=.:$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
! 
! .txi.info:
! 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	cd $(srcdir) \
! 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
! 
! .txi.dvi:
! 	TEXINPUTS=.:$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
! 
! .txi:
! 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	cd $(srcdir) \
! 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
  .dvi.ps:
! 	$(DVIPS) $< -o $@
  
! install-info-am: $(INFO_DEPS)
! 	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(infodir)
! 	@list='$(INFO_DEPS)'; \
! 	for file in $$list; do \
! 	  d=$(srcdir); \
! 	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
! 	    if test -f $$d/$$ifile; then \
! 	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
! 	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
! 	    else : ; fi; \
! 	  done; \
! 	done
! 	@$(POST_INSTALL)
! 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
  	  list='$(INFO_DEPS)'; \
  	  for file in $$list; do \
! 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
! 	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
  	  done; \
! 	else : ; fi
! 
! uninstall-info:
! 	$(PRE_UNINSTALL)
! 	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
! 	  ii=yes; \
! 	else ii=; fi; \
! 	list='$(INFO_DEPS)'; \
! 	for file in $$list; do \
! 	  test -z "$$ii" \
! 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
! 	done
  	@$(NORMAL_UNINSTALL)
! 	list='$(INFO_DEPS)'; \
  	for file in $$list; do \
! 	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
  	done
  
  dist-info: $(INFO_DEPS)
  	list='$(INFO_DEPS)'; \
  	for base in $$list; do \
! 	  d=$(srcdir); \
! 	  for file in `cd $$d && eval echo $$base*`; do \
! 	    test -f $(distdir)/$$file \
! 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! 	    || cp -p $$d/$$file $(distdir)/$$file; \
  	  done; \
  	done
  
  mostlyclean-aminfo:
! 	-rm -f libIDL2.aux libIDL2.cp libIDL2.cps libIDL2.dvi libIDL2.fn \
! 	  libIDL2.fns libIDL2.ky libIDL2.kys libIDL2.ps libIDL2.log \
! 	  libIDL2.pg libIDL2.toc libIDL2.tp libIDL2.tps libIDL2.vr \
! 	  libIDL2.vrs libIDL2.op libIDL2.tr libIDL2.cv libIDL2.cn
! 
! clean-aminfo:
! 
! distclean-aminfo:
  
  maintainer-clean-aminfo:
! 	cd $(srcdir) && for i in $(INFO_DEPS); do \
  	  rm -f $$i; \
  	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
  	    rm -f $$i-[0-9]*; \
  	  fi; \
  	done
! 
  install-pkgconfigDATA: $(pkgconfig_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
  	@list='$(pkgconfig_DATA)'; for p in $$list; do \
! 	  if test -f $(srcdir)/$$p; then \
! 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
! 	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
! 	  else if test -f $$p; then \
! 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
! 	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
! 	  fi; fi; \
  	done
  
  uninstall-pkgconfigDATA:
  	@$(NORMAL_UNINSTALL)
! 	list='$(pkgconfig_DATA)'; for p in $$list; do \
! 	  rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
  	done
! 
  install-libIDLincludeHEADERS: $(libIDLinclude_HEADERS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libIDLincludedir)
  	@list='$(libIDLinclude_HEADERS)'; for p in $$list; do \
! 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
! 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libIDLincludedir)/$$p"; \
! 	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libIDLincludedir)/$$p; \
  	done
  
  uninstall-libIDLincludeHEADERS:
  	@$(NORMAL_UNINSTALL)
! 	list='$(libIDLinclude_HEADERS)'; for p in $$list; do \
! 	  rm -f $(DESTDIR)$(libIDLincludedir)/$$p; \
  	done
  
  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)  $(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)$$unique$(LISP)$$tags" \
! 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$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
! 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
! 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
! lexer.lo lexer.o : lexer.c rename.h util.h IDL.h parser.h
! ns.lo ns.o : ns.c rename.h util.h IDL.h
! parser.lo parser.o : parser.c rename.h util.h IDL.h
! tstidl.o: tstidl.c IDL.h
! util.lo util.o : util.c rename.h util.h IDL.h
! 
! info-am: $(INFO_DEPS)
! info: info-am
! dvi-am: $(DVIS)
! dvi: dvi-am
  check-am: all-am
  check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
! install-exec: install-exec-am
  
! install-data-am: install-info-am install-pkgconfigDATA \
! 		install-libIDLincludeHEADERS
! install-data: install-data-am
  
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  install: install-am
! uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \
! 		uninstall-info uninstall-pkgconfigDATA \
! 		uninstall-libIDLincludeHEADERS
  uninstall: uninstall-am
- all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
- 		$(DATA) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- 		$(DESTDIR)$(infodir) $(DESTDIR)$(pkgconfigdir) \
- 		$(DESTDIR)$(libIDLincludedir)
  
  
  mostlyclean-generic:
  	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
  
  clean-generic:
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
- 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
! mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
! 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
! 		mostlyclean-aminfo mostlyclean-tags mostlyclean-generic
  
! mostlyclean: mostlyclean-am
  
! clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
! 		clean-noinstPROGRAMS clean-aminfo clean-tags \
! 		clean-generic mostlyclean-am
  
! clean: clean-am
  
! distclean-am:  distclean-libLTLIBRARIES distclean-compile \
! 		distclean-libtool distclean-noinstPROGRAMS \
! 		distclean-aminfo distclean-tags distclean-generic \
! 		clean-am
! 	-rm -f libtool
  
! distclean: distclean-am
! 	-rm -f config.status
  
! maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
! 		maintainer-clean-compile maintainer-clean-libtool \
! 		maintainer-clean-noinstPROGRAMS maintainer-clean-aminfo \
! 		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-libLTLIBRARIES distclean-libLTLIBRARIES \
! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
! distclean-compile clean-compile maintainer-clean-compile \
! mostlyclean-libtool distclean-libtool clean-libtool \
! maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
! distclean-noinstPROGRAMS clean-noinstPROGRAMS \
! maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
! install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
! clean-aminfo maintainer-clean-aminfo uninstall-pkgconfigDATA \
! install-pkgconfigDATA uninstall-libIDLincludeHEADERS \
! install-libIDLincludeHEADERS tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
! check-am installcheck-am installcheck 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
  
  
  lexer.c: $(srcdir)/lexer.l parser.h
--- 346,752 ----
  	-rm -rf .libs _libs
  
  distclean-libtool:
! 	-rm -f libtool
  
  .texi.info:
! 	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  .texi.dvi:
! 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
! 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
! 	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
! 
! .texi.pdf:
! 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
! 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
! 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
! libIDL2.info: libIDL2.texi 
! libIDL2.dvi: libIDL2.texi 
! libIDL2.pdf: libIDL2.texi 
! TEXI2DVI = texi2dvi
  
! TEXI2PDF = $(TEXI2DVI) --pdf --batch
! DVIPS = dvips
  .dvi.ps:
! 	$(DVIPS) -o $@ $<
  
! uninstall-info-am:
! 	$(PRE_UNINSTALL)
! 	@if (install-info --version && \
! 	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
  	  list='$(INFO_DEPS)'; \
  	  for file in $$list; do \
! 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
! 	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
  	  done; \
! 	else :; fi
  	@$(NORMAL_UNINSTALL)
! 	@list='$(INFO_DEPS)'; \
  	for file in $$list; do \
! 	  (if cd $(DESTDIR)$(infodir); then \
! 	     echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
! 	     rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
! 	   else :; fi); \
  	done
  
  dist-info: $(INFO_DEPS)
  	list='$(INFO_DEPS)'; \
  	for base in $$list; do \
! 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
! 	  for file in $$d/$$base*; do \
! 	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
! 	    test -f $(distdir)/$$relfile || \
! 	      cp -p $$file $(distdir)/$$relfile; \
  	  done; \
  	done
  
  mostlyclean-aminfo:
! 	-rm -f libIDL2.aux libIDL2.cp libIDL2.fn libIDL2.fns libIDL2.ky libIDL2.log \
! 	  libIDL2.pg libIDL2.tmp libIDL2.toc libIDL2.tp libIDL2.vr \
! 	  libIDL2.dvi libIDL2.pdf libIDL2.ps
  
  maintainer-clean-aminfo:
! 	list='$(INFO_DEPS)'; for i in $$list; do \
  	  rm -f $$i; \
  	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
  	    rm -f $$i-[0-9]*; \
  	  fi; \
  	done
! pkgconfigDATA_INSTALL = $(INSTALL_DATA)
  install-pkgconfigDATA: $(pkgconfig_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
  	@list='$(pkgconfig_DATA)'; for p in $$list; do \
! 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	  echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
! 	  $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
  	done
  
  uninstall-pkgconfigDATA:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
! 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	  echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
! 	  rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
  	done
! libIDLincludeHEADERS_INSTALL = $(INSTALL_HEADER)
  install-libIDLincludeHEADERS: $(libIDLinclude_HEADERS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libIDLincludedir)
  	@list='$(libIDLinclude_HEADERS)'; for p in $$list; do \
! 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
! 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	  echo " $(libIDLincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libIDLincludedir)/$$f"; \
! 	  $(libIDLincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libIDLincludedir)/$$f; \
  	done
  
  uninstall-libIDLincludeHEADERS:
  	@$(NORMAL_UNINSTALL)
! 	@list='$(libIDLinclude_HEADERS)'; for p in $$list; do \
! 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	  echo " rm -f $(DESTDIR)$(libIDLincludedir)/$$f"; \
! 	  rm -f $(DESTDIR)$(libIDLincludedir)/$$f; \
  	done
  
+ ETAGS = etags
+ ETAGSFLAGS =
+ 
+ CTAGS = ctags
+ CTAGSFLAGS =
+ 
  tags: TAGS
  
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	mkid -fID $$unique
  
! TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
! 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	     $$tags $$unique
! 
! ctags: CTAGS
! CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
! distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  
! top_distdir = .
! distdir = $(PACKAGE)-$(VERSION)
  
! am__remove_distdir = \
!   { test ! -d $(distdir) \
!     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
!          && rm -fr $(distdir); }; }
  
! GZIP_ENV = --best
! distuninstallcheck_listfiles = find . -type f -print
! distcleancheck_listfiles = find . -type f -print
  
! distdir: $(DISTFILES)
! 	$(am__remove_distdir)
! 	mkdir $(distdir)
! 	$(mkinstalldirs) $(distdir)/.
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkinstalldirs) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
! 	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
! 	  else \
! 	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
! 	  fi; \
! 	done
! 	$(MAKE) $(AM_MAKEFLAGS) \
! 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
! 	  dist-info
! 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! 	|| chmod -R a+r $(distdir)
! dist-gzip: distdir
! 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! 	$(am__remove_distdir)
! 
! dist dist-all: distdir
! 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! 	$(am__remove_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
! 	$(am__remove_distdir)
! 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! 	chmod -R a-w $(distdir); chmod a+w $(distdir)
  	mkdir $(distdir)/=build
  	mkdir $(distdir)/=inst
! 	chmod a-w $(distdir)
! 	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
! 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! 	  && cd $(distdir)/=build \
! 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
! 	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
  	  && $(MAKE) $(AM_MAKEFLAGS) check \
  	  && $(MAKE) $(AM_MAKEFLAGS) install \
  	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
! 	        distuninstallcheck \
! 	  && chmod -R a-w "$$dc_install_base" \
! 	  && ({ \
! 	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
! 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
! 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
! 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
! 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
! 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
! 	  && rm -rf "$$dc_destdir" \
! 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! 	  && rm -f $(distdir).tar.gz \
! 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! 	$(am__remove_distdir)
! 	@echo "$(distdir).tar.gz is ready for distribution" | \
! 	  sed 'h;s/./=/g;p;x;p;x'
! distuninstallcheck:
! 	cd $(distuninstallcheck_dir) \
! 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
! 	   || { echo "ERROR: files left after uninstall:" ; \
! 	        if test -n "$(DESTDIR)"; then \
! 	          echo "  (check DESTDIR support)"; \
! 	        fi ; \
! 	        $(distuninstallcheck_listfiles) ; \
! 	        exit 1; } >&2
! distcleancheck: distclean
! 	if test '$(srcdir)' = . ; then \
! 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! 	  exit 1 ; \
! 	fi
! 	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! 	  || { echo "ERROR: files left in build directory after distclean:" ; \
! 	       $(distcleancheck_listfiles) ; \
! 	       exit 1; } >&2
  check-am: all-am
  check: check-am
! all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
! 		$(DATA) $(HEADERS)
  
! installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libIDLincludedir)
  
  install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
  uninstall: uninstall-am
  
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
  
  clean-generic:
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
  	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
! clean: clean-am
  
! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
! 	clean-noinstPROGRAMS mostlyclean-am
  
! distclean: distclean-am
! 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-libtool distclean-tags
  
! dvi: dvi-am
  
! dvi-am: $(DVIS)
  
! info: info-am
  
! info-am: $(INFO_DEPS)
! 
! install-data-am: install-info-am install-libIDLincludeHEADERS \
! 	install-pkgconfigDATA
! 
! install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
! 
! install-info: install-info-am
! 
! install-info-am: $(INFO_DEPS)
! 	@$(NORMAL_INSTALL)
! 	$(mkinstalldirs) $(DESTDIR)$(infodir)
! 	@list='$(INFO_DEPS)'; \
! 	for file in $$list; do \
! 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
! 	  for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
! 	    if test -f $$ifile; then \
! 	      relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
! 	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
! 	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
! 	    else : ; fi; \
! 	  done; \
! 	done
! 	@$(POST_INSTALL)
! 	@if (install-info --version && \
! 	     install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
! 	  list='$(INFO_DEPS)'; \
! 	  for file in $$list; do \
! 	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
! 	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
! 	  done; \
! 	else : ; fi
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-am
! 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! 	-rm -rf autom4te.cache
! maintainer-clean-am: distclean-am maintainer-clean-aminfo \
! 	maintainer-clean-generic
  
! mostlyclean: mostlyclean-am
! 
! mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
! 	mostlyclean-generic mostlyclean-libtool
! 
! pdf: pdf-am
! 
! pdf-am: $(PDFS)
! 
! ps: ps-am
! 
! ps-am: $(PSS)
! 
! uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
! 	uninstall-libIDLincludeHEADERS uninstall-libLTLIBRARIES \
! 	uninstall-pkgconfigDATA
! 
! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
! 	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
! 	dist dist-all dist-gzip dist-info distcheck distclean \
! 	distclean-compile distclean-generic distclean-libtool \
! 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
! 	dvi-am info info-am install install-am install-binSCRIPTS \
! 	install-data install-data-am install-exec install-exec-am \
! 	install-info install-info-am install-libIDLincludeHEADERS \
! 	install-libLTLIBRARIES install-man install-pkgconfigDATA \
! 	install-strip installcheck installcheck-am installdirs \
! 	maintainer-clean maintainer-clean-aminfo \
! 	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
! 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
! 	pdf-am ps ps-am tags uninstall uninstall-am \
! 	uninstall-binSCRIPTS uninstall-info-am \
! 	uninstall-libIDLincludeHEADERS uninstall-libLTLIBRARIES \
! 	uninstall-pkgconfigDATA
  
  
  lexer.c: $(srcdir)/lexer.l parser.h
***************
*** 671,680 ****
  
  IDL.h: IDL.h.new
  	@:
- 
- dist-hook:
- 	cd $(distdir) ; rm -f $(CLEANFILES)
- 
  # 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:
--- 765,770 ----
diff -crN ./libIDL/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/aclocal.m4
*** ./libIDL/aclocal.m4	Mon May 26 18:12:13 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/aclocal.m4	Thu Dec 18 19:46:06 2003
***************
*** 1,14 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 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 Autoconf extension macros for libIDL
  AC_DEFUN(AC_CPP_ACCEPT_IDL,
--- 1,15 ----
! # generated automatically by aclocal 1.7.1 -*- Autoconf -*-
  
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
! # This file is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
! 
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
  
  dnl Autoconf extension macros for libIDL
  AC_DEFUN(AC_CPP_ACCEPT_IDL,
***************
*** 61,99 ****
                 CPPFLAGS="$saved_CPPFLAGS"])
         AC_DEFINE_UNQUOTED(CPP_NOSTDINC, "$ac_cv_cpp_nostdinc")])
  
! # 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([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
! 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-${am__api_version}, $missing_dir)
! AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
! AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
! AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
! AC_REQUIRE([AC_PROG_MAKE_SET])])
  
  # Copyright 2002  Free Software Foundation, Inc.
  
--- 62,188 ----
                 CPPFLAGS="$saved_CPPFLAGS"])
         AC_DEFINE_UNQUOTED(CPP_NOSTDINC, "$ac_cv_cpp_nostdinc")])
  
! # Do all the work for Automake.                            -*- Autoconf -*-
! 
! # 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.
! 
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
! 
! # 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.
  
! # serial 8
  
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery.  Also note that it means that autoscan, seeing
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+ 
+ AC_PREREQ([2.54])
+ 
+ # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+ # the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+ # The call with PACKAGE and VERSION arguments is the old style
+ # call (pre autoconf-2.50), which is being phased out.  PACKAGE
+ # and VERSION should now be passed to AC_INIT and removed from
+ # the call to AM_INIT_AUTOMAKE.
+ # We support both call styles for the transition.  After
+ # the next Automake release, Autoconf can make the AC_INIT
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
  AC_DEFUN([AM_INIT_AUTOMAKE],
  [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
!  AC_REQUIRE([AC_PROG_INSTALL])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
! 
! # test whether we have cygpath
! if test -z "$CYGPATH_W"; then
!   if (cygpath --version) >/dev/null 2>/dev/null; then
!     CYGPATH_W='cygpath -w'
!   else
!     CYGPATH_W=echo
!   fi
! fi
! AC_SUBST([CYGPATH_W])
! 
! # Define the identity of the package.
! dnl Distinguish between old-style and new-style calls.
! m4_ifval([$2],
! [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
!  AC_SUBST([PACKAGE], [$1])dnl
!  AC_SUBST([VERSION], [$2])],
! [_AM_SET_OPTIONS([$1])dnl
!  AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
!  AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
! 
! _AM_IF_OPTION([no-define],,
! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
!  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
! 
! # Some tools Automake needs.
! AC_REQUIRE([AM_SANITY_CHECK])dnl
! AC_REQUIRE([AC_ARG_PROGRAM])dnl
! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
! AM_MISSING_PROG(AUTOCONF, autoconf)
! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
! AM_MISSING_PROG(AUTOHEADER, autoheader)
! AM_MISSING_PROG(MAKEINFO, makeinfo)
! AM_MISSING_PROG(AMTAR, tar)
! AM_PROG_INSTALL_SH
! AM_PROG_INSTALL_STRIP
! # We need awk for the "check" target.  The system "awk" is bad on
! # some platforms.
! AC_REQUIRE([AC_PROG_AWK])dnl
! AC_REQUIRE([AC_PROG_MAKE_SET])dnl
! 
! _AM_IF_OPTION([no-dependencies],,
! [AC_PROVIDE_IFELSE([AC_PROG_CC],
!                   [_AM_DEPENDENCIES(CC)],
!                   [define([AC_PROG_CC],
!                           defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
! AC_PROVIDE_IFELSE([AC_PROG_CXX],
!                   [_AM_DEPENDENCIES(CXX)],
!                   [define([AC_PROG_CXX],
!                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
! ])
! ])
! 
! 
! # When config.status generates a header, we must update the stamp-h file.
! # This file resides in the same directory as the config header
! # that is generated.  The stamp files are numbered to have different names.
! 
! # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
! # loop where config.status creates the headers, so we can generate
! # our stamp files there.
! AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
! [_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
! echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
  
  # Copyright 2002  Free Software Foundation, Inc.
  
***************
*** 115,151 ****
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  # generated from the m4 files accompanying Automake X.Y.
! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
  
  # AM_SET_CURRENT_AUTOMAKE_VERSION
  # -------------------------------
  # Call AM_AUTOMAKE_VERSION so it can be traced.
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! 	 [AM_AUTOMAKE_VERSION([1.4-p6])])
  
  #
  # 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
--- 204,306 ----
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  # generated from the m4 files accompanying Automake X.Y.
! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
  
  # AM_SET_CURRENT_AUTOMAKE_VERSION
  # -------------------------------
  # Call AM_AUTOMAKE_VERSION so it can be traced.
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! 	 [AM_AUTOMAKE_VERSION([1.7.1])])
! 
! # Helper functions for option handling.                    -*- Autoconf -*-
! 
! # Copyright 2001, 2002  Free Software Foundation, Inc.
! 
! # 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.
! 
! # serial 2
! 
! # _AM_MANGLE_OPTION(NAME)
! # -----------------------
! AC_DEFUN([_AM_MANGLE_OPTION],
! [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
! 
! # _AM_SET_OPTION(NAME)
! # ------------------------------
! # Set option NAME.  Presently that only means defining a flag for this option.
! AC_DEFUN([_AM_SET_OPTION],
! [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
! 
! # _AM_SET_OPTIONS(OPTIONS)
! # ----------------------------------
! # OPTIONS is a space-separated list of Automake options.
! AC_DEFUN([_AM_SET_OPTIONS],
! [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
! 
! # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
! # -------------------------------------------
! # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
! AC_DEFUN([_AM_IF_OPTION],
! [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  
  #
  # Check to make sure that the build environment is sane.
  #
  
+ # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+ 
+ # 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.
+ 
+ # serial 3
+ 
+ # AM_SANITY_CHECK
+ # ---------------
  AC_DEFUN([AM_SANITY_CHECK],
  [AC_MSG_CHECKING([whether build environment is sane])
  # Just in case
  sleep 1
! echo timestamp > conftest.file
  # 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 conftest.file 2> /dev/null`
!    if test "$[*]" = "X"; then
        # -L didn't work.
!       set X `ls -t $srcdir/configure conftest.file`
     fi
!    rm -f conftest.file
!    if test "$[*]" != "X $srcdir/configure conftest.file" \
!       && test "$[*]" != "X conftest.file $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
***************
*** 155,161 ****
  alias in your environment])
     fi
  
!    test "[$]2" = conftestfile
     )
  then
     # Ok.
--- 310,316 ----
  alias in your environment])
     fi
  
!    test "$[2]" = conftest.file
     )
  then
     # Ok.
***************
*** 164,198 ****
     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)])
  
! # isc-posix.m4 serial 2 (gettext-0.11.2)
! dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
! dnl This file is free software, distributed under the terms of the GNU
! dnl General Public License.  As a special exception to the GNU General
! dnl Public License, this file may be distributed as part of a program
! dnl that contains a configuration script generated by Autoconf, under
! dnl the same distribution terms as the rest of that program.
  
! # This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
  
  # This test replaces the one in autoconf.
  # Currently this macro should have the same name as the autoconf macro
  # because gettext's gettext.m4 (distributed in the automake package)
--- 319,840 ----
     AC_MSG_ERROR([newly created file is older than distributed files!
  Check your system clock])
  fi
  AC_MSG_RESULT(yes)])
  
! #  -*- Autoconf -*-
! 
! 
! # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
! 
! # 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.
! 
! # serial 3
! 
! # AM_MISSING_PROG(NAME, PROGRAM)
! # ------------------------------
  AC_DEFUN([AM_MISSING_PROG],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])
! $1=${$1-"${am_missing_run}$2"}
! AC_SUBST($1)])
! 
! 
! # AM_MISSING_HAS_RUN
! # ------------------
! # Define MISSING if not defined so far and test if it supports --run.
! # If it does, set am_missing_run to use it, otherwise, to nothing.
! AC_DEFUN([AM_MISSING_HAS_RUN],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
! # Use eval to expand $SHELL
! if eval "$MISSING --run true"; then
!   am_missing_run="$MISSING --run "
  else
!   am_missing_run=
!   AC_MSG_WARN([`missing' script is too old or missing])
  fi
! ])
! 
! # AM_AUX_DIR_EXPAND
! 
! # Copyright 2001 Free Software Foundation, Inc.
! 
! # 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.
! 
! # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
! # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
! # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
! #
! # Of course, Automake must honor this variable whenever it calls a
! # tool from the auxiliary directory.  The problem is that $srcdir (and
! # therefore $ac_aux_dir as well) can be either absolute or relative,
! # depending on how configure is run.  This is pretty annoying, since
! # it makes $ac_aux_dir quite unusable in subdirectories: in the top
! # source directory, any form will work fine, but in subdirectories a
! # relative path needs to be adjusted first.
! #
! # $ac_aux_dir/missing
! #    fails when called from a subdirectory if $ac_aux_dir is relative
! # $top_srcdir/$ac_aux_dir/missing
! #    fails if $ac_aux_dir is absolute,
! #    fails when called from a subdirectory in a VPATH build with
! #          a relative $ac_aux_dir
! #
! # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
! # are both prefixed by $srcdir.  In an in-source build this is usually
! # harmless because $srcdir is `.', but things will broke when you
! # start a VPATH build or use an absolute $srcdir.
! #
! # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
! # iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
! #   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
! # and then we would define $MISSING as
! #   MISSING="\${SHELL} $am_aux_dir/missing"
! # This will work as long as MISSING is not called from configure, because
! # unfortunately $(top_srcdir) has no meaning in configure.
! # However there are other variables, like CC, which are often used in
! # configure, and could therefore not use this "fixed" $ac_aux_dir.
! #
! # Another solution, used here, is to always expand $ac_aux_dir to an
! # absolute PATH.  The drawback is that using absolute paths prevent a
! # configured tree to be moved without reconfiguration.
! 
! # Rely on autoconf to set up CDPATH properly.
! AC_PREREQ([2.50])
! 
! AC_DEFUN([AM_AUX_DIR_EXPAND], [
! # expand $ac_aux_dir to an absolute path
! am_aux_dir=`cd $ac_aux_dir && pwd`
! ])
! 
! # AM_PROG_INSTALL_SH
! # ------------------
! # Define $install_sh.
! 
! # Copyright 2001 Free Software Foundation, Inc.
! 
! # 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.
! 
! AC_DEFUN([AM_PROG_INSTALL_SH],
! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
! install_sh=${install_sh-"$am_aux_dir/install-sh"}
! AC_SUBST(install_sh)])
! 
! # AM_PROG_INSTALL_STRIP
! 
! # Copyright 2001 Free Software Foundation, Inc.
! 
! # 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.
! 
! # One issue with vendor `install' (even GNU) is that you can't
! # specify the program used to strip binaries.  This is especially
! # annoying in cross-compiling environments, where the build's strip
! # is unlikely to handle the host's binaries.
! # Fortunately install-sh will honor a STRIPPROG variable, so we
! # always use install-sh in `make install-strip', and initialize
! # STRIPPROG with the value of the STRIP variable (set by the user).
! AC_DEFUN([AM_PROG_INSTALL_STRIP],
! [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
! # Installed binaries are usually stripped using `strip' when the user
! # run `make install-strip'.  However `strip' might not be the right
! # tool to use in cross-compilation environments, therefore Automake
! # will honor the `STRIP' environment variable to overrule this program.
! dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
! if test "$cross_compiling" != no; then
!   AC_CHECK_TOOL([STRIP], [strip], :)
! fi
! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
! AC_SUBST([INSTALL_STRIP_PROGRAM])])
! 
! # serial 4						-*- Autoconf -*-
! 
! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
! 
! # 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.
! 
! 
! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
! # written in clear, in which case automake, when reading aclocal.m4,
! # will think it sees a *use*, and therefore will trigger all it's
! # C support machinery.  Also note that it means that autoscan, seeing
! # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
! 
! 
! 
! # _AM_DEPENDENCIES(NAME)
! # ----------------------
! # See how the compiler implements dependency checking.
! # NAME is "CC", "CXX", "GCJ", or "OBJC".
! # We try a few techniques and use that to set a single cache variable.
! #
! # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
! # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
! # dependency, and given that the user is not expected to run this macro,
! # just rely on AC_PROG_CC.
! AC_DEFUN([_AM_DEPENDENCIES],
! [AC_REQUIRE([AM_SET_DEPDIR])dnl
! AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
! AC_REQUIRE([AM_MAKE_INCLUDE])dnl
! AC_REQUIRE([AM_DEP_TRACK])dnl
! 
! ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
!        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
!        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
!        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
!                    [depcc="$$1"   am_compiler_list=])
! 
! AC_CACHE_CHECK([dependency style of $depcc],
!                [am_cv_$1_dependencies_compiler_type],
! [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
!   # We make a subdir and do the tests there.  Otherwise we can end up
!   # making bogus files that we don't know about and never remove.  For
!   # instance it was reported that on HP-UX the gcc test will end up
!   # making a dummy file named `D' -- because `-MD' means `put the output
!   # in D'.
!   mkdir conftest.dir
!   # Copy depcomp to subdir because otherwise we won't find it if we're
!   # using a relative directory.
!   cp "$am_depcomp" conftest.dir
!   cd conftest.dir
! 
!   am_cv_$1_dependencies_compiler_type=none
!   if test "$am_compiler_list" = ""; then
!      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
!   fi
!   for depmode in $am_compiler_list; do
!     # We need to recreate these files for each test, as the compiler may
!     # overwrite some of them when testing with obscure command lines.
!     # This happens at least with the AIX C compiler.
!     echo '#include "conftest.h"' > conftest.c
!     echo 'int i;' > conftest.h
!     echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
! 
!     case $depmode in
!     nosideeffect)
!       # after this tag, mechanisms are not by side-effect, so they'll
!       # only be used when explicitly requested
!       if test "x$enable_dependency_tracking" = xyes; then
! 	continue
!       else
! 	break
!       fi
!       ;;
!     none) break ;;
!     esac
!     # We check with `-c' and `-o' for the sake of the "dashmstdout"
!     # mode.  It turns out that the SunPro C++ compiler does not properly
!     # handle `-M -o', and we need to detect this.
!     if depmode=$depmode \
!        source=conftest.c object=conftest.o \
!        depfile=conftest.Po tmpdepfile=conftest.TPo \
!        $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
!        grep conftest.h conftest.Po > /dev/null 2>&1 &&
!        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
!       am_cv_$1_dependencies_compiler_type=$depmode
!       break
!     fi
!   done
! 
!   cd ..
!   rm -rf conftest.dir
! else
!   am_cv_$1_dependencies_compiler_type=none
! fi
! ])
! AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
! AM_CONDITIONAL([am__fastdep$1], [
!   test "x$enable_dependency_tracking" != xno \
!   && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
! ])
! 
! 
! # AM_SET_DEPDIR
! # -------------
! # Choose a directory name for dependency files.
! # This macro is AC_REQUIREd in _AM_DEPENDENCIES
! AC_DEFUN([AM_SET_DEPDIR],
! [rm -f .deps 2>/dev/null
! mkdir .deps 2>/dev/null
! if test -d .deps; then
!   DEPDIR=.deps
! else
!   # MS-DOS does not allow filenames that begin with a dot.
!   DEPDIR=_deps
! fi
! rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
! ])
! 
! 
! # AM_DEP_TRACK
! # ------------
! AC_DEFUN([AM_DEP_TRACK],
! [AC_ARG_ENABLE(dependency-tracking,
! [  --disable-dependency-tracking Speeds up one-time builds
!   --enable-dependency-tracking  Do not reject slow dependency extractors])
! if test "x$enable_dependency_tracking" != xno; then
!   am_depcomp="$ac_aux_dir/depcomp"
!   AMDEPBACKSLASH='\'
! fi
! AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
! AC_SUBST([AMDEPBACKSLASH])
! ])
! 
! # Generate code to set up dependency tracking.   -*- Autoconf -*-
! 
! # Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
! 
! # 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.
! 
! #serial 2
! 
! # _AM_OUTPUT_DEPENDENCY_COMMANDS
! # ------------------------------
! AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
! [for mf in $CONFIG_FILES; do
!   # Strip MF so we end up with the name of the file.
!   mf=`echo "$mf" | sed -e 's/:.*$//'`
!   # Check whether this is an Automake generated Makefile or not.
!   # We used to match only the files named `Makefile.in', but
!   # some people rename them; so instead we look at the file content.
!   # Grep'ing the first line is not enough: some people post-process
!   # each Makefile.in and add a new line on top of each file to say so.
!   # So let's grep whole file.
!   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
!     dirpart=`AS_DIRNAME("$mf")`
!   else
!     continue
!   fi
!   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
!   # Extract the definition of DEP_FILES from the Makefile without
!   # running `make'.
!   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
!   test -z "$DEPDIR" && continue
!   # When using ansi2knr, U may be empty or an underscore; expand it
!   U=`sed -n -e '/^U = / s///p' < "$mf"`
!   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
!   # We invoke sed twice because it is the simplest approach to
!   # changing $(DEPDIR) to its actual value in the expansion.
!   for file in `sed -n -e '
!     /^DEP_FILES = .*\\\\$/ {
!       s/^DEP_FILES = //
!       :loop
! 	s/\\\\$//
! 	p
! 	n
! 	/\\\\$/ b loop
!       p
!     }
!     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
!        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
!     # Make sure the directory exists.
!     test -f "$dirpart/$file" && continue
!     fdir=`AS_DIRNAME(["$file"])`
!     AS_MKDIR_P([$dirpart/$fdir])
!     # echo "creating $dirpart/$file"
!     echo '# dummy' > "$dirpart/$file"
!   done
! done
! ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
! 
! 
! # AM_OUTPUT_DEPENDENCY_COMMANDS
! # -----------------------------
! # This macro should only be invoked once -- use via AC_REQUIRE.
! #
! # This code is only required when automatic dependency tracking
! # is enabled.  FIXME.  This creates each `.P' file that we will
! # need in order to bootstrap the dependency handling code.
! AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
! [AC_CONFIG_COMMANDS([depfiles],
!      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
!      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
! ])
  
! # Check to see how 'make' treats includes.	-*- Autoconf -*-
  
! # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
  
+ # 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.
+ 
+ # serial 2
+ 
+ # AM_MAKE_INCLUDE()
+ # -----------------
+ # Check to see how make treats includes.
+ AC_DEFUN([AM_MAKE_INCLUDE],
+ [am_make=${MAKE-make}
+ cat > confinc << 'END'
+ doit:
+ 	@echo done
+ END
+ # If we don't find an include directive, just comment out the code.
+ AC_MSG_CHECKING([for style of include used by $am_make])
+ am__include="#"
+ am__quote=
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+ # We grep out `Entering directory' and `Leaving directory'
+ # messages which can occur if `w' ends up in MAKEFLAGS.
+ # In particular we don't look at `^make:' because GNU make might
+ # be invoked under some other name (usually "gmake"), in which
+ # case it prints its new name instead of `make'.
+ if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+    am__include=include
+    am__quote=
+    _am_result=GNU
+ fi
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+    if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+       am__include=.include
+       am__quote="\""
+       _am_result=BSD
+    fi
+ fi
+ AC_SUBST(am__include)
+ AC_SUBST(am__quote)
+ AC_MSG_RESULT($_am_result)
+ rm -f confinc confmf
+ ])
+ 
+ # AM_CONDITIONAL                                              -*- Autoconf -*-
+ 
+ # Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+ 
+ # 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.
+ 
+ # serial 5
+ 
+ AC_PREREQ(2.52)
+ 
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+ # Define a conditional.
+ AC_DEFUN([AM_CONDITIONAL],
+ [ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+         [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+ AC_SUBST([$1_TRUE])
+ AC_SUBST([$1_FALSE])
+ if $2; then
+   $1_TRUE=
+   $1_FALSE='#'
+ else
+   $1_TRUE='#'
+   $1_FALSE=
+ fi
+ AC_CONFIG_COMMANDS_PRE(
+ [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+   AC_MSG_ERROR([conditional "$1" was never defined.
+ Usually this means the macro was only invoked conditionally.])
+ fi])])
+ 
+ #serial 1
  # This test replaces the one in autoconf.
  # Currently this macro should have the same name as the autoconf macro
  # because gettext's gettext.m4 (distributed in the automake package)
***************
*** 211,223 ****
  )
  
  
! dnl AM_PROG_LEX
! dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
  AC_DEFUN([AM_PROG_LEX],
! [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
! AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
! AC_PROG_LEX
! AC_DECL_YYTEXT])
  
  # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
  
--- 853,889 ----
  )
  
  
! # Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
! 
! # 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.
! 
! # serial 3
! 
! AC_PREREQ(2.50)
! 
! # AM_PROG_LEX
! # -----------
! # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
! # "missing" invocation, for better error output.
  AC_DEFUN([AM_PROG_LEX],
! [AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
! AC_REQUIRE([AC_PROG_LEX])dnl
! if test "$LEX" = :; then
!   LEX=${am_missing_run}flex
! fi])
  
  # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
  
***************
*** 248,255 ****
  AC_REQUIRE([AC_PROG_LD])dnl
  AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
  AC_REQUIRE([AC_PROG_NM])dnl
- AC_REQUIRE([LT_AC_PROG_SED])dnl
- 
  AC_REQUIRE([AC_PROG_LN_S])dnl
  AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
  AC_REQUIRE([AC_OBJEXT])dnl
--- 914,919 ----
***************
*** 417,428 ****
    lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
! irix* | nonstopux*)
    symcode='[[BCDEGRST]]'
    ;;
- osf*)
-   symcode='[[BCDEGQRST]]'
-   ;;
  solaris* | sysv5*)
    symcode='[[BDT]]'
    ;;
--- 1081,1089 ----
    lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
! irix*)
    symcode='[[BCDEGRST]]'
    ;;
  solaris* | sysv5*)
    symcode='[[BDT]]'
    ;;
***************
*** 519,525 ****
  	  save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$no_builtin_flag"
! 	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
  	    pipe_works=yes
  	  fi
  	  LIBS="$save_LIBS"
--- 1180,1186 ----
  	  save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$no_builtin_flag"
! 	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
  	    pipe_works=yes
  	  fi
  	  LIBS="$save_LIBS"
***************
*** 1063,1069 ****
        # like `-m68040'.
        lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
!     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      darwin* | rhapsody*)
--- 1724,1730 ----
        # like `-m68040'.
        lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
!     beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      darwin* | rhapsody*)
***************
*** 1106,1112 ****
        lt_cv_prog_cc_pic='+Z'
        ;;
  
!     irix5* | irix6* | nonstopux*)
        lt_cv_prog_cc_wl='-Wl,'
        lt_cv_prog_cc_static='-non_shared'
        # PIC (with -KPIC) is the default.
--- 1767,1773 ----
        lt_cv_prog_cc_pic='+Z'
        ;;
  
!     irix5* | irix6*)
        lt_cv_prog_cc_wl='-Wl,'
        lt_cv_prog_cc_static='-non_shared'
        # PIC (with -KPIC) is the default.
***************
*** 1150,1156 ****
      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
        lt_cv_prog_cc_pic='-KPIC'
        lt_cv_prog_cc_static='-Bstatic'
!       lt_cv_prog_cc_wl='-Wl,'
        ;;
  
      uts4*)
--- 1811,1821 ----
      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
        lt_cv_prog_cc_pic='-KPIC'
        lt_cv_prog_cc_static='-Bstatic'
!       if test "x$host_vendor" = xsni; then
! 	lt_cv_prog_cc_wl='-LD'
!       else
! 	lt_cv_prog_cc_wl='-Wl,'
!       fi
        ;;
  
      uts4*)
***************
*** 1372,1377 ****
--- 2037,2043 ----
  old_archive_from_new_cmds=
  old_archive_from_expsyms_cmds=
  export_dynamic_flag_spec=
+ use_runtimelinking=
  whole_archive_flag_spec=
  thread_safe_flag_spec=
  hardcode_into_libs=no
***************
*** 1515,1521 ****
      # If the export-symbols file already is a .def file (1st line
      # is EXPORTS), use it as is.
      # If DATA tags from a recent dlltool are present, honour them!
!     archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
  	cp $export_symbols $output_objdir/$soname-def;
        else
  	echo EXPORTS > $output_objdir/$soname-def;
--- 2181,2187 ----
      # If the export-symbols file already is a .def file (1st line
      # is EXPORTS), use it as is.
      # If DATA tags from a recent dlltool are present, honour them!
!     archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  	cp $export_symbols $output_objdir/$soname-def;
        else
  	echo EXPORTS > $output_objdir/$soname-def;
***************
*** 1524,1530 ****
  	 set dummy \$symbol;
  	 case \[$]# in
  	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
- 	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
  	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
  	 esac;
  	 _lt_hint=`expr 1 + \$_lt_hint`;
--- 2190,2195 ----
***************
*** 1629,1653 ****
        aix_use_runtimelinking=no
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
!       aix_use_runtimelinking=no
! 
!       # Test if we are trying to use run time linking or normal
!       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
!       # need to do runtime linking.
!       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
! 	for ld_flag in $LDFLAGS; do
! 	  case $ld_flag in
! 	  *-brtl*)
! 	    aix_use_runtimelinking=yes
! 	    break
! 	  ;;
! 	  esac
! 	done
!       esac
! 
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
  
      # When large executables or shared objects are built, AIX ld can
--- 2294,2306 ----
        aix_use_runtimelinking=no
        exp_sym_flag='-Bexport'
        no_entry_flag=""
+       use_runtimelinking=""
      else
!       aix_use_runtimelinking=yes
!       export_dynamic_flag_spec='-bexpall'
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
+       use_runtimelinking='-brtl'
      fi
  
      # When large executables or shared objects are built, AIX ld can
***************
*** 1682,1696 ****
        shared_flag='-shared'
      else
        # not using gcc
!       if test "$host_cpu" = ia64; then
! 	shared_flag='${wl}-G'
!       else
! 	if test "$aix_use_runtimelinking" = yes; then
! 	  shared_flag='${wl}-G'
! 	else
! 	  shared_flag='${wl}-bM:SRE'
! 	fi
!       fi
      fi
  
      # It seems that -bexpall can do strange things, so it is better to
--- 2335,2341 ----
        shared_flag='-shared'
      else
        # not using gcc
!       shared_flag='${wl}-G'
      fi
  
      # It seems that -bexpall can do strange things, so it is better to
***************
*** 1700,1707 ****
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
        allow_undefined_flag='-berok'
!       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
!       archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
        if test "$host_cpu" = ia64; then
  	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
--- 2345,2352 ----
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
        allow_undefined_flag='-berok'
!       hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
!       archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
      else
        if test "$host_cpu" = ia64; then
  	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
***************
*** 1714,1720 ****
  	allow_undefined_flag='${wl}-berok'
  	# This is a bit strange, but is similar to how AIX traditionally builds
  	# it's shared libraries.
! 	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
        fi
      fi
      ;;
--- 2359,2365 ----
  	allow_undefined_flag='${wl}-berok'
  	# This is a bit strange, but is similar to how AIX traditionally builds
  	# it's shared libraries.
! 	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
        fi
      fi
      ;;
***************
*** 1756,1764 ****
      esac
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
!     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
!     #	     `"' quotes if we put them in here... so don't!
!     archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
--- 2401,2408 ----
      esac
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
!     #        yet detect zsh echo's removal of \ escapes.
!     archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
***************
*** 1810,1823 ****
      export_dynamic_flag_spec='${wl}-E'
      ;;
  
!   irix5* | irix6* | nonstopux*)
      if test "$GCC" = yes; then
        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      else
        archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='-rpath $libdir'
      fi
      hardcode_libdir_separator=:
      link_all_deplibs=yes
      ;;
--- 2454,2466 ----
      export_dynamic_flag_spec='${wl}-E'
      ;;
  
!   irix5* | irix6*)
      if test "$GCC" = yes; then
        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
      else
        archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
      fi
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      link_all_deplibs=yes
      ;;
***************
*** 1845,1851 ****
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
!       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
--- 2488,2494 ----
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
!       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
***************
*** 1855,1861 ****
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)
!         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
          ;;
        esac
--- 2498,2504 ----
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)
!         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
          ;;
        esac
***************
*** 1967,1989 ****
      ;;
  
    sysv4)
!     case $host_vendor in
!       sni)
!         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
!         hardcode_direct=yes # is this really true???
!         ;;
!       siemens)
!         ## LD is ld it makes a PLAMLIB
!         ## CC just makes a GrossModule.
!         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
!         reload_cmds='$CC -r -o $output$reload_objs'
!         hardcode_direct=no
!         ;;
!       motorola)
!         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
!         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
!         ;;
!     esac
      runpath_var='LD_RUN_PATH'
      hardcode_shlibpath_var=no
      ;;
--- 2610,2622 ----
      ;;
  
    sysv4)
!     if test "x$host_vendor" = xsno; then
!       archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
!       hardcode_direct=yes # is this really true???
!     else
!       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
!       hardcode_direct=no #Motorola manual says yes, but my tests say they lie
!     fi
      runpath_var='LD_RUN_PATH'
      hardcode_shlibpath_var=no
      ;;
***************
*** 2124,2132 ****
  
  aix4* | aix5*)
    version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   hardcode_into_libs=yes
    if test "$host_cpu" = ia64; then
      # AIX 5 supports IA64
      library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
--- 2757,2762 ----
***************
*** 2148,2171 ****
  	fi
  	;;
      esac
!     # AIX (on Power*) has no versioning support, so currently we can
!     # not hardcode correct soname into executable. Probably we can
!     # add versioning support to collect2, so additional links can
!     # be useful in future.
!     if test "$aix_use_runtimelinking" = yes; then
!       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
!       # instead of lib<name>.a to let people know that these are not
!       # typical AIX shared libraries.
!       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
!     else
!       # We preserve .a as extension for shared libraries through AIX4.2
!       # and later when we are not doing run time linking.
!       library_names_spec='${libname}${release}.a $libname.a'
!       soname_spec='${libname}${release}.so$major'
!     fi
      shlibpath_var=LIBPATH
    fi
-   hardcode_into_libs=yes
    ;;
  
  amigaos*)
--- 2778,2789 ----
  	fi
  	;;
      esac
!     # We preserve .a as extension for shared libraries through AIX4.2
!     library_names_spec='${libname}${release}.a $libname.a'
!     soname_spec='${libname}${release}.so$major'
      shlibpath_var=LIBPATH
+     hardcode_into_libs=yes
    fi
    ;;
  
  amigaos*)
***************
*** 2213,2219 ****
      ;;
    yes,mingw*)
      library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
!     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
      ;;
    yes,pw32*)
      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
--- 2831,2837 ----
      ;;
    yes,mingw*)
      library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
!     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
      ;;
    yes,pw32*)
      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
***************
*** 2296,2312 ****
    postinstall_cmds='chmod 555 $lib'
    ;;
  
! irix5* | irix6* | nonstopux*)
!   case $host_os in
!     nonstopux*) version_type=nonstopux ;;
!     *)          version_type=irix ;;
!   esac
    need_lib_prefix=no
    need_version=no
    soname_spec='${libname}${release}.so$major'
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
    case $host_os in
!   irix5* | nonstopux*)
      libsuff= shlibsuff=
      ;;
    *)
--- 2914,2927 ----
    postinstall_cmds='chmod 555 $lib'
    ;;
  
! irix5* | irix6*)
!   version_type=irix
    need_lib_prefix=no
    need_version=no
    soname_spec='${libname}${release}.so$major'
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
    case $host_os in
!   irix5*)
      libsuff= shlibsuff=
      ;;
    *)
***************
*** 2351,2376 ****
    # people can always --disable-shared, the test was removed, and we
    # assume the GNU/Linux dynamic linker is in use.
    dynamic_linker='GNU/Linux ld.so'
- 
-   # Find out which ABI we are using (multilib Linux x86_64 hack).
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*)
-     echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-     if AC_TRY_EVAL(ac_compile); then
-       case `/usr/bin/file conftest.$ac_objext` in
-       *64-bit*)
-         libsuff=64
-         ;;
-       esac
-     fi
-     rm -rf conftest*
-     ;;
-   *)
-     ;;
-   esac
-   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-   sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
    ;;
  
  netbsd*)
--- 2966,2971 ----
***************
*** 2430,2441 ****
  osf3* | osf4* | osf5*)
    version_type=osf
    need_version=no
!   soname_spec='${libname}${release}.so$major'
!   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
    shlibpath_var=LD_LIBRARY_PATH
    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   hardcode_into_libs=yes
    ;;
  
  sco3.2v5*)
--- 3025,3035 ----
  osf3* | osf4* | osf5*)
    version_type=osf
    need_version=no
!   soname_spec='${libname}${release}.so'
!   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
    shlibpath_var=LD_LIBRARY_PATH
    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
  sco3.2v5*)
***************
*** 2478,2489 ****
    case $host_vendor in
      sni)
        shlibpath_overrides_runpath=no
-       need_lib_prefix=no
-       export_dynamic_flag_spec='${wl}-Blargedynsym'
-       runpath_var=LD_RUN_PATH
-       ;;
-     siemens)
-       need_lib_prefix=no
        ;;
      motorola)
        need_lib_prefix=no
--- 3072,3077 ----
***************
*** 2545,2551 ****
    ;;
  
  aix4*)
!   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
    ;;
--- 3133,3139 ----
    ;;
  
  aix4*)
!   if test "$host_cpu" != ia64 ; then
      test "$enable_shared" = yes && enable_static=no
    fi
    ;;
***************
*** 2638,2647 ****
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
!   for var in echo old_CC old_CFLAGS SED \
      AR AR_FLAGS CC LD LN_S NM SHELL \
      reload_flag reload_cmds wl \
      pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
      thread_safe_flag_spec whole_archive_flag_spec libname_spec \
      library_names_spec soname_spec \
      RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
--- 3226,3236 ----
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
!   for var in echo old_CC old_CFLAGS \
      AR AR_FLAGS CC LD LN_S NM SHELL \
      reload_flag reload_cmds wl \
      pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+     use_runtimelinking \
      thread_safe_flag_spec whole_archive_flag_spec libname_spec \
      library_names_spec soname_spec \
      RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
***************
*** 2700,2710 ****
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
- # A sed that does not truncate output.
- SED=$lt_SED
- 
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
! Xsed="${SED} -e s/^X//"
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
--- 3289,3296 ----
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
! Xsed="sed -e s/^X//"
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
***************
*** 2826,2831 ****
--- 3412,3420 ----
  # Compiler flag to allow reflexive dlopens.
  export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
  
+ # Compiler flag to allow runtime linking
+ use_runtimelinking=$lt_use_runtimelinking
+ 
  # Compiler flag to generate shared objects directly from archives.
  whole_archive_flag_spec=$lt_whole_archive_flag_spec
  
***************
*** 3465,3471 ****
  # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
  #  -- PORTME fill in with the dynamic library characteristics
  AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
! [AC_CACHE_CHECK([how to recognise dependent libraries],
  lt_cv_deplibs_check_method,
  [lt_cv_file_magic_cmd='$MAGIC_CMD'
  lt_cv_file_magic_test_file=
--- 4054,4060 ----
  # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
  #  -- PORTME fill in with the dynamic library characteristics
  AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
! [AC_CACHE_CHECK([how to recognise dependant libraries],
  lt_cv_deplibs_check_method,
  [lt_cv_file_magic_cmd='$MAGIC_CMD'
  lt_cv_file_magic_test_file=
***************
*** 3540,3548 ****
    lt_cv_file_magic_test_file=/usr/lib/libc.sl
    ;;
  
! irix5* | irix6* | nonstopux*)
    case $host_os in
!   irix5* | nonstopux*)
      # this will be overridden with pass_all, but let us keep it just in case
      lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
      ;;
--- 4129,4137 ----
    lt_cv_file_magic_test_file=/usr/lib/libc.sl
    ;;
  
! irix5* | irix6*)
    case $host_os in
!   irix5*)
      # this will be overridden with pass_all, but let us keep it just in case
      lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
      ;;
***************
*** 3564,3570 ****
  # This must be Linux ELF.
  linux-gnu*)
    case $host_cpu in
!   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*)
      lt_cv_deplibs_check_method=pass_all ;;
    *)
      # glibc up to 2.1.1 does not perform some relocations on ARM
--- 4153,4159 ----
  # This must be Linux ELF.
  linux-gnu*)
    case $host_cpu in
!   alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
      lt_cv_deplibs_check_method=pass_all ;;
    *)
      # glibc up to 2.1.1 does not perform some relocations on ARM
***************
*** 3635,3643 ****
      lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
      lt_cv_file_magic_test_file=/lib/libc.so
      ;;
-   siemens)
-     lt_cv_deplibs_check_method=pass_all
-     ;;
    esac
    ;;
  esac
--- 4224,4229 ----
***************
*** 3666,3672 ****
        #   nm: unknown option "B" ignored
        # Tru64's nm complains that /dev/null is an invalid object file
        if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
! 	lt_cv_path_NM="$tmp_nm -B"
  	break
        elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
  	lt_cv_path_NM="$tmp_nm -p"
--- 4252,4274 ----
        #   nm: unknown option "B" ignored
        # Tru64's nm complains that /dev/null is an invalid object file
        if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
!         # AIX needs to suppress demangling for C++ to work correctly
!         # AIX nm : The default is to demangle all C++ symbol names
!         # GNU nm : The default is to not demangle low-level symbol names.
!         case $host_os in
!         aix*)
!           # check if we are using GNU nm on AIX
!           if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null
!           then
!             lt_cv_path_NM="$tmp_nm -B"
!           else
!             lt_cv_path_NM="$tmp_nm -BC"
!           fi
!           ;;
!         *)
!           lt_cv_path_NM="$tmp_nm -B"
!           ;;
!         esac
  	break
        elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
  	lt_cv_path_NM="$tmp_nm -p"
***************
*** 3703,3714 ****
  ])
  
  # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl convenience library and LTDLINCL to the include flags for
  # the libltdl header and adds --enable-ltdl-convenience to the
! # configure arguments.  Note that LIBLTDL and LTDLINCL are not
  # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
  # provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
! # with '${top_builddir}/' and LTDLINCL will be prefixed with
  # '${top_srcdir}/' (note the single quotes!).  If your package is not
  # flat and you're not using automake, define top_builddir and
  # top_srcdir appropriately in the Makefiles.
--- 4305,4316 ----
  ])
  
  # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl convenience library and INCLTDL to the include flags for
  # the libltdl header and adds --enable-ltdl-convenience to the
! # configure arguments.  Note that LIBLTDL and INCLTDL are not
  # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
  # provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
! # with '${top_builddir}/' and INCLTDL will be prefixed with
  # '${top_srcdir}/' (note the single quotes!).  If your package is not
  # flat and you're not using automake, define top_builddir and
  # top_srcdir appropriately in the Makefiles.
***************
*** 3720,3737 ****
        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
    esac
    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
!   LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
!   # For backwards non-gettext consistent compatibility...
!   INCLTDL="$LTDLINCL"
  ])
  
  # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl installable library and LTDLINCL to the include flags for
  # the libltdl header and adds --enable-ltdl-install to the configure
! # arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
  # AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
  # libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
! # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
  # with '${top_srcdir}/' (note the single quotes!).  If your package is
  # not flat and you're not using automake, define top_builddir and
  # top_srcdir appropriately in the Makefiles.
--- 4322,4337 ----
        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
    esac
    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
!   INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
  ])
  
  # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
! # the libltdl installable library and INCLTDL to the include flags for
  # the libltdl header and adds --enable-ltdl-install to the configure
! # arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
  # AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
  # libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
! # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
  # with '${top_srcdir}/' (note the single quotes!).  If your package is
  # not flat and you're not using automake, define top_builddir and
  # top_srcdir appropriately in the Makefiles.
***************
*** 3749,3762 ****
    if test x"$enable_ltdl_install" = x"yes"; then
      ac_configure_args="$ac_configure_args --enable-ltdl-install"
      LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
!     LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
    else
      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
      LIBLTDL="-lltdl"
!     LTDLINCL=
    fi
-   # For backwards non-gettext consistent compatibility...
-   INCLTDL="$LTDLINCL"
  ])
  
  # old names
--- 4349,4360 ----
    if test x"$enable_ltdl_install" = x"yes"; then
      ac_configure_args="$ac_configure_args --enable-ltdl-install"
      LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
!     INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
    else
      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
      LIBLTDL="-lltdl"
!     INCLTDL=
    fi
  ])
  
  # old names
***************
*** 3771,3869 ****
  # This is just to silence aclocal about the macro not being used
  ifelse([AC_DISABLE_FAST_INSTALL])
  
! # NOTE: This macro has been submitted for inclusion into   #
! #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
! #  a released version of Autoconf we should remove this    #
! #  macro and use it instead.                               #
! # LT_AC_PROG_SED
! # --------------
! # Check for a fully-functional sed program, that truncates
! # as few characters as possible.  Prefer GNU sed if found.
! AC_DEFUN([LT_AC_PROG_SED],
! [AC_MSG_CHECKING([for a sed that does not truncate output])
! AC_CACHE_VAL(lt_cv_path_SED,
! [# Loop through the user's path and test for sed and gsed.
! # Then use that list of sed's as ones to test for truncation.
! as_executable_p="test -f"
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_prog in sed gsed; do
!     for ac_exec_ext in '' $ac_executable_extensions; do
!       if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
!         _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
!       fi
!     done
!   done
! done
  
!   # Create a temporary directory, and hook for its removal unless debugging.
! $debug ||
! {
!   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
!   trap '{ (exit 1); exit 1; }' 1 2 13 15
! }
  
! # Create a (secure) tmp directory for tmp files.
! : ${TMPDIR=/tmp}
! {
!   tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
!   test -n "$tmp" && test -d "$tmp"
! }  ||
! {
!   tmp=$TMPDIR/sed$$-$RANDOM
!   (umask 077 && mkdir $tmp)
! } ||
! {
!    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
!    { (exit 1); exit 1; }
! }
!   _max=0
!   _count=0
!   # Add /usr/xpg4/bin/sed as it is typically found on Solaris
!   # along with /bin/sed that truncates output.
!   for _sed in $_sed_list /usr/xpg4/bin/sed; do
!     test ! -f ${_sed} && break
!     cat /dev/null > "$tmp/sed.in"
!     _count=0
!     echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
!     # Check for GNU sed and select it if it is found.
!     if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
!       lt_cv_path_SED=${_sed}
!       break
!     fi
!     while true; do
!       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
!       mv "$tmp/sed.tmp" "$tmp/sed.in"
!       cp "$tmp/sed.in" "$tmp/sed.nl"
!       echo >>"$tmp/sed.nl"
!       ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
!       cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
!       # 40000 chars as input seems more than enough
!       test $_count -gt 10 && break
!       _count=`expr $_count + 1`
!       if test $_count -gt $_max; then
!         _max=$_count
!         lt_cv_path_SED=$_sed
!       fi
!     done
!   done
!   rm -rf "$tmp"
! ])
! if test "X$SED" != "X"; then
!   lt_cv_path_SED=$SED
! else
!   SED=$lt_cv_path_SED
! fi
! AC_MSG_RESULT([$SED])
! ])
  
! # Add --enable-maintainer-mode option to configure.
! # From Jim Meyering
  
! # serial 1
  
  AC_DEFUN([AM_MAINTAINER_MODE],
  [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--- 4369,4395 ----
  # This is just to silence aclocal about the macro not being used
  ifelse([AC_DISABLE_FAST_INSTALL])
  
! # Add --enable-maintainer-mode option to configure.
! # From Jim Meyering
  
! # Copyright 1996, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
  
! # 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.
! 
! # serial 2
  
  AC_DEFUN([AM_MAINTAINER_MODE],
  [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
***************
*** 3873,3897 ****
                            (and sometimes confusing) to the casual installer],
        USE_MAINTAINER_MODE=$enableval,
        USE_MAINTAINER_MODE=no)
!   AC_MSG_RESULT($USE_MAINTAINER_MODE)
!   AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
    MAINT=$MAINTAINER_MODE_TRUE
    AC_SUBST(MAINT)dnl
  ]
  )
  
! # Define a conditional.
! 
! AC_DEFUN([AM_CONDITIONAL],
! [AC_SUBST($1_TRUE)
! AC_SUBST($1_FALSE)
! if $2; then
!   $1_TRUE=
!   $1_FALSE='#'
! else
!   $1_TRUE='#'
!   $1_FALSE=
! fi])
  
  
  dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
--- 4399,4412 ----
                            (and sometimes confusing) to the casual installer],
        USE_MAINTAINER_MODE=$enableval,
        USE_MAINTAINER_MODE=no)
!   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
!   AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
    MAINT=$MAINTAINER_MODE_TRUE
    AC_SUBST(MAINT)dnl
  ]
  )
  
! AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
  
  
  dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
diff -crN ./libIDL/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/config.guess
*** ./libIDL/config.guess	Mon May 26 18:12:13 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/config.guess	Thu Dec 18 19:46:07 2003
***************
*** 1,9 ****
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
! timestamp='2003-01-10'
  
  # 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
--- 1,9 ----
  #! /bin/sh
  # Attempt to guess a canonical system name.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! #   Free Software Foundation, Inc.
  
! timestamp='2001-09-04'
  
  # 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
***************
*** 24,32 ****
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
! # Originally written by Per Bothner <per@bothner.com>.
! # Please send patches to <config-patches@gnu.org>.  Submit a context
! # diff and a properly formatted ChangeLog entry.
  #
  # This script attempts to guess a canonical system name similar to
  # config.sub.  If it succeeds, it prints the system name on stdout, and
--- 24,31 ----
  # 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
***************
*** 88,128 ****
    exit 1
  fi
  
- trap 'exit 1' 1 2 15
  
! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
! # compiler to aid in system detection is discouraged as it requires
! # temporary files to be created and, as you can see below, it is a
! # headache to deal with in a portable fashion.
  
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
! # Portable tmp directory creation inspired by the Autoconf team.
! 
! set_cc_for_build='
! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
! : ${TMPDIR=/tmp} ;
!  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
!  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
!  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
! dummy=$tmp/dummy ;
! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
! case $CC_FOR_BUILD,$HOST_CC,$CC in
!  ,,)    echo "int x;" > $dummy.c ;
! 	for c in cc gcc c89 c99 ; do
! 	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
  	     CC_FOR_BUILD="$c"; break ;
  	  fi ;
  	done ;
  	if test x"$CC_FOR_BUILD" = x ; then
  	  CC_FOR_BUILD=no_compiler_found ;
  	fi
  	;;
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
! esac ;'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi@noc.rutgers.edu 1994-08-24)
--- 87,116 ----
    exit 1
  fi
  
  
! dummy=dummy-$$
! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
  
+ # CC_FOR_BUILD -- compiler used by this script.
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
!  ,,)    echo "int dummy(){}" > $dummy.c ;
! 	for c in cc gcc c89 ; do
! 	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
! 	  if test $? = 0 ; then
  	     CC_FOR_BUILD="$c"; break ;
  	  fi ;
  	done ;
+ 	rm -f $dummy.c $dummy.o $dummy.rel ;
  	if test x"$CC_FOR_BUILD" = x ; then
  	  CC_FOR_BUILD=no_compiler_found ;
  	fi
  	;;
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
! esac'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi@noc.rutgers.edu 1994-08-24)
***************
*** 139,168 ****
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
! 	# NetBSD (nbsd) targets should (where applicable) match one or
  	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
  	# switched to ELF, *-*-netbsd* would select the old
  	# object file format.  This provides both forward
  	# compatibility and a consistent mechanism for selecting the
  	# object file format.
! 	#
! 	# Note: NetBSD doesn't particularly care about the vendor
! 	# portion of the name.  We always set it to "unknown".
! 	sysctl="sysctl -n hw.machine_arch"
! 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
! 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
! 	case "${UNAME_MACHINE_ARCH}" in
! 	    armeb) machine=armeb-unknown ;;
! 	    arm*) machine=arm-unknown ;;
! 	    sh3el) machine=shl-unknown ;;
! 	    sh3eb) machine=sh-unknown ;;
! 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
  	# to ELF recently, or will in the future.
! 	case "${UNAME_MACHINE_ARCH}" in
! 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
  			| grep __ELF__ >/dev/null
--- 127,155 ----
  
  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-unknown ;;
! 	    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 it has switched
  	# to ELF recently, or will in the future.
! 	case "${UNAME_MACHINE}" in
! 	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
  			| grep __ELF__ >/dev/null
***************
*** 179,243 ****
  		;;
  	esac
  	# The OS release
! 	# Debian GNU/NetBSD machines have a different userland, and
! 	# thus, need a distinct triplet. However, they do not need
! 	# kernel version information, so it can be replaced with a
! 	# suitable tag, in the style of linux-gnu.
! 	case "${UNAME_VERSION}" in
! 	    Debian*)
! 		release='-gnu'
! 		;;
! 	    *)
! 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
! 		;;
! 	esac
  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
  	exit 0 ;;
-     amiga:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     arc:OpenBSD:*:*)
- 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     hp300:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     mac68k:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     macppc:OpenBSD:*:*)
- 	echo powerpc-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 ;;
-     mvmeppc:OpenBSD:*:*)
- 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     pmax:OpenBSD:*:*)
- 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     sgi:OpenBSD:*:*)
- 	echo mipseb-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     sun3:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     wgrisc:OpenBSD:*:*)
- 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     *:OpenBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     *:MicroBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
- 	exit 0 ;;
      alpha:OSF1:*:*)
  	if test $UNAME_RELEASE = "V4.0"; then
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--- 166,177 ----
  		;;
  	esac
  	# 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}'`
***************
*** 246,252 ****
  	# 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.
- 	eval $set_cc_for_build
  	cat <<EOF >$dummy.s
  	.data
  \$Lformat:
--- 180,185 ----
***************
*** 272,280 ****
  	jsr \$26,exit
  	.end main
  EOF
! 	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
  	if test "$?" = 0 ; then
! 		case `$dummy` in
  			0-0)
  				UNAME_MACHINE="alpha"
  				;;
--- 205,214 ----
  	jsr \$26,exit
  	.end main
  EOF
! 	eval $set_cc_for_build
! 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
  	if test "$?" = 0 ; then
! 		case `./$dummy` in
  			0-0)
  				UNAME_MACHINE="alpha"
  				;;
***************
*** 296,306 ****
  			2-1307)
  				UNAME_MACHINE="alphaev68"
  				;;
- 			3-1307)
- 				UNAME_MACHINE="alphaev7"
- 				;;
  		esac
  	fi
  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
  	exit 0 ;;
      Alpha\ *:Windows_NT*:*)
--- 230,238 ----
  			2-1307)
  				UNAME_MACHINE="alphaev68"
  				;;
  		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*:*)
***************
*** 315,325 ****
      Amiga*:UNIX_System_V:4.0:*)
  	echo m68k-unknown-sysv4
  	exit 0;;
      *:[Aa]miga[Oo][Ss]:*:*)
  	echo ${UNAME_MACHINE}-unknown-amigaos
  	exit 0 ;;
!     *:[Mm]orph[Oo][Ss]:*:*)
! 	echo ${UNAME_MACHINE}-unknown-morphos
  	exit 0 ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
--- 247,275 ----
      Amiga*:UNIX_System_V:4.0:*)
  	echo m68k-unknown-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
***************
*** 341,350 ****
      NILE*:*:*:dcosx)
  	echo pyramid-pyramid-svr4
  	exit 0 ;;
-     DRS?6000:UNIX_SV:4.2*:7*)
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
- 	esac ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
--- 291,296 ----
***************
*** 373,379 ****
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
      sun*:*:4.2BSD:*)
! 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  	case "`/bin/arch`" in
  	    sun3)
--- 319,325 ----
  	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)
***************
*** 387,392 ****
--- 333,344 ----
      aushp:SunOS:*:*)
  	echo sparc-auspex-sunos${UNAME_RELEASE}
  	exit 0 ;;
+     sparc*:NetBSD:*)
+ 	echo `uname -p`-unknown-netbsd${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
***************
*** 413,418 ****
--- 365,382 ----
      *:*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 ;;
***************
*** 451,470 ****
  	  exit (-1);
  	}
  EOF
! 	$CC_FOR_BUILD -o $dummy $dummy.c \
! 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! 	  && exit 0
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
      Motorola:PowerMAX_OS:*:*)
  	echo powerpc-motorola-powermax
  	exit 0 ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
- 	exit 0 ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
- 	exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
  	echo powerpc-harris-powerunix
  	exit 0 ;;
--- 415,429 ----
  	  exit (-1);
  	}
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy \
! 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! 	  && rm -f $dummy.c $dummy && exit 0
! 	rm -f $dummy.c $dummy
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
      Motorola:PowerMAX_OS:*:*)
  	echo powerpc-motorola-powermax
  	exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
  	echo powerpc-harris-powerunix
  	exit 0 ;;
***************
*** 537,543 ****
  			exit(0);
  			}
  EOF
! 		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  		echo rs6000-ibm-aix3.2.5
  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
  		echo rs6000-ibm-aix3.2.4
--- 496,503 ----
  			exit(0);
  			}
  EOF
! 		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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
***************
*** 546,552 ****
  	fi
  	exit 0 ;;
      *:AIX:*:[45])
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
--- 506,512 ----
  	fi
  	exit 0 ;;
      *:AIX:*:[45])
! 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
***************
*** 586,593 ****
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
  	    9000/[678][0-9][0-9])
! 		if [ -x /usr/bin/getconf ]; then
! 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                      sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                      case "${sc_cpu_version}" in
                        523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
--- 546,555 ----
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
  	    9000/[678][0-9][0-9])
!               case "${HPUX_REV}" in
!                 11.[0-9][0-9])
!                   if [ -x /usr/bin/getconf ]; then
!                     sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                      sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                      case "${sc_cpu_version}" in
                        523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
***************
*** 596,608 ****
                          case "${sc_kernel_bits}" in
                            32) HP_ARCH="hppa2.0n" ;;
                            64) HP_ARCH="hppa2.0w" ;;
- 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                          esac ;;
                      esac
! 		fi
! 		if [ "${HP_ARCH}" = "" ]; then
! 		    eval $set_cc_for_build
! 		    sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
                #include <stdlib.h>
--- 558,570 ----
                          case "${sc_kernel_bits}" in
                            32) HP_ARCH="hppa2.0n" ;;
                            64) HP_ARCH="hppa2.0w" ;;
                          esac ;;
                      esac
!                   fi ;;
!               esac
!               if [ "${HP_ARCH}" = "" ]; then
! 	      eval $set_cc_for_build
!               sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
                #include <stdlib.h>
***************
*** 635,655 ****
                    exit (0);
                }
  EOF
! 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
! 		    test -z "$HP_ARCH" && HP_ARCH=hppa
! 		fi ;;
  	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
- 	    # avoid double evaluation of $set_cc_for_build
- 	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
- 		HP_ARCH="hppa64"
- 	    fi
- 	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
  	exit 0 ;;
      ia64:HP-UX:*:*)
--- 597,607 ----
                    exit (0);
                }
  EOF
! 	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
! 	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
! 	    rm -f $dummy.c $dummy
! 	fi ;;
  	esac
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
  	exit 0 ;;
      ia64:HP-UX:*:*)
***************
*** 683,689 ****
  	  exit (0);
  	}
  EOF
! 	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
--- 635,642 ----
  	  exit (0);
  	}
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $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:*:* )
***************
*** 711,716 ****
--- 664,672 ----
      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 ;;
***************
*** 729,734 ****
--- 685,693 ----
      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} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
***************
*** 741,761 ****
      CRAY*TS:*:*:*)
  	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
      CRAY*T3E:*:*:*)
  	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
      CRAY*SV1:*:*:*)
  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
!     *:UNICOS/mp:*:*)
! 	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
! 	exit 0 ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          exit 0 ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit 0 ;;
--- 700,726 ----
      CRAY*TS:*:*:*)
  	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
+     CRAY*T3D:*:*:*)
+ 	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
      CRAY*T3E:*:*:*)
  	echo alphaev5-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 ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          exit 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 ;;
***************
*** 766,783 ****
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
! 	# Determine whether the default compiler uses glibc.
! 	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#include <features.h>
! 	#if __GLIBC__ >= 2
! 	LIBC=gnu
! 	#else
! 	LIBC=
! 	#endif
! EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
  	exit 0 ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
--- 731,740 ----
  	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
***************
*** 788,804 ****
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit 0 ;;
-     x86:Interix*:3*)
- 	echo i586-pc-interix3
- 	exit 0 ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	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 i586-pc-interix
  	exit 0 ;;
      i*:UWIN*:*)
  	echo ${UNAME_MACHINE}-pc-uwin
--- 745,755 ----
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	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
***************
*** 819,866 ****
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
      ia64:Linux:*:*)
! 	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
      mips:Linux:*:*)
! 	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#undef CPU
! 	#undef mips
! 	#undef mipsel
! 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! 	CPU=mipsel
! 	#else
! 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! 	CPU=mips
! 	#else
! 	CPU=
! 	#endif
! 	#endif
! EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
! 	;;
!     mips64:Linux:*:*)
! 	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#undef CPU
! 	#undef mips64
! 	#undef mips64el
! 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! 	CPU=mips64el
! 	#else
! 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! 	CPU=mips64
! 	#else
! 	CPU=
! 	#endif
! 	#endif
! EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
  	;;
      ppc:Linux:*:*)
  	echo powerpc-unknown-linux-gnu
--- 770,785 ----
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
      ia64:Linux:*:*)
! 	echo ${UNAME_MACHINE}-unknown-linux
  	exit 0 ;;
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit 0 ;;
      mips:Linux:*:*)
! 	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
! 	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
! 	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
! 	esac
  	;;
      ppc:Linux:*:*)
  	echo powerpc-unknown-linux-gnu
***************
*** 909,916 ****
  	# 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.
! 	# Set LC_ALL=C to ensure ld outputs messages in English.
! 	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
  			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
  				    s/.*supported targets: *//
--- 828,834 ----
  	# 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_supported_targets=`cd /; ld --help 2>&1 \
  			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
  				    s/.*supported targets: *//
***************
*** 922,928 ****
  		;;
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! 		exit 0 ;;
  	  coff-i386)
  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
  		exit 0 ;;
--- 840,846 ----
  		;;
  	  a.out-i386-linux)
  		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! 		exit 0 ;;		
  	  coff-i386)
  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
  		exit 0 ;;
***************
*** 934,961 ****
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
! 	sed 's/^	//' << EOF >$dummy.c
! 	#include <features.h>
! 	#ifdef __ELF__
! 	# ifdef __GLIBC__
! 	#  if __GLIBC__ >= 2
! 	LIBC=gnu
! 	#  else
! 	LIBC=gnulibc1
! 	#  endif
! 	# else
! 	LIBC=gnulibc1
! 	# endif
! 	#else
! 	#ifdef __INTEL_COMPILER
! 	LIBC=gnu
! 	#else
! 	LIBC=gnuaout
! 	#endif
! 	#endif
  EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
  	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
  	;;
      i*86:DYNIX/ptx:4*:*)
--- 852,883 ----
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
! 	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-pc-linux-gnu\n", argv[1]);
! #  else
!     printf ("%s-pc-linux-gnulibc1\n", argv[1]);
! #  endif
! # else
!    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
! # endif
! #else
!   printf ("%s-pc-linux-gnuaout\n", argv[1]);
! #endif
!   return 0;
! }
  EOF
! 	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
! 	rm -f $dummy.c $dummy
  	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
  	;;
      i*86:DYNIX/ptx:4*:*)
***************
*** 972,994 ****
          # Use sysv4.2uw... so that sysv4* matches it.
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit 0 ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
- 	exit 0 ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
- 	exit 0 ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
- 	exit 0 ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit 0 ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
- 	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
--- 894,899 ----
***************
*** 1010,1028 ****
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
  		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
  	elif /bin/uname -X 2>/dev/null >/dev/null ; then
! 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
! 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
! 		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
  			&& UNAME_MACHINE=i586
! 		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
  			&& UNAME_MACHINE=i686
! 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
  			&& UNAME_MACHINE=i686
  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
  	exit 0 ;;
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
--- 915,936 ----
  		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
***************
*** 1046,1060 ****
  	# "miniframe"
  	echo m68010-convergent-sysv
  	exit 0 ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
- 	exit 0 ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
- 	exit 0 ;;
      M68*:*:R3V[567]*:*)
  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
!     3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
--- 954,962 ----
  	# "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]??A:*: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`
***************
*** 1071,1076 ****
--- 973,981 ----
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit 0 ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
      TSUNAMI:LynxOS:2.*:*)
  	echo sparc-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
***************
*** 1142,1150 ****
      SX-5:SUPER-UX:*:*)
  	echo sx5-nec-superux${UNAME_RELEASE}
  	exit 0 ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
- 	exit 0 ;;
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  	exit 0 ;;
--- 1047,1052 ----
***************
*** 1152,1175 ****
  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  	exit 0 ;;
      *:Darwin:*:*)
! 	case `uname -p` in
! 	    *86) UNAME_PROCESSOR=i686 ;;
! 	    powerpc) UNAME_PROCESSOR=powerpc ;;
! 	esac
! 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
! 	UNAME_PROCESSOR=`uname -p`
! 	if test "$UNAME_PROCESSOR" = "x86"; then
! 		UNAME_PROCESSOR=i386
  		UNAME_MACHINE=pc
  	fi
! 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
  	exit 0 ;;
      *:QNX:*:4*)
  	echo i386-pc-qnx
  	exit 0 ;;
!     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
      *:NonStop-UX:*:*)
--- 1054,1071 ----
  	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-[KW]:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
  	exit 0 ;;
      *:NonStop-UX:*:*)
***************
*** 1192,1197 ****
--- 1088,1098 ----
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
  	exit 0 ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+ 	exit 0 ;;
      *:TOPS-10:*:*)
  	echo pdp10-unknown-tops10
  	exit 0 ;;
***************
*** 1210,1215 ****
--- 1111,1122 ----
      *:ITS:*:*)
  	echo pdp10-unknown-its
  	exit 0 ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+ 	exit 0 ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
***************
*** 1330,1336 ****
  }
  EOF
  
! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
  
  # Apollos put the system type in the environment.
  
--- 1237,1244 ----
  }
  EOF
  
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
  
  # Apollos put the system type in the environment.
  
diff -crN ./libIDL/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/config.sub
*** ./libIDL/config.sub	Mon May 26 18:12:13 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/config.sub	Thu Dec 18 19:46:07 2003
***************
*** 1,9 ****
  #! /bin/sh
  # Configuration validation subroutine script.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
! timestamp='2003-01-03'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
--- 1,9 ----
  #! /bin/sh
  # Configuration validation subroutine script.
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! #   Free Software Foundation, Inc.
  
! timestamp='2001-09-07'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
***************
*** 29,36 ****
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
! # Please send patches to <config-patches@gnu.org>.  Submit a context
! # diff and a properly formatted ChangeLog entry.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
--- 29,35 ----
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
! # Please send patches to <config-patches@gnu.org>.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
***************
*** 118,124 ****
  # 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* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
--- 117,123 ----
  # 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* | storm-chaos* | os2-emx* | windows32-*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
***************
*** 227,271 ****
  	1750a | 580 \
  	| a29k \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! 	| clipper \
! 	| d10v | d30v | dlx | dsp16xx \
! 	| fr30 | frv \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
- 	| ip2k \
  	| m32r | m68000 | m68k | m88k | mcore \
! 	| mips | mipsbe | mipseb | mipsel | mipsle \
! 	| mips16 \
! 	| mips64 | mips64el \
! 	| mips64vr | mips64vrel \
! 	| mips64orion | mips64orionel \
! 	| mips64vr4100 | mips64vr4100el \
! 	| mips64vr4300 | mips64vr4300el \
! 	| mips64vr5000 | mips64vr5000el \
! 	| mipsisa32 | mipsisa32el \
! 	| mipsisa32r2 | mipsisa32r2el \
! 	| mipsisa64 | mipsisa64el \
! 	| mipsisa64sb1 | mipsisa64sb1el \
! 	| mipsisa64sr71k | mipsisa64sr71kel \
! 	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
- 	| msp430 \
  	| ns16k | ns32k \
! 	| openrisc | or32 \
  	| pdp10 | pdp11 | pj | pjl \
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
  	| s390 | s390x \
! 	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
! 	| sh64 | sh64le \
! 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
! 	| strongarm \
  	| tahoe | thumb | tic80 | tron \
! 	| v850 | v850e \
  	| we32k \
! 	| x86 | xscale | xstormy16 | xtensa \
  	| z8k)
  		basic_machine=$basic_machine-unknown
  		;;
--- 226,257 ----
  	1750a | 580 \
  	| a29k \
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! 	| c4x | clipper \
! 	| d10v | d30v | dsp16xx \
! 	| fr30 \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
  	| m32r | m68000 | m68k | m88k | mcore \
! 	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
! 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
! 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
! 	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
! 	| mipsisa32 \
  	| mn10200 | mn10300 \
  	| ns16k | ns32k \
! 	| openrisc \
  	| pdp10 | pdp11 | pj | pjl \
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
  	| s390 | s390x \
! 	| sh | sh[34] | sh[34]eb | shbe | shle \
! 	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
! 	| stormy16 | strongarm \
  	| tahoe | thumb | tic80 | tron \
! 	| v850 \
  	| we32k \
! 	| x86 | xscale \
  	| z8k)
  		basic_machine=$basic_machine-unknown
  		;;
***************
*** 292,345 ****
  	580-* \
  	| a29k-* \
  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
! 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
! 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
! 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
! 	| avr-* \
  	| bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
! 	| clipper-* | cydra-* \
! 	| d10v-* | d30v-* | dlx-* \
  	| elxsi-* \
! 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* \
  	| m32r-* \
! 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
  	| m88110-* | m88k-* | mcore-* \
! 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
! 	| mips16-* \
! 	| mips64-* | mips64el-* \
! 	| mips64vr-* | mips64vrel-* \
! 	| mips64orion-* | mips64orionel-* \
! 	| mips64vr4100-* | mips64vr4100el-* \
! 	| mips64vr4300-* | mips64vr4300el-* \
! 	| mips64vr5000-* | mips64vr5000el-* \
! 	| mipsisa32-* | mipsisa32el-* \
! 	| mipsisa32r2-* | mipsisa32r2el-* \
! 	| mipsisa64-* | mipsisa64el-* \
! 	| mipsisa64sb1-* | mipsisa64sb1el-* \
! 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
! 	| mipstx39-* | mipstx39el-* \
! 	| msp430-* \
! 	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
  	| s390-* | s390x-* \
! 	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
! 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
! 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! 	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
! 	| v850-* | v850e-* | vax-* \
  	| we32k-* \
! 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
! 	| xtensa-* \
  	| ymp-* \
  	| z8k-*)
  		;;
--- 278,315 ----
  	580-* \
  	| a29k-* \
  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
! 	| alphapca5[67]-* | arc-* \
! 	| arm-*  | armbe-* | armle-* | armv*-* \
  	| bs2000-* \
! 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
! 	| clipper-* | cray2-* | cydra-* \
! 	| d10v-* | d30v-* \
  	| elxsi-* \
! 	| f30[01]-* | f700-* | fr30-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| m32r-* \
! 	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
  	| m88110-* | m88k-* | mcore-* \
! 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
! 	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
! 	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
! 	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
! 	| none-* | np1-* | ns16k-* | ns32k-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
  	| s390-* | s390x-* \
! 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
! 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
! 	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
! 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
! 	| v850-* | vax-* \
  	| we32k-* \
! 	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
  	| ymp-* \
  	| z8k-*)
  		;;
***************
*** 404,413 ****
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
--- 374,379 ----
***************
*** 428,435 ****
  		basic_machine=c38-convex
  		os=-bsd
  		;;
! 	cray | j90)
! 		basic_machine=j90-cray
  		os=-unicos
  		;;
  	crds | unos)
--- 394,409 ----
  		basic_machine=c38-convex
  		os=-bsd
  		;;
! 	cray | ymp)
! 		basic_machine=ymp-cray
! 		os=-unicos
! 		;;
! 	cray2)
! 		basic_machine=cray2-cray
! 		os=-unicos
! 		;;
! 	[cjt]90)
! 		basic_machine=${basic_machine}-cray
  		os=-unicos
  		;;
  	crds | unos)
***************
*** 444,457 ****
  	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
  		basic_machine=mips-dec
  		;;
- 	decsystem10* | dec10*)
- 		basic_machine=pdp10-dec
- 		os=-tops10
- 		;;
- 	decsystem20* | dec20*)
- 		basic_machine=pdp10-dec
- 		os=-tops20
- 		;;
  	delta | 3300 | motorola-3300 | motorola-delta \
  	      | 3300-motorola | delta-motorola)
  		basic_machine=m68k-motorola
--- 418,423 ----
***************
*** 632,637 ****
--- 598,611 ----
  		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/'`
  		;;
***************
*** 646,655 ****
  		basic_machine=m68k-rom68k
  		os=-coff
  		;;
- 	morphos)
- 		basic_machine=powerpc-unknown
- 		os=-morphos
- 		;;
  	msdos)
  		basic_machine=i386-pc
  		os=-msdos
--- 620,625 ----
***************
*** 722,731 ****
  	np1)
  		basic_machine=np1-gould
  		;;
- 	nv1)
- 		basic_machine=nv1-cray
- 		os=-unicosmp
- 		;;
  	nsr-tandem)
  		basic_machine=nsr-tandem
  		;;
--- 692,697 ----
***************
*** 733,742 ****
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
- 	or32 | or32-*)
- 		basic_machine=or32-unknown
- 		os=-coff
- 		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
  		os=-ose
--- 699,704 ----
***************
*** 759,777 ****
  	pbb)
  		basic_machine=m68k-tti
  		;;
! 	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
  		basic_machine=i686-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumpro-* | p6-* | 6x86-* | athlon-*)
--- 721,739 ----
  	pbb)
  		basic_machine=m68k-tti
  		;;
!         pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
! 	pentium | p5 | k5 | k6 | nexgen)
  		basic_machine=i586-pc
  		;;
! 	pentiumpro | p6 | 6x86 | athlon)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
  		basic_machine=i686-pc
  		;;
! 	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumpro-* | p6-* | 6x86-* | athlon-*)
***************
*** 786,807 ****
  	power)	basic_machine=power-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
! 		;;
  	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
! 		;;
  	ppcle-* | powerpclittle-*)
  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppc64)	basic_machine=powerpc64-unknown
! 		;;
  	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
  		basic_machine=powerpc64le-unknown
! 		;;
  	ppc64le-* | powerpc64little-*)
  		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
--- 748,769 ----
  	power)	basic_machine=power-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
! 	        ;;
  	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
! 	        ;;
  	ppcle-* | powerpclittle-*)
  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppc64)	basic_machine=powerpc64-unknown
! 	        ;;
  	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
  		basic_machine=powerpc64le-unknown
! 	        ;;
  	ppc64le-* | powerpc64little-*)
  		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
***************
*** 826,837 ****
  		basic_machine=a29k-amd
  		os=-udi
  		;;
- 	sb1)
- 		basic_machine=mipsisa64sb1-unknown
- 		;;
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
--- 788,793 ----
***************
*** 839,845 ****
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
! 	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
--- 795,801 ----
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
! 	sparclite-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
***************
*** 906,922 ****
  		os=-dynix
  		;;
  	t3e)
! 		basic_machine=alphaev5-cray
  		os=-unicos
  		;;
- 	t90)
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
-         tic4x | c4x*)
- 		basic_machine=tic4x-unknown
- 		os=-coff
- 		;;
  	tic54x | c54x*)
  		basic_machine=tic54x-unknown
  		os=-coff
--- 862,870 ----
  		os=-dynix
  		;;
  	t3e)
! 		basic_machine=t3e-cray
  		os=-unicos
  		;;
  	tic54x | c54x*)
  		basic_machine=tic54x-unknown
  		os=-coff
***************
*** 927,936 ****
  	tx39el)
  		basic_machine=mipstx39el-unknown
  		;;
- 	toad1)
- 		basic_machine=pdp10-xkl
- 		os=-tops20
- 		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
--- 875,880 ----
***************
*** 955,962 ****
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
! 		basic_machine=f301-fujitsu
! 		;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
--- 899,906 ----
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
!                basic_machine=f301-fujitsu
!                ;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
***************
*** 977,989 ****
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
! 	xps | xps100)
! 		basic_machine=xps100-honeywell
  		;;
! 	ymp)
! 		basic_machine=ymp-cray
  		os=-unicos
  		;;
  	z8k-*-coff)
  		basic_machine=z8k-unknown
  		os=-sim
--- 921,937 ----
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
! 	windows32)
! 		basic_machine=i386-pc
! 		os=-windows32-msvcrt
  		;;
! 	xmp)
! 		basic_machine=xmp-cray
  		os=-unicos
  		;;
+         xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
  	z8k-*-coff)
  		basic_machine=z8k-unknown
  		os=-sim
***************
*** 1004,1009 ****
--- 952,964 ----
  	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
  		;;
***************
*** 1023,1038 ****
  	we32k)
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
  		basic_machine=sh-unknown
  		;;
- 	sh64)
- 		basic_machine=sh64-unknown
- 		;;
  	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
! 	cydra)
  		basic_machine=cydra-cydrome
  		;;
  	orion)
--- 978,990 ----
  	we32k)
  		basic_machine=we32k-att
  		;;
! 	sh3 | sh4 | sh3eb | sh4eb)
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
!         cydra)
  		basic_machine=cydra-cydrome
  		;;
  	orion)
***************
*** 1047,1052 ****
--- 999,1008 ----
  	pmac | pmac-mpw)
  		basic_machine=powerpc-apple
  		;;
+ 	c4x*)
+ 		basic_machine=c4x-none
+ 		os=-coff
+ 		;;
  	*-unknown)
  		# Make sure to match an already-canonicalized machine name.
  		;;
***************
*** 1109,1120 ****
  	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
! 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
! 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! 	      | -powermax* | -dnix* | -microbsd*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
--- 1065,1074 ----
  	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
! 	      | -os2* | -vos*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
***************
*** 1126,1135 ****
  			;;
  		esac
  		;;
- 	-nto-qnx*)
- 		;;
  	-nto*)
! 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
--- 1080,1087 ----
  			;;
  		esac
  		;;
  	-nto*)
! 		os=-nto-qnx
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
***************
*** 1168,1187 ****
  	-acis*)
  		os=-aos
  		;;
- 	-atheos*)
- 		os=-atheos
- 		;;
  	-386bsd)
  		os=-bsd
  		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
- 	-nova*)
- 		os=-rtmk-nova
- 		;;
  	-ns2 )
! 		os=-nextstep2
  		;;
  	-nsk*)
  		os=-nsk
--- 1120,1133 ----
  	-acis*)
  		os=-aos
  		;;
  	-386bsd)
  		os=-bsd
  		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
  	-ns2 )
! 	        os=-nextstep2
  		;;
  	-nsk*)
  		os=-nsk
***************
*** 1220,1227 ****
  	-xenix)
  		os=-xenix
  		;;
! 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! 		os=-mint
  		;;
  	-none)
  		;;
--- 1166,1173 ----
  	-xenix)
  		os=-xenix
  		;;
!         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! 	        os=-mint
  		;;
  	-none)
  		;;
***************
*** 1254,1264 ****
  	arm*-semi)
  		os=-aout
  		;;
- 	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
  		;;
! 	pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
--- 1200,1209 ----
  	arm*-semi)
  		os=-aout
  		;;
  	pdp10-*)
  		os=-tops20
  		;;
!         pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
***************
*** 1285,1293 ****
  	mips*-*)
  		os=-elf
  		;;
- 	or32-*)
- 		os=-coff
- 		;;
  	*-tti)	# must be before sparc entry or we get the wrong os.
  		os=-sysv3
  		;;
--- 1230,1235 ----
***************
*** 1351,1369 ****
  	*-next)
  		os=-nextstep3
  		;;
! 	*-gould)
  		os=-sysv
  		;;
! 	*-highlevel)
  		os=-bsd
  		;;
  	*-encore)
  		os=-bsd
  		;;
! 	*-sgi)
  		os=-irix
  		;;
! 	*-siemens)
  		os=-sysv4
  		;;
  	*-masscomp)
--- 1293,1311 ----
  	*-next)
  		os=-nextstep3
  		;;
!         *-gould)
  		os=-sysv
  		;;
!         *-highlevel)
  		os=-bsd
  		;;
  	*-encore)
  		os=-bsd
  		;;
!         *-sgi)
  		os=-irix
  		;;
!         *-siemens)
  		os=-sysv4
  		;;
  	*-masscomp)
***************
*** 1435,1441 ****
  			-ptx*)
  				vendor=sequent
  				;;
! 			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs
  				;;
  			-aux*)
--- 1377,1383 ----
  			-ptx*)
  				vendor=sequent
  				;;
! 			-vxsim* | -vxworks*)
  				vendor=wrs
  				;;
  			-aux*)
diff -crN ./libIDL/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/configure
*** ./libIDL/configure	Mon May 26 18:12:17 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/configure	Thu Dec 18 19:46:35 2003
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57.
  #
  # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.54.
  #
  # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
***************
*** 36,45 ****
  PS4='+ '
  
  # NLS nuisances.
! for as_var in \
!   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
!   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
!   LC_TELEPHONE LC_TIME
  do
    if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
--- 36,42 ----
  PS4='+ '
  
  # NLS nuisances.
! for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
  do
    if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
***************
*** 85,99 ****
  
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
!   echo "#! /bin/sh" >conf$$.sh
!   echo  "exit 0"   >>conf$$.sh
!   chmod +x conf$$.sh
!   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
      PATH_SEPARATOR=';'
    else
      PATH_SEPARATOR=:
    fi
!   rm -f conf$$.sh
  fi
  
  
--- 82,96 ----
  
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
!   echo "#! /bin/sh" >conftest.sh
!   echo  "exit 0"   >>conftest.sh
!   chmod +x conftest.sh
!   if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
      PATH_SEPARATOR=';'
    else
      PATH_SEPARATOR=:
    fi
!   rm -f conftest.sh
  fi
  
  
***************
*** 467,473 ****
  # include <unistd.h>
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBIDL_MAJOR_VERSION LIBIDL_MINOR_VERSION LIBIDL_MICRO_VERSION LIBIDL_VERSION LT_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP LEX LEXLIB LEX_OUTPUT_ROOT LFLAGS YACC HAVE_YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP EGREP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKG_CONFIG LIBIDL_CFLAGS LIBIDL_LIBS HAVE_WCHAR_H HAVE_WCSTR_H IDL_LL WARN_CFLAGS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
--- 464,470 ----
  # include <unistd.h>
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBIDL_MAJOR_VERSION LIBIDL_MINOR_VERSION LIBIDL_MICRO_VERSION LIBIDL_VERSION LT_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LEX LEXLIB LEX_OUTPUT_ROOT LFLAGS YACC HAVE_YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PKG_CONFIG LIBIDL_CFLAGS LIBIDL_LIBS HAVE_WCHAR_H HAVE_WCSTR_H IDL_LL WARN_CFLAGS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
***************
*** 1008,1013 ****
--- 1005,1012 ----
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-compile-warnings=no/yes Turn on compiler warnings.
+   --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors
    --enable-shared=PKGS  build shared libraries default=yes
    --enable-static=PKGS  build static libraries default=yes
    --enable-fast-install=PKGS  optimize for fast installation default=yes
***************
*** 1109,1115 ****
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.57.  Invocation command line was
  
    $ $0 $@
  
--- 1108,1114 ----
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.54.  Invocation command line was
  
    $ $0 $@
  
***************
*** 1161,1214 ****
  
  # Keep a trace of the command line.
  # Strip out --no-create and --no-recursion so they do not pile up.
- # Strip out --silent because we don't want to record it for future runs.
  # Also quote any args containing shell meta-characters.
- # Make two passes to allow for proper duplicate-argument suppression.
  ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
  ac_sep=
! ac_must_keep_next=false
! for ac_pass in 1 2
  do
!   for ac_arg
!   do
!     case $ac_arg in
!     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
!     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
!     | -silent | --silent | --silen | --sile | --sil)
!       continue ;;
!     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
!       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
!     esac
!     case $ac_pass in
!     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
!     2)
!       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
!       if test $ac_must_keep_next = true; then
!         ac_must_keep_next=false # Got value, back to normal.
!       else
!         case $ac_arg in
!           *=* | --config-cache | -C | -disable-* | --disable-* \
!           | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
!           | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
!           | -with-* | --with-* | -without-* | --without-* | --x)
!             case "$ac_configure_args0 " in
!               "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
!             esac
!             ;;
!           -* ) ac_must_keep_next=true ;;
!         esac
!       fi
!       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
!       # Get rid of the leading space.
!       ac_sep=" "
!       ;;
!     esac
!   done
  done
- $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
- $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
--- 1160,1183 ----
  
  # Keep a trace of the command line.
  # Strip out --no-create and --no-recursion so they do not pile up.
  # Also quote any args containing shell meta-characters.
  ac_configure_args=
  ac_sep=
! for ac_arg
  do
!   case $ac_arg in
!   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
!   | --no-cr | --no-c | -n ) continue ;;
!   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
!   | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
!     continue ;;
!   *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
!     ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
!   esac
!   ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
!   # Get rid of the leading space.
!   ac_sep=" "
  done
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
***************
*** 1460,1466 ****
  LT_VERSION=0:0:0
  
  
! am__api_version="1.4"
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
--- 1429,1435 ----
  LT_VERSION=0:0:0
  
  
! am__api_version="1.7"
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
***************
*** 1567,1586 ****
  echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
  # 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
--- 1536,1556 ----
  echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
  # Just in case
  sleep 1
! echo timestamp > conftest.file
  # 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 conftest.file 2> /dev/null`
     if test "$*" = "X"; then
        # -L didn't work.
!       set X `ls -t $srcdir/configure conftest.file`
     fi
!    rm -f conftest.file
!    if test "$*" != "X $srcdir/configure conftest.file" \
!       && test "$*" != "X conftest.file $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
***************
*** 1593,1599 ****
     { (exit 1); exit 1; }; }
     fi
  
!    test "$2" = conftestfile
     )
  then
     # Ok.
--- 1563,1569 ----
     { (exit 1); exit 1; }; }
     fi
  
!    test "$2" = conftest.file
     )
  then
     # Ok.
***************
*** 1605,1611 ****
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
- rm -f conftest*
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  test "$program_prefix" != NONE &&
--- 1575,1580 ----
***************
*** 1621,1635 ****
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
  rm conftest.sed
  
! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
! echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
  if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.make <<\_ACEOF
  all:
! 	@echo 'ac_maketemp="$(MAKE)"'
  _ACEOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--- 1590,1658 ----
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
  rm conftest.sed
  
! 
! # expand $ac_aux_dir to an absolute path
! am_aux_dir=`cd $ac_aux_dir && pwd`
! 
! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
! # Use eval to expand $SHELL
! if eval "$MISSING --run true"; then
!   am_missing_run="$MISSING --run "
! else
!   am_missing_run=
!   { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
! echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
! fi
! 
! for ac_prog in gawk mawk nawk awk
! do
!   # Extract the first word of "$ac_prog", so it can be a program name with args.
! set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_prog_AWK+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   if test -n "$AWK"; then
!   ac_cv_prog_AWK="$AWK" # Let the user override the test.
! else
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
!     ac_cv_prog_AWK="$ac_prog"
!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
!     break 2
!   fi
! done
! done
! 
! fi
! fi
! AWK=$ac_cv_prog_AWK
! if test -n "$AWK"; then
!   echo "$as_me:$LINENO: result: $AWK" >&5
! echo "${ECHO_T}$AWK" >&6
! else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
! 
!   test -n "$AWK" && break
! done
! 
! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
! echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
  if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.make <<\_ACEOF
  all:
! 	@echo 'ac_maketemp="${MAKE}"'
  _ACEOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
***************
*** 1650,1743 ****
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
! 
! PACKAGE=libIDL
! 
! VERSION=$LIBIDL_VERSION
! 
! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
  echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
  
  
- missing_dir=`cd $ac_aux_dir && pwd`
- echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
- echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6
- # 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-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-    ACLOCAL=aclocal-${am__api_version}
-    echo "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-    ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-    echo "$as_me:$LINENO: result: missing" >&5
- echo "${ECHO_T}missing" >&6
- fi
- 
- echo "$as_me:$LINENO: checking for working autoconf" >&5
- echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
- # 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 "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-    AUTOCONF="$missing_dir/missing autoconf"
-    echo "$as_me:$LINENO: result: missing" >&5
- echo "${ECHO_T}missing" >&6
- fi
- 
- echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
- echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6
- # 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-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-${am__api_version}
-    echo "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-    AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-    echo "$as_me:$LINENO: result: missing" >&5
- echo "${ECHO_T}missing" >&6
- fi
- 
- echo "$as_me:$LINENO: checking for working autoheader" >&5
- echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
- # 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 "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-    AUTOHEADER="$missing_dir/missing autoheader"
-    echo "$as_me:$LINENO: result: missing" >&5
- echo "${ECHO_T}missing" >&6
- fi
- 
- echo "$as_me:$LINENO: checking for working makeinfo" >&5
- echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
- # 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 "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-    MAKEINFO="$missing_dir/missing makeinfo"
-    echo "$as_me:$LINENO: result: missing" >&5
- echo "${ECHO_T}missing" >&6
  fi
  
  
  
--- 1673,1813 ----
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
!  # test to see if srcdir already configured
! if test "`cd $srcdir && pwd`" != "`pwd`" &&
!    test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
  echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
+ # test whether we have cygpath
+ if test -z "$CYGPATH_W"; then
+   if (cygpath --version) >/dev/null 2>/dev/null; then
+     CYGPATH_W='cygpath -w'
+   else
+     CYGPATH_W=echo
+   fi
+ fi
+ 
+ 
+ # Define the identity of the package.
+  PACKAGE=libIDL
+  VERSION=$LIBIDL_VERSION
+ 
+ 
+ # Some tools Automake needs.
+ 
+ ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+ 
+ 
+ AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+ 
+ 
+ AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+ 
+ 
+ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+ 
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+ 
+ AMTAR=${AMTAR-"${am_missing_run}tar"}
+ 
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ 
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'.  However `strip' might not be the right
+ # tool to use in cross-compilation environments, therefore Automake
+ # will honor the `STRIP' environment variable to overrule this program.
+ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+   echo "$as_me:$LINENO: result: $STRIP" >&5
+ echo "${ECHO_T}$STRIP" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+   test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+   echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+ echo "${ECHO_T}$ac_ct_STRIP" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
  
+   STRIP=$ac_ct_STRIP
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
  
  fi
+ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+ 
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ 
  
  
  
***************
*** 1767,1772 ****
--- 1837,1915 ----
  echo "${ECHO_T}$ac_cv_linc_aclocal_flags" >&6
  ACLOCAL="$ACLOCAL $ac_cv_linc_aclocal_flags"
  
+ rm -f .deps 2>/dev/null
+ mkdir .deps 2>/dev/null
+ if test -d .deps; then
+   DEPDIR=.deps
+ else
+   # MS-DOS does not allow filenames that begin with a dot.
+   DEPDIR=_deps
+ fi
+ rmdir .deps 2>/dev/null
+ 
+ 
+           ac_config_commands="$ac_config_commands depfiles"
+ 
+ 
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ doit:
+ 	@echo done
+ END
+ # If we don't find an include directive, just comment out the code.
+ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+ echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+ am__include="#"
+ am__quote=
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+ # We grep out `Entering directory' and `Leaving directory'
+ # messages which can occur if `w' ends up in MAKEFLAGS.
+ # In particular we don't look at `^make:' because GNU make might
+ # be invoked under some other name (usually "gmake"), in which
+ # case it prints its new name instead of `make'.
+ if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+    am__include=include
+    am__quote=
+    _am_result=GNU
+ fi
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+    echo '.include "confinc"' > confmf
+    if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+       am__include=.include
+       am__quote="\""
+       _am_result=BSD
+    fi
+ fi
+ 
+ 
+ echo "$as_me:$LINENO: result: $_am_result" >&5
+ echo "${ECHO_T}$_am_result" >&6
+ rm -f confinc confmf
+ 
+ # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+   enableval="$enable_dependency_tracking"
+ 
+ fi;
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+ fi
+ 
+ 
+ if test "x$enable_dependency_tracking" != xno; then
+   AMDEP_TRUE=
+   AMDEP_FALSE='#'
+ else
+   AMDEP_TRUE='#'
+   AMDEP_FALSE=
+ fi
+ 
+ 
+ 
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
***************
*** 2076,2085 ****
  fi
  
  
! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
! See \`config.log' for more details." >&5
! echo "$as_me: error: no acceptable C compiler found in \$PATH
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
--- 2219,2226 ----
  fi
  
  
! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
***************
*** 2104,2114 ****
  
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 2245,2251 ----
  
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 2119,2125 ****
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
! ac_clean_files="$ac_clean_files a.out a.exe b.out"
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
--- 2256,2262 ----
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
! ac_clean_files="$ac_clean_files a.out a.exe"
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
***************
*** 2138,2176 ****
  # Be careful to initialize this variable, since it used to be cached.
  # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
  ac_cv_exeext=
! # b.out is created by i960 compilers.
! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
! do
    test -f "$ac_file" || continue
    case $ac_file in
!     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
!         ;;
!     conftest.$ac_ext )
!         # This is the source file.
!         ;;
!     [ab].out )
!         # We found the default executable, but exeext='' is most
!         # certainly right.
!         break;;
!     *.* )
!         ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
!         # FIXME: I believe we export ac_cv_exeext for Libtool,
!         # but it would be cool to find out if it's true.  Does anybody
!         # maintain Libtool? --akim.
!         export ac_cv_exeext
!         break;;
!     * )
!         break;;
    esac
  done
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  { { echo "$as_me:$LINENO: error: C compiler cannot create executables
! See \`config.log' for more details." >&5
  echo "$as_me: error: C compiler cannot create executables
! See \`config.log' for more details." >&2;}
     { (exit 77); exit 77; }; }
  fi
  
--- 2275,2301 ----
  # Be careful to initialize this variable, since it used to be cached.
  # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
  ac_cv_exeext=
! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
!     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
!     a.out ) # We found the default executable, but exeext='' is most
!             # certainly right.
!             break;;
!     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
!           # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
!           export ac_cv_exeext
!           break;;
!     * ) break;;
    esac
  done
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  { { echo "$as_me:$LINENO: error: C compiler cannot create executables
! check \`config.log' for details." >&5
  echo "$as_me: error: C compiler cannot create executables
! check \`config.log' for details." >&2;}
     { (exit 77); exit 77; }; }
  fi
  
***************
*** 2197,2207 ****
  	cross_compiling=yes
      else
  	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
! If you meant to cross compile, use \`--host'.
! See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run C compiled programs.
! If you meant to cross compile, use \`--host'.
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
      fi
    fi
--- 2322,2330 ----
  	cross_compiling=yes
      else
  	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
! If you meant to cross compile, use \`--host'." >&5
  echo "$as_me: error: cannot run C compiled programs.
! If you meant to cross compile, use \`--host'." >&2;}
     { (exit 1); exit 1; }; }
      fi
    fi
***************
*** 2209,2215 ****
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
! rm -f a.out a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
  # Check the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
--- 2332,2338 ----
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
  
! rm -f a.out a.exe conftest$ac_cv_exeext
  ac_clean_files=$ac_clean_files_save
  # Check the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
***************
*** 2240,2249 ****
    esac
  done
  else
!   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
! See \`config.log' for more details." >&5
! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
  
--- 2363,2370 ----
    esac
  done
  else
!   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
***************
*** 2261,2271 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 2382,2388 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 2290,2301 ****
  done
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
! See \`config.log' for more details." >&5
! echo "$as_me: error: cannot compute suffix of object files: cannot compile
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
  
--- 2407,2415 ----
  done
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
! echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
***************
*** 2312,2322 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 2426,2432 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 2344,2351 ****
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_compiler_gnu=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 2454,2460 ----
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_compiler_gnu=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 2365,2375 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 2474,2480 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 2394,2401 ****
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_prog_cc_g=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 2499,2505 ----
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_prog_cc_g=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 2426,2436 ****
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
--- 2530,2536 ----
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
***************
*** 2493,2500 ****
  break
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext
  done
--- 2593,2599 ----
  break
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext
  done
***************
*** 2545,2555 ****
  do
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdlib.h>
  $ac_declaration
  int
--- 2644,2650 ----
  do
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
  int
***************
*** 2575,2592 ****
    :
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  continue
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_declaration
  int
  main ()
--- 2670,2682 ----
    :
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  continue
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_declaration
  int
  main ()
***************
*** 2611,2618 ****
    break
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
--- 2701,2707 ----
    break
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
***************
*** 2625,2632 ****
  
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
--- 2714,2720 ----
  
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
***************
*** 2635,2640 ****
--- 2723,2809 ----
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
+ depcc="$CC"   am_compiler_list=
+ 
+ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+   # making a dummy file named `D' -- because `-MD' means `put the output
+   # in D'.
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+   # using a relative directory.
+   cp "$am_depcomp" conftest.dir
+   cd conftest.dir
+ 
+   am_cv_CC_dependencies_compiler_type=none
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
+   for depmode in $am_compiler_list; do
+     # We need to recreate these files for each test, as the compiler may
+     # overwrite some of them when testing with obscure command lines.
+     # This happens at least with the AIX C compiler.
+     echo '#include "conftest.h"' > conftest.c
+     echo 'int i;' > conftest.h
+     echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ 
+     case $depmode in
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+ 	break
+       fi
+       ;;
+     none) break ;;
+     esac
+     # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+     # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+        grep conftest.h conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       am_cv_CC_dependencies_compiler_type=$depmode
+       break
+     fi
+   done
+ 
+   cd ..
+   rm -rf conftest.dir
+ else
+   am_cv_CC_dependencies_compiler_type=none
+ fi
+ 
+ fi
+ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+ 
+ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+   am__fastdepCC_TRUE=
+   am__fastdepCC_FALSE='#'
+ else
+   am__fastdepCC_TRUE='#'
+   am__fastdepCC_FALSE=
+ fi
+ 
+ 
  
  
          echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
***************
*** 2646,2656 ****
  LIBS="-lcposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 2815,2821 ----
  LIBS="-lcposix  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 2682,2689 ****
    ac_cv_lib_cposix_strerror=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_cposix_strerror=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 2847,2853 ----
    ac_cv_lib_cposix_strerror=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_cposix_strerror=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 3007,3016 ****
  fi
  
  
! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
! See \`config.log' for more details." >&5
! echo "$as_me: error: no acceptable C compiler found in \$PATH
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
--- 3171,3178 ----
  fi
  
  
! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
***************
*** 3040,3050 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 3202,3208 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 3072,3079 ****
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_compiler_gnu=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 3230,3236 ----
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_compiler_gnu=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 3093,3103 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 3250,3256 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 3122,3129 ****
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_prog_cc_g=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 3275,3281 ----
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_prog_cc_g=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 3154,3164 ****
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
--- 3306,3312 ----
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
  #include <sys/types.h>
***************
*** 3221,3228 ****
  break
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext
  done
--- 3369,3375 ----
  break
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext
  done
***************
*** 3273,3283 ****
  do
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdlib.h>
  $ac_declaration
  int
--- 3420,3426 ----
  do
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdlib.h>
  $ac_declaration
  int
***************
*** 3303,3320 ****
    :
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  continue
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_declaration
  int
  main ()
--- 3446,3458 ----
    :
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  continue
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_declaration
  int
  main ()
***************
*** 3339,3346 ****
    break
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
--- 3477,3483 ----
    break
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
***************
*** 3353,3360 ****
  
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
--- 3490,3496 ----
  
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
***************
*** 3363,3368 ****
--- 3499,3586 ----
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
+ depcc="$CC"   am_compiler_list=
+ 
+ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+   # making a dummy file named `D' -- because `-MD' means `put the output
+   # in D'.
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+   # using a relative directory.
+   cp "$am_depcomp" conftest.dir
+   cd conftest.dir
+ 
+   am_cv_CC_dependencies_compiler_type=none
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
+   for depmode in $am_compiler_list; do
+     # We need to recreate these files for each test, as the compiler may
+     # overwrite some of them when testing with obscure command lines.
+     # This happens at least with the AIX C compiler.
+     echo '#include "conftest.h"' > conftest.c
+     echo 'int i;' > conftest.h
+     echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ 
+     case $depmode in
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+ 	break
+       fi
+       ;;
+     none) break ;;
+     esac
+     # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+     # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+        grep conftest.h conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       am_cv_CC_dependencies_compiler_type=$depmode
+       break
+     fi
+   done
+ 
+   cd ..
+   rm -rf conftest.dir
+ else
+   am_cv_CC_dependencies_compiler_type=none
+ fi
+ 
+ fi
+ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+ 
+ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+   am__fastdepCC_TRUE=
+   am__fastdepCC_FALSE='#'
+ else
+   am__fastdepCC_TRUE='#'
+   am__fastdepCC_FALSE=
+ fi
+ 
+ 
+ 
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
***************
*** 3386,3407 ****
  do
    # Use a header file that comes with gcc, so configuring glibc
    # with a fresh cross-compiler works.
-   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-   # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #ifdef __STDC__
! # include <limits.h>
! #else
! # include <assert.h>
! #endif
                       Syntax error
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 3604,3615 ----
  do
    # Use a header file that comes with gcc, so configuring glibc
    # with a fresh cross-compiler works.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
! #include <assert.h>
                       Syntax error
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 3424,3431 ****
    :
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    # Broken: fails on valid input.
  continue
  fi
--- 3632,3638 ----
    :
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    # Broken: fails on valid input.
  continue
  fi
***************
*** 3435,3445 ****
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 3642,3648 ----
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 3463,3470 ****
  continue
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    # Passes both tests.
  ac_preproc_ok=:
  break
--- 3666,3672 ----
  continue
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
***************
*** 3493,3514 ****
  do
    # Use a header file that comes with gcc, so configuring glibc
    # with a fresh cross-compiler works.
-   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-   # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #ifdef __STDC__
! # include <limits.h>
! #else
! # include <assert.h>
! #endif
                       Syntax error
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 3695,3706 ----
  do
    # Use a header file that comes with gcc, so configuring glibc
    # with a fresh cross-compiler works.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
! #include <assert.h>
                       Syntax error
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 3531,3538 ****
    :
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    # Broken: fails on valid input.
  continue
  fi
--- 3723,3729 ----
    :
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    # Broken: fails on valid input.
  continue
  fi
***************
*** 3542,3552 ****
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 3733,3739 ----
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <ac_nonexistent.h>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 3570,3577 ****
  continue
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    # Passes both tests.
  ac_preproc_ok=:
  break
--- 3757,3763 ----
  continue
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    # Passes both tests.
  ac_preproc_ok=:
  break
***************
*** 3584,3593 ****
  if $ac_preproc_ok; then
    :
  else
!   { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
! See \`config.log' for more details." >&5
! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
  
--- 3770,3777 ----
  if $ac_preproc_ok; then
    :
  else
!   { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
     { (exit 1); exit 1; }; }
  fi
  
***************
*** 3605,3615 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  			#pragma prefix "foo.org"
  			module FOO {
--- 3789,3795 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  			#pragma prefix "foo.org"
  			module FOO {
***************
*** 3640,3647 ****
    ac_cv_cpp_accept_idl=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    ac_cv_cpp_accept_idl=no
  fi
  rm -f conftest.err conftest.$ac_ext
--- 3820,3826 ----
    ac_cv_cpp_accept_idl=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    ac_cv_cpp_accept_idl=no
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 3681,3691 ****
                 CPPFLAGS="$CPPFLAGS -I-"
                 cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 3860,3866 ----
                 CPPFLAGS="$CPPFLAGS -I-"
                 cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 3708,3723 ****
    ac_cv_cpp_nostdinc=-I-
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    CPPFLAGS="$saved_CPPFLAGS -I"
                         cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 3883,3893 ----
    ac_cv_cpp_nostdinc=-I-
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    CPPFLAGS="$saved_CPPFLAGS -I"
                         cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 3740,3747 ****
    ac_cv_cpp_nostdinc=-I
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  
  fi
  rm -f conftest.err conftest.$ac_ext
--- 3910,3916 ----
    ac_cv_cpp_nostdinc=-I
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 3755,3808 ****
  #define CPP_NOSTDINC "$ac_cv_cpp_nostdinc"
  _ACEOF
  
! CPP_PROGRAM="$CPP"
  cat >>confdefs.h <<_ACEOF
! #define CPP_PROGRAM "$CPP"
  _ACEOF
  
  
- missing_dir=`cd $ac_aux_dir && pwd`
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LEX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -n "$LEX"; then
-   ac_cv_prog_LEX="$LEX" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_prog_LEX="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
- fi
- fi
- LEX=$ac_cv_prog_LEX
- if test -n "$LEX"; then
-   echo "$as_me:$LINENO: result: $LEX" >&5
- echo "${ECHO_T}$LEX" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$LEX" && break
- done
- test -n "$LEX" || LEX=""$missing_dir/missing flex""
- 
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
--- 3924,3937 ----
  #define CPP_NOSTDINC "$ac_cv_cpp_nostdinc"
  _ACEOF
  
! if test x"$CPP_PROGRAM" = x; then
! 	CPP_PROGRAM="$CPP"
! fi
  cat >>confdefs.h <<_ACEOF
! #define CPP_PROGRAM "$CPP_PROGRAM"
  _ACEOF
  
  
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
***************
*** 3855,3865 ****
  LIBS="-lfl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 3984,3990 ----
  LIBS="-lfl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 3891,3898 ****
    ac_cv_lib_fl_yywrap=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_fl_yywrap=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 4016,4022 ----
    ac_cv_lib_fl_yywrap=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_fl_yywrap=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 3912,3922 ****
  LIBS="-ll  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 4036,4042 ----
  LIBS="-ll  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 3948,3955 ****
    ac_cv_lib_l_yywrap=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_l_yywrap=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 4068,4074 ----
    ac_cv_lib_l_yywrap=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_l_yywrap=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 4027,4034 ****
    ac_cv_prog_lex_yytext_pointer=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_save_LIBS
--- 4146,4152 ----
    ac_cv_prog_lex_yytext_pointer=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_save_LIBS
***************
*** 4046,4052 ****
  fi
  
  fi
! 
  if [ "$LEX" != "flex" ]; then
  	{ { echo "$as_me:$LINENO: error: flex is required to create the libIDL scanner" >&5
  echo "$as_me: error: flex is required to create the libIDL scanner" >&2;}
--- 4164,4172 ----
  fi
  
  fi
! if test "$LEX" = :; then
!   LEX=${am_missing_run}flex
! fi
  if [ "$LEX" != "flex" ]; then
  	{ { echo "$as_me:$LINENO: error: flex is required to create the libIDL scanner" >&5
  echo "$as_me: error: flex is required to create the libIDL scanner" >&2;}
***************
*** 4401,4407 ****
        #   nm: unknown option "B" ignored
        # Tru64's nm complains that /dev/null is an invalid object file
        if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
! 	lt_cv_path_NM="$tmp_nm -B"
  	break
        elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
  	lt_cv_path_NM="$tmp_nm -p"
--- 4521,4543 ----
        #   nm: unknown option "B" ignored
        # Tru64's nm complains that /dev/null is an invalid object file
        if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
!         # AIX needs to suppress demangling for C++ to work correctly
!         # AIX nm : The default is to demangle all C++ symbol names
!         # GNU nm : The default is to not demangle low-level symbol names.
!         case $host_os in
!         aix*)
!           # check if we are using GNU nm on AIX
!           if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null
!           then
!             lt_cv_path_NM="$tmp_nm -B"
!           else
!             lt_cv_path_NM="$tmp_nm -BC"
!           fi
!           ;;
!         *)
!           lt_cv_path_NM="$tmp_nm -B"
!           ;;
!         esac
  	break
        elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
  	lt_cv_path_NM="$tmp_nm -p"
***************
*** 4421,4511 ****
  echo "$as_me:$LINENO: result: $NM" >&5
  echo "${ECHO_T}$NM" >&6
  
- echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
- echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
- if test "${lt_cv_path_SED+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
- as_executable_p="test -f"
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-         _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-       fi
-     done
-   done
- done
- 
-   # Create a temporary directory, and hook for its removal unless debugging.
- $debug ||
- {
-   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
- 
- # Create a (secure) tmp directory for tmp files.
- : ${TMPDIR=/tmp}
- {
-   tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
-   tmp=$TMPDIR/sed$$-$RANDOM
-   (umask 077 && mkdir $tmp)
- } ||
- {
-    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-    { (exit 1); exit 1; }
- }
-   _max=0
-   _count=0
-   # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-   # along with /bin/sed that truncates output.
-   for _sed in $_sed_list /usr/xpg4/bin/sed; do
-     test ! -f ${_sed} && break
-     cat /dev/null > "$tmp/sed.in"
-     _count=0
-     echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-     # Check for GNU sed and select it if it is found.
-     if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-       lt_cv_path_SED=${_sed}
-       break
-     fi
-     while true; do
-       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-       mv "$tmp/sed.tmp" "$tmp/sed.in"
-       cp "$tmp/sed.in" "$tmp/sed.nl"
-       echo >>"$tmp/sed.nl"
-       ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-       cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-       # 40000 chars as input seems more than enough
-       test $_count -gt 10 && break
-       _count=`expr $_count + 1`
-       if test $_count -gt $_max; then
-         _max=$_count
-         lt_cv_path_SED=$_sed
-       fi
-     done
-   done
-   rm -rf "$tmp"
- 
- fi
- 
- if test "X$SED" != "X"; then
-   lt_cv_path_SED=$SED
- else
-   SED=$lt_cv_path_SED
- fi
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
  echo "$as_me:$LINENO: checking whether ln -s works" >&5
  echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
  LN_S=$as_ln_s
--- 4557,4562 ----
***************
*** 4517,4524 ****
  echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
! echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
! echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4568,4575 ----
  echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
! echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5
! echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4595,4603 ****
    lt_cv_file_magic_test_file=/usr/lib/libc.sl
    ;;
  
! irix5* | irix6* | nonstopux*)
    case $host_os in
!   irix5* | nonstopux*)
      # this will be overridden with pass_all, but let us keep it just in case
      lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
      ;;
--- 4646,4654 ----
    lt_cv_file_magic_test_file=/usr/lib/libc.sl
    ;;
  
! irix5* | irix6*)
    case $host_os in
!   irix5*)
      # this will be overridden with pass_all, but let us keep it just in case
      lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
      ;;
***************
*** 4619,4625 ****
  # This must be Linux ELF.
  linux-gnu*)
    case $host_cpu in
!   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*)
      lt_cv_deplibs_check_method=pass_all ;;
    *)
      # glibc up to 2.1.1 does not perform some relocations on ARM
--- 4670,4676 ----
  # This must be Linux ELF.
  linux-gnu*)
    case $host_cpu in
!   alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
      lt_cv_deplibs_check_method=pass_all ;;
    *)
      # glibc up to 2.1.1 does not perform some relocations on ARM
***************
*** 4690,4698 ****
      lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
      lt_cv_file_magic_test_file=/lib/libc.so
      ;;
-   siemens)
-     lt_cv_deplibs_check_method=pass_all
-     ;;
    esac
    ;;
  esac
--- 4741,4746 ----
***************
*** 4746,4757 ****
    lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
! irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
- osf*)
-   symcode='[BCDEGQRST]'
-   ;;
  solaris* | sysv5*)
    symcode='[BDT]'
    ;;
--- 4794,4802 ----
    lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
! irix*)
    symcode='[BCDEGRST]'
    ;;
  solaris* | sysv5*)
    symcode='[BDT]'
    ;;
***************
*** 4860,4866 ****
    (eval $ac_link) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } && test -s conftest$ac_exeext; then
  	    pipe_works=yes
  	  fi
  	  LIBS="$save_LIBS"
--- 4905,4911 ----
    (eval $ac_link) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } && test -s conftest; then
  	    pipe_works=yes
  	  fi
  	  LIBS="$save_LIBS"
***************
*** 4929,4982 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
  #include <string.h>
  #include <float.h>
  
- int
- main ()
- {
- 
-   ;
-   return 0;
- }
  _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_cv_header_stdc=no
  fi
! rm -f conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <string.h>
  
  _ACEOF
--- 4974,5016 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
  #include <string.h>
  #include <float.h>
  
  _ACEOF
! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
!   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } >/dev/null; then
!   if test -s conftest.err; then
!     ac_cpp_err=$ac_c_preproc_warn_flag
!   else
!     ac_cpp_err=
!   fi
! else
!   ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   ac_cv_header_stdc=no
  fi
! rm -f conftest.err conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <string.h>
  
  _ACEOF
***************
*** 4994,5004 ****
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdlib.h>
  
  _ACEOF
--- 5028,5034 ----
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdlib.h>
  
  _ACEOF
***************
*** 5019,5036 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  #else
! # define ISLOWER(c) \
!                    (('a' <= (c) && (c) <= 'i') \
                       || ('j' <= (c) && (c) <= 'r') \
                       || ('s' <= (c) && (c) <= 'z'))
  # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--- 5049,5061 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  #else
! # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
                       || ('j' <= (c) && (c) <= 'r') \
                       || ('s' <= (c) && (c) <= 'z'))
  # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
***************
*** 5063,5070 ****
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
--- 5088,5094 ----
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
***************
*** 5103,5113 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  
  #include <$ac_header>
--- 5127,5133 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  
  #include <$ac_header>
***************
*** 5127,5134 ****
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  eval "$as_ac_Header=no"
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 5147,5153 ----
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  eval "$as_ac_Header=no"
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 5163,5173 ****
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
--- 5182,5188 ----
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
***************
*** 5186,5193 ****
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 5201,5207 ----
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 5199,5209 ****
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 5213,5219 ----
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 5226,5233 ****
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
--- 5236,5242 ----
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 5240,5271 ****
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--- 5249,5262 ----
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
***************
*** 5291,5297 ****
  
  
  
- 
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
--- 5282,5287 ----
***************
*** 5607,5613 ****
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5610 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--- 5597,5603 ----
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
!   echo '#line 5600 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
***************
*** 5647,5657 ****
  
       cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 5637,5643 ----
  
       cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 5676,5683 ****
    lt_cv_cc_needs_belf=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  lt_cv_cc_needs_belf=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 5662,5668 ----
    lt_cv_cc_needs_belf=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  lt_cv_cc_needs_belf=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 5849,5855 ****
        # like `-m68040'.
        lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
!     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      darwin* | rhapsody*)
--- 5834,5840 ----
        # like `-m68040'.
        lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
!     beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
      darwin* | rhapsody*)
***************
*** 5892,5898 ****
        lt_cv_prog_cc_pic='+Z'
        ;;
  
!     irix5* | irix6* | nonstopux*)
        lt_cv_prog_cc_wl='-Wl,'
        lt_cv_prog_cc_static='-non_shared'
        # PIC (with -KPIC) is the default.
--- 5877,5883 ----
        lt_cv_prog_cc_pic='+Z'
        ;;
  
!     irix5* | irix6*)
        lt_cv_prog_cc_wl='-Wl,'
        lt_cv_prog_cc_static='-non_shared'
        # PIC (with -KPIC) is the default.
***************
*** 5936,5942 ****
      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
        lt_cv_prog_cc_pic='-KPIC'
        lt_cv_prog_cc_static='-Bstatic'
!       lt_cv_prog_cc_wl='-Wl,'
        ;;
  
      uts4*)
--- 5921,5931 ----
      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
        lt_cv_prog_cc_pic='-KPIC'
        lt_cv_prog_cc_static='-Bstatic'
!       if test "x$host_vendor" = xsni; then
! 	lt_cv_prog_cc_wl='-LD'
!       else
! 	lt_cv_prog_cc_wl='-Wl,'
!       fi
        ;;
  
      uts4*)
***************
*** 5976,5986 ****
      CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 5965,5971 ----
      CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 6020,6027 ****
  
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
        lt_cv_prog_cc_pic_works=no
  
  fi
--- 6005,6011 ----
  
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
        lt_cv_prog_cc_pic_works=no
  
  fi
***************
*** 6064,6074 ****
    LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 6048,6054 ----
    LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 6093,6100 ****
    lt_cv_prog_cc_static_works=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    LDFLAGS="$save_LDFLAGS"
--- 6073,6079 ----
    lt_cv_prog_cc_static_works=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    LDFLAGS="$save_LDFLAGS"
***************
*** 6136,6142 ****
  save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:6139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
    if test -s out/conftest.err; then
--- 6115,6121 ----
  save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
  compiler_c_o=no
! if { (eval echo configure:6118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
    # The compiler can only warn and ignore the option if not recognized
    # So say no if there are warnings
    if test -s out/conftest.err; then
***************
*** 6178,6188 ****
    ac_objext=lo
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 6157,6163 ----
    ac_objext=lo
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 6214,6221 ****
  
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    ac_objext="$save_objext"
--- 6189,6195 ----
  
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    ac_objext="$save_objext"
***************
*** 6263,6273 ****
    compiler_rtti_exceptions=no
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  int
  main ()
--- 6237,6243 ----
    compiler_rtti_exceptions=no
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  int
  main ()
***************
*** 6299,6306 ****
  
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
--- 6269,6275 ----
  
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
***************
*** 6329,6334 ****
--- 6298,6304 ----
  old_archive_from_new_cmds=
  old_archive_from_expsyms_cmds=
  export_dynamic_flag_spec=
+ use_runtimelinking=
  whole_archive_flag_spec=
  thread_safe_flag_spec=
  hardcode_into_libs=no
***************
*** 6472,6478 ****
      # If the export-symbols file already is a .def file (1st line
      # is EXPORTS), use it as is.
      # If DATA tags from a recent dlltool are present, honour them!
!     archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
  	cp $export_symbols $output_objdir/$soname-def;
        else
  	echo EXPORTS > $output_objdir/$soname-def;
--- 6442,6448 ----
      # If the export-symbols file already is a .def file (1st line
      # is EXPORTS), use it as is.
      # If DATA tags from a recent dlltool are present, honour them!
!     archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  	cp $export_symbols $output_objdir/$soname-def;
        else
  	echo EXPORTS > $output_objdir/$soname-def;
***************
*** 6481,6487 ****
  	 set dummy \$symbol;
  	 case \$# in
  	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
- 	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
  	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
  	 esac;
  	 _lt_hint=`expr 1 + \$_lt_hint`;
--- 6451,6456 ----
***************
*** 6586,6610 ****
        aix_use_runtimelinking=no
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
!       aix_use_runtimelinking=no
! 
!       # Test if we are trying to use run time linking or normal
!       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
!       # need to do runtime linking.
!       case $host_os in aix4.[23]|aix4.[23].*|aix5*)
! 	for ld_flag in $LDFLAGS; do
! 	  case $ld_flag in
! 	  *-brtl*)
! 	    aix_use_runtimelinking=yes
! 	    break
! 	  ;;
! 	  esac
! 	done
!       esac
! 
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
  
      # When large executables or shared objects are built, AIX ld can
--- 6555,6567 ----
        aix_use_runtimelinking=no
        exp_sym_flag='-Bexport'
        no_entry_flag=""
+       use_runtimelinking=""
      else
!       aix_use_runtimelinking=yes
!       export_dynamic_flag_spec='-bexpall'
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
+       use_runtimelinking='-brtl'
      fi
  
      # When large executables or shared objects are built, AIX ld can
***************
*** 6639,6653 ****
        shared_flag='-shared'
      else
        # not using gcc
!       if test "$host_cpu" = ia64; then
! 	shared_flag='${wl}-G'
!       else
! 	if test "$aix_use_runtimelinking" = yes; then
! 	  shared_flag='${wl}-G'
! 	else
! 	  shared_flag='${wl}-bM:SRE'
! 	fi
!       fi
      fi
  
      # It seems that -bexpall can do strange things, so it is better to
--- 6596,6602 ----
        shared_flag='-shared'
      else
        # not using gcc
!       shared_flag='${wl}-G'
      fi
  
      # It seems that -bexpall can do strange things, so it is better to
***************
*** 6657,6664 ****
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
        allow_undefined_flag='-berok'
!       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
!       archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
        if test "$host_cpu" = ia64; then
  	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
--- 6606,6613 ----
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
        allow_undefined_flag='-berok'
!       hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
!       archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
      else
        if test "$host_cpu" = ia64; then
  	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
***************
*** 6671,6677 ****
  	allow_undefined_flag='${wl}-berok'
  	# This is a bit strange, but is similar to how AIX traditionally builds
  	# it's shared libraries.
! 	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
        fi
      fi
      ;;
--- 6620,6626 ----
  	allow_undefined_flag='${wl}-berok'
  	# This is a bit strange, but is similar to how AIX traditionally builds
  	# it's shared libraries.
! 	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
        fi
      fi
      ;;
***************
*** 6713,6721 ****
      esac
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
!     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
!     #	     `"' quotes if we put them in here... so don't!
!     archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
--- 6662,6669 ----
      esac
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
!     #        yet detect zsh echo's removal of \ escapes.
!     archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
***************
*** 6767,6780 ****
      export_dynamic_flag_spec='${wl}-E'
      ;;
  
!   irix5* | irix6* | nonstopux*)
      if test "$GCC" = yes; then
        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      else
        archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='-rpath $libdir'
      fi
      hardcode_libdir_separator=:
      link_all_deplibs=yes
      ;;
--- 6715,6727 ----
      export_dynamic_flag_spec='${wl}-E'
      ;;
  
!   irix5* | irix6*)
      if test "$GCC" = yes; then
        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
      else
        archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
      fi
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      link_all_deplibs=yes
      ;;
***************
*** 6802,6808 ****
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
!       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
--- 6749,6755 ----
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
!       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
***************
*** 6812,6818 ****
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)
!         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
          ;;
        esac
--- 6759,6765 ----
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)
!         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
          ;;
        esac
***************
*** 6924,6946 ****
      ;;
  
    sysv4)
!     case $host_vendor in
!       sni)
!         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
!         hardcode_direct=yes # is this really true???
!         ;;
!       siemens)
!         ## LD is ld it makes a PLAMLIB
!         ## CC just makes a GrossModule.
!         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
!         reload_cmds='$CC -r -o $output$reload_objs'
!         hardcode_direct=no
!         ;;
!       motorola)
!         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
!         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
!         ;;
!     esac
      runpath_var='LD_RUN_PATH'
      hardcode_shlibpath_var=no
      ;;
--- 6871,6883 ----
      ;;
  
    sysv4)
!     if test "x$host_vendor" = xsno; then
!       archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
!       hardcode_direct=yes # is this really true???
!     else
!       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
!       hardcode_direct=no #Motorola manual says yes, but my tests say they lie
!     fi
      runpath_var='LD_RUN_PATH'
      hardcode_shlibpath_var=no
      ;;
***************
*** 7088,7096 ****
  
  aix4* | aix5*)
    version_type=linux
-   need_lib_prefix=no
-   need_version=no
-   hardcode_into_libs=yes
    if test "$host_cpu" = ia64; then
      # AIX 5 supports IA64
      library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
--- 7025,7030 ----
***************
*** 7112,7135 ****
  	fi
  	;;
      esac
!     # AIX (on Power*) has no versioning support, so currently we can
!     # not hardcode correct soname into executable. Probably we can
!     # add versioning support to collect2, so additional links can
!     # be useful in future.
!     if test "$aix_use_runtimelinking" = yes; then
!       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
!       # instead of lib<name>.a to let people know that these are not
!       # typical AIX shared libraries.
!       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
!     else
!       # We preserve .a as extension for shared libraries through AIX4.2
!       # and later when we are not doing run time linking.
!       library_names_spec='${libname}${release}.a $libname.a'
!       soname_spec='${libname}${release}.so$major'
!     fi
      shlibpath_var=LIBPATH
    fi
-   hardcode_into_libs=yes
    ;;
  
  amigaos*)
--- 7046,7057 ----
  	fi
  	;;
      esac
!     # We preserve .a as extension for shared libraries through AIX4.2
!     library_names_spec='${libname}${release}.a $libname.a'
!     soname_spec='${libname}${release}.so$major'
      shlibpath_var=LIBPATH
+     hardcode_into_libs=yes
    fi
    ;;
  
  amigaos*)
***************
*** 7177,7183 ****
      ;;
    yes,mingw*)
      library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
!     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
      ;;
    yes,pw32*)
      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
--- 7099,7105 ----
      ;;
    yes,mingw*)
      library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
!     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
      ;;
    yes,pw32*)
      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
***************
*** 7260,7276 ****
    postinstall_cmds='chmod 555 $lib'
    ;;
  
! irix5* | irix6* | nonstopux*)
!   case $host_os in
!     nonstopux*) version_type=nonstopux ;;
!     *)          version_type=irix ;;
!   esac
    need_lib_prefix=no
    need_version=no
    soname_spec='${libname}${release}.so$major'
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
    case $host_os in
!   irix5* | nonstopux*)
      libsuff= shlibsuff=
      ;;
    *)
--- 7182,7195 ----
    postinstall_cmds='chmod 555 $lib'
    ;;
  
! irix5* | irix6*)
!   version_type=irix
    need_lib_prefix=no
    need_version=no
    soname_spec='${libname}${release}.so$major'
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
    case $host_os in
!   irix5*)
      libsuff= shlibsuff=
      ;;
    *)
***************
*** 7315,7344 ****
    # people can always --disable-shared, the test was removed, and we
    # assume the GNU/Linux dynamic linker is in use.
    dynamic_linker='GNU/Linux ld.so'
- 
-   # Find out which ABI we are using (multilib Linux x86_64 hack).
-   libsuff=
-   case "$host_cpu" in
-   x86_64*|s390x*)
-     echo '#line 7323 "configure"' > conftest.$ac_ext
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-       case `/usr/bin/file conftest.$ac_objext` in
-       *64-bit*)
-         libsuff=64
-         ;;
-       esac
-     fi
-     rm -rf conftest*
-     ;;
-   *)
-     ;;
-   esac
-   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-   sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
    ;;
  
  netbsd*)
--- 7234,7239 ----
***************
*** 7397,7409 ****
  
  osf3* | osf4* | osf5*)
    version_type=osf
!   need_version=no
!   soname_spec='${libname}${release}.so$major'
!   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
    shlibpath_var=LD_LIBRARY_PATH
    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   hardcode_into_libs=yes
    ;;
  
  sco3.2v5*)
--- 7292,7303 ----
  
  osf3* | osf4* | osf5*)
    version_type=osf
!   need_version=no
!   soname_spec='${libname}${release}.so'
!   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
    shlibpath_var=LD_LIBRARY_PATH
    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
  sco3.2v5*)
***************
*** 7446,7457 ****
    case $host_vendor in
      sni)
        shlibpath_overrides_runpath=no
-       need_lib_prefix=no
-       export_dynamic_flag_spec='${wl}-Blargedynsym'
-       runpath_var=LD_RUN_PATH
-       ;;
-     siemens)
-       need_lib_prefix=no
        ;;
      motorola)
        need_lib_prefix=no
--- 7340,7345 ----
***************
*** 7517,7523 ****
    ;;
  
  aix4*)
!   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
    ;;
--- 7405,7411 ----
    ;;
  
  aix4*)
!   if test "$host_cpu" != ia64 ; then
      test "$enable_shared" = yes && enable_static=no
    fi
    ;;
***************
*** 7574,7617 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char shl_load (); below.
!     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
!     <limits.h> exists even on freestanding compilers.  */
! #ifdef __STDC__
! # include <limits.h>
! #else
! # include <assert.h>
! #endif
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char shl_load ();
  /* 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_shl_load) || defined (__stub___shl_load)
  choke me
  #else
! char (*f) () = shl_load;
! #endif
! #ifdef __cplusplus
! }
  #endif
  
- int
- main ()
- {
- return f != shl_load;
    ;
    return 0;
  }
--- 7462,7492 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char shl_load (); below.  */
! #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char shl_load ();
+ char (*f) ();
+ 
+ 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_shl_load) || defined (__stub___shl_load)
  choke me
  #else
! f = shl_load;
  #endif
  
    ;
    return 0;
  }
***************
*** 7631,7638 ****
    ac_cv_func_shl_load=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_func_shl_load=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 7506,7512 ----
    ac_cv_func_shl_load=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_func_shl_load=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 7651,7661 ****
  LIBS="-ldld  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 7525,7531 ----
  LIBS="-ldld  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 7687,7694 ****
    ac_cv_lib_dld_shl_load=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_dld_shl_load=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 7557,7563 ----
    ac_cv_lib_dld_shl_load=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_dld_shl_load=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 7706,7749 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char dlopen (); below.
!     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
!     <limits.h> exists even on freestanding compilers.  */
! #ifdef __STDC__
! # include <limits.h>
! #else
! # include <assert.h>
! #endif
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char dlopen ();
  /* 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_dlopen) || defined (__stub___dlopen)
  choke me
  #else
! char (*f) () = dlopen;
! #endif
! #ifdef __cplusplus
! }
  #endif
  
- int
- main ()
- {
- return f != dlopen;
    ;
    return 0;
  }
--- 7575,7605 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char dlopen (); below.  */
! #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
  char dlopen ();
+ char (*f) ();
+ 
+ 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_dlopen) || defined (__stub___dlopen)
  choke me
  #else
! f = dlopen;
  #endif
  
    ;
    return 0;
  }
***************
*** 7763,7770 ****
    ac_cv_func_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_func_dlopen=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 7619,7625 ----
    ac_cv_func_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_func_dlopen=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 7783,7793 ****
  LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 7638,7644 ----
  LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 7819,7826 ****
    ac_cv_lib_dl_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_dl_dlopen=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 7670,7676 ----
    ac_cv_lib_dl_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_dl_dlopen=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 7840,7850 ****
  LIBS="-lsvld  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 7690,7696 ----
  LIBS="-lsvld  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 7876,7883 ****
    ac_cv_lib_svld_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_svld_dlopen=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 7722,7728 ----
    ac_cv_lib_svld_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_svld_dlopen=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 7897,7907 ****
  LIBS="-ldld  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
--- 7742,7748 ----
  LIBS="-ldld  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
***************
*** 7933,7940 ****
    ac_cv_lib_dld_dld_link=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_lib_dld_dld_link=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 7774,7780 ----
    ac_cv_lib_dld_dld_link=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_lib_dld_dld_link=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 7992,7998 ****
      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7995 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
--- 7832,7838 ----
      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7835 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
***************
*** 8090,8096 ****
      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 8093 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
--- 7930,7936 ----
      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
! #line 7933 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
***************
*** 8273,8282 ****
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
!   for var in echo old_CC old_CFLAGS SED \
      AR AR_FLAGS CC LD LN_S NM SHELL \
      reload_flag reload_cmds wl \
      pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
      thread_safe_flag_spec whole_archive_flag_spec libname_spec \
      library_names_spec soname_spec \
      RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
--- 8113,8123 ----
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
!   for var in echo old_CC old_CFLAGS \
      AR AR_FLAGS CC LD LN_S NM SHELL \
      reload_flag reload_cmds wl \
      pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+     use_runtimelinking \
      thread_safe_flag_spec whole_archive_flag_spec libname_spec \
      library_names_spec soname_spec \
      RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
***************
*** 8335,8345 ****
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
- # A sed that does not truncate output.
- SED=$lt_SED
- 
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
! Xsed="${SED} -e s/^X//"
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
--- 8176,8183 ----
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
! Xsed="sed -e s/^X//"
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
***************
*** 8461,8466 ****
--- 8299,8307 ----
  # Compiler flag to allow reflexive dlopens.
  export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
  
+ # Compiler flag to allow runtime linking
+ use_runtimelinking=$lt_use_runtimelinking
+ 
  # Compiler flag to generate shared objects directly from archives.
  whole_archive_flag_spec=$lt_whole_archive_flag_spec
  
***************
*** 8837,8842 ****
--- 8678,8684 ----
    MAINTAINER_MODE_TRUE='#'
    MAINTAINER_MODE_FALSE=
  fi
+ 
    MAINT=$MAINTAINER_MODE_TRUE
  
  
***************
*** 8949,9002 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
  #include <string.h>
  #include <float.h>
  
- int
- main ()
- {
- 
-   ;
-   return 0;
- }
  _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_cv_header_stdc=no
  fi
! rm -f conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <string.h>
  
  _ACEOF
--- 8791,8833 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
  #include <string.h>
  #include <float.h>
  
  _ACEOF
! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
!   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } >/dev/null; then
!   if test -s conftest.err; then
!     ac_cpp_err=$ac_c_preproc_warn_flag
!   else
!     ac_cpp_err=
!   fi
! else
!   ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   ac_cv_header_stdc=no
  fi
! rm -f conftest.err conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <string.h>
  
  _ACEOF
***************
*** 9014,9024 ****
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdlib.h>
  
  _ACEOF
--- 8845,8851 ----
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdlib.h>
  
  _ACEOF
***************
*** 9039,9056 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  #else
! # define ISLOWER(c) \
!                    (('a' <= (c) && (c) <= 'i') \
                       || ('j' <= (c) && (c) <= 'r') \
                       || ('s' <= (c) && (c) <= 'z'))
  # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--- 8866,8878 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  #else
! # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
                       || ('j' <= (c) && (c) <= 'r') \
                       || ('s' <= (c) && (c) <= 'z'))
  # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
***************
*** 9083,9090 ****
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
--- 8905,8911 ----
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
***************
*** 9120,9130 ****
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
--- 8941,8947 ----
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
***************
*** 9143,9150 ****
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 8960,8966 ----
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 9156,9166 ****
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 8972,8978 ----
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 9183,9190 ****
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
--- 8995,9001 ----
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 9197,9228 ****
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--- 9008,9021 ----
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
***************
*** 9262,9272 ****
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
--- 9055,9061 ----
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
***************
*** 9285,9292 ****
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 9074,9080 ----
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 9298,9308 ****
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 9086,9092 ----
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 9325,9332 ****
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
--- 9109,9115 ----
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 9339,9370 ****
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--- 9122,9135 ----
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
***************
*** 9404,9414 ****
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
--- 9169,9175 ----
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
***************
*** 9427,9434 ****
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 9188,9194 ----
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 9440,9450 ****
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 9200,9206 ----
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 9467,9474 ****
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
--- 9223,9229 ----
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 9481,9512 ****
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--- 9236,9249 ----
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
***************
*** 9546,9556 ****
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
--- 9283,9289 ----
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  #include <$ac_header>
  _ACEOF
***************
*** 9569,9576 ****
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 9302,9308 ----
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_header_compiler=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 9582,9592 ****
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--- 9314,9320 ----
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <$ac_header>
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
***************
*** 9609,9616 ****
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
--- 9337,9343 ----
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
!   cat conftest.$ac_ext >&5
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
***************
*** 9623,9654 ****
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug-autoconf@gnu.org. ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--- 9350,9363 ----
      { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
    no:yes )
      { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
  esac
  echo "$as_me:$LINENO: checking for $ac_header" >&5
  echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
***************
*** 9691,9734 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
!     which can conflict with char $ac_func (); below.
!     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
!     <limits.h> exists even on freestanding compilers.  */
! #ifdef __STDC__
! # include <limits.h>
! #else
! # include <assert.h>
! #endif
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
  /* 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 ();
  /* 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
! char (*f) () = $ac_func;
! #endif
! #ifdef __cplusplus
! }
  #endif
  
- int
- main ()
- {
- return f != $ac_func;
    ;
    return 0;
  }
--- 9400,9430 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "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.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  /* 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 ();
+ char (*f) ();
+ 
+ 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
! f = $ac_func;
  #endif
  
    ;
    return 0;
  }
***************
*** 9748,9755 ****
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  eval "$as_ac_var=no"
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--- 9444,9450 ----
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  eval "$as_ac_var=no"
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
***************
*** 9772,9782 ****
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
--- 9467,9473 ----
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  int
  main ()
***************
*** 9804,9811 ****
    ac_cv_type_long_long=yes
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_cv_type_long_long=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 9495,9501 ----
    ac_cv_type_long_long=yes
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_cv_type_long_long=no
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 9827,9837 ****
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
--- 9517,9523 ----
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  int
  main ()
***************
*** 9859,9869 ****
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
--- 9545,9551 ----
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  int
  main ()
***************
*** 9890,9897 ****
    ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_lo=`expr $ac_mid + 1`
                      if test $ac_lo -le $ac_mid; then
                        ac_lo= ac_hi=
--- 9572,9578 ----
    ac_hi=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_lo=`expr $ac_mid + 1`
                      if test $ac_lo -le $ac_mid; then
                        ac_lo= ac_hi=
***************
*** 9903,9917 ****
    done
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
--- 9584,9593 ----
    done
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  int
  main ()
***************
*** 9939,9949 ****
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
--- 9615,9621 ----
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  int
  main ()
***************
*** 9970,9977 ****
    ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_hi=`expr '(' $ac_mid ')' - 1`
                         if test $ac_mid -le $ac_hi; then
                           ac_lo= ac_hi=
--- 9642,9648 ----
    ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_hi=`expr '(' $ac_mid ')' - 1`
                         if test $ac_mid -le $ac_hi; then
                           ac_lo= ac_hi=
***************
*** 9983,9990 ****
    done
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_lo= ac_hi=
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
--- 9654,9660 ----
    done
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_lo= ac_hi=
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
***************
*** 9995,10005 ****
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
--- 9665,9671 ----
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  int
  main ()
***************
*** 10026,10060 ****
    ac_hi=$ac_mid
  else
    echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long_long=$ac_lo;;
! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
! See \`config.log' for more details." >&5
! echo "$as_me: error: cannot compute sizeof (long long), 77
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
  else
    if test "$cross_compiling" = yes; then
!   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
! See \`config.log' for more details." >&5
! echo "$as_me: error: cannot run test program while cross compiling
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  $ac_includes_default
  long longval () { return (long) (sizeof (long long)); }
  unsigned long ulongval () { return (long) (sizeof (long long)); }
--- 9692,9717 ----
    ac_hi=$ac_mid
  else
    echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long_long=$ac_lo;;
! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5
! echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;}
     { (exit 1); exit 1; }; } ;;
  esac
  else
    if test "$cross_compiling" = yes; then
!   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
! echo "$as_me: error: cannot run test program while cross compiling" >&2;}
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  $ac_includes_default
  long longval () { return (long) (sizeof (long long)); }
  unsigned long ulongval () { return (long) (sizeof (long long)); }
***************
*** 10102,10114 ****
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  ( exit $ac_status )
! { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
! See \`config.log' for more details." >&5
! echo "$as_me: error: cannot compute sizeof (long long), 77
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--- 9759,9768 ----
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  ( exit $ac_status )
! { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5
! echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;}
     { (exit 1); exit 1; }; }
  fi
  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
***************
*** 10135,10153 ****
  
      for format in ll q I64; do
  	if test "$cross_compiling" = yes; then
!   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
! See \`config.log' for more details." >&5
! echo "$as_me: error: cannot run test program while cross compiling
! See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  #include <stdio.h>
  	    int main()
  	    {
--- 9789,9801 ----
  
      for format in ll q I64; do
  	if test "$cross_compiling" = yes; then
!   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
! echo "$as_me: error: cannot run test program while cross compiling" >&2;}
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
! #include "confdefs.h"
  #include <stdio.h>
  	    int main()
  	    {
***************
*** 10175,10182 ****
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
--- 9823,9829 ----
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
  fi
  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
***************
*** 10260,10266 ****
       t end
       /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
       : end' >>confcache
! if diff $cache_file confcache >/dev/null 2>&1; then :; else
    if test -w $cache_file; then
      test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
      cat confcache >$cache_file
--- 9907,9913 ----
       t end
       /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
       : end' >>confcache
! if cmp -s $cache_file confcache; then :; else
    if test -w $cache_file; then
      test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
      cat confcache >$cache_file
***************
*** 10337,10342 ****
--- 9984,10017 ----
  LTLIBOBJS=$ac_ltlibobjs
  
  
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
  
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
***************
*** 10351,10358 ****
  # configure, is in config.log if it exists.
  
  debug=false
- ac_cs_recheck=false
- ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
--- 10026,10031 ----
***************
*** 10387,10396 ****
  PS4='+ '
  
  # NLS nuisances.
! for as_var in \
!   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
!   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
!   LC_TELEPHONE LC_TIME
  do
    if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
--- 10060,10066 ----
  PS4='+ '
  
  # NLS nuisances.
! for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
  do
    if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
***************
*** 10436,10450 ****
  
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
!   echo "#! /bin/sh" >conf$$.sh
!   echo  "exit 0"   >>conf$$.sh
!   chmod +x conf$$.sh
!   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
      PATH_SEPARATOR=';'
    else
      PATH_SEPARATOR=:
    fi
!   rm -f conf$$.sh
  fi
  
  
--- 10106,10120 ----
  
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
!   echo "#! /bin/sh" >conftest.sh
!   echo  "exit 0"   >>conftest.sh
!   chmod +x conftest.sh
!   if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
      PATH_SEPARATOR=';'
    else
      PATH_SEPARATOR=:
    fi
!   rm -f conftest.sh
  fi
  
  
***************
*** 10607,10613 ****
  cat >&5 <<_CSEOF
  
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.57.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
--- 10277,10283 ----
  cat >&5 <<_CSEOF
  
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.54.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
***************
*** 10647,10653 ****
  
    -h, --help       print this help, then exit
    -V, --version    print version number, then exit
-   -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
    --file=FILE[:TEMPLATE]
--- 10317,10322 ----
***************
*** 10665,10671 ****
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.57,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
--- 10334,10340 ----
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.54,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
***************
*** 10702,10710 ****
    case $ac_option in
    # Handling of the options.
  _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     ac_cs_recheck=: ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
--- 10371,10382 ----
    case $ac_option in
    # Handling of the options.
  _ACEOF
! cat >>$CONFIG_STATUS <<_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
!     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
!     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
! _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
***************
*** 10726,10734 ****
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
  
    # This is an error.
    -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--- 10398,10403 ----
***************
*** 10743,10765 ****
    shift
  done
  
- ac_configure_extra_args=
- 
- if $ac_cs_silent; then
-   exec 6>/dev/null
-   ac_configure_extra_args="$ac_configure_extra_args --silent"
- fi
- 
  _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-   echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-   exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
  
! _ACEOF
  
  
  
  
  
--- 10412,10427 ----
    shift
  done
  
  _ACEOF
  
! cat >>$CONFIG_STATUS <<_ACEOF
! #
! # INIT-COMMANDS section.
! #
  
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  
+ _ACEOF
  
  
  
***************
*** 10775,10780 ****
--- 10437,10443 ----
    "libIDL.spec" ) CONFIG_FILES="$CONFIG_FILES libIDL.spec" ;;
    "libIDL-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES libIDL-2.0.pc" ;;
    "IDL.h.new" ) CONFIG_FILES="$CONFIG_FILES IDL.h.new" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
***************
*** 10791,10799 ****
    test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
  fi
  
- # Have a temporary directory for convenience.  Make it in the build tree
- # simply because there is no reason to put it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
  # Create a temporary directory, and hook for its removal unless debugging.
  $debug ||
  {
--- 10454,10459 ----
***************
*** 10802,10818 ****
  }
  
  # Create a (secure) tmp directory for tmp files.
! 
  {
!   tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
    test -n "$tmp" && test -d "$tmp"
  }  ||
  {
!   tmp=./confstat$$-$RANDOM
    (umask 077 && mkdir $tmp)
  } ||
  {
!    echo "$me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }
  
--- 10462,10478 ----
  }
  
  # Create a (secure) tmp directory for tmp files.
! : ${TMPDIR=/tmp}
  {
!   tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
    test -n "$tmp" && test -d "$tmp"
  }  ||
  {
!   tmp=$TMPDIR/cs$$-$RANDOM
    (umask 077 && mkdir $tmp)
  } ||
  {
!    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
     { (exit 1); exit 1; }
  }
  
***************
*** 10868,10873 ****
--- 10528,10534 ----
  s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
  s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
  s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@CYGPATH_W@,$CYGPATH_W,;t t
  s,@PACKAGE@,$PACKAGE,;t t
  s,@VERSION@,$VERSION,;t t
  s,@ACLOCAL@,$ACLOCAL,;t t
***************
*** 10875,10880 ****
--- 10536,10547 ----
  s,@AUTOMAKE@,$AUTOMAKE,;t t
  s,@AUTOHEADER@,$AUTOHEADER,;t t
  s,@MAKEINFO@,$MAKEINFO,;t t
+ s,@AMTAR@,$AMTAR,;t t
+ s,@install_sh@,$install_sh,;t t
+ s,@STRIP@,$STRIP,;t t
+ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+ s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+ s,@AWK@,$AWK,;t t
  s,@SET_MAKE@,$SET_MAKE,;t t
  s,@CC@,$CC,;t t
  s,@CFLAGS@,$CFLAGS,;t t
***************
*** 10883,10888 ****
--- 10550,10564 ----
  s,@ac_ct_CC@,$ac_ct_CC,;t t
  s,@EXEEXT@,$EXEEXT,;t t
  s,@OBJEXT@,$OBJEXT,;t t
+ s,@DEPDIR@,$DEPDIR,;t t
+ s,@am__include@,$am__include,;t t
+ s,@am__quote@,$am__quote,;t t
+ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+ s,@CCDEPMODE@,$CCDEPMODE,;t t
+ s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+ s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
  s,@CPP@,$CPP,;t t
  s,@LEX@,$LEX,;t t
  s,@LEXLIB@,$LEXLIB,;t t
***************
*** 10902,10909 ****
  s,@ECHO@,$ECHO,;t t
  s,@RANLIB@,$RANLIB,;t t
  s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
- s,@STRIP@,$STRIP,;t t
- s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
  s,@EGREP@,$EGREP,;t t
  s,@LIBTOOL@,$LIBTOOL,;t t
  s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
--- 10578,10583 ----
***************
*** 11179,11184 ****
--- 10853,10949 ----
    { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
  echo "$as_me: executing $ac_dest commands" >&6;}
    case $ac_dest in
+     depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # Check whether this is an Automake generated Makefile or not.
+   # We used to match only the files named `Makefile.in', but
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+   # So let's grep whole file.
+   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+     dirpart=`(dirname "$mf") 2>/dev/null ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$mf" : 'X\(//\)[^/]' \| \
+          X"$mf" : 'X\(//\)$' \| \
+          X"$mf" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$mf" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   else
+     continue
+   fi
+   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+   # Extract the definition of DEP_FILES from the Makefile without
+   # running `make'.
+   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+   test -z "$DEPDIR" && continue
+   # When using ansi2knr, U may be empty or an underscore; expand it
+   U=`sed -n -e '/^U = / s///p' < "$mf"`
+   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+   # We invoke sed twice because it is the simplest approach to
+   # changing $(DEPDIR) to its actual value in the expansion.
+   for file in `sed -n -e '
+     /^DEP_FILES = .*\\\\$/ {
+       s/^DEP_FILES = //
+       :loop
+ 	s/\\\\$//
+ 	p
+ 	n
+ 	/\\\\$/ b loop
+       p
+     }
+     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+     fdir=`(dirname "$file") 2>/dev/null ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$file" : 'X\(//\)[^/]' \| \
+          X"$file" : 'X\(//\)$' \| \
+          X"$file" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+     { if $as_mkdir_p; then
+     mkdir -p $dirpart/$fdir
+   else
+     as_dir=$dirpart/$fdir
+     as_dirs=
+     while test ! -d "$as_dir"; do
+       as_dirs="$as_dir $as_dirs"
+       as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$as_dir" : 'X\(//\)[^/]' \| \
+          X"$as_dir" : 'X\(//\)$' \| \
+          X"$as_dir" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+     done
+     test ! -n "$as_dirs" || mkdir $as_dirs
+   fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+ echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+    { (exit 1); exit 1; }; }; }
+ 
+     # echo "creating $dirpart/$file"
+     echo '# dummy' > "$dirpart/$file"
+   done
+ done
+  ;;
      default )
  if test -f "IDL.h.new"; then
  		if cmp -s "IDL.h" "IDL.h.new" 2>/dev/null; then
***************
*** 11212,11222 ****
  # need to make the FD available again.
  if test "$no_create" != yes; then
    ac_cs_success=:
-   ac_config_status_args=
-   test "$silent" = yes &&
-     ac_config_status_args="$ac_config_status_args --quiet"
    exec 5>/dev/null
!   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
--- 10977,10984 ----
  # need to make the FD available again.
  if test "$no_create" != yes; then
    ac_cs_success=:
    exec 5>/dev/null
!   $SHELL $CONFIG_STATUS || ac_cs_success=false
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
diff -crN ./libIDL/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/install-sh
*** ./libIDL/install-sh	Sat Jun 13 17:21:36 1998
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/install-sh	Thu Dec 18 19:46:30 2003
***************
*** 118,123 ****
--- 118,124 ----
  	
  	if [ -d $dst ]; then
  		instcmd=:
+ 		chmodcmd=""
  	else
  		instcmd=mkdir
  	fi
***************
*** 195,201 ****
  
  	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
  
--- 196,202 ----
  
  	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 || true; else true ; fi &&
  	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
  else
  
***************
*** 236,242 ****
  
  	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.
--- 237,243 ----
  
  	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 || true; else true;fi &&
  	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
  
  # Now rename the file to the real destination.
diff -crN ./libIDL/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/ltmain.sh
*** ./libIDL/ltmain.sh	Mon May 26 18:12:13 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/ltmain.sh	Thu Dec 18 19:46:07 2003
***************
*** 48,65 ****
    exit 0
  fi
  
- # define SED for historic ltconfig's generated by Libtool 1.3
- test -z "$SED" && SED=sed
- 
  # The name of this program.
! progname=`$echo "$0" | ${SED} 's%^.*/%%'`
  modename="$progname"
  
  # Constants.
  PROGRAM=ltmain.sh
  PACKAGE=libtool
! VERSION=1.4.3
! TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
  
  default_mode=
  help="Try \`$progname --help' for more information."
--- 48,62 ----
    exit 0
  fi
  
  # The name of this program.
! progname=`$echo "$0" | sed 's%^.*/%%'`
  modename="$progname"
  
  # Constants.
  PROGRAM=ltmain.sh
  PACKAGE=libtool
! VERSION=1.4.2
! TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"
  
  default_mode=
  help="Try \`$progname --help' for more information."
***************
*** 70,88 ****
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
! Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
! # test EBCDIC or ASCII                                                         
! case `echo A|od -x` in                                                         
!  *[Cc]1*) # EBCDIC based system                                                
!   SP2NL="tr '\100' '\n'"                                                       
!   NL2SP="tr '\r\n' '\100\100'"                                                 
!   ;;                                                                           
!  *) # Assume ASCII based system                                                
!   SP2NL="tr '\040' '\012'"                                                     
!   NL2SP="tr '\015\012' '\040\040'"                                             
!   ;;                                                                           
! esac                                                                           
  
  # NLS nuisances.
  # Only set LANG and LC_ALL to C if already set.
--- 67,76 ----
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
! Xsed='sed -e 1s/^X//'
  sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
! SP2NL='tr \040 \012'
! NL2SP='tr \015\012 \040\040'
  
  # NLS nuisances.
  # Only set LANG and LC_ALL to C if already set.
***************
*** 156,162 ****
      ;;
  
    --config)
!     ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
      exit 0
      ;;
  
--- 144,150 ----
      ;;
  
    --config)
!     sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
      exit 0
      ;;
  
***************
*** 189,196 ****
    --mode) prevopt="--mode" prev=mode ;;
    --mode=*) mode="$optarg" ;;
  
-   --preserve-dup-deps) duplicate_deps="yes" ;;
- 
    --quiet | --silent)
      show=:
      ;;
--- 177,182 ----
***************
*** 229,235 ****
    # Infer the operation mode.
    if test -z "$mode"; then
      case $nonopt in
!     *cc | *++ | gcc* | *-gcc* | xlc*)
        mode=link
        for arg
        do
--- 215,221 ----
    # Infer the operation mode.
    if test -z "$mode"; then
      case $nonopt in
!     *cc | *++ | gcc* | *-gcc*)
        mode=link
        for arg
        do
***************
*** 481,487 ****
        pic_mode=default
        ;;
      esac
!     if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
        # non-PIC code in shared libraries is not supported
        pic_mode=default
      fi
--- 467,473 ----
        pic_mode=default
        ;;
      esac
!     if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
        # non-PIC code in shared libraries is not supported
        pic_mode=default
      fi
***************
*** 771,777 ****
      linker_flags=
      dllsearchpath=
      lib_search_path=`pwd`
-     inst_prefix_dir=
  
      avoid_version=no
      dlfiles=
--- 757,762 ----
***************
*** 902,912 ****
  	  prev=
  	  continue
  	  ;;
-         inst_prefix)
- 	  inst_prefix_dir="$arg"
- 	  prev=
- 	  continue
- 	  ;;
  	release)
  	  release="-$arg"
  	  prev=
--- 887,892 ----
***************
*** 1008,1023 ****
  	continue
  	;;
  
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
- 	;;
- 
        # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
        # so, if we see these flags be careful not to treat them like -L
        -L[A-Z][A-Z]*:*)
  	case $with_gcc/$host in
! 	no/*-*-irix* | no/*-*-nonstopux*)
  	  compile_command="$compile_command $arg"
  	  finalize_command="$finalize_command $arg"
  	  ;;
--- 988,998 ----
  	continue
  	;;
  
        # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
        # so, if we see these flags be careful not to treat them like -L
        -L[A-Z][A-Z]*:*)
  	case $with_gcc/$host in
! 	no/*-*-irix*)
  	  compile_command="$compile_command $arg"
  	  finalize_command="$finalize_command $arg"
  	  ;;
***************
*** 1068,1081 ****
  	    # These systems don't actually have a C library (as such)
  	    test "X$arg" = "X-lc" && continue
  	    ;;
! 	  *-*-openbsd* | *-*-freebsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
  	    ;;
  	  esac
  	 elif test "X$arg" = "X-lc_r"; then
  	  case $host in
! 	 *-*-openbsd* | *-*-freebsd*)
  	    # Do not include libc_r directly, use -pthread flag.
  	    continue
  	    ;;
--- 1043,1056 ----
  	    # These systems don't actually have a C library (as such)
  	    test "X$arg" = "X-lc" && continue
  	    ;;
! 	  *-*-openbsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
  	    ;;
  	  esac
  	 elif test "X$arg" = "X-lc_r"; then
  	  case $host in
! 	  *-*-openbsd*)
  	    # Do not include libc_r directly, use -pthread flag.
  	    continue
  	    ;;
***************
*** 1355,1365 ****
      # Find all interdependent deplibs by searching for libraries
      # that are linked more than once (e.g. -la -lb -la)
      for deplib in $deplibs; do
!       if test "X$duplicate_deps" = "Xyes" ; then
! 	case "$libs " in
! 	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	esac
!       fi
        libs="$libs $deplib"
      done
      deplibs=
--- 1330,1338 ----
      # Find all interdependent deplibs by searching for libraries
      # that are linked more than once (e.g. -la -lb -la)
      for deplib in $deplibs; do
!       case "$libs " in
!       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
!       esac
        libs="$libs $deplib"
      done
      deplibs=
***************
*** 1488,1499 ****
  	  lib)
  	    if test "$deplibs_check_method" != pass_all; then
  	      echo
! 	      echo "*** Warning: Trying to link with static lib archive $deplib."
  	      echo "*** I have the capability to make that library automatically link in when"
  	      echo "*** you link to this library.  But I can only do this if you have a"
! 	      echo "*** shared version of the library, which you do not appear to have"
! 	      echo "*** because the file extensions .$libext of this argument makes me believe"
! 	      echo "*** that it is just a static archive that I should not used here."
  	    else
  	      echo
  	      echo "*** Warning: Linking the shared library $output against the"
--- 1461,1470 ----
  	  lib)
  	    if test "$deplibs_check_method" != pass_all; then
  	      echo
! 	      echo "*** Warning: This library needs some functionality provided by $deplib."
  	      echo "*** I have the capability to make that library automatically link in when"
  	      echo "*** you link to this library.  But I can only do this if you have a"
! 	      echo "*** shared version of the library, which you do not appear to have."
  	    else
  	      echo
  	      echo "*** Warning: Linking the shared library $output against the"
***************
*** 1537,1543 ****
  	fi
  
  	# Check to see that this really is a libtool archive.
! 	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  exit 1
--- 1508,1514 ----
  	fi
  
  	# Check to see that this really is a libtool archive.
! 	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  exit 1
***************
*** 1584,1594 ****
  	    tmp_libs=
  	    for deplib in $dependency_libs; do
  	      deplibs="$deplib $deplibs"
!               if test "X$duplicate_deps" = "Xyes" ; then
! 	        case "$tmp_libs " in
! 	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	        esac
!               fi
  	      tmp_libs="$tmp_libs $deplib"
  	    done
  	  elif test $linkmode != prog && test $linkmode != lib; then
--- 1555,1563 ----
  	    tmp_libs=
  	    for deplib in $dependency_libs; do
  	      deplibs="$deplib $deplibs"
! 	      case "$tmp_libs " in
! 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	      esac
  	      tmp_libs="$tmp_libs $deplib"
  	    done
  	  elif test $linkmode != prog && test $linkmode != lib; then
***************
*** 1711,1721 ****
  	      # or/and link against static libraries
  	      newdependency_libs="$deplib $newdependency_libs"
  	    fi
! 	    if test "X$duplicate_deps" = "Xyes" ; then
! 	      case "$tmp_libs " in
! 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	      esac
! 	    fi
  	    tmp_libs="$tmp_libs $deplib"
  	  done # for deplib
  	  continue
--- 1680,1688 ----
  	      # or/and link against static libraries
  	      newdependency_libs="$deplib $newdependency_libs"
  	    fi
! 	    case "$tmp_libs " in
! 	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	    esac
  	    tmp_libs="$tmp_libs $deplib"
  	  done # for deplib
  	  continue
***************
*** 1799,1806 ****
  
  	    # Make a new name for the extract_expsyms_cmds to use
  	    soroot="$soname"
! 	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
! 	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
  
  	    # If the library has no export list, then create one now
  	    if test -f "$output_objdir/$soname-def"; then :
--- 1766,1773 ----
  
  	    # Make a new name for the extract_expsyms_cmds to use
  	    soroot="$soname"
! 	    soname=`echo $soroot | sed -e 's/^.*\///'`
! 	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
  
  	    # If the library has no export list, then create one now
  	    if test -f "$output_objdir/$soname-def"; then :
***************
*** 1907,1922 ****
  	    if test "$hardcode_direct" = yes; then
  	      add="$libdir/$linklib"
  	    elif test "$hardcode_minus_L" = yes; then
! 	      # Try looking first in the location we're being installed to.
! 	      add_dir=
! 	      if test -n "$inst_prefix_dir"; then
! 		case "$libdir" in
! 		[\\/]*)
! 		  add_dir="-L$inst_prefix_dir$libdir"
! 		  ;;
! 		esac
! 	      fi
! 	      add_dir="$add_dir -L$libdir"
  	      add="-l$name"
  	    elif test "$hardcode_shlibpath_var" = yes; then
  	      case :$finalize_shlibpath: in
--- 1874,1880 ----
  	    if test "$hardcode_direct" = yes; then
  	      add="$libdir/$linklib"
  	    elif test "$hardcode_minus_L" = yes; then
! 	      add_dir="-L$libdir"
  	      add="-l$name"
  	    elif test "$hardcode_shlibpath_var" = yes; then
  	      case :$finalize_shlibpath: in
***************
*** 1926,1941 ****
  	      add="-l$name"
  	    else
  	      # We cannot seem to hardcode it, guess we'll fake it.
! 	      # Try looking first in the location we're being installed to.
! 	      add_dir=
! 	      if test -n "$inst_prefix_dir"; then
! 		case "$libdir" in
! 		[\\/]*)
! 		  add_dir="-L$inst_prefix_dir$libdir"
! 		  ;;
! 		esac
! 	      fi
! 	      add_dir="$add_dir -L$libdir"
  	      add="-l$name"
  	    fi
  
--- 1884,1890 ----
  	      add="-l$name"
  	    else
  	      # We cannot seem to hardcode it, guess we'll fake it.
! 	      add_dir="-L$libdir"
  	      add="-l$name"
  	    fi
  
***************
*** 1977,1990 ****
  	    # Just print a warning and add the library to dependency_libs so
  	    # that the program can be linked against the static library.
  	    echo
! 	    echo "*** Warning: This system can not link to static lib archive $lib."
  	    echo "*** I have the capability to make that library automatically link in when"
  	    echo "*** you link to this library.  But I can only do this if you have a"
  	    echo "*** shared version of the library, which you do not appear to have."
  	    if test "$module" = yes; then
! 	      echo "*** But as you try to build a module library, libtool will still create "
! 	      echo "*** a static module, that should work as long as the dlopening application"
! 	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
  	      if test -z "$global_symbol_pipe"; then
  		echo
  		echo "*** However, this would only work if libtool was able to extract symbol"
--- 1926,1938 ----
  	    # Just print a warning and add the library to dependency_libs so
  	    # that the program can be linked against the static library.
  	    echo
! 	    echo "*** Warning: This library needs some functionality provided by $lib."
  	    echo "*** I have the capability to make that library automatically link in when"
  	    echo "*** you link to this library.  But I can only do this if you have a"
  	    echo "*** shared version of the library, which you do not appear to have."
  	    if test "$module" = yes; then
! 	      echo "*** Therefore, libtool will create a static module, that should work "
! 	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
  	      if test -z "$global_symbol_pipe"; then
  		echo
  		echo "*** However, this would only work if libtool was able to extract symbol"
***************
*** 2033,2043 ****
  	  tmp_libs=
  	  for deplib in $dependency_libs; do
  	    newdependency_libs="$deplib $newdependency_libs"
! 	    if test "X$duplicate_deps" = "Xyes" ; then
! 	      case "$tmp_libs " in
! 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	      esac
! 	    fi
  	    tmp_libs="$tmp_libs $deplib"
  	  done
  
--- 1981,1989 ----
  	  tmp_libs=
  	  for deplib in $dependency_libs; do
  	    newdependency_libs="$deplib $newdependency_libs"
! 	    case "$tmp_libs " in
! 	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
! 	    esac
  	    tmp_libs="$tmp_libs $deplib"
  	  done
  
***************
*** 2063,2069 ****
  		if grep "^installed=no" $deplib > /dev/null; then
  		  path="-L$absdir/$objdir"
  		else
! 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  if test -z "$libdir"; then
  		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		    exit 1
--- 2009,2015 ----
  		if grep "^installed=no" $deplib > /dev/null; then
  		  path="-L$absdir/$objdir"
  		else
! 		  eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  if test -z "$libdir"; then
  		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		    exit 1
***************
*** 2268,2274 ****
  
  	# Check that each of the things are valid numbers.
  	case $current in
! 	[0-9]*) ;;
  	*)
  	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- 2214,2220 ----
  
  	# Check that each of the things are valid numbers.
  	case $current in
! 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
  	*)
  	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
***************
*** 2277,2283 ****
  	esac
  
  	case $revision in
! 	[0-9]*) ;;
  	*)
  	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- 2223,2229 ----
  	esac
  
  	case $revision in
! 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
  	*)
  	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
***************
*** 2286,2292 ****
  	esac
  
  	case $age in
! 	[0-9]*) ;;
  	*)
  	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--- 2232,2238 ----
  	esac
  
  	case $age in
! 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
  	*)
  	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
***************
*** 2327,2347 ****
  	  versuffix=".$current";
  	  ;;
  
! 	irix | nonstopux)
  	  major=`expr $current - $age + 1`
! 
! 	  case $version_type in
! 	    nonstopux) verstring_prefix=nonstopux ;;
! 	    *)         verstring_prefix=sgi ;;
! 	  esac
! 	  verstring="$verstring_prefix$major.$revision"
  
  	  # Add in all the interfaces that we are compatible with.
  	  loop=$revision
  	  while test $loop != 0; do
  	    iface=`expr $revision - $loop`
  	    loop=`expr $loop - 1`
! 	    verstring="$verstring_prefix$major.$iface:$verstring"
  	  done
  
  	  # Before this point, $major must not contain `.'.
--- 2273,2288 ----
  	  versuffix=".$current";
  	  ;;
  
! 	irix)
  	  major=`expr $current - $age + 1`
! 	  verstring="sgi$major.$revision"
  
  	  # Add in all the interfaces that we are compatible with.
  	  loop=$revision
  	  while test $loop != 0; do
  	    iface=`expr $revision - $loop`
  	    loop=`expr $loop - 1`
! 	    verstring="sgi$major.$iface:$verstring"
  	  done
  
  	  # Before this point, $major must not contain `.'.
***************
*** 2355,2361 ****
  	  ;;
  
  	osf)
! 	  major=.`expr $current - $age`
  	  versuffix=".$current.$age.$revision"
  	  verstring="$current.$age.$revision"
  
--- 2296,2302 ----
  	  ;;
  
  	osf)
! 	  major=`expr $current - $age`
  	  versuffix=".$current.$age.$revision"
  	  verstring="$current.$age.$revision"
  
***************
*** 2447,2455 ****
  
        # Eliminate all temporary directories.
        for path in $notinst_path; do
! 	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
! 	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
! 	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
        done
  
        if test -n "$xrpath"; then
--- 2388,2396 ----
  
        # Eliminate all temporary directories.
        for path in $notinst_path; do
! 	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
! 	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
! 	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
        done
  
        if test -n "$xrpath"; then
***************
*** 2500,2506 ****
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
! 	  *-*-openbsd* | *-*-freebsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
  	  *)
--- 2441,2447 ----
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
! 	  *-*-openbsd*)
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
  	  *)
***************
*** 2561,2580 ****
  		else
  		  droppeddeps=yes
  		  echo
! 		  echo "*** Warning: dynamic linker does not accept needed library $i."
  		  echo "*** I have the capability to make that library automatically link in when"
  		  echo "*** you link to this library.  But I can only do this if you have a"
! 		  echo "*** shared version of the library, which I believe you do not have"
! 		  echo "*** because a test_compile did reveal that the linker did not use it for"
! 		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
  		fi
  	      else
  		newdeplibs="$newdeplibs $i"
  	      fi
  	    done
  	  else
! 	    # Error occured in the first compile.  Let's try to salvage
! 	    # the situation: Compile a separate program for each library.
  	    for i in $deplibs; do
  	      name="`expr $i : '-l\(.*\)'`"
  	     # If $name is empty we are operating on a -L argument.
--- 2502,2519 ----
  		else
  		  droppeddeps=yes
  		  echo
! 		  echo "*** Warning: This library needs some functionality provided by $i."
  		  echo "*** I have the capability to make that library automatically link in when"
  		  echo "*** you link to this library.  But I can only do this if you have a"
! 		  echo "*** shared version of the library, which you do not appear to have."
  		fi
  	      else
  		newdeplibs="$newdeplibs $i"
  	      fi
  	    done
  	  else
! 	    # Error occured in the first compile.  Let's try to salvage the situation:
! 	    # Compile a seperate program for each library.
  	    for i in $deplibs; do
  	      name="`expr $i : '-l\(.*\)'`"
  	     # If $name is empty we are operating on a -L argument.
***************
*** 2593,2604 ****
  		  else
  		    droppeddeps=yes
  		    echo
! 		    echo "*** Warning: dynamic linker does not accept needed library $i."
  		    echo "*** I have the capability to make that library automatically link in when"
  		    echo "*** you link to this library.  But I can only do this if you have a"
! 		    echo "*** shared version of the library, which you do not appear to have"
! 		    echo "*** because a test_compile did reveal that the linker did not use this one"
! 		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
  		  fi
  		else
  		  droppeddeps=yes
--- 2532,2541 ----
  		  else
  		    droppeddeps=yes
  		    echo
! 		    echo "*** Warning: This library needs some functionality provided by $i."
  		    echo "*** I have the capability to make that library automatically link in when"
  		    echo "*** you link to this library.  But I can only do this if you have a"
! 		    echo "*** shared version of the library, which you do not appear to have."
  		  fi
  		else
  		  droppeddeps=yes
***************
*** 2637,2650 ****
  		      # but so what?
  		      potlib="$potent_lib"
  		      while test -h "$potlib" 2>/dev/null; do
! 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
  			case $potliblink in
  			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
  			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
  			esac
  		      done
  		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
! 			 | ${SED} 10q \
  			 | egrep "$file_magic_regex" > /dev/null; then
  			newdeplibs="$newdeplibs $a_deplib"
  			a_deplib=""
--- 2574,2587 ----
  		      # but so what?
  		      potlib="$potent_lib"
  		      while test -h "$potlib" 2>/dev/null; do
! 			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
  			case $potliblink in
  			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
  			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
  			esac
  		      done
  		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
! 			 | sed 10q \
  			 | egrep "$file_magic_regex" > /dev/null; then
  			newdeplibs="$newdeplibs $a_deplib"
  			a_deplib=""
***************
*** 2655,2671 ****
  	      if test -n "$a_deplib" ; then
  		droppeddeps=yes
  		echo
! 		echo "*** Warning: linker path does not have real file for library $a_deplib."
  		echo "*** I have the capability to make that library automatically link in when"
  		echo "*** you link to this library.  But I can only do this if you have a"
! 		echo "*** shared version of the library, which you do not appear to have"
! 		echo "*** because I did check the linker path looking for a file starting"
! 		if test -z "$potlib" ; then
! 		  echo "*** with $libname but no candidates were found. (...for file magic test)"
! 		else
! 		  echo "*** with $libname and none of the candidates passed a file format test"
! 		  echo "*** using a file magic. Last file checked: $potlib"
! 		fi
  	      fi
  	    else
  	      # Add a -L argument.
--- 2592,2601 ----
  	      if test -n "$a_deplib" ; then
  		droppeddeps=yes
  		echo
! 		echo "*** Warning: This library needs some functionality provided by $a_deplib."
  		echo "*** I have the capability to make that library automatically link in when"
  		echo "*** you link to this library.  But I can only do this if you have a"
! 		echo "*** shared version of the library, which you do not appear to have."
  	      fi
  	    else
  	      # Add a -L argument.
***************
*** 2684,2692 ****
  	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  		for potent_lib in $potential_libs; do
- 		  potlib="$potent_lib" # see symlink-check below in file_magic test
  		  if eval echo \"$potent_lib\" 2>/dev/null \
! 		      | ${SED} 10q \
  		      | egrep "$match_pattern_regex" > /dev/null; then
  		    newdeplibs="$newdeplibs $a_deplib"
  		    a_deplib=""
--- 2614,2621 ----
  	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  		for potent_lib in $potential_libs; do
  		  if eval echo \"$potent_lib\" 2>/dev/null \
! 		      | sed 10q \
  		      | egrep "$match_pattern_regex" > /dev/null; then
  		    newdeplibs="$newdeplibs $a_deplib"
  		    a_deplib=""
***************
*** 2697,2713 ****
  	      if test -n "$a_deplib" ; then
  		droppeddeps=yes
  		echo
! 		echo "*** Warning: linker path does not have real file for library $a_deplib."
  		echo "*** I have the capability to make that library automatically link in when"
  		echo "*** you link to this library.  But I can only do this if you have a"
! 		echo "*** shared version of the library, which you do not appear to have"
! 		echo "*** because I did check the linker path looking for a file starting"
! 		if test -z "$potlib" ; then
! 		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
! 		else
! 		  echo "*** with $libname and none of the candidates passed a file format test"
! 		  echo "*** using a regex pattern. Last file checked: $potlib"
! 		fi
  	      fi
  	    else
  	      # Add a -L argument.
--- 2626,2635 ----
  	      if test -n "$a_deplib" ; then
  		droppeddeps=yes
  		echo
! 		echo "*** Warning: This library needs some functionality provided by $a_deplib."
  		echo "*** I have the capability to make that library automatically link in when"
  		echo "*** you link to this library.  But I can only do this if you have a"
! 		echo "*** shared version of the library, which you do not appear to have."
  	      fi
  	    else
  	      # Add a -L argument.
***************
*** 2972,2989 ****
  	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
  	  eval cmds=\"$archive_expsym_cmds\"
  	else
- 	  save_deplibs="$deplibs"
- 	  for conv in $convenience; do
- 	    tmp_deplibs=
- 	    for test_deplib in $deplibs; do
- 	      if test "$test_deplib" != "$conv"; then
- 		tmp_deplibs="$tmp_deplibs $test_deplib"
- 	      fi
- 	    done
- 	    deplibs="$tmp_deplibs"
- 	  done
  	  eval cmds=\"$archive_cmds\"
- 	  deplibs="$save_deplibs"
  	fi
  	save_ifs="$IFS"; IFS='~'
  	for cmd in $cmds; do
--- 2894,2900 ----
***************
*** 3182,3188 ****
  
      prog)
        case $host in
! 	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
        esac
        if test -n "$vinfo"; then
  	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
--- 3093,3099 ----
  
      prog)
        case $host in
! 	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
        esac
        if test -n "$vinfo"; then
  	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
***************
*** 3204,3219 ****
  	# On Rhapsody replace the C library is the System framework
  	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
  	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
- 	case $host in
- 	*darwin*)
- 	  # Don't allow lazy linking, it breaks C++ global constructors
- 	  compile_command="$compile_command ${wl}-bind_at_load"
- 	  finalize_command="$finalize_command ${wl}-bind_at_load"
- 	  ;;
- 	esac
  	;;
        esac
  
        compile_command="$compile_command $compile_deplibs"
        finalize_command="$finalize_command $finalize_deplibs"
  
--- 3115,3128 ----
  	# On Rhapsody replace the C library is the System framework
  	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
  	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
  	;;
        esac
  
+       # AIX needs explicit runtime linking option
+ 
+       compile_command="$compile_command $use_runtimelinking"
+       finalize_command="$finalize_command $use_runtimelinking"
+ 
        compile_command="$compile_command $compile_deplibs"
        finalize_command="$finalize_command $finalize_deplibs"
  
***************
*** 3377,3385 ****
  	    if test -z "$export_symbols"; then
  	      export_symbols="$output_objdir/$output.exp"
  	      $run $rm $export_symbols
! 	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
  	    else
! 	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
  	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
  	      $run eval 'mv "$nlist"T "$nlist"'
  	    fi
--- 3286,3294 ----
  	    if test -z "$export_symbols"; then
  	      export_symbols="$output_objdir/$output.exp"
  	      $run $rm $export_symbols
! 	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
  	    else
! 	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
  	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
  	      $run eval 'mv "$nlist"T "$nlist"'
  	    fi
***************
*** 3387,3393 ****
  
  	  for arg in $dlprefiles; do
  	    $show "extracting global C symbols from \`$arg'"
! 	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
  	    $run eval 'echo ": $name " >> "$nlist"'
  	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
  	  done
--- 3296,3302 ----
  
  	  for arg in $dlprefiles; do
  	    $show "extracting global C symbols from \`$arg'"
! 	    name=`echo "$arg" | sed -e 's%^.*/%%'`
  	    $run eval 'echo ": $name " >> "$nlist"'
  	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
  	  done
***************
*** 3402,3414 ****
  	    fi
  
  	    # Try sorting and uniquifying the output.
! 	    if grep -v "^: " < "$nlist" |
! 		if sort -k 3 </dev/null >/dev/null 2>&1; then
! 		  sort -k 3
! 		else
! 		  sort +2
! 		fi |
! 		uniq > "$nlist"S; then
  	      :
  	    else
  	      grep -v "^: " < "$nlist" > "$nlist"S
--- 3311,3317 ----
  	    fi
  
  	    # Try sorting and uniquifying the output.
! 	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
  	      :
  	    else
  	      grep -v "^: " < "$nlist" > "$nlist"S
***************
*** 3630,3636 ****
  	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
  	  fi
  	done
! 	relink_command="(cd `pwd`; $relink_command)"
  	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
        fi
  
--- 3533,3539 ----
  	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
  	  fi
  	done
! 	relink_command="cd `pwd`; $relink_command"
  	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
        fi
  
***************
*** 3650,3656 ****
  	# win32 will think the script is a binary if it has
  	# a .exe suffix, so we strip it off here.
  	case $output in
! 	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
  	esac
  	# test for cygwin because mv fails w/o .exe extensions
  	case $host in
--- 3553,3559 ----
  	# win32 will think the script is a binary if it has
  	# a .exe suffix, so we strip it off here.
  	case $output in
! 	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
  	esac
  	# test for cygwin because mv fails w/o .exe extensions
  	case $host in
***************
*** 3674,3680 ****
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
! Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='$sed_quote_subst'
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
--- 3577,3583 ----
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
! Xsed='sed -e 1s/^X//'
  sed_quote_subst='$sed_quote_subst'
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
***************
*** 3712,3718 ****
    test \"x\$thisdir\" = \"x\$file\" && thisdir=.
  
    # Follow symbolic links until we get to the real thisdir.
!   file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
    while test -n \"\$file\"; do
      destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
  
--- 3615,3621 ----
    test \"x\$thisdir\" = \"x\$file\" && thisdir=.
  
    # Follow symbolic links until we get to the real thisdir.
!   file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
    while test -n \"\$file\"; do
      destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
  
***************
*** 3725,3731 ****
      fi
  
      file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
!     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
    done
  
    # Try to get the absolute directory name.
--- 3628,3634 ----
      fi
  
      file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
!     file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
    done
  
    # Try to get the absolute directory name.
***************
*** 3739,3745 ****
    progdir=\"\$thisdir/$objdir\"
  
    if test ! -f \"\$progdir/\$program\" || \\
!      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
         test \"X\$file\" != \"X\$progdir/\$program\"; }; then
  
      file=\"\$\$-\$program\"
--- 3642,3648 ----
    progdir=\"\$thisdir/$objdir\"
  
    if test ! -f \"\$progdir/\$program\" || \\
!      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
         test \"X\$file\" != \"X\$progdir/\$program\"; }; then
  
      file=\"\$\$-\$program\"
***************
*** 3785,3791 ****
      $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
  
      # Some systems cannot cope with colon-terminated $shlibpath_var
!     # The second colon is a workaround for a bug in BeOS R4 ${SED}
      $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
  
      export $shlibpath_var
--- 3688,3694 ----
      $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
  
      # Some systems cannot cope with colon-terminated $shlibpath_var
!     # The second colon is a workaround for a bug in BeOS R4 sed
      $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
  
      export $shlibpath_var
***************
*** 3960,3966 ****
  	fi
        done
        # Quote the link command for shipping.
!       relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
        relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
  
        # Only create the output if not a dry run.
--- 3863,3869 ----
  	fi
        done
        # Quote the link command for shipping.
!       relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
        relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
  
        # Only create the output if not a dry run.
***************
*** 3977,3983 ****
  	      case $deplib in
  	      *.la)
  		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
! 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		if test -z "$libdir"; then
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit 1
--- 3880,3886 ----
  	      case $deplib in
  	      *.la)
  		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
! 		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		if test -z "$libdir"; then
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit 1
***************
*** 3991,3997 ****
  	    newdlfiles=
  	    for lib in $dlfiles; do
  	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
! 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  		exit 1
--- 3894,3900 ----
  	    newdlfiles=
  	    for lib in $dlfiles; do
  	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
! 	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  		exit 1
***************
*** 4002,4008 ****
  	    newdlprefiles=
  	    for lib in $dlprefiles; do
  	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
! 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  		exit 1
--- 3905,3911 ----
  	    newdlprefiles=
  	    for lib in $dlprefiles; do
  	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
! 	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  		exit 1
***************
*** 4016,4021 ****
--- 3919,3925 ----
  	  tdlname=$dlname
  	  case $host,$output,$installed,$module,$dlname in
  	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	    *aix*,*,*,*,*) tdlname=$realname\($dlname\) ;;
  	  esac
  	  $echo > $output "\
  # $outputname - a libtool library file
***************
*** 4226,4232 ****
  
        *.la)
  	# Check to see that this really is a libtool archive.
! 	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  	else
  	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
--- 4130,4136 ----
  
        *.la)
  	# Check to see that this really is a libtool archive.
! 	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  	else
  	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
***************
*** 4260,4292 ****
  	test "X$dir" = "X$file/" && dir=
  	dir="$dir$objdir"
  
! 	if test -n "$relink_command"; then
! 	  # Determine the prefix the user has applied to our future dir.
! 	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
! 
! 	  # Don't allow the user to place us outside of our expected
! 	  # location b/c this prevents finding dependent libraries that
! 	  # are installed to the same prefix.
! 	  if test "$inst_prefix_dir" = "$destdir"; then
! 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
! 	    exit 1
! 	  fi
! 
! 	  if test -n "$inst_prefix_dir"; then
! 	    # Stick the inst_prefix_dir data into the link command.
! 	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
! 	  else
! 	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
! 	  fi
! 
! 	  $echo "$modename: warning: relinking \`$file'" 1>&2
! 	  $show "$relink_command"
! 	  if $run eval "$relink_command"; then :
! 	  else
! 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
! 	    exit 1
! 	  fi
! 	fi
  
  	# See the names of the shared library.
  	set dummy $library_names
--- 4164,4180 ----
  	test "X$dir" = "X$file/" && dir=
  	dir="$dir$objdir"
  
! # BEGIN WORKAROUND DESTDIR
! #	if test -n "$relink_command"; then
! #	  $echo "$modename: warning: relinking \`$file'" 1>&2
! #	  $show "$relink_command"
! #	  if $run eval "$relink_command"; then :
! #	  else
! #	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
! #	    continue
! #	  fi
! #	fi
! # END WORKAROUND DESTDIR
  
  	# See the names of the shared library.
  	set dummy $library_names
***************
*** 4296,4302 ****
  	  shift
  
  	  srcname="$realname"
! 	  test -n "$relink_command" && srcname="$realname"T
  
  	  # Install the shared library and build the symlinks.
  	  $show "$install_prog $dir/$srcname $destdir/$realname"
--- 4184,4192 ----
  	  shift
  
  	  srcname="$realname"
! # BEGIN WORKAROUND DESTDIR
! #	  test -n "$relink_command" && srcname="$realname"T
! # END WORKAROUND DESTDIR
  
  	  # Install the shared library and build the symlinks.
  	  $show "$install_prog $dir/$srcname $destdir/$realname"
***************
*** 4393,4419 ****
  	fi
  
  	# Do a test to see if this is really a libtool program.
! 	case $host in
! 	*cygwin*|*mingw*)
! 	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
! 	    ;;
! 	*)
! 	    wrapper=$file
! 	    ;;
! 	esac
! 	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
  	  notinst_deplibs=
  	  relink_command=
  
  	  # If there is no directory component, then add one.
  	  case $file in
! 	  */* | *\\*) . $wrapper ;;
! 	  *) . ./$wrapper ;;
  	  esac
  
  	  # Check the variables that should have been set.
  	  if test -z "$notinst_deplibs"; then
! 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
  	    exit 1
  	  fi
  
--- 4283,4301 ----
  	fi
  
  	# Do a test to see if this is really a libtool program.
! 	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  notinst_deplibs=
  	  relink_command=
  
  	  # If there is no directory component, then add one.
  	  case $file in
! 	  */* | *\\*) . $file ;;
! 	  *) . ./$file ;;
  	  esac
  
  	  # Check the variables that should have been set.
  	  if test -z "$notinst_deplibs"; then
! 	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
  	    exit 1
  	  fi
  
***************
*** 4438,4445 ****
  	  relink_command=
  	  # If there is no directory component, then add one.
  	  case $file in
! 	  */* | *\\*) . $wrapper ;;
! 	  *) . ./$wrapper ;;
  	  esac
  
  	  outputname=
--- 4320,4327 ----
  	  relink_command=
  	  # If there is no directory component, then add one.
  	  case $file in
! 	  */* | *\\*) . $file ;;
! 	  *) . ./$file ;;
  	  esac
  
  	  outputname=
***************
*** 4447,4459 ****
  	    if test "$finalize" = yes && test -z "$run"; then
  	      tmpdir="/tmp"
  	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
! 	      tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
! 	      if test $? = 0 ; then
! 		tmpdir="$tmpdir_mktemp"
! 		unset tmpdir_mktemp
! 	       else
! 		tmpdir="$tmpdir/libtool-$$"
! 	      fi
  	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
  	      else
  		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
--- 4329,4335 ----
  	    if test "$finalize" = yes && test -z "$run"; then
  	      tmpdir="/tmp"
  	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
! 	      tmpdir="$tmpdir/libtool-$$"
  	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
  	      else
  		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
***************
*** 4493,4499 ****
  	    destfile=$destfile.exe
  	    ;;
  	  *:*.exe)
! 	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
  	    ;;
  	  esac
  	  ;;
--- 4369,4375 ----
  	    destfile=$destfile.exe
  	    ;;
  	  *:*.exe)
! 	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
  	    ;;
  	  esac
  	  ;;
***************
*** 4641,4647 ****
        case $file in
        *.la)
  	# Check to see that this really is a libtool archive.
! 	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
--- 4517,4523 ----
        case $file in
        *.la)
  	# Check to see that this really is a libtool archive.
! 	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
***************
*** 4712,4718 ****
        -*) ;;
        *)
  	# Do a test to see if this is really a libtool program.
! 	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  # If there is no directory component, then add one.
  	  case $file in
  	  */* | *\\*) . $file ;;
--- 4588,4594 ----
        -*) ;;
        *)
  	# Do a test to see if this is really a libtool program.
! 	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  # If there is no directory component, then add one.
  	  case $file in
  	  */* | *\\*) . $file ;;
***************
*** 4744,4750 ****
        fi
  
        # Now prepare to actually exec the command.
!       exec_cmd="\$cmd$args"
      else
        # Display what would be done.
        if test -n "$shlibpath_var"; then
--- 4620,4626 ----
        fi
  
        # Now prepare to actually exec the command.
!       exec_cmd='"$cmd"$args'
      else
        # Display what would be done.
        if test -n "$shlibpath_var"; then
***************
*** 4821,4827 ****
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
! 	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  . $dir/$name
  
  	  # Delete the libtool libraries and symlinks.
--- 4697,4703 ----
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
! 	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  . $dir/$name
  
  	  # Delete the libtool libraries and symlinks.
***************
*** 4876,4882 ****
        *)
  	# Do a test to see if this is a libtool program.
  	if test $mode = clean &&
! 	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  relink_command=
  	  . $dir/$file
  
--- 4752,4758 ----
        *)
  	# Do a test to see if this is a libtool program.
  	if test $mode = clean &&
! 	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
  	  relink_command=
  	  . $dir/$file
  
diff -crN ./libIDL/missing /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/missing
*** ./libIDL/missing	Sat Jun 13 17:21:36 1998
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/missing	Thu Dec 18 19:46:30 2003
***************
*** 1,7 ****
  #! /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
--- 1,7 ----
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
! # Originally by Fran,cois 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
***************
*** 18,28 ****
--- 18,54 ----
  # 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.
+ 
  if test $# -eq 0; then
    echo 1>&2 "Try \`$0 --help' for more information"
    exit 1
  fi
  
+ run=:
+ 
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+ if test -f configure.ac; then
+   configure_ac=configure.ac
+ else
+   configure_ac=configure.in
+ fi
+ 
+ case "$1" in
+ --run)
+   # Try to run requested program, and just exit if it succeeds.
+   run=
+   shift
+   "$@" && exit 0
+   ;;
+ esac
+ 
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
  case "$1" in
  
    -h|--h|--he|--hel|--help)
***************
*** 35,40 ****
--- 61,67 ----
  Options:
    -h, --help      display this help and exit
    -v, --version   output version information and exit
+   --run           try to run the given command, and emulate it if it fails
  
  Supported PROGRAM values:
    aclocal      touch file \`aclocal.m4'
***************
*** 43,55 ****
    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"
      ;;
  
    -*)
--- 70,84 ----
    automake     touch all \`Makefile.in' files
    bison        create \`y.tab.[ch]', if possible, from existing .[ch]
    flex         create \`lex.yy.c', if possible, from existing .c
+   help2man     touch the output file
    lex          create \`lex.yy.c', if possible, from existing .c
    makeinfo     touch the output file
+   tar          try tar, gnutar, gtar, then tar without non-portable flags
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
      ;;
  
    -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
!     echo "missing 0.4 - GNU automake"
      ;;
  
    -*)
***************
*** 58,107 ****
      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`
!     if test -z "$files"; then
!       files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in`
!       test -z "$files" || files="$files.in"
!     else
!       files=`echo "$files" | sed -e 's/:/ /g'`
      fi
-     test -z "$files" && files="config.h.in"
-     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$/touch \1.in/' \
!       | sh
      ;;
  
    bison|yacc)
--- 87,186 ----
      exit 1
      ;;
  
!   aclocal*)
!     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
!        # We have it, but it failed.
!        exit 1
!     fi
! 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
           to install the \`Automake' and \`Perl' packages.  Grab them from
           any GNU archive site."
      touch aclocal.m4
      ;;
  
    autoconf)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`${configure_ac}'.  You might want to install the
           \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
           archive site."
      touch configure
      ;;
  
    autoheader)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
           to install the \`Autoconf' and \`GNU m4' packages.  Grab them
           from any GNU archive site."
!     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
!     test -z "$files" && files="config.h"
!     touch_files=
!     for f in $files; do
!       case "$f" in
!       *:*) touch_files="$touch_files "`echo "$f" |
! 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
!       *) touch_files="$touch_files $f.in";;
!       esac
!     done
!     touch $touch_files
!     ;;
! 
!   automake*)
!     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
!        # We have it, but it failed.
!        exit 1
      fi
  
      echo 1>&2 "\
  WARNING: \`$1' is missing on your system.  You should only need it if
!          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
           You might want to install the \`Automake' and \`Perl' packages.
           Grab them from any GNU archive site."
!     find . -type f -name Makefile.am -print |
! 	   sed 's/\.am$/.in/' |
! 	   while read f; do touch "$f"; done
!     ;;
! 
!   autom4te)
!     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
!        # We have it, but it failed.
!        exit 1
!     fi
! 
!     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.
!          You can get \`$1Help2man' as part of \`Autoconf' from any GNU
!          archive site."
! 
!     file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
!     test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
!     if test -f "$file"; then
! 	touch $file
!     else
! 	test -z "$file" || exec >$file
! 	echo "#! /bin/sh"
! 	echo "# Created by GNU Automake missing as a replacement of"
! 	echo "#  $ $@"
! 	echo "exit 0"
! 	chmod +x $file
! 	exit 1
!     fi
      ;;
  
    bison|yacc)
***************
*** 157,163 ****
--- 236,272 ----
      fi
      ;;
  
+   help2man)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
+     fi
+ 
+     echo 1>&2 "\
+ WARNING: \`$1' is missing on your system.  You should only need it if
+ 	 you modified a dependency of a manual page.  You may need the
+ 	 \`Help2man' package in order for those modifications to take
+ 	 effect.  You can get \`Help2man' from any GNU archive site."
+ 
+     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+     if test -z "$file"; then
+ 	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+     fi
+     if [ -f "$file" ]; then
+ 	touch $file
+     else
+ 	test -z "$file" || exec >$file
+ 	echo ".ab help2man is required to generate this page"
+ 	exit 1
+     fi
+     ;;
+ 
    makeinfo)
+     if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+        # We have makeinfo, but it failed.
+        exit 1
+     fi
+ 
      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
***************
*** 173,178 ****
--- 282,326 ----
      touch $file
      ;;
  
+   tar)
+     shift
+     if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+     fi
+ 
+     # We have already tried tar in the generic part.
+     # Look for gnutar/gtar before invocation to avoid ugly error
+     # messages.
+     if (gnutar --version > /dev/null 2>&1); then
+        gnutar "$@" && exit 0
+     fi
+     if (gtar --version > /dev/null 2>&1); then
+        gtar "$@" && exit 0
+     fi
+     firstarg="$1"
+     if shift; then
+ 	case "$firstarg" in
+ 	*o*)
+ 	    firstarg=`echo "$firstarg" | sed s/o//`
+ 	    tar "$firstarg" "$@" && exit 0
+ 	    ;;
+ 	esac
+ 	case "$firstarg" in
+ 	*h*)
+ 	    firstarg=`echo "$firstarg" | sed s/h//`
+ 	    tar "$firstarg" "$@" && exit 0
+ 	    ;;
+ 	esac
+     fi
+ 
+     echo 1>&2 "\
+ WARNING: I can't seem to be able to run \`tar' with the given arguments.
+          You may want to install GNU tar or Free paxutils, or check the
+          command line arguments."
+     exit 1
+     ;;
+ 
    *)
      echo 1>&2 "\
  WARNING: \`$1' is needed, and you do not seem to have it handy on your
diff -crN ./libIDL/mkinstalldirs /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/mkinstalldirs
*** ./libIDL/mkinstalldirs	Sat Jun 13 17:21:36 1998
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libIDL/mkinstalldirs	Thu Dec 18 19:46:30 2003
***************
*** 4,40 ****
  # Created: 1993-05-16
  # Public domain
  
- # $Id: mkinstalldirs,v 1.1.1.1 1998/06/13 16:21:36 andrewtv 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" 1>&2
! 
!         mkdir "$pathcomp" || lasterr=$?
! 
!         if test ! -d "$pathcomp"; then
!   	  errstatus=$lasterr
!         fi
!      fi
  
!      pathcomp="$pathcomp/"
!    done
  done
  
  exit $errstatus
  
  # mkinstalldirs ends here
--- 4,111 ----
  # Created: 1993-05-16
  # Public domain
  
  errstatus=0
+ dirmode=""
+ 
+ usage="\
+ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+ 
+ # process command line arguments
+ while test $# -gt 0 ; do
+   case $1 in
+     -h | --help | --h*)         # -h for help
+       echo "$usage" 1>&2
+       exit 0
+       ;;
+     -m)                         # -m PERM arg
+       shift
+       test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+       dirmode=$1
+       shift
+       ;;
+     --)                         # stop option processing
+       shift
+       break
+       ;;
+     -*)                         # unknown option
+       echo "$usage" 1>&2
+       exit 1
+       ;;
+     *)                          # first non-opt arg
+       break
+       ;;
+   esac
+ done
+ 
+ for file
+ do
+   if test -d "$file"; then
+     shift
+   else
+     break
+   fi
+ done
+ 
+ case $# in
+   0) exit 0 ;;
+ esac
+ 
+ case $dirmode in
+   '')
+     if mkdir -p -- . 2>/dev/null; then
+       echo "mkdir -p -- $*"
+       exec mkdir -p -- "$@"
+     fi
+     ;;
+   *)
+     if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+       echo "mkdir -m $dirmode -p -- $*"
+       exec mkdir -m "$dirmode" -p -- "$@"
+     fi
+     ;;
+ esac
  
  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
!       else
!   	if test ! -z "$dirmode"; then
! 	  echo "chmod $dirmode $pathcomp"
!     	  lasterr=""
!   	  chmod "$dirmode" "$pathcomp" || lasterr=$?
! 
!   	  if test ! -z "$lasterr"; then
!   	    errstatus=$lasterr
!   	  fi
!   	fi
!       fi
!     fi
  
!     pathcomp="$pathcomp/"
!   done
  done
  
  exit $errstatus
  
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
+ # End:
  # mkinstalldirs ends here
