diff -C3 -N -r ./Makefile.am d:/temp/distmake/popt12s/contrib/popt-1.2/Makefile.am
*** ./Makefile.am	Mon Oct 26 21:53:26 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/Makefile.am	Sun Jul 30 00:20:50 2000
***************
*** 1,8 ****
  # Makefile for popt library.
  
! AUTOMAKE_OPTIONS = 1.3 foreign
  
  SUBDIRS = po
  
  LDFLAGS = -L$(top_builddir)
  INCLUDES = -I$(top_srcdir)
--- 1,12 ----
  # Makefile for popt library.
  
! AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
  
+ if ENABLE_NLS
  SUBDIRS = po
+ else
+ SUBDIRS =
+ endif
  
  LDFLAGS = -L$(top_builddir)
  INCLUDES = -I$(top_srcdir)
diff -C3 -N -r ./Makefile.in d:/temp/distmake/popt12s/contrib/popt-1.2/Makefile.in
*** ./Makefile.in	Tue Oct 27 14:45:38 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/Makefile.in	Sun Jul 30 00:24:46 2000
***************
*** 1,6 ****
! # Makefile.in generated automatically by automake 1.3 from Makefile.am
  
! # Copyright (C) 1994, 1995, 1996, 1997, 1998 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,6 ----
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
  
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
***************
*** 13,19 ****
  # Makefile for popt library.
  
  
! SHELL = /bin/sh
  
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
--- 13,19 ----
  # Makefile for popt library.
  
  
! SHELL = @SHELL@
  
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
***************
*** 34,40 ****
  includedir = @includedir@
  oldincludedir = /usr/include
  
! DISTDIR =
  
  pkgdatadir = $(datadir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
--- 34,40 ----
  includedir = @includedir@
  oldincludedir = /usr/include
  
! DESTDIR =
  
  pkgdatadir = $(datadir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
***************
*** 48,54 ****
  AUTOHEADER = @AUTOHEADER@
  
  INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  transform = @program_transform_name@
--- 48,54 ----
  AUTOHEADER = @AUTOHEADER@
  
  INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  transform = @program_transform_name@
***************
*** 61,66 ****
--- 61,67 ----
  POST_UNINSTALL = :
  CC = @CC@
  CPP = @CPP@
+ EXEEXT = @EXEEXT@
  MAKEINFO = @MAKEINFO@
  PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
***************
*** 68,76 ****
  U = @U@
  VERSION = @VERSION@
  
! AUTOMAKE_OPTIONS = 1.3 foreign
! 
! SUBDIRS = po
  
  LDFLAGS = -L$(top_builddir)
  INCLUDES = -I$(top_srcdir)
--- 69,77 ----
  U = @U@
  VERSION = @VERSION@
  
! AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies
! @ENABLE_NLS_TRUE@SUBDIRS = po
! @ENABLE_NLS_FALSE@SUBDIRS = 
  
  LDFLAGS = -L$(top_builddir)
  INCLUDES = -I$(top_srcdir)
***************
*** 87,93 ****
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES = 
  LIBRARIES =  $(lib_LIBRARIES)
  
  
--- 88,94 ----
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =  testit.sh
  LIBRARIES =  $(lib_LIBRARIES)
  
  
***************
*** 97,156 ****
  libpopt_a_LIBADD = 
  libpopt_a_OBJECTS =  popt.o findme.o poptparse.o poptconfig.o popthelp.o
  AR = ar
  PROGRAMS =  $(noinst_PROGRAMS)
  
  test1_OBJECTS =  test1.o
  test1_DEPENDENCIES = 
  test1_LDFLAGS = 
  CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
! LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
  HEADERS =  $(include_HEADERS)
  
! DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
! aclocal.m4 config.h.in configure configure.in install-sh missing \
! mkinstalldirs stamp-h.in
  
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
  TAR = tar
! GZIP = --best
! DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
! .deps/popthelp.P .deps/poptparse.P .deps/test1.P
  SOURCES = $(libpopt_a_SOURCES) $(test1_SOURCES)
  OBJECTS = $(libpopt_a_OBJECTS) $(test1_OBJECTS)
  
! all: all-recursive-am all-am
! 
  .SUFFIXES:
  .SUFFIXES: .S .c .o .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
  	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
  
! Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
  	cd $(top_builddir) \
  	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  $(ACLOCAL_M4):  configure.in 
  	cd $(srcdir) && $(ACLOCAL)
  
! config.status: $(srcdir)/configure
  	$(SHELL) ./config.status --recheck
  $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
  
  config.h: stamp-h
! 	@:
! stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
  	cd $(top_builddir) \
! 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
  	     $(SHELL) ./config.status
! 	@echo timestamp > stamp-h
! $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
  $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
  	cd $(top_srcdir) && $(AUTOHEADER)
! 	@echo timestamp > $(srcdir)/stamp-h.in
  
  mostlyclean-hdr:
  
--- 98,164 ----
  libpopt_a_LIBADD = 
  libpopt_a_OBJECTS =  popt.o findme.o poptparse.o poptconfig.o popthelp.o
  AR = ar
+ noinst_PROGRAMS =  test1$(EXEEXT)
  PROGRAMS =  $(noinst_PROGRAMS)
  
  test1_OBJECTS =  test1.o
  test1_DEPENDENCIES = 
  test1_LDFLAGS = 
  CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
  HEADERS =  $(include_HEADERS)
  
! DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
! acconfig.h aclocal.m4 config.hin configure configure.in install-sh \
! missing mkinstalldirs testit-in.sh
  
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
  TAR = tar
! GZIP_ENV = --best
! DIST_SUBDIRS =  po
  SOURCES = $(libpopt_a_SOURCES) $(test1_SOURCES)
  OBJECTS = $(libpopt_a_OBJECTS) $(test1_OBJECTS)
  
! all: all-redirect
  .SUFFIXES:
  .SUFFIXES: .S .c .o .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
  	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
  
! Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) \
  	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  $(ACLOCAL_M4):  configure.in 
  	cd $(srcdir) && $(ACLOCAL)
  
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
  
  config.h: stamp-h
! 	@if test ! -f $@; then \
! 		rm -f stamp-h; \
! 		$(MAKE) stamp-h; \
! 	else :; fi
! stamp-h: $(srcdir)/config.hin $(top_builddir)/config.status
  	cd $(top_builddir) \
! 	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.hin \
  	     $(SHELL) ./config.status
! 	@echo timestamp > stamp-h 2> /dev/null
! $(srcdir)/config.hin: $(srcdir)/stamp-h.in
! 	@if test ! -f $@; then \
! 		rm -f $(srcdir)/stamp-h.in; \
! 		$(MAKE) $(srcdir)/stamp-h.in; \
! 	else :; fi
  $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
  	cd $(top_srcdir) && $(AUTOHEADER)
! 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
  
  mostlyclean-hdr:
  
***************
*** 160,165 ****
--- 168,175 ----
  	-rm -f config.h
  
  maintainer-clean-hdr:
+ testit.sh: $(top_builddir)/config.status testit-in.sh
+ 	cd $(top_builddir) && CONFIG_FILES=$@:testit-in.sh CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-libLIBRARIES:
  
***************
*** 173,179 ****
  install-libLIBRARIES: $(lib_LIBRARIES)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
! 	list='$(lib_LIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
  	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
--- 183,189 ----
  install-libLIBRARIES: $(lib_LIBRARIES)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
! 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
  	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
***************
*** 193,198 ****
--- 203,211 ----
  	  rm -f $(DESTDIR)$(libdir)/$$p; \
  	done
  
+ .c.o:
+ 	$(COMPILE) -c $<
+ 
  .s.o:
  	$(COMPILE) -c $<
  
***************
*** 223,230 ****
  
  maintainer-clean-noinstPROGRAMS:
  
! test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
! 	@rm -f test1
  	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
  
  install-includeHEADERS: $(include_HEADERS)
--- 236,243 ----
  
  maintainer-clean-noinstPROGRAMS:
  
! test1$(EXEEXT): $(test1_OBJECTS) $(test1_DEPENDENCIES)
! 	@rm -f test1$(EXEEXT)
  	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
  
  install-includeHEADERS: $(include_HEADERS)
***************
*** 255,302 ****
  installdirs-recursive install-recursive uninstall-recursive  \
  check-recursive installcheck-recursive info-recursive dvi-recursive:
  	@set fnord $(MAKEFLAGS); amf=$$2; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  target=`echo $@ | sed s/-recursive//`; \
  	  echo "Making $$target in $$subdir"; \
! 	  (cd $$subdir && $(MAKE) $$target) \
  	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! 	done && test -z "$$fail"
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
  	@set fnord $(MAKEFLAGS); amf=$$2; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
  	done; \
  	for subdir in $$rev; do \
- 	  target=`echo $@ | sed s/-recursive//`; \
  	  echo "Making $$target in $$subdir"; \
! 	  (cd $$subdir && $(MAKE) $$target) \
  	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  (cd $$subdir && $(MAKE) tags); \
  	done
  
  tags: TAGS
  
  ID: $(HEADERS) $(SOURCES) $(LISP)
  	here=`pwd` && cd $(srcdir) \
! 	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
  	tags=; \
  	here=`pwd`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
  	done; \
  	list='$(SOURCES) $(HEADERS)'; \
  	unique=`for i in $$list; do echo $$i; done | \
  	  awk '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
  
  mostlyclean-tags:
  
--- 268,339 ----
  installdirs-recursive install-recursive uninstall-recursive  \
  check-recursive installcheck-recursive info-recursive dvi-recursive:
  	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  echo "Making $$target in $$subdir"; \
! 	  if test "$$subdir" = "."; then \
! 	    dot_seen=yes; \
! 	    local_target="$$target-am"; \
! 	  else \
! 	    local_target="$$target"; \
! 	  fi; \
! 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! 	done; \
! 	if test "$$dot_seen" = "no"; then \
! 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
! 	fi; test -z "$$fail"
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
  	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
  	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
  	  rev="$$subdir $$rev"; \
+ 	  test "$$subdir" = "." && dot_seen=yes; \
  	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
  	for subdir in $$rev; do \
  	  echo "Making $$target in $$subdir"; \
! 	  if test "$$subdir" = "."; then \
! 	    local_target="$$target-am"; \
! 	  else \
! 	    local_target="$$target"; \
! 	  fi; \
! 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
  	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
  	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: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) $(LISP)
  	tags=; \
  	here=`pwd`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
!    if test "$$subdir" = .; then :; else \
! 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
!    fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)'; \
  	unique=`for i in $$list; do echo $$i; done | \
  	  awk '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)config.hin$$unique$(LISP)$$tags" \
! 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hin $$unique $(LISP) -o $$here/TAGS)
  
  mostlyclean-tags:
  
***************
*** 315,466 ****
  # tarfile.
  distcheck: dist
  	-rm -rf $(distdir)
! 	GZIP=$(GZIP) $(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) \
! 	  && $(MAKE) dvi \
! 	  && $(MAKE) check \
! 	  && $(MAKE) install \
! 	  && $(MAKE) installcheck \
! 	  && $(MAKE) dist
  	-rm -rf $(distdir)
! 	@echo "========================"; \
! 	echo "$(distdir).tar.gz is ready for distribution"; \
! 	echo "========================"
  dist: distdir
  	-chmod -R a+r $(distdir)
! 	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
  	-rm -rf $(distdir)
  dist-all: distdir
  	-chmod -R a+r $(distdir)
! 	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
  	-rm -rf $(distdir)
  distdir: $(DISTFILES)
  	-rm -rf $(distdir)
  	mkdir $(distdir)
  	-chmod 777 $(distdir)
- 	here=`cd $(top_builddir) && pwd`; \
- 	top_distdir=`cd $(distdir) && pwd`; \
- 	distdir=`cd $(distdir) && pwd`; \
- 	cd $(top_srcdir) \
- 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
! 	  test -f $(distdir)/$$file \
! 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! 	  || cp -p $$d/$$file $(distdir)/$$file; \
  	done
! 	for subdir in $(SUBDIRS); do \
! 	  test -d $(distdir)/$$subdir \
! 	  || mkdir $(distdir)/$$subdir \
! 	  || exit 1; \
! 	  chmod 777 $(distdir)/$$subdir; \
! 	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
  	    || exit 1; \
  	done
! 
! DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
! 
! -include $(DEP_FILES)
! 
! mostlyclean-depend:
! 
! clean-depend:
! 
! distclean-depend:
! 
! maintainer-clean-depend:
! 	-rm -rf .deps
! 
! %.o: %.c
! 	@echo '$(COMPILE) -c $<'; \
! 	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
! 
! %.lo: %.c
! 	@echo '$(LTCOMPILE) -c $<'; \
! 	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
! 	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
! 	  < .deps/$(*F).p > .deps/$(*F).P
! 	@-rm -f .deps/$(*F).p
  info: info-recursive
  dvi: dvi-recursive
! check: all-am
! 	$(MAKE) check-recursive
  installcheck: installcheck-recursive
  all-recursive-am: config.h
! 	$(MAKE) all-recursive
! 
! all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
  
  install-exec-am: install-libLIBRARIES
  
  install-data-am: install-includeHEADERS
  
  uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS
! 
! install-exec: install-exec-recursive install-exec-am
! 	@$(NORMAL_INSTALL)
! 
! install-data: install-data-recursive install-data-am
! 	@$(NORMAL_INSTALL)
! 
! install: install-recursive install-exec-am install-data-am
! 	@:
! 
! uninstall: uninstall-recursive uninstall-am
! 
  install-strip:
! 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
  installdirs: installdirs-recursive
! 	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(includedir)
  
  
  mostlyclean-generic:
- 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
  
  clean-generic:
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
  
  distclean-generic:
! 	-rm -f Makefile $(DISTCLEANFILES)
  	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
  		mostlyclean-compile mostlyclean-noinstPROGRAMS \
! 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
  
  clean-am:  clean-hdr clean-libLIBRARIES clean-compile \
! 		clean-noinstPROGRAMS clean-tags clean-depend \
! 		clean-generic mostlyclean-am
  
  distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
  		distclean-noinstPROGRAMS distclean-tags \
! 		distclean-depend distclean-generic clean-am
  
  maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
  		maintainer-clean-compile \
  		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
! 		maintainer-clean-depend maintainer-clean-generic \
! 		distclean-am
! 
! mostlyclean:  mostlyclean-recursive mostlyclean-am
! 
! clean:  clean-recursive clean-am
! 
! distclean:  distclean-recursive distclean-am
! 	-rm -f config.status
! 
! maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
  	@echo "This command is intended for maintainers to use;"
  	@echo "it deletes files that may require special tools to rebuild."
  	-rm -f config.status
  
  .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--- 352,474 ----
  # 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 $$/$$file $(distdir)/$$file; \
! 	  else \
! 	    test -f $(distdir)/$$file \
! 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
! 	  fi; \
  	done
! 	for subdir in $(DIST_SUBDIRS); do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test -d $(distdir)/$$subdir \
! 	    || mkdir $(distdir)/$$subdir \
  	    || exit 1; \
+ 	    chmod 777 $(distdir)/$$subdir; \
+ 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ 	      || exit 1; \
+ 	  fi; \
  	done
! info-am:
  info: info-recursive
+ dvi-am:
  dvi: dvi-recursive
! check-am: all-am
! check: check-recursive
! installcheck-am:
  installcheck: installcheck-recursive
  all-recursive-am: config.h
! 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
  install-exec-am: install-libLIBRARIES
+ install-exec: install-exec-recursive
  
  install-data-am: install-includeHEADERS
+ install-data: install-data-recursive
  
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-recursive
  uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS
! uninstall: uninstall-recursive
! all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
! all-redirect: all-recursive-am
  install-strip:
! 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs: installdirs-recursive
! installdirs-am:
! 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
  
  
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
  	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
  
  maintainer-clean-generic:
  mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
  		mostlyclean-compile mostlyclean-noinstPROGRAMS \
! 		mostlyclean-tags mostlyclean-generic
! 
! mostlyclean: mostlyclean-recursive
  
  clean-am:  clean-hdr clean-libLIBRARIES clean-compile \
! 		clean-noinstPROGRAMS clean-tags clean-generic \
! 		mostlyclean-am
! 
! clean: clean-recursive
  
  distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
  		distclean-noinstPROGRAMS distclean-tags \
! 		distclean-generic clean-am
! 
! distclean: distclean-recursive
! 	-rm -f config.status
  
  maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
  		maintainer-clean-compile \
  		maintainer-clean-noinstPROGRAMS 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-recursive
  	-rm -f config.status
  
  .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
***************
*** 476,488 ****
  installcheck-recursive info-recursive dvi-recursive \
  mostlyclean-recursive distclean-recursive clean-recursive \
  maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir \
! mostlyclean-depend distclean-depend clean-depend \
! maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
! install-exec-am install-data-am uninstall-am install-exec install-data \
! install uninstall all installdirs mostlyclean-generic distclean-generic \
! clean-generic maintainer-clean-generic clean mostlyclean distclean \
! maintainer-clean
  
  
  .PHONY: archive
--- 484,495 ----
  installcheck-recursive info-recursive dvi-recursive \
  mostlyclean-recursive distclean-recursive clean-recursive \
  maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
! install-exec-am install-exec install-data-am install-data install-am \
! install uninstall-am uninstall all-redirect all-am all installdirs-am \
! installdirs mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
  
  .PHONY: archive
diff -C3 -N -r ./aclocal.m4 d:/temp/distmake/popt12s/contrib/popt-1.2/aclocal.m4
*** ./aclocal.m4	Sat Jul 29 23:17:44 2000
--- d:/temp/distmake/popt12s/contrib/popt-1.2/aclocal.m4	Sat Jul 29 23:14:44 2000
***************
*** 235,237 ****
--- 235,250 ----
  esac
  ])
  
+ # 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])
+ 
diff -C3 -N -r ./config.h.in d:/temp/distmake/popt12s/contrib/popt-1.2/config.h.in
*** ./config.h.in	Thu Oct 22 19:32:52 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/config.h.in	Thu Jan  1 00:00:00 1970
***************
*** 1,34 ****
- /* config.h.in.  Generated automatically from configure.in by autoheader.  */
- 
- /* Define if you have the ANSI C header files.  */
- #undef STDC_HEADERS
- 
- /* Define to the name of the distribution.  */
- #undef PACKAGE
- 
- /* Define to the version of the distribution.  */
- #undef VERSION
- 
- /* Define to 1 if ANSI function prototypes are usable.  */
- #undef PROTOTYPES
- 
- /* Define if you have the dgettext function.  */
- #undef HAVE_DGETTEXT
- 
- /* Define if you have the gettext function.  */
- #undef HAVE_GETTEXT
- 
- /* Define if you have the strerror function.  */
- #undef HAVE_STRERROR
- 
- /* Define if you have the <alloca.h> header file.  */
- #undef HAVE_ALLOCA_H
- 
- /* Define if you have the <libintl.h> header file.  */
- #undef HAVE_LIBINTL_H
- 
- /* Define if you have the <string.h> header file.  */
- #undef HAVE_STRING_H
- 
- /* Define if you have the <unistd.h> header file.  */
- #undef HAVE_UNISTD_H
--- 0 ----
diff -C3 -N -r ./config.hin d:/temp/distmake/popt12s/contrib/popt-1.2/config.hin
*** ./config.hin	Thu Jan  1 00:00:00 1970
--- d:/temp/distmake/popt12s/contrib/popt-1.2/config.hin	Fri Jul 14 10:49:46 2000
***************
*** 0 ****
--- 1,35 ----
+ /* config.hin.  Generated automatically from configure.in by autoheader.  */
+ 
+ /* Define if you have the ANSI C header files.  */
+ #undef STDC_HEADERS
+ 
+ /* Define if you have the dgettext function.  */
+ #undef HAVE_DGETTEXT
+ 
+ /* Define if you have the gettext function.  */
+ #undef HAVE_GETTEXT
+ 
+ /* Define if you have the strerror function.  */
+ #undef HAVE_STRERROR
+ 
+ /* Define if you have the <alloca.h> header file.  */
+ #undef HAVE_ALLOCA_H
+ 
+ /* Define if you have the <libintl.h> header file.  */
+ #undef HAVE_LIBINTL_H
+ 
+ /* Define if you have the <string.h> header file.  */
+ #undef HAVE_STRING_H
+ 
+ /* Define if you have the <unistd.h> header file.  */
+ #undef HAVE_UNISTD_H
+ 
+ /* Name of package */
+ #undef PACKAGE
+ 
+ /* Version number of package */
+ #undef VERSION
+ 
+ /* Define if compiler has function prototypes */
+ #undef PROTOTYPES
+ 
diff -C3 -N -r ./configure d:/temp/distmake/popt12s/contrib/popt-1.2/configure
*** ./configure	Tue Oct 27 14:45:50 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/configure	Sat Jul 29 22:56:44 2000
***************
*** 1,7 ****
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.12 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
--- 1,7 ----
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
***************
*** 11,16 ****
--- 11,18 ----
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
+ ac_help="$ac_help
+ --disable-nls - do not use Native Language Support"
  
  # Initialize some variables set by options.
  # The variables have the same names as the options, with
***************
*** 49,54 ****
--- 51,57 ----
  # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
  
***************
*** 332,338 ****
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.12"
      exit 0 ;;
  
    -with-* | --with-*)
--- 335,341 ----
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.13"
      exit 0 ;;
  
    -with-* | --with-*)
***************
*** 502,510 ****
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
--- 505,515 ----
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
+ ac_exeext=
+ ac_objext=o
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
***************
*** 544,571 ****
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:552: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
!     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
      case "$ac_dir/" in
      /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
!       for ac_prog in ginstall installbsd scoinst install; do
!         if test -f $ac_dir/$ac_prog; then
  	  if test $ac_prog = install &&
              grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
- 	    # OSF/1 installbsd also uses dspmsg, but is usable.
  	    :
  	  else
  	    ac_cv_path_install="$ac_dir/$ac_prog -c"
--- 549,583 ----
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:558: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
!     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
!   ac_test_flag="-f"
!   if ! test -z "$COMSPEC$ComSpec"; then
!     ac_test_flag="-x"
!     IFS="${PATH_SEPARATOR-;}"
!   fi
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
      case "$ac_dir/" in
      /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
!       # Don't use installbsd from OSF since it installs stuff as root
!       # by default.
!       for ac_prog in ginstall scoinst install; do
!         if test $ac_test_flag $ac_dir/$ac_prog; then
  	  if test $ac_prog = install &&
              grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
  	    :
  	  else
  	    ac_cv_path_install="$ac_dir/$ac_prog -c"
***************
*** 595,607 ****
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
  test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
  
  echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
! echo "configure:605: checking whether build environment is sane" >&5
  # Just in case
  sleep 1
  echo timestamp > conftestfile
--- 607,618 ----
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
  test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
  
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
  echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
! echo "configure:616: checking whether build environment is sane" >&5
  # Just in case
  sleep 1
  echo timestamp > conftestfile
***************
*** 658,664 ****
  test "$program_transform_name" = "" && program_transform_name="s,x,x,"
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:662: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 669,675 ----
  test "$program_transform_name" = "" && program_transform_name="s,x,x,"
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:673: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 704,710 ****
  
  missing_dir=`cd $ac_aux_dir && pwd`
  echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
! echo "configure:708: checking for working aclocal" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
--- 715,721 ----
  
  missing_dir=`cd $ac_aux_dir && pwd`
  echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
! echo "configure:719: checking for working aclocal" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
***************
*** 717,723 ****
  fi
  
  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
! echo "configure:721: checking for working autoconf" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
--- 728,734 ----
  fi
  
  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
! echo "configure:732: checking for working autoconf" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
***************
*** 730,736 ****
  fi
  
  echo $ac_n "checking for working automake""... $ac_c" 1>&6
! echo "configure:734: checking for working automake" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
--- 741,747 ----
  fi
  
  echo $ac_n "checking for working automake""... $ac_c" 1>&6
! echo "configure:745: checking for working automake" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
***************
*** 743,749 ****
  fi
  
  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
! echo "configure:747: checking for working autoheader" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
--- 754,760 ----
  fi
  
  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
! echo "configure:758: checking for working autoheader" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
***************
*** 756,762 ****
  fi
  
  echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
! echo "configure:760: checking for working makeinfo" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
--- 767,773 ----
  fi
  
  echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
! echo "configure:771: checking for working makeinfo" >&5
  # Run test in a subshell; some versions of sh will print an error if
  # an executable is not found, even if stderr is redirected.
  # Redirect stdin to placate older versions of autoconf.  Sigh.
***************
*** 776,792 ****
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:780: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
!     if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
        break
      fi
--- 787,809 ----
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:791: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   ac_test_flag="-f"
!   if ! test -z "$COMSPEC$ComSpec"; then
!     ac_test_flag="-x"
!     IFS="${PATH_SEPARATOR-;}"
!   fi
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
!     if test $ac_test_flag $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
        break
      fi
***************
*** 805,822 ****
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:809: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    ac_prog_rejected=no
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
!     if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
          ac_prog_rejected=yes
  	continue
--- 822,845 ----
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:826: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
!   ac_dummy="$PATH"
!   ac_test_flag="-f"
!   if ! test -z "$COMSPEC$ComSpec"; then
!     ac_test_flag="-x"
!     IFS="${PATH_SEPARATOR-;}"
!   fi
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
!     if test $ac_test_flag $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
          ac_prog_rejected=yes
  	continue
***************
*** 849,873 ****
    echo "$ac_t""no" 1>&6
  fi
  
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:857: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext <<EOF
! #line 867 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 872,937 ----
    echo "$ac_t""no" 1>&6
  fi
  
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:882: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+   ac_test_flag="-f"
+   if ! test -z "$COMSPEC$ComSpec"; then
+     ac_test_flag="-x"
+     IFS="${PATH_SEPARATOR-;}"
+   fi
+   for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test $ac_test_flag $ac_dir/$ac_word; then
+       ac_cv_prog_CC="cl"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+ fi
+ fi
+ CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+   echo "$ac_t""$CC" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+  ;;
+     esac
+   fi
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:919: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext << EOF
! 
! #line 930 "configure"
  #include "confdefs.h"
+ 
  main(){return(0);}
  EOF
! if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 881,898 ****
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:891: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:896: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 945,968 ----
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:961: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:966: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 901,907 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
--- 971,977 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
***************
*** 912,922 ****
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
!   ac_test_CFLAGS="${CFLAGS+set}"
!   ac_save_CFLAGS="$CFLAGS"
!   CFLAGS=
!   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:920: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 982,996 ----
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
! else
!   GCC=
! fi
! 
! ac_test_CFLAGS="${CFLAGS+set}"
! ac_save_CFLAGS="$CFLAGS"
! CFLAGS=
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:994: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 931,950 ****
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
!   if test "$ac_test_CFLAGS" = set; then
!     CFLAGS="$ac_save_CFLAGS"
!   elif test $ac_cv_prog_cc_g = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-O2"
    fi
  else
!   GCC=
!   test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:948: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
--- 1005,1028 ----
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS="$ac_save_CFLAGS"
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-g"
    fi
  else
!   if test "$GCC" = yes; then
!     CFLAGS="-O2"
!   else
!     CFLAGS=
!   fi
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1026: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
***************
*** 959,972 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 963 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
--- 1037,1050 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1041 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
***************
*** 976,989 ****
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 980 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
--- 1054,1084 ----
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1058 "configure"
! #include "confdefs.h"
! #include <assert.h>
! Syntax Error
! EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
! if test -z "$ac_err"; then
!   :
! else
!   echo "$ac_err" >&5
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   CPP="${CC-cc} -nologo -E"
!   cat > conftest.$ac_ext <<EOF
! #line 1075 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
***************
*** 996,1001 ****
--- 1091,1098 ----
  rm -f conftest*
  fi
  rm -f conftest*
+ fi
+ rm -f conftest*
    ac_cv_prog_CPP="$CPP"
  fi
    CPP="$ac_cv_prog_CPP"
***************
*** 1006,1018 ****
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:1010: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 1016 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
--- 1103,1115 ----
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:1107: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 1113 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
***************
*** 1030,1036 ****
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 1034 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
--- 1127,1133 ----
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 1131 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
***************
*** 1055,1061 ****
  
  
  echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
! echo "configure:1059: checking for ${CC-cc} option to accept ANSI C" >&5
  if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1152,1158 ----
  
  
  echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
! echo "configure:1156: checking for ${CC-cc} option to accept ANSI C" >&5
  if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1071,1077 ****
  do
    CC="$ac_save_CC $ac_arg"
    cat > conftest.$ac_ext <<EOF
! #line 1075 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
--- 1168,1174 ----
  do
    CC="$ac_save_CC $ac_arg"
    cat > conftest.$ac_ext <<EOF
! #line 1172 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  #include <stdio.h>
***************
*** 1108,1114 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    am_cv_prog_cc_stdc="$ac_arg"; break
  else
--- 1205,1211 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    am_cv_prog_cc_stdc="$ac_arg"; break
  else
***************
*** 1134,1140 ****
  
  
  echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
! echo "configure:1138: checking for function prototypes" >&5
  if test "$am_cv_prog_cc_stdc" != no; then
    echo "$ac_t""yes" 1>&6
    cat >> confdefs.h <<\EOF
--- 1231,1237 ----
  
  
  echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
! echo "configure:1235: checking for function prototypes" >&5
  if test "$am_cv_prog_cc_stdc" != no; then
    echo "$ac_t""yes" 1>&6
    cat >> confdefs.h <<\EOF
***************
*** 1147,1158 ****
    U=_ ANSI2KNR=./ansi2knr
    # Ensure some checks needed by ansi2knr itself.
    echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1151: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1156 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 1244,1255 ----
    U=_ ANSI2KNR=./ansi2knr
    # Ensure some checks needed by ansi2knr itself.
    echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:1248: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1253 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 1160,1167 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    ac_cv_header_stdc=yes
--- 1257,1264 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    ac_cv_header_stdc=yes
***************
*** 1177,1183 ****
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1181 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 1274,1280 ----
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1278 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
***************
*** 1195,1201 ****
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1199 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 1292,1298 ----
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 1296 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 1216,1222 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1220 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 1313,1319 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 1317 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 1227,1233 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:1231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 1324,1330 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:1328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
***************
*** 1254,1271 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1258: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1263 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 1351,1368 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1355: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1360 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 1296,1312 ****
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1300: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
!     if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
        break
      fi
--- 1393,1415 ----
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1397: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   ac_test_flag="-f"
!   if ! test -z "$COMSPEC$ComSpec"; then
!     ac_test_flag="-x"
!     IFS="${PATH_SEPARATOR-;}"
!   fi
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
!     if test $ac_test_flag $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
        break
      fi
***************
*** 1329,1356 ****
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:1337: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
!     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
      case "$ac_dir/" in
      /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
!       for ac_prog in ginstall installbsd scoinst install; do
!         if test -f $ac_dir/$ac_prog; then
  	  if test $ac_prog = install &&
              grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
- 	    # OSF/1 installbsd also uses dspmsg, but is usable.
  	    :
  	  else
  	    ac_cv_path_install="$ac_dir/$ac_prog -c"
--- 1432,1466 ----
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:1441: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
!     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
!   ac_test_flag="-f"
!   if ! test -z "$COMSPEC$ComSpec"; then
!     ac_test_flag="-x"
!     IFS="${PATH_SEPARATOR-;}"
!   fi
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
      case "$ac_dir/" in
      /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
!       # Don't use installbsd from OSF since it installs stuff as root
!       # by default.
!       for ac_prog in ginstall scoinst install; do
!         if test $ac_test_flag $ac_dir/$ac_prog; then
  	  if test $ac_prog = install &&
              grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
  	    :
  	  else
  	    ac_cv_path_install="$ac_dir/$ac_prog -c"
***************
*** 1380,1385 ****
--- 1490,1497 ----
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
***************
*** 1407,1428 ****
  fi
  
  
! for ac_hdr in unistd.h alloca.h libintl.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1415: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1420 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 1519,1540 ----
  fi
  
  
! for ac_hdr in unistd.h alloca.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1527: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1532 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 1448,1454 ****
  done
  
  echo $ac_n "checking for /usr/ucblib in LIBS""... $ac_c" 1>&6
! echo "configure:1452: checking for /usr/ucblib in LIBS" >&5
  if test -d /usr/ucblib ; then
  	if test "$build" = "mips-sni-sysv4" ; then
  		addlib /usr/ccs/lib -lc
--- 1560,1566 ----
  done
  
  echo $ac_n "checking for /usr/ucblib in LIBS""... $ac_c" 1>&6
! echo "configure:1564: checking for /usr/ucblib in LIBS" >&5
  if test -d /usr/ucblib ; then
  	if test "$build" = "mips-sni-sysv4" ; then
  		addlib /usr/ccs/lib -lc
***************
*** 1464,1475 ****
  for ac_func in strerror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1468: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1473 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 1576,1587 ----
  for ac_func in strerror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1580: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1585 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 1492,1498 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1604,1610 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1516,1530 ****
  fi
  done
  
! for ac_func in gettext
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1523: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1528 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 1628,1702 ----
  fi
  done
  
! 
! # Check whether --enable-nls or --disable-nls was given.
! if test "${enable_nls+set}" = set; then
!   enableval="$enable_nls"
!   ENABLE_NLS=n; echo "disabling Native Language Support"
! else
!   ENABLE_NLS=y
! fi
! 
! 
! 
! if test x$ENABLE_NLS = xy; then
!   ENABLE_NLS_TRUE=
!   ENABLE_NLS_FALSE='#'
! else
!   ENABLE_NLS_TRUE='#'
!   ENABLE_NLS_FALSE=
! fi
! 
! if test "$ENABLE_NLS" = "y"; then
! 	for ac_hdr in libintl.h
! do
! ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
! echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:1656: checking for $ac_hdr" >&5
! if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
!   echo $ac_n "(cached) $ac_c" 1>&6
! else
!   cat > conftest.$ac_ext <<EOF
! #line 1661 "configure"
! #include "confdefs.h"
! #include <$ac_hdr>
! EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
! if test -z "$ac_err"; then
!   rm -rf conftest*
!   eval "ac_cv_header_$ac_safe=yes"
! else
!   echo "$ac_err" >&5
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   eval "ac_cv_header_$ac_safe=no"
! fi
! rm -f conftest*
! fi
! if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
!   echo "$ac_t""yes" 1>&6
!     ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
!   cat >> confdefs.h <<EOF
! #define $ac_tr_hdr 1
! EOF
!  
! else
!   echo "$ac_t""no" 1>&6
! fi
! done
! 
! 	for ac_func in gettext
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1695: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1700 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 1547,1553 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1719,1725 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1571,1585 ****
  fi
  done
  
! for ac_func in dgettext
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1578: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1583 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 1743,1757 ----
  fi
  done
  
! 	for ac_func in dgettext
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:1750: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1755 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 1602,1608 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1774,1780 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1626,1638 ****
  fi
  done
  
  echo $ac_n "checking for setreuid""... $ac_c" 1>&6
! echo "configure:1631: checking for setreuid" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setreuid'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1636 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char setreuid(); below.  */
--- 1798,1812 ----
  fi
  done
  
+ fi
+ 
  echo $ac_n "checking for setreuid""... $ac_c" 1>&6
! echo "configure:1805: checking for setreuid" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setreuid'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1810 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char setreuid(); below.  */
***************
*** 1655,1661 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_setreuid=yes"
  else
--- 1829,1835 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_setreuid=yes"
  else
***************
*** 1674,1680 ****
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for setreuid in -lucb""... $ac_c" 1>&6
! echo "configure:1678: checking for setreuid in -lucb" >&5
  ac_lib_var=`echo ucb'_'setreuid | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1848,1854 ----
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for setreuid in -lucb""... $ac_c" 1>&6
! echo "configure:1852: checking for setreuid in -lucb" >&5
  ac_lib_var=`echo ucb'_'setreuid | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1682,1688 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lucb  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1686 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 1856,1862 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lucb  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1860 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 1693,1699 ****
  setreuid()
  ; return 0; }
  EOF
! if { (eval echo configure:1697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1867,1873 ----
  setreuid()
  ; return 0; }
  EOF
! if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1717,1722 ****
--- 1891,1992 ----
  fi
  
  
+ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+ echo "configure:1896: checking for Cygwin environment" >&5
+ if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1901 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ #ifndef __CYGWIN__
+ #define __CYGWIN__ __CYGWIN32__
+ #endif
+ return __CYGWIN__;
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cygwin=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cygwin=no
+ fi
+ rm -f conftest*
+ rm -f conftest*
+ fi
+ 
+ echo "$ac_t""$ac_cv_cygwin" 1>&6
+ CYGWIN=
+ test "$ac_cv_cygwin" = yes && CYGWIN=yes
+ echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+ echo "configure:1929: checking for mingw32 environment" >&5
+ if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1934 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return __MINGW32__;
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_mingw32=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_mingw32=no
+ fi
+ rm -f conftest*
+ rm -f conftest*
+ fi
+ 
+ echo "$ac_t""$ac_cv_mingw32" 1>&6
+ MINGW32=
+ test "$ac_cv_mingw32" = yes && MINGW32=yes
+ 
+ 
+ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+ echo "configure:1960: checking for executable suffix" >&5
+ if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+   ac_cv_exeext=.exe
+ else
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_exeext=
+   if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj) ;;
+       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+   else
+     { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+   fi
+   rm -f conftest*
+   test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+ fi
+ fi
+ 
+ EXEEXT=""
+ test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+ echo "$ac_t""${ac_cv_exeext}" 1>&6
+ ac_exeext=$EXEEXT
+ 
+ 
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
***************
*** 1740,1746 ****
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
!   case `(ac_space=' '; set) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
--- 2010,2016 ----
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
!   case `(ac_space=' '; set | grep ac_space) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
***************
*** 1807,1813 ****
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.12"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
--- 2077,2083 ----
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
***************
*** 1818,1824 ****
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
! trap 'rm -fr `echo "Makefile  po/Makefile.in config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
--- 2088,2094 ----
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
! trap 'rm -fr `echo "Makefile  po/Makefile.in:po/Make-in.in testit.sh:testit-in.sh config.h:config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
***************
*** 1827,1835 ****
--- 2097,2107 ----
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
+ s%@SHELL@%$SHELL%g
  s%@CFLAGS@%$CFLAGS%g
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g
+ s%@FFLAGS@%$FFLAGS%g
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
***************
*** 1849,1856 ****
  s%@infodir@%$infodir%g
  s%@mandir@%$mandir%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@PACKAGE@%$PACKAGE%g
  s%@VERSION@%$VERSION%g
  s%@ACLOCAL@%$ACLOCAL%g
--- 2121,2128 ----
  s%@infodir@%$infodir%g
  s%@mandir@%$mandir%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
  s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@PACKAGE@%$PACKAGE%g
  s%@VERSION@%$VERSION%g
  s%@ACLOCAL@%$ACLOCAL%g
***************
*** 1865,1870 ****
--- 2137,2145 ----
  s%@ANSI2KNR@%$ANSI2KNR%g
  s%@RANLIB@%$RANLIB%g
  s%@TARGET@%$TARGET%g
+ s%@ENABLE_NLS_TRUE@%$ENABLE_NLS_TRUE%g
+ s%@ENABLE_NLS_FALSE@%$ENABLE_NLS_FALSE%g
+ s%@EXEEXT@%$EXEEXT%g
  
  CEOF
  EOF
***************
*** 1906,1912 ****
  
  cat >> $CONFIG_STATUS <<EOF
  
! CONFIG_FILES=\${CONFIG_FILES-"Makefile  po/Makefile.in"}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--- 2181,2187 ----
  
  cat >> $CONFIG_STATUS <<EOF
  
! CONFIG_FILES=\${CONFIG_FILES-"Makefile  po/Makefile.in:po/Make-in.in testit.sh:testit-in.sh"}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
***************
*** 1987,1993 ****
  if test "${CONFIG_HEADERS+set}" != set; then
  EOF
  cat >> $CONFIG_STATUS <<EOF
!   CONFIG_HEADERS="config.h"
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  fi
--- 2262,2268 ----
  if test "${CONFIG_HEADERS+set}" != set; then
  EOF
  cat >> $CONFIG_STATUS <<EOF
!   CONFIG_HEADERS="config.h:config.hin"
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  fi
diff -C3 -N -r ./configure.in d:/temp/distmake/popt12s/contrib/popt-1.2/configure.in
*** ./configure.in	Thu Oct 22 21:32:10 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/configure.in	Sat Jul 29 22:56:42 2000
***************
*** 1,6 ****
  AC_INIT(popt.h)
  AM_INIT_AUTOMAKE(popt, 1.2)
! AM_CONFIG_HEADER(config.h)
  
  AC_PROG_CC
  AC_GCC_TRADITIONAL
--- 1,6 ----
  AC_INIT(popt.h)
  AM_INIT_AUTOMAKE(popt, 1.2)
! AM_CONFIG_HEADER(config.h:config.hin)
  
  AC_PROG_CC
  AC_GCC_TRADITIONAL
***************
*** 38,44 ****
  fi
  AC_SUBST(TARGET)
  
! AC_CHECK_HEADERS(unistd.h alloca.h libintl.h)
  AC_MSG_CHECKING(for /usr/ucblib in LIBS)
  if test -d /usr/ucblib ; then
  	if test "$build" = "mips-sni-sysv4" ; then
--- 38,44 ----
  fi
  AC_SUBST(TARGET)
  
! AC_CHECK_HEADERS(unistd.h alloca.h)
  AC_MSG_CHECKING(for /usr/ucblib in LIBS)
  if test -d /usr/ucblib ; then
  	if test "$build" = "mips-sni-sysv4" ; then
***************
*** 53,63 ****
  fi
  
  AC_CHECK_FUNCS(strerror)
! AC_CHECK_FUNCS(gettext)
! AC_CHECK_FUNCS(dgettext)
  AC_CHECK_FUNC(setreuid, [], [
      AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
  ])
  
! AC_OUTPUT([Makefile  po/Makefile.in],
  	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
--- 53,77 ----
  fi
  
  AC_CHECK_FUNCS(strerror)
! 
! dnl Internationalization
! AC_ARG_ENABLE(nls,
! [--disable-nls - do not use Native Language Support],
! [ENABLE_NLS=n; echo "disabling Native Language Support"],
! [ENABLE_NLS=y])
! AM_CONDITIONAL(ENABLE_NLS, test x$ENABLE_NLS = xy)
! 
! if test "$ENABLE_NLS" = "y"; then
! 	AC_CHECK_HEADERS(libintl.h)
! 	AC_CHECK_FUNCS(gettext)
! 	AC_CHECK_FUNCS(dgettext)
! fi
! 
  AC_CHECK_FUNC(setreuid, [], [
      AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
  ])
  
! AC_EXEEXT
! 
! AC_OUTPUT([Makefile  po/Makefile.in:po/Make-in.in testit.sh:testit-in.sh],
  	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff -C3 -N -r ./po/Make-in.in d:/temp/distmake/popt12s/contrib/popt-1.2/po/Make-in.in
*** ./po/Make-in.in	Thu Jan  1 00:00:00 1970
--- d:/temp/distmake/popt12s/contrib/popt-1.2/po/Make-in.in	Sat Jul 29 22:55:58 2000
***************
*** 0 ****
--- 1,80 ----
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = $(srcdir)
+ 
+ INSTALL= @INSTALL@
+ INSTALL_PROGRAM= @INSTALL_PROGRAM@
+ INSTALL_DATA= @INSTALL_DATA@
+ CC = @CC@
+ 
+ installprefix = $(DESTDIR)
+ 
+ MSGMERGE = msgmerge
+ 
+ NLSPACKAGE = @PACKAGE@
+ 
+ LINGUAS = ro
+ CATALOGS = $(addsuffix .mo, $(LINGUAS))
+ 
+ POTFILES = \
+ 
+ all: $(NLSPACKAGE).pot $(CATALOGS)
+ 
+ $(NLSPACKAGE).pot: $(POTFILES)
+ 	xgettext --default-domain=$(NLSPACKAGE) \
+ 	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
+ 	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
+ 	    rm -f $(NLSPACKAGE).po; \
+ 	else \
+ 	    mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
+ 	fi
+ 
+ update-po: Makefile
+ 	@$(MAKE) $(NLSPACKAGE).pot
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 		lang=`echo $$cat | sed 's/.mo//'`; \
+ 		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
+ 			echo "$(MSGMERGE) of $$lang succeeded" ; \
+ 			mv $$lang.pox $$lang.po ; \
+ 		else \
+ 			echo "$(MSGMERGE) of $$lang failed" ; \
+ 			rm -f $$lang.pox ; \
+ 		fi \
+ 	done
+ 
+ clean:
+ 	rm -f *mo $(NLSPACKAGE).pot
+ 
+ distclean: clean
+ 	rm -f .depend Makefile
+ 
+ depend:
+ 
+ install:
+ 	for n in $(CATALOGS); do \
+ 	    l=`basename $$n .mo`; \
+ 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
+ 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
+ 	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+ 	done
+ 
+ check:
+ 
+ POTFILES: POTFILES.in
+ 	( if test 'x$(srcdir)' != 'x.'; then \
+ 	    posrcprefix='$(top_srcdir)/'; \
+ 	  else \
+ 	    posrcprefix="../"; \
+ 	  fi; \
+ 	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+ 	      -e "s@.*@	$$posrcprefix& \\\\@" \
+ 	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+ 
+ Makefile: Make-in.in ../config.status POTFILES
+ 	cd .. \
+ 	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+ 	       $(SHELL) ./config.status
+ 
+ %.mo: %.po
+ 	msgfmt -o $@ $<
diff -C3 -N -r ./po/Makefile.in.in d:/temp/distmake/popt12s/contrib/popt-1.2/po/Makefile.in.in
*** ./po/Makefile.in.in	Thu Oct 22 20:39:18 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/po/Makefile.in.in	Thu Jan  1 00:00:00 1970
***************
*** 1,80 ****
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = $(srcdir)
- 
- INSTALL= @INSTALL@
- INSTALL_PROGRAM= @INSTALL_PROGRAM@
- INSTALL_DATA= @INSTALL_DATA@
- CC = @CC@
- 
- installprefix = $(DESTDIR)
- 
- MSGMERGE = msgmerge
- 
- NLSPACKAGE = @PACKAGE@
- 
- LINGUAS = ro
- CATALOGS = $(addsuffix .mo, $(LINGUAS))
- 
- POTFILES = \
- 
- all: $(NLSPACKAGE).pot $(CATALOGS)
- 
- $(NLSPACKAGE).pot: $(POTFILES)
- 	xgettext --default-domain=$(NLSPACKAGE) \
- 	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
- 	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
- 	    rm -f $(NLSPACKAGE).po; \
- 	else \
- 	    mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
- 	fi
- 
- update-po: Makefile
- 	@$(MAKE) $(NLSPACKAGE).pot
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 		lang=`echo $$cat | sed 's/.mo//'`; \
- 		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
- 			echo "$(MSGMERGE) of $$lang succeeded" ; \
- 			mv $$lang.pox $$lang.po ; \
- 		else \
- 			echo "$(MSGMERGE) of $$lang failed" ; \
- 			rm -f $$lang.pox ; \
- 		fi \
- 	done
- 
- clean:
- 	rm -f *mo $(NLSPACKAGE).pot
- 
- distclean: clean
- 	rm -f .depend Makefile
- 
- depend:
- 
- install:
- 	for n in $(CATALOGS); do \
- 	    l=`basename $$n .mo`; \
- 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
- 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
- 	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
- 	done
- 
- check:
- 
- POTFILES: POTFILES.in
- 	( if test 'x$(srcdir)' != 'x.'; then \
- 	    posrcprefix='$(top_srcdir)/'; \
- 	  else \
- 	    posrcprefix="../"; \
- 	  fi; \
- 	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
- 	      -e "s@.*@	$$posrcprefix& \\\\@" \
- 	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
- 
- Makefile: Makefile.in.in ../config.status POTFILES
- 	cd .. \
- 	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
- 	       $(SHELL) ./config.status
- 
- %.mo: %.po
- 	msgfmt -o $@ $<
--- 0 ----
diff -C3 -N -r ./popt.c d:/temp/distmake/popt12s/contrib/popt-1.2/popt.c
*** ./popt.c	Tue Oct 27 05:38:38 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/popt.c	Fri Jul 14 00:16:46 2000
***************
*** 222,228 ****
--- 222,230 ----
  #ifdef __hpux
      setresuid(getuid(), getuid(),-1);
  #else
+ #ifdef HAVE_SETREUID    
      setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+ #endif /* HAVE_SETREUID */    
  #endif
  
      execvp(argv[0], argv);
diff -C3 -N -r ./poptconfig.c d:/temp/distmake/popt12s/contrib/popt-1.2/poptconfig.c
*** ./poptconfig.c	Fri Oct 16 20:05:18 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/poptconfig.c	Fri Jul 14 00:16:54 2000
***************
*** 75,81 ****
      int fd, rc;
      int fileLength;
  
!     fd = open(fn, O_RDONLY);
      if (fd < 0) {
  	if (errno == ENOENT)
  	    return 0;
--- 75,85 ----
      int fd, rc;
      int fileLength;
  
!     /* Richard Dawe: MS-DOS uses CRLF as a line delimiter. DJGPP can perform
!      * automatic conversion of CRLFs. However, the method used here to discover
!      * the file length is broken when using CRLF conversion. Hence, open the
!      * file in binary mode, rather than text mode. */
!     fd = open(fn, O_RDONLY|O_BINARY);
      if (fd < 0) {
  	if (errno == ENOENT)
  	    return 0;
***************
*** 101,106 ****
--- 105,111 ----
      end = (file + fileLength);
      while (chptr < end) {
  	switch (*chptr) {
+ 	  case '\r': /* CRLF is the line separator on MS-DOS. */
  	  case '\n':
  	    *dst = '\0';
  	    dst = buf;
***************
*** 113,119 ****
  	  case '\\':
  	    *dst++ = *chptr++;
  	    if (chptr < end) {
! 		if (*chptr == '\n') 
  		    dst--, chptr++;	
  		    /* \ at the end of a line does not insert a \n */
  		else
--- 118,126 ----
  	  case '\\':
  	    *dst++ = *chptr++;
  	    if (chptr < end) {
! 		/* CRLF is the line separator on MS-DOS. */
! 		if (   (*chptr == '\n')
! 		    || ((*chptr == '\r') && (*(chptr + 1) == '\n')))
  		    dst--, chptr++;	
  		    /* \ at the end of a line does not insert a \n */
  		else
diff -C3 -N -r ./testit-in.sh d:/temp/distmake/popt12s/contrib/popt-1.2/testit-in.sh
*** ./testit-in.sh	Thu Jan  1 00:00:00 1970
--- d:/temp/distmake/popt12s/contrib/popt-1.2/testit-in.sh	Fri Jul 14 00:18:12 2000
***************
*** 0 ****
--- 1,50 ----
+ #!/bin/sh
+ 
+ EXEEXT=@EXEEXT@
+ TEST1=test1$EXEEXT
+ 
+ run() {
+     prog=$1; shift
+     name=$1; shift
+     answer=$1; shift
+ 
+     echo Running test $name.
+ 
+     result=`./$prog $*`
+     if [ "$answer" != "$result" ]; then
+ 	echo "Test \"$*\" failed with: $result"
+ 	exit 2
+     fi
+ }
+ 
+ make -q testcases
+ 
+ run $TEST1 "test1 - 1" "arg1: 1 arg2: (none)" --arg1
+ run $TEST1 "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
+ run $TEST1 "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
+ run $TEST1 "test1 - 4" "arg1: 0 arg2: another" --simple another
+ run $TEST1 "test1 - 5" "arg1: 1 arg2: alias" --two
+ run $TEST1 "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
+ run $TEST1 "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
+ run $TEST1 "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
+ run $TEST1 "test1 - 9" "arg1: 0 arg2: foo" -2 foo
+ run $TEST1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
+ run $TEST1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
+ run $TEST1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
+ run $TEST1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
+ run $TEST1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
+ run $TEST1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
+ POSIX_ME_HARDER=1 run $TEST1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+ POSIXLY_CORRECT=1 run $TEST1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+ run $TEST1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
+ run $TEST1 "test1 - 19" "./test1$EXEEXT ;" --echo-args
+ run $TEST1 "test1 - 20" "./test1$EXEEXT ; --arg1" --echo-args --arg1
+ run $TEST1 "test1 - 21" "./test1$EXEEXT ; --arg2 something" -T something -e
+ run $TEST1 "test1 - 22" "./test1$EXEEXT ; --arg2 something -- more args" -T something -a more args
+ run $TEST1 "test1 - 23" "./test1$EXEEXT ; --echo-args -a" --echo-args -e -a
+ run $TEST1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
+ run $TEST1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
+ run $TEST1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
+ 
+ echo ""
+ echo "Passed."
diff -C3 -N -r ./testit.sh d:/temp/distmake/popt12s/contrib/popt-1.2/testit.sh
*** ./testit.sh	Tue Oct 27 05:38:40 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/testit.sh	Thu Jan  1 00:00:00 1970
***************
*** 1,47 ****
- #!/bin/sh
- 
- run() {
-     prog=$1; shift
-     name=$1; shift
-     answer=$1; shift
- 
-     echo Running test $name.
- 
-     result=`./$prog $*`
-     if [ "$answer" != "$result" ]; then
- 	echo "Test \"$*\" failed with: $result"
- 	exit 2
-     fi
- }
- 
- make -q testcases
- 
- run test1 "test1 - 1" "arg1: 1 arg2: (none)" --arg1
- run test1 "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
- run test1 "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
- run test1 "test1 - 4" "arg1: 0 arg2: another" --simple another
- run test1 "test1 - 5" "arg1: 1 arg2: alias" --two
- run test1 "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
- run test1 "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
- run test1 "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
- run test1 "test1 - 9" "arg1: 0 arg2: foo" -2 foo
- run test1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
- run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
- run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
- run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
- run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
- run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
- POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
- POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
- run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
- run test1 "test1 - 19" "./test1 ;" --echo-args
- run test1 "test1 - 20" "./test1 ; --arg1" --echo-args --arg1
- run test1 "test1 - 21" "./test1 ; --arg2 something" -T something -e
- run test1 "test1 - 22" "./test1 ; --arg2 something -- more args" -T something -a more args
- run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
- run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
- run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
- run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
- 
- echo ""
- echo "Passed."
--- 0 ----
*** ./popt.h	Tue Oct 27 05:38:38 1998
--- d:/temp/distmake/popt12s/contrib/popt-1.2/popt.h	Sun Aug  5 17:17:00 2001
***************
*** 76,81 ****
--- 76,85 ----
  			         const struct poptOption * opt,
  				 const char * arg, void * data);
  
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  poptContext poptGetContext(char * name, int argc, char ** argv, 
  			   const struct poptOption * options, int flags);
  void poptResetContext(poptContext con);
***************
*** 107,110 ****
--- 111,118 ----
  void poptSetOtherOptionHelp(poptContext con, const char * text);
  const char * poptGetInvocationName(poptContext con);
  
+ #ifdef __cplusplus
+ }
+ #endif
+ 
  #endif
