From 1cbd2908f938f350ed56d90bb3fdf561d65703f7 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Sat, 14 May 2022 03:32:59 +0800 Subject: [PATCH] format patches --- debian/patches/build-system-update | 4020 ++++++++++++++------------- debian/patches/changelog-format | 18 +- debian/patches/imwheelrc-update | 32 +- debian/patches/makefile-update | 16 +- debian/patches/manpage-update | 48 +- debian/patches/prune-deps | 14 +- debian/patches/support-more-buttons | 159 +- 7 files changed, 2191 insertions(+), 2116 deletions(-) diff --git a/debian/patches/build-system-update b/debian/patches/build-system-update index 4b41f8d..aada345 100644 --- a/debian/patches/build-system-update +++ b/debian/patches/build-system-update @@ -1,6 +1,1232 @@ -Description: Re-autotoolize the build infrastructure using modern autotools -Author: Christopher Martin +From: Christopher Martin +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Re-autotoolize the build infrastructure using modern autotools + Last-Update: 2014-09-10 +--- + Makefile.in | 837 +++-- + aclocal.m4 | 1281 +++---- + config.h.in | 9 +- + configure | 9526 ++++++++++++++++++++++++--------------------------- + getopt/Makefile.in | 360 +- + jax/Makefile.in | 360 +- + mdetect/Makefile.in | 356 +- + 7 files changed, 6408 insertions(+), 6321 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 3adbf8a..0bd8ff3 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9 from Makefile.am. ++# Makefile.in generated by automake 1.14.1 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# Copyright (C) 1994-2013 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. +@@ -14,17 +14,57 @@ + + @SET_MAKE@ + +-SOURCES = getmdt.c $(imwheel_SOURCES) mdump.c setimps2.c setmmplus.c setps2.c setps2rate.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ ++ case $$MAKEFLAGS in \ ++ *\\[\ \ ]*) \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,23 +79,23 @@ POST_UNINSTALL = : + bin_PROGRAMS = imwheel$(EXEEXT) + EXTRA_PROGRAMS = setimps2$(EXEEXT) setmmplus$(EXEEXT) setps2$(EXEEXT) \ + getmdt$(EXEEXT) mdump$(EXEEXT) setps2rate$(EXEEXT) +-noinst_PROGRAMS = @extras@ @mdump@ + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ +- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ +- TODO depcomp install-sh missing mkinstalldirs ++DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ ++ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/config.h.in mkinstalldirs depcomp COPYING TODO \ ++ compile install-sh missing + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno ++ configure.lineno config.status.lineno + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) + getmdt_SOURCES = getmdt.c + getmdt_OBJECTS = getmdt.$(OBJEXT) +@@ -77,44 +117,156 @@ setps2_LDADD = $(LDADD) + setps2rate_SOURCES = setps2rate.c + setps2rate_OBJECTS = setps2rate.$(OBJEXT) + setps2rate_LDADD = $(LDADD) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I. ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = ++DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++AM_V_CC = $(am__v_CC_@AM_V@) ++am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) ++am__v_CC_0 = @echo " CC " $@; ++am__v_CC_1 = + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++AM_V_CCLD = $(am__v_CCLD_@AM_V@) ++am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) ++am__v_CCLD_0 = @echo " CCLD " $@; ++am__v_CCLD_1 = + SOURCES = getmdt.c $(imwheel_SOURCES) mdump.c setimps2.c setmmplus.c \ + setps2.c setps2rate.c + DIST_SOURCES = getmdt.c $(imwheel_SOURCES) mdump.c setimps2.c \ + setmmplus.c setps2.c setps2rate.c +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ++ ctags-recursive dvi-recursive html-recursive info-recursive \ ++ install-data-recursive install-dvi-recursive \ ++ install-exec-recursive install-html-recursive \ ++ install-info-recursive install-pdf-recursive \ ++ install-ps-recursive install-recursive installcheck-recursive \ ++ installdirs-recursive pdf-recursive ps-recursive \ ++ tags-recursive uninstall-recursive ++am__can_run_installinfo = \ ++ case $$AM_UPDATE_INFO_DIR in \ ++ n|no|NO) false;; \ ++ *) (install-info --version) >/dev/null 2>&1;; \ ++ esac ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } + man1dir = $(mandir)/man1 + NROFF = nroff + MANS = $(man_MANS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++am__recursive_targets = \ ++ $(RECURSIVE_TARGETS) \ ++ $(RECURSIVE_CLEAN_TARGETS) \ ++ $(am__extra_recursive_targets) ++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ ++ cscope distdir dist dist-all distcheck ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ ++ $(LISP)config.h.in ++# Read a list of newline-separated strings from the standard input, ++# and print each of them once, without duplicates. Input order is ++# *not* preserved. ++am__uniquify_input = $(AWK) '\ ++ BEGIN { nonempty = 0; } \ ++ { items[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in items) print i; }; } \ ++' ++# Make sure the list of sources is unique. This is necessary because, ++# e.g., the same source file might be shared among _SOURCES variables ++# for different programs/libraries. ++am__define_uniq_tagged_files = \ ++ list='$(am__tagged_files)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | $(am__uniquify_input)` + ETAGS = etags + CTAGS = ctags ++CSCOPE = cscope + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ if test -d "$(distdir)"; then \ ++ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -rf "$(distdir)" \ ++ || { sleep 5 && rm -rf "$(distdir)"; }; \ ++ else :; fi ++am__post_remove_distdir = $(am__remove_distdir) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best ++DIST_TARGETS = dist-gzip + distuninstallcheck_listfiles = find . -type f -print ++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ ++ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ +@@ -135,7 +287,9 @@ EXEEXT = @EXEEXT@ + GETOPT_INCS = @GETOPT_INCS@ + GETOPT_LIBS = @GETOPT_LIBS@ + GPM_DIR = @GPM_DIR@ ++GREP = @GREP@ + HAVE_GPM_SRC = @HAVE_GPM_SRC@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -145,32 +299,31 @@ LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ +-NO_GPM_DOC_FALSE = @NO_GPM_DOC_FALSE@ +-NO_GPM_DOC_TRUE = @NO_GPM_DOC_TRUE@ ++MKDIR_P = @MKDIR_P@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-SUID_FALSE = @SUID_FALSE@ +-SUID_TRUE = @SUID_TRUE@ + VERSION = @VERSION@ ++XMKMF = @XMKMF@ + X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -178,7 +331,11 @@ am__tar = @am__tar@ + am__untar = @am__untar@ + bindir = @bindir@ + build_alias = @build_alias@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + extras = @extras@ + extras_dist = @extras_dist@ +@@ -187,11 +344,13 @@ getopt_dist = @getopt_dist@ + gpm_dist = @gpm_dist@ + gpm_imwheel = @gpm_imwheel@ + host_alias = @host_alias@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mdetect = @mdetect@ +@@ -200,42 +359,48 @@ mdump = @mdump@ + mdump_dist = @mdump_dist@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + subdirs = @subdirs@ + suid = @suid@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = jax @getopt@ @mdetect@ @gpm_imwheel@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++SUBDIRS = jax getopt @mdetect@ @gpm_imwheel@ + AM_CFLAGS = @CFLAGS@ @GETOPT_INCS@ @X_CFLAGS@ -I@srcdir@/jax -I. -Wall + imwheel_SOURCES = imwheel.c util.c cfg.c util.h imwheel.h cfg.h + imwheel_LDADD = @GETOPT_LIBS@ -L$(top_builddir)/jax -ljax @X_LIBS@ + imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a ++noinst_PROGRAMS = @extras@ @mdump@ + man_MANS = imwheel.1 + EXTRA_DIST = BUGS FREEBSD EMACS M-BA47 BUGS see imwheel.1.html imwheel.1 TODO imwheelrc @extras_dist@ @mdump_dist@ lefty.sh imwheel.spec slack.sh +-ETCDIR = /etc/X11/imwheel + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .o .obj +-am--refresh: ++am--refresh: Makefile + @: + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ +- cd $(srcdir) && $(AUTOMAKE) --gnu \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -251,21 +416,20 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) ++ $(am__cd) $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + config.h: stamp-h1 +- @if test ! -f $@; then \ +- rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ +- else :; fi ++ @test -f $@ || rm -f stamp-h1 ++ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + $(srcdir)/config.h.in: $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) ++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +@@ -273,51 +437,77 @@ distclean-hdr: + -rm -f config.h stamp-h1 + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p \ ++ ; then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' \ ++ -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' \ ++ `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + + clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) +-getmdt$(EXEEXT): $(getmdt_OBJECTS) $(getmdt_DEPENDENCIES) ++ ++getmdt$(EXEEXT): $(getmdt_OBJECTS) $(getmdt_DEPENDENCIES) $(EXTRA_getmdt_DEPENDENCIES) + @rm -f getmdt$(EXEEXT) +- $(LINK) $(getmdt_LDFLAGS) $(getmdt_OBJECTS) $(getmdt_LDADD) $(LIBS) +-imwheel$(EXEEXT): $(imwheel_OBJECTS) $(imwheel_DEPENDENCIES) ++ $(AM_V_CCLD)$(LINK) $(getmdt_OBJECTS) $(getmdt_LDADD) $(LIBS) ++ ++imwheel$(EXEEXT): $(imwheel_OBJECTS) $(imwheel_DEPENDENCIES) $(EXTRA_imwheel_DEPENDENCIES) + @rm -f imwheel$(EXEEXT) +- $(LINK) $(imwheel_LDFLAGS) $(imwheel_OBJECTS) $(imwheel_LDADD) $(LIBS) +-mdump$(EXEEXT): $(mdump_OBJECTS) $(mdump_DEPENDENCIES) ++ $(AM_V_CCLD)$(LINK) $(imwheel_OBJECTS) $(imwheel_LDADD) $(LIBS) ++ ++mdump$(EXEEXT): $(mdump_OBJECTS) $(mdump_DEPENDENCIES) $(EXTRA_mdump_DEPENDENCIES) + @rm -f mdump$(EXEEXT) +- $(LINK) $(mdump_LDFLAGS) $(mdump_OBJECTS) $(mdump_LDADD) $(LIBS) +-setimps2$(EXEEXT): $(setimps2_OBJECTS) $(setimps2_DEPENDENCIES) ++ $(AM_V_CCLD)$(LINK) $(mdump_OBJECTS) $(mdump_LDADD) $(LIBS) ++ ++setimps2$(EXEEXT): $(setimps2_OBJECTS) $(setimps2_DEPENDENCIES) $(EXTRA_setimps2_DEPENDENCIES) + @rm -f setimps2$(EXEEXT) +- $(LINK) $(setimps2_LDFLAGS) $(setimps2_OBJECTS) $(setimps2_LDADD) $(LIBS) +-setmmplus$(EXEEXT): $(setmmplus_OBJECTS) $(setmmplus_DEPENDENCIES) ++ $(AM_V_CCLD)$(LINK) $(setimps2_OBJECTS) $(setimps2_LDADD) $(LIBS) ++ ++setmmplus$(EXEEXT): $(setmmplus_OBJECTS) $(setmmplus_DEPENDENCIES) $(EXTRA_setmmplus_DEPENDENCIES) + @rm -f setmmplus$(EXEEXT) +- $(LINK) $(setmmplus_LDFLAGS) $(setmmplus_OBJECTS) $(setmmplus_LDADD) $(LIBS) +-setps2$(EXEEXT): $(setps2_OBJECTS) $(setps2_DEPENDENCIES) ++ $(AM_V_CCLD)$(LINK) $(setmmplus_OBJECTS) $(setmmplus_LDADD) $(LIBS) ++ ++setps2$(EXEEXT): $(setps2_OBJECTS) $(setps2_DEPENDENCIES) $(EXTRA_setps2_DEPENDENCIES) + @rm -f setps2$(EXEEXT) +- $(LINK) $(setps2_LDFLAGS) $(setps2_OBJECTS) $(setps2_LDADD) $(LIBS) +-setps2rate$(EXEEXT): $(setps2rate_OBJECTS) $(setps2rate_DEPENDENCIES) ++ $(AM_V_CCLD)$(LINK) $(setps2_OBJECTS) $(setps2_LDADD) $(LIBS) ++ ++setps2rate$(EXEEXT): $(setps2rate_OBJECTS) $(setps2rate_DEPENDENCIES) $(EXTRA_setps2rate_DEPENDENCIES) + @rm -f setps2rate$(EXEEXT) +- $(LINK) $(setps2rate_LDFLAGS) $(setps2rate_OBJECTS) $(setps2rate_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(setps2rate_OBJECTS) $(setps2rate_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -336,76 +526,82 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c $< ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +-uninstall-info-am: +-install-man1: $(man1_MANS) $(man_MANS) ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++install-man1: $(man_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ ++ @list1=''; \ ++ list2='$(man_MANS)'; \ ++ test -n "$(man1dir)" \ ++ && test -n "`echo $$list1$$list2`" \ ++ || exit 0; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ ++ { for i in $$list1; do echo "$$i"; done; \ ++ if test -n "$$list2"; then \ ++ for i in $$list2; do echo "$$i"; done \ ++ | sed -n '/\.1[a-z]*$$/p'; \ ++ fi; \ ++ } | while read p; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; echo "$$p"; \ ++ done | \ ++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ sed 'N;N;s,\n, ,g' | { \ ++ list=; while read file base inst; do \ ++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ ++ fi; \ + done; \ +- for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ ++ while read files; do \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ ++ done; } ++ + uninstall-man1: + @$(NORMAL_UNINSTALL) +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ +- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ files=`{ for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ ++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) + + # This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++# into them and run 'make' without going through this Makefile. ++# To change the values of 'make' variables: instead of editing Makefiles, ++# (1) if the variable is set in 'config.status', edit 'config.status' ++# (which will cause the Makefiles to be regenerated when you run 'make'); ++# (2) otherwise, pass the desired values on the 'make' command line. ++$(am__recursive_targets): ++ @fail=; \ ++ if $(am__make_keepgoing); then \ ++ failcom='fail=yes'; \ ++ else \ ++ failcom='exit 1'; \ ++ fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ +@@ -413,60 +609,20 @@ $(RECURSIVE_TARGETS): + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + 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; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- 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 +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-recursive ++TAGS: tags + +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ ++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -478,83 +634,113 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ $(am__define_uniq_tagged_files); \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ctags: ctags-recursive ++ ++CTAGS: ctags ++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) ++ $(am__define_uniq_tagged_files); \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" ++cscope: cscope.files ++ test ! -s cscope.files \ ++ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) ++clean-cscope: ++ -rm -f cscope.files ++cscope.files: clean-cscope cscopelist ++cscopelist: cscopelist-recursive ++ ++cscopelist-am: $(am__tagged_files) ++ list='$(am__tagged_files)'; \ ++ case "$(srcdir)" in \ ++ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ ++ *) sdir=$(subdir)/$(srcdir) ;; \ ++ esac; \ ++ for i in $$list; do \ ++ if test -f "$$i"; then \ ++ echo "$(subdir)/$$i"; \ ++ else \ ++ echo "$$sdir/$$i"; \ ++ fi; \ ++ done >> $(top_builddir)/cscope.files + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d "$(distdir)" || mkdir "$(distdir)" ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ +- || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ $(am__make_dryrun) \ ++ || test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -562,35 +748,51 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 +- $(am__remove_distdir) ++ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 ++ $(am__post_remove_distdir) ++ ++dist-lzip: distdir ++ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz ++ $(am__post_remove_distdir) ++ ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz ++ $(am__post_remove_distdir) + + dist-tarZ: distdir ++ @echo WARNING: "Support for shar distribution archives is" \ ++ "deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-shar: distdir ++ @echo WARNING: "Support for distribution archives compressed with" \ ++ "legacy program 'compress' is deprecated." >&2 ++ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + + dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) +- $(am__remove_distdir) ++ $(am__post_remove_distdir) + +-dist dist-all: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__remove_distdir) ++dist dist-all: ++ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' ++ $(am__post_remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another +@@ -598,25 +800,33 @@ dist dist-all: distdir + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lz*) \ ++ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +- chmod -R a-w $(distdir); chmod a+w $(distdir) +- mkdir $(distdir)/_build +- mkdir $(distdir)/_inst ++ chmod -R a-w $(distdir) ++ chmod u+w $(distdir) ++ mkdir $(distdir)/_build $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ +- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ ++ && ../configure \ ++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ ++ --srcdir=.. --prefix="$$dc_install_base" \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ +@@ -636,14 +846,24 @@ distcheck: dist + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck +- $(am__remove_distdir) ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 ++ $(am__post_remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ +- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ++ @test -n '$(distuninstallcheck_dir)' || { \ ++ echo 'ERROR: trying to run $@ with an empty' \ ++ '$$(distuninstallcheck_dir)' >&2; \ ++ exit 1; \ ++ }; \ ++ $(am__cd) '$(distuninstallcheck_dir)' || { \ ++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ ++ exit 1; \ ++ }; \ ++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ +@@ -665,7 +885,7 @@ all-am: Makefile $(PROGRAMS) $(MANS) config.h + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive + install-exec: install-exec-recursive +@@ -677,16 +897,22 @@ install-am: all-am + + installcheck: installcheck-recursive + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++ if test -z '$(STRIP)'; then \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install; \ ++ else \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ ++ fi + mostlyclean-generic: + + clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -709,20 +935,38 @@ dvi-am: + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: install-man + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: install-binPROGRAMS +- @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ++ ++install-html: install-html-recursive ++ ++install-html-am: + + install-info: install-info-recursive + ++install-info-am: ++ + install-man: install-man1 + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -744,28 +988,29 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man +- +-uninstall-info: uninstall-info-recursive ++uninstall-am: uninstall-binPROGRAMS uninstall-man + + uninstall-man: uninstall-man1 + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ +- check-am clean clean-binPROGRAMS clean-generic \ +- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ +- dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \ +- dist-tarZ dist-zip distcheck distclean distclean-compile \ +- distclean-generic distclean-hdr distclean-recursive \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-exec \ +- install-exec-am install-exec-hook install-info install-info-am \ +- install-man install-man1 install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \ ++.MAKE: $(am__recursive_targets) all install-am install-strip ++ ++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ ++ am--refresh check check-am clean clean-binPROGRAMS \ ++ clean-cscope clean-generic clean-noinstPROGRAMS cscope \ ++ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ ++ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ ++ dist-zip distcheck distclean distclean-compile \ ++ distclean-generic distclean-hdr distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-binPROGRAMS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-man1 install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-man uninstall-man1 + + +@@ -777,15 +1022,6 @@ dist-hook: + find $(distdir) -name CVS -exec rm -rvf '{}' ';' ; \ + done + +-install-exec-hook: +-@SUID_TRUE@ progname=$(DESTDIR)$(bindir)/`echo imwheel|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'` ; \ +-@SUID_TRUE@ chown @suid@ $$progname ; \ +-@SUID_TRUE@ chmod u+s $$progname +- $(mkinstalldirs) $(ETCDIR) +- -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true +- -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true +- -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc +- + extras: $(EXTRA_PROGRAMS) + + @NO_GPM_DOC_TRUE@Makefile.am: .premake +@@ -798,6 +1034,7 @@ extras: $(EXTRA_PROGRAMS) + @NO_GPM_DOC_TRUE@.postmake: + @NO_GPM_DOC_TRUE@ @#End + @NO_GPM_DOC_TRUE@ @rm -f .premake ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff --git a/aclocal.m4 b/aclocal.m4 +index 0a2f37e..e2d7b32 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ @@ -26,6 +1252,11 @@ Last-Update: 2014-09-10 -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl @@ -35,11 +1266,6 @@ Last-Update: 2014-09-10 +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -86,8 +1312,7 @@ Last-Update: 2014-09-10 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- - +- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) @@ -97,7 +1322,8 @@ Last-Update: 2014-09-10 -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -- ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -116,7 +1342,7 @@ Last-Update: 2014-09-10 # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and -@@ -82,7 +85,7 @@ +@@ -82,7 +85,7 @@ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually @@ -125,15 +1351,14 @@ Last-Update: 2014-09-10 # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -@@ -106,36 +109,26 @@ +@@ -106,36 +109,26 @@ AC_PREREQ([2.50])dnl am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. -+# AM_CONDITIONAL -*- Autoconf -*- - +- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) @@ -143,7 +1368,8 @@ Last-Update: 2014-09-10 -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -- ++# AM_CONDITIONAL -*- Autoconf -*- + -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -176,7 +1402,7 @@ Last-Update: 2014-09-10 if $2; then $1_TRUE= $1_FALSE='#' -@@ -149,39 +142,24 @@ +@@ -149,39 +142,24 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) @@ -223,7 +1449,7 @@ Last-Update: 2014-09-10 # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -@@ -194,11 +172,13 @@ +@@ -194,11 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl @@ -242,7 +1468,7 @@ Last-Update: 2014-09-10 AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], -@@ -206,8 +186,9 @@ +@@ -206,8 +186,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up @@ -254,7 +1480,7 @@ Last-Update: 2014-09-10 mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. -@@ -225,6 +206,16 @@ +@@ -225,6 +206,16 @@ AC_CACHE_CHECK([dependency style of $depcc], if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi @@ -271,7 +1497,7 @@ Last-Update: 2014-09-10 for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and -@@ -236,34 +227,49 @@ +@@ -236,34 +227,49 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -332,7 +1558,7 @@ Last-Update: 2014-09-10 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message -@@ -296,7 +302,7 @@ +@@ -296,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. @@ -341,7 +1567,7 @@ Last-Update: 2014-09-10 AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -@@ -306,80 +312,85 @@ +@@ -306,80 +312,85 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], @@ -487,7 +1713,7 @@ Last-Update: 2014-09-10 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS -@@ -388,7 +399,7 @@ +@@ -388,7 +399,7 @@ done # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking @@ -496,12 +1722,13 @@ Last-Update: 2014-09-10 # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], -@@ -396,54 +407,22 @@ +@@ -396,54 +407,22 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -- ++# Do all the work for Automake. -*- Autoconf -*- + -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify @@ -520,8 +1747,7 @@ Last-Update: 2014-09-10 -# 02111-1307, USA. - -# serial 7 -+# Do all the work for Automake. -*- Autoconf -*- - +- -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - @@ -563,7 +1789,7 @@ Last-Update: 2014-09-10 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) -@@ -457,16 +436,20 @@ +@@ -457,16 +436,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], @@ -589,7 +1815,7 @@ Last-Update: 2014-09-10 fi # test whether we have cygpath -@@ -482,48 +465,122 @@ +@@ -482,48 +465,122 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], @@ -731,7 +1957,7 @@ Last-Update: 2014-09-10 # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header -@@ -534,62 +591,44 @@ +@@ -534,62 +591,44 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. @@ -817,7 +2043,7 @@ Last-Update: 2014-09-10 # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. -@@ -604,26 +643,13 @@ +@@ -604,26 +643,13 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) @@ -829,8 +2055,7 @@ Last-Update: 2014-09-10 -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+# Check to see how 'make' treats includes. -*- Autoconf -*- - +- -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -840,7 +2065,8 @@ Last-Update: 2014-09-10 -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -- ++# Check to see how 'make' treats includes. -*- Autoconf -*- + -# serial 2 +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# @@ -850,7 +2076,7 @@ Last-Update: 2014-09-10 # AM_MAKE_INCLUDE() # ----------------- -@@ -632,7 +658,7 @@ +@@ -632,7 +658,7 @@ AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' am__doit: @@ -859,7 +2085,7 @@ Last-Update: 2014-09-10 .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -@@ -642,24 +668,24 @@ +@@ -642,24 +668,24 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf @@ -899,7 +2125,7 @@ Last-Update: 2014-09-10 fi AC_SUBST([am__include]) AC_SUBST([am__quote]) -@@ -667,27 +693,13 @@ +@@ -667,27 +693,13 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) @@ -933,7 +2159,7 @@ Last-Update: 2014-09-10 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ -@@ -696,117 +708,66 @@ +@@ -696,117 +708,66 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) @@ -996,10 +2222,14 @@ Last-Update: 2014-09-10 -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). --# ++# -*- Autoconf -*- ++# Obsolete and "removed" macros, that must however still report explicit ++# error messages when used, to smooth transition. + # -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. --# ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. + # -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' @@ -1043,28 +2273,21 @@ Last-Update: 2014-09-10 -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -+# -*- Autoconf -*- -+# Obsolete and "removed" macros, that must however still report explicit -+# error messages when used, to smooth transition. -+# -+# Copyright (C) 1996-2013 Free Software Foundation, Inc. -+# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) -+ + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc @@ -1073,16 +2296,15 @@ Last-Update: 2014-09-10 +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) -+ -+AC_DEFUN([AM_C_PROTOTYPES], -+ [AC_FATAL([automatic de-ANSI-fication support has been removed])]) -+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -- ++AC_DEFUN([AM_C_PROTOTYPES], ++ [AC_FATAL([automatic de-ANSI-fication support has been removed])]) ++AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) + -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -1098,7 +2320,7 @@ Last-Update: 2014-09-10 # _AM_MANGLE_OPTION(NAME) # ----------------------- -@@ -814,16 +775,16 @@ +@@ -814,16 +775,16 @@ AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) @@ -1119,7 +2341,7 @@ Last-Update: 2014-09-10 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- -@@ -831,59 +792,126 @@ +@@ -831,59 +792,126 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) @@ -1181,17 +2403,16 @@ Last-Update: 2014-09-10 -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -+ + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. @@ -1284,13 +2505,15 @@ Last-Update: 2014-09-10 test "$[2]" = conftest.file ) then -@@ -893,73 +921,141 @@ +@@ -893,73 +921,141 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) - -# AM_PROG_INSTALL_STRIP +- +-# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. @@ -1309,17 +2532,20 @@ Last-Update: 2014-09-10 +rm -f conftest.file +]) --# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT @@ -1374,11 +2600,6 @@ Last-Update: 2014-09-10 +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -1436,17 +2657,16 @@ Last-Update: 2014-09-10 -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -+ + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. @@ -1469,7 +2689,7 @@ Last-Update: 2014-09-10 # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory -@@ -969,75 +1065,114 @@ +@@ -969,75 +1065,114 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar @@ -1534,12 +2754,7 @@ Last-Update: 2014-09-10 - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - -- # tar/untar a dummy directory, and stop if the command works -- rm -rf conftest.dir -- mkdir conftest.dir -- echo GrepMe > conftest.dir/file -- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. @@ -1614,7 +2829,12 @@ Last-Update: 2014-09-10 + am__untar=false + ;; + esac -+ + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break @@ -1647,6 +2867,8 @@ Last-Update: 2014-09-10 AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +diff --git a/config.h.in b/config.h.in +index b9a92a0..5748803 100644 --- a/config.h.in +++ b/config.h.in @@ -24,15 +24,9 @@ @@ -1675,6 +2897,8 @@ Last-Update: 2014-09-10 /* Define to the version of this package. */ #undef PACKAGE_VERSION +diff --git a/configure b/configure +index 9da68d2..7f54928 100755 --- a/configure +++ b/configure @@ -1,81 +1,459 @@ @@ -2104,10 +3328,10 @@ Last-Update: 2014-09-10 + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -+ -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then ++ +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are @@ -2156,7 +3380,6 @@ Last-Update: 2014-09-10 - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -- + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ @@ -2173,11 +3396,12 @@ Last-Update: 2014-09-10 + } + s/.*/./; q'` +- -# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +461,91 @@ +@@ -83,146 +461,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -2382,7 +3606,7 @@ Last-Update: 2014-09-10 # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +554,25 @@ +@@ -231,38 +554,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -2426,7 +3650,7 @@ Last-Update: 2014-09-10 # Identity of this package. PACKAGE_NAME= -@@ -270,52 +580,193 @@ +@@ -270,52 +580,193 @@ PACKAGE_TARNAME= PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= @@ -2635,7 +3859,7 @@ Last-Update: 2014-09-10 # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null -@@ -338,34 +789,49 @@ +@@ -338,34 +789,49 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. @@ -2692,7 +3916,7 @@ Last-Update: 2014-09-10 -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -@@ -387,33 +853,59 @@ +@@ -387,33 +853,59 @@ do --config-cache | -C) cache_file=config.cache ;; @@ -2770,7 +3994,7 @@ Last-Update: 2014-09-10 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -440,6 +932,12 @@ +@@ -440,6 +932,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; @@ -2783,7 +4007,7 @@ Last-Update: 2014-09-10 -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -@@ -464,13 +962,16 @@ +@@ -464,13 +962,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; @@ -2804,7 +4028,7 @@ Last-Update: 2014-09-10 localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -535,6 +1036,16 @@ +@@ -535,6 +1036,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; @@ -2821,7 +4045,7 @@ Last-Update: 2014-09-10 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; -@@ -585,26 +1096,36 @@ +@@ -585,26 +1096,36 @@ do ac_init_version=: ;; -with-* | --with-*) @@ -2873,7 +4097,7 @@ Last-Update: 2014-09-10 --x) # Obsolete; use --with-x. -@@ -624,27 +1145,26 @@ +@@ -624,27 +1145,26 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -2911,7 +4135,7 @@ Last-Update: 2014-09-10 ;; esac -@@ -652,31 +1172,36 @@ +@@ -652,31 +1172,36 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -2949,24 +4173,24 @@ Last-Update: 2014-09-10 - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var + # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; + esac ++ # Be sure to have absolute directory names. ++ case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac ++ esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' -@@ -690,8 +1215,6 @@ +@@ -690,8 +1215,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -2975,7 +4199,7 @@ Last-Update: 2014-09-10 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi -@@ -703,74 +1226,72 @@ +@@ -703,74 +1226,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null @@ -3107,7 +4331,7 @@ Last-Update: 2014-09-10 # # Report the --help message. -@@ -793,20 +1314,17 @@ +@@ -793,20 +1314,17 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit @@ -3131,7 +4355,7 @@ Last-Update: 2014-09-10 By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -816,18 +1334,25 @@ +@@ -816,18 +1334,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: @@ -3169,7 +4393,7 @@ Last-Update: 2014-09-10 _ACEOF cat <<\_ACEOF -@@ -848,10 +1373,15 @@ +@@ -848,10 +1373,15 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: @@ -3187,7 +4411,7 @@ Last-Update: 2014-09-10 --enable-suid=user suid user default=root the imwheel executable no --enable-mdetect build mdetect, a ps/2 mouse data detector no --enable-mdump build mdump, a ps/2 mouse data dumper no -@@ -871,158 +1401,537 @@ +@@ -871,162 +1401,541 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory @@ -3288,7 +4512,13 @@ Last-Update: 2014-09-10 - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; --esac ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) @@ -3297,15 +4527,8 @@ Last-Update: 2014-09-10 - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - +-esac +- - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then @@ -3318,6 +4541,8 @@ Last-Update: 2014-09-10 - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then @@ -3358,14 +4583,13 @@ Last-Update: 2014-09-10 - -It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was -- -- $ $0 $@ --_ACEOF +- $ $0 $@ +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## -+ + +-_ACEOF +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. @@ -3375,6 +4599,23 @@ Last-Update: 2014-09-10 -## --------- ## -## Platform. ## -## --------- ## +- +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` +- +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +- +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" @@ -3401,27 +4642,22 @@ Last-Update: 2014-09-10 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` +-_ASUNAME + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done +} # ac_fn_c_try_compile --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +-} >&5 +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -3451,7 +4687,8 @@ Last-Update: 2014-09-10 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-cat >&5 <<_ACEOF + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno @@ -3535,8 +4772,7 @@ Last-Update: 2014-09-10 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } - --_ASUNAME ++ +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } @@ -3552,11 +4788,7 @@ Last-Update: 2014-09-10 +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS ++ +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) @@ -3830,16 +5062,18 @@ Last-Update: 2014-09-10 +for as_dir in $PATH +do + IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done ++ test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS ++ ++} >&5 ++ ++cat >&5 <<_ACEOF - } >&5 -@@ -1044,7 +1953,6 @@ + ## ----------- ## +@@ -1044,7 +1953,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= @@ -3847,7 +5081,7 @@ Last-Update: 2014-09-10 ac_must_keep_next=false for ac_pass in 1 2 do -@@ -1055,13 +1963,13 @@ +@@ -1055,13 +1963,13 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; @@ -3865,7 +5099,7 @@ Last-Update: 2014-09-10 if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else -@@ -1077,104 +1985,115 @@ +@@ -1077,104 +1985,115 @@ do -* ) ac_must_keep_next=true ;; esac fi @@ -4029,7 +5263,7 @@ Last-Update: 2014-09-10 # Predefined preprocessor variables. -@@ -1182,112 +2101,137 @@ +@@ -1182,112 +2101,137 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF @@ -4066,11 +5300,6 @@ Last-Update: 2014-09-10 - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi --fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE @@ -4087,7 +5316,11 @@ Last-Update: 2014-09-10 +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site -+fi + fi +-for ac_site_file in $CONFIG_SITE; do +- if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue @@ -4204,20 +5437,19 @@ Last-Update: 2014-09-10 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } --fi + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi + fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -1297,48 +2241,36 @@ +@@ -1297,48 +2241,36 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -4264,12 +5496,11 @@ Last-Update: 2014-09-10 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } --fi ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. @@ -4282,7 +5513,7 @@ Last-Update: 2014-09-10 # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or -@@ -1353,22 +2285,23 @@ +@@ -1353,22 +2285,23 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -4314,7 +5545,7 @@ Last-Update: 2014-09-10 /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -1376,7 +2309,7 @@ +@@ -1376,7 +2309,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do @@ -4323,7 +5554,7 @@ Last-Update: 2014-09-10 if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. -@@ -1386,30 +2319,43 @@ +@@ -1386,30 +2319,43 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else @@ -4375,7 +5606,7 @@ Last-Update: 2014-09-10 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -1419,194 +2365,383 @@ +@@ -1419,176 +2365,324 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -4425,6 +5656,7 @@ Last-Update: 2014-09-10 -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi +- + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file @@ -4435,7 +5667,7 @@ Last-Update: 2014-09-10 + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then - ++ + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually @@ -4517,10 +5749,8 @@ Last-Update: 2014-09-10 am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} - fi - +-fi +- -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in @@ -4552,13 +5782,8 @@ Last-Update: 2014-09-10 - else - mkdir_p='$(install_sh) -d' - fi -+if test x"${install_sh}" != xset; then -+ case $am_aux_dir in -+ *\ * | *\ *) -+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; -+ *) -+ install_sh="\${SHELL} $am_aux_dir/install-sh" -+ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -for ac_prog in gawk mawk nawk awk @@ -4569,6 +5794,15 @@ Last-Update: 2014-09-10 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++ +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake @@ -4600,38 +5834,24 @@ Last-Update: 2014-09-10 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done ++ break 2 ++ fi ++done + done +IFS=$as_save_IFS - - fi - fi --AWK=$ac_cv_prog_AWK --if test -n "$AWK"; then -- echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 ++ ++fi ++fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 ++else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - fi - -- test -n "$AWK" && break --done - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ ++ +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP @@ -4641,19 +5861,10 @@ Last-Update: 2014-09-10 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 - else -- cat >conftest.make <<\_ACEOF --all: -- @echo 'ac_maketemp="$(MAKE)"' --_ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes ++else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. - else -- eval ac_cv_prog_make_${ac_make}_set=no ++else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -4663,35 +5874,23 @@ Last-Update: 2014-09-10 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done + break 2 + fi + done + done +IFS=$as_save_IFS + - fi --rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- SET_MAKE= ++fi ++fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- SET_MAKE="MAKE=${MAKE-make}" ++else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - fi - --rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. ++fi ++ + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else @@ -4775,37 +5974,54 @@ Last-Update: 2014-09-10 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi -+done + done + done +IFS=$as_save_IFS -+ -+fi -+fi -+AWK=$ac_cv_prog_AWK -+if test -n "$AWK"; then + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } -+else + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$AWK" && break -+done + fi + + + test -n "$AWK" && break + done + +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.make <<\_ACEOF + else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh -+all: + all: +- @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) @@ -4813,24 +6029,24 @@ Last-Update: 2014-09-10 + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac -+rm -f conftest.make -+fi + rm -f conftest.make + fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -+ SET_MAKE= -+else + SET_MAKE= + else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -+ SET_MAKE="MAKE=${MAKE-make}" -+fi -+ -+rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. - else - am__leading_dot=_ + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -1601,12 +2695,53 @@ else fi rmdir .tst 2>/dev/null @@ -4890,7 +6106,7 @@ Last-Update: 2014-09-10 fi # test whether we have cygpath -@@ -1620,6 +2755,7 @@ +@@ -1620,6 +2755,7 @@ fi # Define the identity of the package. @@ -4898,7 +6114,7 @@ Last-Update: 2014-09-10 PACKAGE=imwheel VERSION=1.0.0pre12 -@@ -1649,107 +2785,70 @@ +@@ -1649,107 +2785,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} @@ -4983,6 +6199,8 @@ Last-Update: 2014-09-10 -done +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' ++ ++am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" -fi @@ -4995,7 +6213,6 @@ Last-Update: 2014-09-10 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - STRIP=$ac_ct_STRIP -else @@ -5012,7 +6229,6 @@ Last-Update: 2014-09-10 -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is @@ -5024,7 +6240,7 @@ Last-Update: 2014-09-10 +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! -+ + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with @@ -5057,7 +6273,7 @@ Last-Update: 2014-09-10 Warnings=0 -@@ -1765,10 +2864,10 @@ +@@ -1765,10 +2864,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -5072,7 +6288,7 @@ Last-Update: 2014-09-10 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1778,35 +2877,37 @@ +@@ -1778,35 +2877,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5122,7 +6338,7 @@ Last-Update: 2014-09-10 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1816,39 +2917,50 @@ +@@ -1816,39 +2917,50 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5188,7 +6404,7 @@ Last-Update: 2014-09-10 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1858,77 +2970,37 @@ +@@ -1858,77 +2970,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5226,9 +6442,7 @@ Last-Update: 2014-09-10 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else +-else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else @@ -5252,7 +6466,9 @@ Last-Update: 2014-09-10 -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 --else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -5280,7 +6496,7 @@ Last-Update: 2014-09-10 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1939,18 +3011,19 @@ +@@ -1939,18 +3011,19 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5304,7 +6520,7 @@ Last-Update: 2014-09-10 if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. -@@ -1968,24 +3041,25 @@ +@@ -1968,24 +3041,25 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5339,7 +6555,7 @@ Last-Update: 2014-09-10 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1995,39 +3069,41 @@ +@@ -1995,39 +3069,41 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5394,7 +6610,7 @@ Last-Update: 2014-09-10 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2037,66 +3113,78 @@ +@@ -2037,66 +3113,78 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5509,7 +6725,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ int -@@ -2108,112 +3196,108 @@ +@@ -2108,112 +3196,108 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files @@ -5699,7 +6915,7 @@ Last-Update: 2014-09-10 # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -2221,88 +3305,141 @@ +@@ -2221,38 +3305,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -5717,16 +6933,15 @@ Last-Update: 2014-09-10 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } --fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } -+fi + fi +- +-rm -f conftest$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } @@ -5741,26 +6956,21 @@ Last-Update: 2014-09-10 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- ++/* end confdefs.h. */ +#include - int - main () - { ++int ++main () ++{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; - - ; - return 0; - } ++ ++ ; ++ return 0; ++} _ACEOF --rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. @@ -5786,37 +6996,7 @@ Last-Update: 2014-09-10 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -- case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -- break;; -- esac --done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --rm -f conftest.$ac_cv_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 --OBJEXT=$ac_cv_objext --ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no @@ -5841,23 +7021,21 @@ Last-Update: 2014-09-10 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} + /* end confdefs.h. */ + + int +@@ -2264,45 +3400,46 @@ main () + } _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+rm -f conftest.o conftest.obj + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -5871,37 +7049,56 @@ Last-Update: 2014-09-10 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; -+ case $ac_file in + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; -+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -+ break;; -+ esac -+done -+else + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } -+fi -+rm -f conftest.$ac_cv_objext conftest.$ac_ext -+fi + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } -+OBJEXT=$ac_cv_objext -+ac_objext=$OBJEXT + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -@@ -2316,55 +3453,34 @@ +@@ -2316,55 +3453,34 @@ main () return 0; } _ACEOF @@ -5977,7 +7174,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ int -@@ -2375,39 +3491,49 @@ +@@ -2375,39 +3491,49 @@ main () return 0; } _ACEOF @@ -6055,7 +7252,7 @@ Last-Update: 2014-09-10 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then -@@ -2423,23 +3549,18 @@ +@@ -2423,23 +3549,18 @@ else CFLAGS= fi fi @@ -6086,7 +7283,7 @@ Last-Update: 2014-09-10 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -2462,12 +3583,17 @@ +@@ -2462,12 +3583,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated @@ -6106,7 +7303,7 @@ Last-Update: 2014-09-10 int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; -@@ -2482,266 +3608,156 @@ +@@ -2482,266 +3608,156 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF @@ -6340,6 +7537,12 @@ Last-Update: 2014-09-10 - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, @@ -6360,12 +7563,7 @@ Last-Update: 2014-09-10 + done + rm -f core conftest* + unset am_i - fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then @@ -6469,7 +7667,7 @@ Last-Update: 2014-09-10 AMDEP_TRUE= AMDEP_FALSE='#' else -@@ -2751,20 +3767,20 @@ +@@ -2751,20 +3767,20 @@ fi @@ -6497,7 +7695,7 @@ Last-Update: 2014-09-10 mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. -@@ -2782,6 +3798,11 @@ +@@ -2782,6 +3798,11 @@ else if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi @@ -6509,7 +7707,7 @@ Last-Update: 2014-09-10 for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and -@@ -2793,34 +3814,49 @@ +@@ -2793,34 +3814,49 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -6570,7 +7768,7 @@ Last-Update: 2014-09-10 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message -@@ -2844,13 +3880,11 @@ +@@ -2844,13 +3880,11 @@ else fi fi @@ -6587,7 +7785,7 @@ Last-Update: 2014-09-10 test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= -@@ -2861,92 +3895,14 @@ +@@ -2861,92 +3895,14 @@ else fi @@ -6684,7 +7882,7 @@ Last-Update: 2014-09-10 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2956,35 +3912,37 @@ +@@ -2956,35 +3912,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6734,7 +7932,7 @@ Last-Update: 2014-09-10 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2994,62 +3952,74 @@ +@@ -2994,62 +3952,74 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6838,7 +8036,7 @@ Last-Update: 2014-09-10 -@@ -3061,15 +4031,15 @@ +@@ -3061,15 +4031,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6858,7 +8056,7 @@ Last-Update: 2014-09-10 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -3083,11 +4053,7 @@ +@@ -3083,11 +4053,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -6871,7 +8069,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -3096,78 +4062,34 @@ +@@ -3096,78 +4062,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF @@ -6959,7 +8157,7 @@ Last-Update: 2014-09-10 break fi -@@ -3179,8 +4101,8 @@ +@@ -3179,8 +4101,8 @@ fi else ac_cv_prog_CPP=$CPP fi @@ -6970,7 +8168,7 @@ Last-Update: 2014-09-10 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do -@@ -3190,11 +4112,7 @@ +@@ -3190,11 +4112,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -6983,7 +8181,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -3203,85 +4121,40 @@ +@@ -3203,85 +4121,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF @@ -7001,7 +8199,9 @@ Last-Update: 2014-09-10 - else - ac_cpp_err= - fi --else ++if ac_fn_c_try_cpp "$LINENO"; then : ++ + else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then @@ -7009,9 +8209,7 @@ Last-Update: 2014-09-10 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else +- # Broken: fails on valid input. continue fi @@ -7083,7 +8281,7 @@ Last-Update: 2014-09-10 fi ac_ext=c -@@ -3291,31 +4164,142 @@ +@@ -3291,31 +4164,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -7091,15 +8289,14 @@ Last-Update: 2014-09-10 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 -+else + else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST @@ -7133,7 +8330,7 @@ Last-Update: 2014-09-10 + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count -+ fi + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done @@ -7152,17 +8349,29 @@ Last-Update: 2014-09-10 + ac_cv_path_GREP=$GREP +fi + -+fi + fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 +- EGREP=$ac_cv_prog_egrep +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" -+ -+ + + +-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +-if test "${ac_cv_header_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else @@ -7199,7 +8408,7 @@ Last-Update: 2014-09-10 + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count - fi ++ fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done @@ -7219,34 +8428,22 @@ Last-Update: 2014-09-10 +fi + + fi - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -@@ -3330,51 +4314,23 @@ +@@ -3330,51 +4314,23 @@ main () return 0; } _ACEOF @@ -7304,7 +8501,7 @@ Last-Update: 2014-09-10 else ac_cv_header_stdc=no fi -@@ -3384,18 +4340,14 @@ +@@ -3384,18 +4340,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -7326,7 +8523,7 @@ Last-Update: 2014-09-10 else ac_cv_header_stdc=no fi -@@ -3405,16 +4357,13 @@ +@@ -3405,16 +4357,13 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -7346,7 +8543,7 @@ Last-Update: 2014-09-10 #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3434,59 +4383,40 @@ +@@ -3434,59 +4383,40 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) @@ -7423,7 +8620,7 @@ Last-Update: 2014-09-10 #endif #ifndef WIFEXITED # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -@@ -3502,112 +4432,31 @@ +@@ -3502,112 +4432,31 @@ main () return 0; } _ACEOF @@ -7548,7 +8745,7 @@ Last-Update: 2014-09-10 _ACEOF fi -@@ -3615,153 +4464,13 @@ +@@ -3615,153 +4464,13 @@ fi done @@ -7707,7 +8904,7 @@ Last-Update: 2014-09-10 _ACEOF fi -@@ -3770,29 +4479,25 @@ +@@ -3770,29 +4479,25 @@ done @@ -7747,7 +8944,7 @@ Last-Update: 2014-09-10 /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; -@@ -3801,16 +4506,18 @@ +@@ -3801,16 +4506,18 @@ main () an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; @@ -7772,7 +8969,7 @@ Last-Update: 2014-09-10 } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; -@@ -3822,119 +4529,40 @@ +@@ -3822,119 +4529,40 @@ main () iptr p = 0; ++p; } @@ -7905,7 +9102,7 @@ Last-Update: 2014-09-10 else cat >>confdefs.h <<_ACEOF -@@ -3943,16 +4571,12 @@ +@@ -3943,16 +4571,12 @@ _ACEOF fi @@ -7927,7 +9124,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ #include #include -@@ -3967,420 +4591,82 @@ +@@ -3967,471 +4591,128 @@ return 0; return 0; } _ACEOF @@ -8174,8 +9371,9 @@ Last-Update: 2014-09-10 +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + -echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 -if test "${ac_cv_func__doprnt+set}" = set; then @@ -8190,7 +9388,9 @@ Last-Update: 2014-09-10 -/* Define _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt -- ++fi ++done + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since @@ -8379,14 +9579,13 @@ Last-Update: 2014-09-10 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -4388,50 +4674,45 @@ - +-_ACEOF +- +-fi +-done +- -echo "$as_me:$LINENO: checking that regex functions are available" >&5 -echo $ECHO_N "checking that regex functions are available... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that regex functions are available" >&5 @@ -8454,7 +9653,7 @@ Last-Update: 2014-09-10 yes) suid=root ;; no) suid= ;; *) if [ "x$enableval" = x ] -@@ -4443,21 +4724,20 @@ +@@ -4443,21 +4724,20 @@ if test "${enable_suid+set}" = set; then esac else suid= @@ -8485,7 +9684,7 @@ Last-Update: 2014-09-10 SUID_TRUE= SUID_FALSE='#' else -@@ -4467,35 +4747,33 @@ +@@ -4467,35 +4747,33 @@ fi getopt_dist= @@ -8535,7 +9734,7 @@ Last-Update: 2014-09-10 getopt_dist=getopt fi fi -@@ -4513,60 +4791,56 @@ +@@ -4513,60 +4791,56 @@ fi @@ -8620,7 +9819,7 @@ Last-Update: 2014-09-10 fi -@@ -4574,30 +4848,28 @@ +@@ -4574,30 +4848,28 @@ fi EXTRAS="setimps2 setmmplus getmdt setps2 setps2rate" EXTRAS_SRC="setimps2.c setmmplus.c getmdt.c setps2.c setps2rate.c" @@ -8663,7 +9862,7 @@ Last-Update: 2014-09-10 extras_dist="$EXTRAS_SRC" fi -@@ -4607,69 +4879,64 @@ +@@ -4607,69 +4879,64 @@ fi NO_GPM_DOC= GPM_DIR="gpm-1.19.3" @@ -8759,7 +9958,7 @@ Last-Update: 2014-09-10 subdirs="$subdirs gpm-1.19.3" -@@ -4679,9 +4946,7 @@ +@@ -4679,9 +4946,7 @@ cat >>confdefs.h <<_ACEOF #define HAVE_GPM_SRC 1 _ACEOF @@ -8770,7 +9969,7 @@ Last-Update: 2014-09-10 NO_GPM_DOC_TRUE= NO_GPM_DOC_FALSE='#' else -@@ -4690,11 +4955,9 @@ +@@ -4690,11 +4955,9 @@ else fi else @@ -8785,7 +9984,7 @@ Last-Update: 2014-09-10 NO_GPM_DOC_TRUE= NO_GPM_DOC_FALSE='#' else -@@ -4707,11 +4970,9 @@ +@@ -4707,11 +4970,9 @@ else gpm_imwheel= if [ "x$gpm_enabled" = "xyes" ] then @@ -8800,7 +9999,7 @@ Last-Update: 2014-09-10 NO_GPM_DOC_TRUE= NO_GPM_DOC_FALSE='#' else -@@ -4719,15 +4980,13 @@ +@@ -4719,15 +4980,13 @@ else NO_GPM_DOC_FALSE= fi @@ -8821,7 +10020,7 @@ Last-Update: 2014-09-10 NO_GPM_DOC_TRUE= NO_GPM_DOC_FALSE='#' else -@@ -4742,44 +5001,47 @@ +@@ -4742,44 +5001,47 @@ gpm_dist="$GPM_DIR" @@ -8892,7 +10091,7 @@ Last-Update: 2014-09-10 ac_im_usrlibdir=$ac_im_libdir; break fi done -@@ -4787,37 +5049,41 @@ +@@ -4787,37 +5049,41 @@ _ACEOF # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in @@ -8937,7 +10136,7 @@ Last-Update: 2014-09-10 /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 -@@ -4837,48 +5103,24 @@ +@@ -4837,48 +5103,24 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then @@ -8992,7 +10191,7 @@ Last-Update: 2014-09-10 fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then -@@ -4886,102 +5128,76 @@ +@@ -4886,102 +5128,76 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS @@ -9127,7 +10326,7 @@ Last-Update: 2014-09-10 X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else -@@ -4994,16 +5210,12 @@ +@@ -4994,16 +5210,12 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . @@ -9150,7 +10349,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ int -@@ -5014,48 +5226,13 @@ +@@ -5014,48 +5226,13 @@ main () return 0; } _ACEOF @@ -9205,7 +10404,7 @@ Last-Update: 2014-09-10 /* end confdefs.h. */ int -@@ -5066,48 +5243,21 @@ +@@ -5066,48 +5243,21 @@ main () return 0; } _ACEOF @@ -9267,7 +10466,7 @@ Last-Update: 2014-09-10 fi # Check for system-dependent libraries X programs must link with. -@@ -5121,196 +5271,112 @@ +@@ -5121,196 +5271,112 @@ echo "${ECHO_T}neither works" >&6 # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" @@ -9505,7 +10704,7 @@ Last-Update: 2014-09-10 LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -@@ -5321,232 +5387,90 @@ +@@ -5321,232 +5387,90 @@ rm -f conftest.err conftest.$ac_objext \ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. @@ -9784,7 +10983,7 @@ Last-Update: 2014-09-10 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -@@ -5560,489 +5484,147 @@ +@@ -5560,489 +5484,147 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. @@ -9813,9 +11012,7 @@ Last-Update: 2014-09-10 -#else -# include -#endif -+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -+if test "x$ac_cv_func_connect" = xyes; then : - +- -#undef connect - -/* Override any gcc2 internal prototype to avoid an error. */ @@ -9872,7 +11069,9 @@ Last-Update: 2014-09-10 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" ++if test "x$ac_cv_func_connect" = xyes; then : + -ac_cv_func_connect=no fi -rm -f conftest.err conftest.$ac_objext \ @@ -9988,9 +11187,7 @@ Last-Update: 2014-09-10 - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -+if test "x$ac_cv_func_remove" = xyes; then : - +- -#ifdef __STDC__ -# include -#else @@ -10053,7 +11250,9 @@ Last-Update: 2014-09-10 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" ++if test "x$ac_cv_func_remove" = xyes; then : + -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ @@ -10236,10 +11435,10 @@ Last-Update: 2014-09-10 +if test "x$ac_cv_func_shmat" = xyes; then : -ac_cv_func_shmat=no --fi + fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi +-fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 @@ -10328,7 +11527,7 @@ Last-Update: 2014-09-10 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -@@ -6058,71 +5640,43 @@ +@@ -6058,71 +5640,43 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry @@ -10416,7 +11615,7 @@ Last-Update: 2014-09-10 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -@@ -6136,72 +5690,43 @@ +@@ -6136,72 +5690,43 @@ fi LIBS_saved="$LIBS" LIBS= @@ -10505,169 +11704,21 @@ Last-Update: 2014-09-10 cat >>confdefs.h <<_ACEOF #define HAVE_LIBX11 1 _ACEOF -@@ -6210,226 +5735,47 @@ +@@ -6210,316 +5735,106 @@ _ACEOF else - { { echo "$as_me:$LINENO: error: IMWheel depends on the X11 libraries!" >&5 -echo "$as_me: error: IMWheel depends on the X11 libraries!" >&2;} - { (exit 1); exit 1; }; } -- --fi -- -- --echo "$as_me:$LINENO: checking for XextAddDisplay in -lXext" >&5 --echo $ECHO_N "checking for XextAddDisplay in -lXext... $ECHO_C" >&6 --if test "${ac_cv_lib_Xext_XextAddDisplay+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lXext $LIBS_saved $X_LIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char XextAddDisplay (); --int --main () --{ --XextAddDisplay (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_Xext_XextAddDisplay=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_Xext_XextAddDisplay=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextAddDisplay" >&5 --echo "${ECHO_T}$ac_cv_lib_Xext_XextAddDisplay" >&6 --if test $ac_cv_lib_Xext_XextAddDisplay = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBXEXT 1 --_ACEOF -- -- LIBS="-lXext $LIBS" + as_fn_error $? "IMWheel depends on the X11 libraries!" "$LINENO" 5 fi - --echo "$as_me:$LINENO: checking for XtFree in -lXt" >&5 --echo $ECHO_N "checking for XtFree in -lXt... $ECHO_C" >&6 --if test "${ac_cv_lib_Xt_XtFree+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lXt $LIBS_saved $X_LIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char XtFree (); --int --main () --{ --XtFree (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_Xt_XtFree=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_Xt_XtFree=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtFree" >&5 --echo "${ECHO_T}$ac_cv_lib_Xt_XtFree" >&6 --if test $ac_cv_lib_Xt_XtFree = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBXT 1 --_ACEOF -- -- LIBS="-lXt $LIBS" -- --fi -- -- --echo "$as_me:$LINENO: checking for XmuInternAtom in -lXmu" >&5 --echo $ECHO_N "checking for XmuInternAtom in -lXmu... $ECHO_C" >&6 --if test "${ac_cv_lib_Xmu_XmuInternAtom+set}" = set; then +-echo "$as_me:$LINENO: checking for XextAddDisplay in -lXext" >&5 +-echo $ECHO_N "checking for XextAddDisplay in -lXext... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xext_XextAddDisplay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuInternAtom in -lXmu" >&5 +$as_echo_n "checking for XmuInternAtom in -lXmu... " >&6; } @@ -10675,12 +11726,13 @@ Last-Update: 2014-09-10 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS - LIBS="-lXmu $LIBS_saved $X_LIBS $LIBS" +-LIBS="-lXext $LIBS_saved $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-lXmu $LIBS_saved $X_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10693,11 +11745,12 @@ Last-Update: 2014-09-10 #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char XmuInternAtom (); +-char XextAddDisplay (); ++char XmuInternAtom (); int main () { --XmuInternAtom (); +-XextAddDisplay (); +return XmuInternAtom (); ; return 0; @@ -10725,13 +11778,14 @@ Last-Update: 2014-09-10 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +- ac_cv_lib_Xext_XextAddDisplay=yes +if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xmu_XmuInternAtom=yes ++ ac_cv_lib_Xmu_XmuInternAtom=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_Xmu_XmuInternAtom=no +-ac_cv_lib_Xext_XextAddDisplay=no + ac_cv_lib_Xmu_XmuInternAtom=no fi -rm -f conftest.err conftest.$ac_objext \ @@ -10740,23 +11794,26 @@ Last-Update: 2014-09-10 + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5 --echo "${ECHO_T}$ac_cv_lib_Xmu_XmuInternAtom" >&6 --if test $ac_cv_lib_Xmu_XmuInternAtom = yes; then +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XextAddDisplay" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xext_XextAddDisplay" >&6 +-if test $ac_cv_lib_Xext_XextAddDisplay = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5 +$as_echo "$ac_cv_lib_Xmu_XmuInternAtom" >&6; } +if test "x$ac_cv_lib_Xmu_XmuInternAtom" = xyes; then : cat >>confdefs.h <<_ACEOF - #define HAVE_LIBXMU 1 +-#define HAVE_LIBXEXT 1 ++#define HAVE_LIBXMU 1 _ACEOF -@@ -6438,72 +5784,43 @@ + +- LIBS="-lXext $LIBS" ++ LIBS="-lXmu $LIBS" fi - --echo "$as_me:$LINENO: checking for XTestFakeDeviceKeyEvent in -lXtst" >&5 --echo $ECHO_N "checking for XTestFakeDeviceKeyEvent in -lXtst... $ECHO_C" >&6 --if test "${ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent+set}" = set; then +-echo "$as_me:$LINENO: checking for XtFree in -lXt" >&5 +-echo $ECHO_N "checking for XtFree in -lXt... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xt_XtFree+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTestFakeDeviceKeyEvent in -lXtst" >&5 +$as_echo_n "checking for XTestFakeDeviceKeyEvent in -lXtst... " >&6; } @@ -10764,12 +11821,13 @@ Last-Update: 2014-09-10 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS - LIBS="-lXtst $LIBS_saved $X_LIBS $LIBS" +-LIBS="-lXt $LIBS_saved $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-lXtst $LIBS_saved $X_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10782,11 +11840,12 @@ Last-Update: 2014-09-10 #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char XTestFakeDeviceKeyEvent (); +-char XtFree (); ++char XTestFakeDeviceKeyEvent (); int main () { --XTestFakeDeviceKeyEvent (); +-XtFree (); +return XTestFakeDeviceKeyEvent (); ; return 0; @@ -10814,13 +11873,14 @@ Last-Update: 2014-09-10 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +- ac_cv_lib_Xt_XtFree=yes +if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent=yes ++ ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent=no +-ac_cv_lib_Xt_XtFree=no + ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent=no fi -rm -f conftest.err conftest.$ac_objext \ @@ -10829,27 +11889,188 @@ Last-Update: 2014-09-10 + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" >&5 --echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" >&6 --if test $ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent = yes; then +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtFree" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xt_XtFree" >&6 +-if test $ac_cv_lib_Xt_XtFree = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" >&5 +$as_echo "$ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" >&6; } +if test "x$ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" = xyes; then : cat >>confdefs.h <<_ACEOF - #define HAVE_LIBXTST 1 +-#define HAVE_LIBXT 1 ++#define HAVE_LIBXTST 1 _ACEOF -@@ -6512,9 +5829,7 @@ - else - -- { { echo "$as_me:$LINENO: error: IMWheel depends on the XTest extention!" >&5 --echo "$as_me: error: IMWheel depends on the XTest extention!" >&2;} -- { (exit 1); exit 1; }; } +- LIBS="-lXt $LIBS" ++ LIBS="-lXtst $LIBS" ++ ++else ++ + as_fn_error $? "IMWheel depends on the XTest extention!" "$LINENO" 5 fi -@@ -6535,7 +5850,8 @@ +- +-echo "$as_me:$LINENO: checking for XmuInternAtom in -lXmu" >&5 +-echo $ECHO_N "checking for XmuInternAtom in -lXmu... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xmu_XmuInternAtom+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXmu $LIBS_saved $X_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char XmuInternAtom (); +-int +-main () +-{ +-XmuInternAtom (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_Xmu_XmuInternAtom=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_Xmu_XmuInternAtom=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuInternAtom" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xmu_XmuInternAtom" >&6 +-if test $ac_cv_lib_Xmu_XmuInternAtom = yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBXMU 1 +-_ACEOF +- +- LIBS="-lXmu $LIBS" +- +-fi +- +- +-echo "$as_me:$LINENO: checking for XTestFakeDeviceKeyEvent in -lXtst" >&5 +-echo $ECHO_N "checking for XTestFakeDeviceKeyEvent in -lXtst... $ECHO_C" >&6 +-if test "${ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXtst $LIBS_saved $X_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char XTestFakeDeviceKeyEvent (); +-int +-main () +-{ +-XTestFakeDeviceKeyEvent (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" >&5 +-echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent" >&6 +-if test $ac_cv_lib_Xtst_XTestFakeDeviceKeyEvent = yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBXTST 1 +-_ACEOF +- +- LIBS="-lXtst $LIBS" +- +-else +- +- { { echo "$as_me:$LINENO: error: IMWheel depends on the XTest extention!" >&5 +-echo "$as_me: error: IMWheel depends on the XTest extention!" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +-X_LIBS="$X_LIBS $LIBS" +-LIBS="$LIBS_saved" ++X_LIBS="$X_LIBS $LIBS" ++LIBS="$LIBS_saved" + + + if [ "$Warnings" != "0" ] +@@ -6535,7 +5850,8 @@ then echo "" fi @@ -10859,7 +12080,7 @@ Last-Update: 2014-09-10 cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -@@ -6554,39 +5870,70 @@ +@@ -6554,39 +5870,70 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -10949,7 +12170,7 @@ Last-Update: 2014-09-10 fi fi rm -f confcache -@@ -6595,94 +5942,77 @@ +@@ -6595,94 +5942,77 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -11086,17 +12307,20 @@ Last-Update: 2014-09-10 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -6692,81 +6022,253 @@ +@@ -6692,81 +6022,253 @@ cat >$CONFIG_STATUS <<_ACEOF debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - +- -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF @@ -11104,9 +12328,7 @@ Last-Update: 2014-09-10 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : @@ -11171,8 +12393,8 @@ Last-Update: 2014-09-10 + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' -+fi -+ + fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: @@ -11180,11 +12402,11 @@ Last-Update: 2014-09-10 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } - fi - ++fi -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH ++ +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. @@ -11239,8 +12461,6 @@ Last-Update: 2014-09-10 - eval $as_var=C; export $as_var - else - $as_unset $as_var -- fi --done +LC_ALL=C +export LC_ALL +LANGUAGE=C @@ -11261,12 +12481,15 @@ Last-Update: 2014-09-10 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi + fi +-done + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + -+ + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. @@ -11310,9 +12533,7 @@ Last-Update: 2014-09-10 + eval $1=\$$1\$2 + } +fi # as_fn_append - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then ++ +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the @@ -11384,7 +12605,7 @@ Last-Update: 2014-09-10 # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -6774,148 +6276,111 @@ +@@ -6774,148 +6276,111 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -11553,7 +12774,7 @@ Last-Update: 2014-09-10 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + -+ + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. @@ -11598,7 +12819,7 @@ Last-Update: 2014-09-10 + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - ++ + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then @@ -11623,7 +12844,7 @@ Last-Update: 2014-09-10 # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -6924,31 +6389,20 @@ +@@ -6924,31 +6389,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -11637,13 +12858,14 @@ Last-Update: 2014-09-10 -$as_unset CDPATH - exec 6>&1 +- +-# Open the log real soon, to keep \$[0] and so on meaningful, and to +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to ++ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their @@ -11665,7 +12887,7 @@ Last-Update: 2014-09-10 CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -6956,45 +6410,47 @@ +@@ -6956,45 +6410,47 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ @@ -11739,7 +12961,7 @@ Last-Update: 2014-09-10 Configuration files: $config_files -@@ -7005,84 +6461,92 @@ +@@ -7005,84 +6461,92 @@ $config_headers Configuration commands: $config_commands @@ -11873,7 +13095,7 @@ Last-Update: 2014-09-10 esac shift -@@ -7096,42 +6560,54 @@ +@@ -7096,42 +6560,54 @@ if $ac_cs_silent; then fi _ACEOF @@ -11947,7 +13169,7 @@ Last-Update: 2014-09-10 # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely -@@ -7143,835 +6619,689 @@ +@@ -7143,835 +6619,689 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree @@ -12080,7 +13302,7 @@ Last-Update: 2014-09-10 +/^[^""]/{ + N + s/\n// -+} + } +' >>$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -12088,7 +13310,8 @@ Last-Update: 2014-09-10 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" -+ + +-_ACEOF +} +{ + line = $ 0 @@ -12108,8 +13331,9 @@ Last-Update: 2014-09-10 + } + + print line - } ++} +-cat >>$CONFIG_STATUS <<_ACEOF +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -12119,9 +13343,11 @@ Last-Update: 2014-09-10 + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 - _ACEOF ++_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF +-# +-# CONFIG_FILES section. +-# +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty @@ -12145,12 +13371,6 @@ Last-Update: 2014-09-10 +}' +fi --# --# CONFIG_FILES section. --# -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then @@ -12256,9 +13476,17 @@ Last-Update: 2014-09-10 -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF -- --_ACEOF -- ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++fi # test -n "$CONFIG_FILES" + ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || ++BEGIN { + _ACEOF + - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. @@ -12295,14 +13523,6 @@ Last-Update: 2014-09-10 - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$ac_tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. @@ -12758,6 +13978,31 @@ Last-Update: 2014-09-10 - cat $tmp/out - rm -f $tmp/out - fi +- +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# +- +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='[ ].*$,\1#\2' +-ac_dC=' ' +-ac_dD=',;t' +-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='$,\1#\2define\3' +-ac_uC=' ' +-ac_uD=',;t' +- +-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t @@ -12783,31 +14028,7 @@ Last-Update: 2014-09-10 +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} - --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_HEADER section. --# -- --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -- --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ + rm -f "$ac_tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin @@ -13390,7 +14611,7 @@ Last-Update: 2014-09-10 # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -7991,7 +7321,7 @@ +@@ -7991,7 +7321,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -13399,7 +14620,7 @@ Last-Update: 2014-09-10 fi # -@@ -7999,10 +7329,14 @@ +@@ -7999,10 +7329,14 @@ fi # if test "$no_recursion" != yes; then @@ -13416,7 +14637,7 @@ Last-Update: 2014-09-10 if test -n "$ac_prev"; then ac_prev= continue -@@ -8025,126 +7359,92 @@ +@@ -8025,126 +7359,92 @@ if test "$no_recursion" != yes; then ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ;; @@ -13605,7 +14826,7 @@ Last-Update: 2014-09-10 ac_sub_configure= fi -@@ -8153,21 +7453,23 @@ +@@ -8153,21 +7453,23 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} # Make the cache file name correct relative to the subdirectory. case $cache_file in [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; @@ -13639,6 +14860,8 @@ Last-Update: 2014-09-10 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi +diff --git a/getopt/Makefile.in b/getopt/Makefile.in +index 1466c0f..ef79a12 100644 --- a/getopt/Makefile.in +++ b/getopt/Makefile.in @@ -1,8 +1,8 @@ @@ -13718,7 +14941,7 @@ Last-Update: 2014-09-10 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,7 +77,8 @@ +@@ -37,7 +77,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = getopt @@ -13728,7 +14951,7 @@ Last-Update: 2014-09-10 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -@@ -45,29 +86,76 @@ +@@ -45,29 +86,76 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -13808,7 +15031,7 @@ Last-Update: 2014-09-10 AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ -@@ -88,7 +176,9 @@ +@@ -88,7 +176,9 @@ EXEEXT = @EXEEXT@ GETOPT_INCS = @GETOPT_INCS@ GETOPT_LIBS = @GETOPT_LIBS@ GPM_DIR = @GPM_DIR@ @@ -13818,7 +15041,7 @@ Last-Update: 2014-09-10 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -98,32 +188,31 @@ +@@ -98,32 +188,31 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -13858,7 +15081,7 @@ Last-Update: 2014-09-10 am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -131,7 +220,11 @@ +@@ -131,7 +220,11 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ @@ -13870,7 +15093,7 @@ Last-Update: 2014-09-10 exec_prefix = @exec_prefix@ extras = @extras@ extras_dist = @extras_dist@ -@@ -140,11 +233,13 @@ +@@ -140,11 +233,13 @@ getopt_dist = @getopt_dist@ gpm_dist = @gpm_dist@ gpm_imwheel = @gpm_imwheel@ host_alias = @host_alias@ @@ -13884,7 +15107,7 @@ Last-Update: 2014-09-10 localstatedir = @localstatedir@ mandir = @mandir@ mdetect = @mdetect@ -@@ -153,14 +248,20 @@ +@@ -153,14 +248,20 @@ mdump = @mdump@ mdump_dist = @mdump_dist@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -13905,7 +15128,7 @@ Last-Update: 2014-09-10 AM_CFLAGS = -O6 -s -Wall noinst_LIBRARIES = libgetopt.a libgetopt_a_SOURCES = getopt.c getopt1.c getopt.h -@@ -173,14 +274,14 @@ +@@ -173,14 +274,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -13925,7 +15148,7 @@ Last-Update: 2014-09-10 .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -198,13 +299,15 @@ +@@ -198,13 +299,15 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -13945,7 +15168,7 @@ Last-Update: 2014-09-10 mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -216,92 +319,98 @@ +@@ -216,92 +319,98 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ .c.o: @@ -13969,8 +15192,7 @@ Last-Update: 2014-09-10 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - +- -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ @@ -13984,6 +15206,8 @@ Last-Update: 2014-09-10 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am @@ -14108,7 +15332,7 @@ Last-Update: 2014-09-10 || exit 1; \ fi; \ done -@@ -319,16 +428,22 @@ +@@ -319,16 +428,22 @@ install-am: all-am installcheck: installcheck-am install-strip: @@ -14135,7 +15359,7 @@ Last-Update: 2014-09-10 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -349,18 +464,38 @@ +@@ -349,18 +464,38 @@ dvi-am: html: html-am @@ -14174,7 +15398,7 @@ Last-Update: 2014-09-10 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -380,18 +515,23 @@ +@@ -380,18 +515,23 @@ ps: ps-am ps-am: @@ -14208,6 +15432,8 @@ Last-Update: 2014-09-10 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. +diff --git a/jax/Makefile.in b/jax/Makefile.in +index 6285714..3a534b5 100644 --- a/jax/Makefile.in +++ b/jax/Makefile.in @@ -1,8 +1,8 @@ @@ -14287,7 +15513,7 @@ Last-Update: 2014-09-10 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,7 +77,8 @@ +@@ -37,7 +77,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = jax @@ -14297,7 +15523,7 @@ Last-Update: 2014-09-10 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -@@ -45,29 +86,76 @@ +@@ -45,29 +86,76 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -14377,7 +15603,7 @@ Last-Update: 2014-09-10 AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ -@@ -88,7 +176,9 @@ +@@ -88,7 +176,9 @@ EXEEXT = @EXEEXT@ GETOPT_INCS = @GETOPT_INCS@ GETOPT_LIBS = @GETOPT_LIBS@ GPM_DIR = @GPM_DIR@ @@ -14387,7 +15613,7 @@ Last-Update: 2014-09-10 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -98,32 +188,31 @@ +@@ -98,32 +188,31 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -14427,7 +15653,7 @@ Last-Update: 2014-09-10 am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -131,7 +220,11 @@ +@@ -131,7 +220,11 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ @@ -14439,7 +15665,7 @@ Last-Update: 2014-09-10 exec_prefix = @exec_prefix@ extras = @extras@ extras_dist = @extras_dist@ -@@ -140,11 +233,13 @@ +@@ -140,11 +233,13 @@ getopt_dist = @getopt_dist@ gpm_dist = @gpm_dist@ gpm_imwheel = @gpm_imwheel@ host_alias = @host_alias@ @@ -14453,7 +15679,7 @@ Last-Update: 2014-09-10 localstatedir = @localstatedir@ mandir = @mandir@ mdetect = @mdetect@ -@@ -153,14 +248,20 @@ +@@ -153,14 +248,20 @@ mdump = @mdump@ mdump_dist = @mdump_dist@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -14474,7 +15700,7 @@ Last-Update: 2014-09-10 AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ noinst_LIBRARIES = libjax.a libjax_a_SOURCES = jax.c jax.h -@@ -172,14 +273,14 @@ +@@ -172,14 +273,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -14494,7 +15720,7 @@ Last-Update: 2014-09-10 .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -197,13 +298,15 @@ +@@ -197,13 +298,15 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -14514,7 +15740,7 @@ Last-Update: 2014-09-10 mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -214,92 +317,98 @@ +@@ -214,92 +317,98 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jax.Po@am__quote@ .c.o: @@ -14538,8 +15764,7 @@ Last-Update: 2014-09-10 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - +- -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ @@ -14553,6 +15778,8 @@ Last-Update: 2014-09-10 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am @@ -14677,7 +15904,7 @@ Last-Update: 2014-09-10 || exit 1; \ fi; \ done -@@ -317,16 +426,22 @@ +@@ -317,16 +426,22 @@ install-am: all-am installcheck: installcheck-am install-strip: @@ -14704,7 +15931,7 @@ Last-Update: 2014-09-10 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -347,18 +462,38 @@ +@@ -347,18 +462,38 @@ dvi-am: html: html-am @@ -14743,7 +15970,7 @@ Last-Update: 2014-09-10 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -378,18 +513,23 @@ +@@ -378,18 +513,23 @@ ps: ps-am ps-am: @@ -14777,1216 +16004,8 @@ Last-Update: 2014-09-10 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9 from Makefile.am. -+# Makefile.in generated by automake 1.14.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# Copyright (C) 1994-2013 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. -@@ -14,17 +14,57 @@ - - @SET_MAKE@ - --SOURCES = getmdt.c $(imwheel_SOURCES) mdump.c setimps2.c setmmplus.c setps2.c setps2rate.c -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ -+ esac; \ -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = . -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -39,23 +79,23 @@ - bin_PROGRAMS = imwheel$(EXEEXT) - EXTRA_PROGRAMS = setimps2$(EXEEXT) setmmplus$(EXEEXT) setps2$(EXEEXT) \ - getmdt$(EXEEXT) mdump$(EXEEXT) setps2rate$(EXEEXT) --noinst_PROGRAMS = @extras@ @mdump@ - subdir = . --DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ -- TODO depcomp install-sh missing mkinstalldirs -+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ -+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/configure $(am__configure_deps) \ -+ $(srcdir)/config.h.in mkinstalldirs depcomp COPYING TODO \ -+ compile install-sh missing - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -- configure.lineno configure.status.lineno -+ configure.lineno config.status.lineno - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = - am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" --binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - getmdt_SOURCES = getmdt.c - getmdt_OBJECTS = getmdt.$(OBJEXT) -@@ -77,44 +117,156 @@ - setps2rate_SOURCES = setps2rate.c - setps2rate_OBJECTS = setps2rate.$(OBJEXT) - setps2rate_LDADD = $(LDADD) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = -+DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -+am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+AM_V_CC = $(am__v_CC_@AM_V@) -+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -+am__v_CC_0 = @echo " CC " $@; -+am__v_CC_1 = - CCLD = $(CC) - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+AM_V_CCLD = $(am__v_CCLD_@AM_V@) -+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -+am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_1 = - SOURCES = getmdt.c $(imwheel_SOURCES) mdump.c setimps2.c setmmplus.c \ - setps2.c setps2rate.c - DIST_SOURCES = getmdt.c $(imwheel_SOURCES) mdump.c setimps2.c \ - setmmplus.c setps2.c setps2rate.c --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - man1dir = $(mandir)/man1 - NROFF = nroff - MANS = $(man_MANS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ -+ cscope distdir dist dist-all distcheck -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ -+ $(LISP)config.h.in -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags -+CSCOPE = cscope - DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ -- { test ! -d $(distdir) \ -- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr $(distdir); }; } -+ if test -d "$(distdir)"; then \ -+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -rf "$(distdir)" \ -+ || { sleep 5 && rm -rf "$(distdir)"; }; \ -+ else :; fi -+am__post_remove_distdir = $(am__remove_distdir) -+am__relativize = \ -+ dir0=`pwd`; \ -+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ -+ sed_rest='s,^[^/]*/*,,'; \ -+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ -+ sed_butlast='s,/*[^/]*$$,,'; \ -+ while test -n "$$dir1"; do \ -+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ -+ if test "$$first" != "."; then \ -+ if test "$$first" = ".."; then \ -+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ -+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ -+ else \ -+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ -+ if test "$$first2" = "$$first"; then \ -+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ -+ else \ -+ dir2="../$$dir2"; \ -+ fi; \ -+ dir0="$$dir0"/"$$first"; \ -+ fi; \ -+ fi; \ -+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ -+ done; \ -+ reldir="$$dir2" - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best -+DIST_TARGETS = dist-gzip - distuninstallcheck_listfiles = find . -type f -print -+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ -+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ -@@ -135,7 +287,9 @@ - GETOPT_INCS = @GETOPT_INCS@ - GETOPT_LIBS = @GETOPT_LIBS@ - GPM_DIR = @GPM_DIR@ -+GREP = @GREP@ - HAVE_GPM_SRC = @HAVE_GPM_SRC@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -145,32 +299,31 @@ - LIBS = @LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --NO_GPM_DOC_FALSE = @NO_GPM_DOC_FALSE@ --NO_GPM_DOC_TRUE = @NO_GPM_DOC_TRUE@ -+MKDIR_P = @MKDIR_P@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --SUID_FALSE = @SUID_FALSE@ --SUID_TRUE = @SUID_TRUE@ - VERSION = @VERSION@ -+XMKMF = @XMKMF@ - X_CFLAGS = @X_CFLAGS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -178,7 +331,11 @@ - am__untar = @am__untar@ - bindir = @bindir@ - build_alias = @build_alias@ -+builddir = @builddir@ - datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - extras = @extras@ - extras_dist = @extras_dist@ -@@ -187,11 +344,13 @@ - gpm_dist = @gpm_dist@ - gpm_imwheel = @gpm_imwheel@ - host_alias = @host_alias@ -+htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mdetect = @mdetect@ -@@ -200,42 +359,48 @@ - mdump_dist = @mdump_dist@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - subdirs = @subdirs@ - suid = @suid@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = jax @getopt@ @mdetect@ @gpm_imwheel@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+SUBDIRS = jax getopt @mdetect@ @gpm_imwheel@ - AM_CFLAGS = @CFLAGS@ @GETOPT_INCS@ @X_CFLAGS@ -I@srcdir@/jax -I. -Wall - imwheel_SOURCES = imwheel.c util.c cfg.c util.h imwheel.h cfg.h - imwheel_LDADD = @GETOPT_LIBS@ -L$(top_builddir)/jax -ljax @X_LIBS@ - imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a -+noinst_PROGRAMS = @extras@ @mdump@ - man_MANS = imwheel.1 - EXTRA_DIST = BUGS FREEBSD EMACS M-BA47 BUGS see imwheel.1.html imwheel.1 TODO imwheelrc @extras_dist@ @mdump_dist@ lefty.sh imwheel.spec slack.sh --ETCDIR = /etc/X11/imwheel - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .o .obj --am--refresh: -+am--refresh: Makefile - @: - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -- cd $(srcdir) && $(AUTOMAKE) --gnu \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ -+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu Makefile -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -251,21 +416,20 @@ - $(SHELL) ./config.status --recheck - - $(top_srcdir)/configure: $(am__configure_deps) -- cd $(srcdir) && $(AUTOCONF) -+ $(am__cd) $(srcdir) && $(AUTOCONF) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+$(am__aclocal_m4_deps): - - config.h: stamp-h1 -- @if test ! -f $@; then \ -- rm -f stamp-h1; \ -- $(MAKE) stamp-h1; \ -- else :; fi -+ @test -f $@ || rm -f stamp-h1 -+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h - $(srcdir)/config.h.in: $(am__configure_deps) -- cd $(top_srcdir) && $(AUTOHEADER) -+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -@@ -273,51 +437,77 @@ - -rm -f config.h stamp-h1 - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" -- @list='$(bin_PROGRAMS)'; for p in $$list; do \ -- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -- if test -f $$p \ -- ; then \ -- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -- else :; fi; \ -- done -+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed 's/$(EXEEXT)$$//' | \ -+ while read p p1; do if test -f $$p \ -+ ; then echo "$$p"; echo "$$p"; else :; fi; \ -+ done | \ -+ sed -e 'p;s,.*/,,;n;h' \ -+ -e 's|.*|.|' \ -+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ -+ sed 'N;N;N;s,\n, ,g' | \ -+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -+ if ($$2 == $$4) files[d] = files[d] " " $$1; \ -+ else { print "f", $$3 "/" $$4, $$1; } } \ -+ END { for (d in files) print "f", d, files[d] }' | \ -+ while read type dir files; do \ -+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ -+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ -+ } \ -+ ; done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- @list='$(bin_PROGRAMS)'; for p in $$list; do \ -- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(bindir)/$$f"; \ -- done -+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -+ files=`for p in $$list; do echo "$$p"; done | \ -+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -+ -e 's/$$/$(EXEEXT)/' \ -+ `; \ -+ test -n "$$list" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(bindir)" && rm -f $$files - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - - clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) --getmdt$(EXEEXT): $(getmdt_OBJECTS) $(getmdt_DEPENDENCIES) -+ -+getmdt$(EXEEXT): $(getmdt_OBJECTS) $(getmdt_DEPENDENCIES) $(EXTRA_getmdt_DEPENDENCIES) - @rm -f getmdt$(EXEEXT) -- $(LINK) $(getmdt_LDFLAGS) $(getmdt_OBJECTS) $(getmdt_LDADD) $(LIBS) --imwheel$(EXEEXT): $(imwheel_OBJECTS) $(imwheel_DEPENDENCIES) -+ $(AM_V_CCLD)$(LINK) $(getmdt_OBJECTS) $(getmdt_LDADD) $(LIBS) -+ -+imwheel$(EXEEXT): $(imwheel_OBJECTS) $(imwheel_DEPENDENCIES) $(EXTRA_imwheel_DEPENDENCIES) - @rm -f imwheel$(EXEEXT) -- $(LINK) $(imwheel_LDFLAGS) $(imwheel_OBJECTS) $(imwheel_LDADD) $(LIBS) --mdump$(EXEEXT): $(mdump_OBJECTS) $(mdump_DEPENDENCIES) -+ $(AM_V_CCLD)$(LINK) $(imwheel_OBJECTS) $(imwheel_LDADD) $(LIBS) -+ -+mdump$(EXEEXT): $(mdump_OBJECTS) $(mdump_DEPENDENCIES) $(EXTRA_mdump_DEPENDENCIES) - @rm -f mdump$(EXEEXT) -- $(LINK) $(mdump_LDFLAGS) $(mdump_OBJECTS) $(mdump_LDADD) $(LIBS) --setimps2$(EXEEXT): $(setimps2_OBJECTS) $(setimps2_DEPENDENCIES) -+ $(AM_V_CCLD)$(LINK) $(mdump_OBJECTS) $(mdump_LDADD) $(LIBS) -+ -+setimps2$(EXEEXT): $(setimps2_OBJECTS) $(setimps2_DEPENDENCIES) $(EXTRA_setimps2_DEPENDENCIES) - @rm -f setimps2$(EXEEXT) -- $(LINK) $(setimps2_LDFLAGS) $(setimps2_OBJECTS) $(setimps2_LDADD) $(LIBS) --setmmplus$(EXEEXT): $(setmmplus_OBJECTS) $(setmmplus_DEPENDENCIES) -+ $(AM_V_CCLD)$(LINK) $(setimps2_OBJECTS) $(setimps2_LDADD) $(LIBS) -+ -+setmmplus$(EXEEXT): $(setmmplus_OBJECTS) $(setmmplus_DEPENDENCIES) $(EXTRA_setmmplus_DEPENDENCIES) - @rm -f setmmplus$(EXEEXT) -- $(LINK) $(setmmplus_LDFLAGS) $(setmmplus_OBJECTS) $(setmmplus_LDADD) $(LIBS) --setps2$(EXEEXT): $(setps2_OBJECTS) $(setps2_DEPENDENCIES) -+ $(AM_V_CCLD)$(LINK) $(setmmplus_OBJECTS) $(setmmplus_LDADD) $(LIBS) -+ -+setps2$(EXEEXT): $(setps2_OBJECTS) $(setps2_DEPENDENCIES) $(EXTRA_setps2_DEPENDENCIES) - @rm -f setps2$(EXEEXT) -- $(LINK) $(setps2_LDFLAGS) $(setps2_OBJECTS) $(setps2_LDADD) $(LIBS) --setps2rate$(EXEEXT): $(setps2rate_OBJECTS) $(setps2rate_DEPENDENCIES) -+ $(AM_V_CCLD)$(LINK) $(setps2_OBJECTS) $(setps2_LDADD) $(LIBS) -+ -+setps2rate$(EXEEXT): $(setps2rate_OBJECTS) $(setps2rate_DEPENDENCIES) $(EXTRA_setps2rate_DEPENDENCIES) - @rm -f setps2rate$(EXEEXT) -- $(LINK) $(setps2rate_LDFLAGS) $(setps2rate_OBJECTS) $(setps2rate_LDADD) $(LIBS) -+ $(AM_V_CCLD)$(LINK) $(setps2rate_OBJECTS) $(setps2rate_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -336,76 +526,82 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` --uninstall-info-am: --install-man1: $(man1_MANS) $(man_MANS) -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+install-man1: $(man_MANS) - @$(NORMAL_INSTALL) -- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" -- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ -- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -- for i in $$l2; do \ -- case "$$i" in \ -- *.1*) list="$$list $$i" ;; \ -- esac; \ -+ @list1=''; \ -+ list2='$(man_MANS)'; \ -+ test -n "$(man1dir)" \ -+ && test -n "`echo $$list1$$list2`" \ -+ || exit 0; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ -+ { for i in $$list1; do echo "$$i"; done; \ -+ if test -n "$$list2"; then \ -+ for i in $$list2; do echo "$$i"; done \ -+ | sed -n '/\.1[a-z]*$$/p'; \ -+ fi; \ -+ } | while read p; do \ -+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; echo "$$p"; \ -+ done | \ -+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ -+ sed 'N;N;s,\n, ,g' | { \ -+ list=; while read file base inst; do \ -+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ -+ fi; \ - done; \ -- for i in $$list; do \ -- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ -- else file=$$i; fi; \ -- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -- case "$$ext" in \ -- 1*) ;; \ -- *) ext='1' ;; \ -- esac; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed -e 's/^.*\///'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ -- done -+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ -+ while read files; do \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ -+ done; } -+ - uninstall-man1: - @$(NORMAL_UNINSTALL) -- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ -- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -- for i in $$l2; do \ -- case "$$i" in \ -- *.1*) list="$$list $$i" ;; \ -- esac; \ -- done; \ -- for i in $$list; do \ -- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -- case "$$ext" in \ -- 1*) ;; \ -- *) ext='1' ;; \ -- esac; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed -e 's/^.*\///'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ -- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ -- done -+ @list=''; test -n "$(man1dir)" || exit 0; \ -+ files=`{ for i in $$list; do echo "$$i"; done; \ -+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -+ sed -n '/\.1[a-z]*$$/p'; \ -+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ -+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) - - # This directory's subdirectories are mostly independent; you can cd --# into them and run `make' without going through this Makefile. --# To change the values of `make' variables: instead of editing Makefiles, --# (1) if the variable is set in `config.status', edit `config.status' --# (which will cause the Makefiles to be regenerated when you run `make'); --# (2) otherwise, pass the desired values on the `make' command line. --$(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+# into them and run 'make' without going through this Makefile. -+# To change the values of 'make' variables: instead of editing Makefiles, -+# (1) if the variable is set in 'config.status', edit 'config.status' -+# (which will cause the Makefiles to be regenerated when you run 'make'); -+# (2) otherwise, pass the desired values on the 'make' command line. -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ -@@ -413,60 +609,20 @@ - else \ - local_target="$$target"; \ - fi; \ -- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ - 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; \ -- case "$@" in \ -- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -- *) list='$(SUBDIRS)' ;; \ -- esac; \ -- rev=''; for subdir in $$list; do \ -- if test "$$subdir" = "."; then :; else \ -- rev="$$subdir $$rev"; \ -- fi; \ -- done; \ -- 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 --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -@@ -478,83 +634,113 @@ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ -- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ $(am__define_uniq_tagged_files); \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ -+ test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -+ $$unique - - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" -+cscope: cscope.files -+ test ! -s cscope.files \ -+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -+clean-cscope: -+ -rm -f cscope.files -+cscope.files: clean-cscope cscopelist -+cscopelist: cscopelist-recursive -+ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - - distdir: $(DISTFILES) - $(am__remove_distdir) -- mkdir $(distdir) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ test -d "$(distdir)" || mkdir "$(distdir)" -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -- || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -- (cd $$subdir && \ -+ $(am__make_dryrun) \ -+ || test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ -+ $(am__relativize); \ -+ new_distdir=$$reldir; \ -+ dir1=$$subdir; dir2="$(top_distdir)"; \ -+ $(am__relativize); \ -+ new_top_distdir=$$reldir; \ -+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ -+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ -+ ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -+ top_distdir="$$new_top_distdir" \ -+ distdir="$$new_distdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ -+ am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -562,35 +748,51 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ -test -n "$(am__skip_mode_fix)" \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -- || chmod -R a+r $(distdir) -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r "$(distdir)" - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - - dist-bzip2: distdir -- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -- $(am__remove_distdir) -+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 -+ $(am__post_remove_distdir) -+ -+dist-lzip: distdir -+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz -+ $(am__post_remove_distdir) -+ -+dist-xz: distdir -+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz -+ $(am__post_remove_distdir) - - dist-tarZ: distdir -+ @echo WARNING: "Support for shar distribution archives is" \ -+ "deprecated." >&2 -+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - - dist-shar: distdir -+ @echo WARNING: "Support for distribution archives compressed with" \ -+ "legacy program 'compress' is deprecated." >&2 -+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - - dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) -- $(am__remove_distdir) -+ $(am__post_remove_distdir) - --dist dist-all: distdir -- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -- $(am__remove_distdir) -+dist dist-all: -+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' -+ $(am__post_remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another -@@ -598,25 +800,33 @@ - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lz*) \ -+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ -+ *.tar.xz*) \ -+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -- chmod -R a-w $(distdir); chmod a+w $(distdir) -- mkdir $(distdir)/_build -- mkdir $(distdir)/_inst -+ chmod -R a-w $(distdir) -+ chmod u+w $(distdir) -+ mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) -+ test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -- && cd $(distdir)/_build \ -- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ && am__cwd=`pwd` \ -+ && $(am__cd) $(distdir)/_build \ -+ && ../configure \ -+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ -+ --srcdir=.. --prefix="$$dc_install_base" \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ -@@ -636,14 +846,24 @@ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ -- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck -- $(am__remove_distdir) -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ -+ && cd "$$am__cwd" \ -+ || exit 1 -+ $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: -- @cd $(distuninstallcheck_dir) \ -- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ @test -n '$(distuninstallcheck_dir)' || { \ -+ echo 'ERROR: trying to run $@ with an empty' \ -+ '$$(distuninstallcheck_dir)' >&2; \ -+ exit 1; \ -+ }; \ -+ $(am__cd) '$(distuninstallcheck_dir)' || { \ -+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ -+ exit 1; \ -+ }; \ -+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ -@@ -665,7 +885,7 @@ - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive - install-exec: install-exec-recursive -@@ -677,16 +897,22 @@ - - installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - - clean-generic: - - distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -709,20 +935,38 @@ - - html: html-recursive - -+html-am: -+ - info: info-recursive - - info-am: - - install-data-am: install-man - -+install-dvi: install-dvi-recursive -+ -+install-dvi-am: -+ - install-exec-am: install-binPROGRAMS -- @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook -+ -+install-html: install-html-recursive -+ -+install-html-am: - - install-info: install-info-recursive - -+install-info-am: -+ - install-man: install-man1 - -+install-pdf: install-pdf-recursive -+ -+install-pdf-am: -+ -+install-ps: install-ps-recursive -+ -+install-ps-am: -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -744,28 +988,29 @@ - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man -- --uninstall-info: uninstall-info-recursive -+uninstall-am: uninstall-binPROGRAMS uninstall-man - - uninstall-man: uninstall-man1 - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ -- check-am clean clean-binPROGRAMS clean-generic \ -- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ -- dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \ -- dist-tarZ dist-zip distcheck distclean distclean-compile \ -- distclean-generic distclean-hdr distclean-recursive \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-binPROGRAMS install-data install-data-am install-exec \ -- install-exec-am install-exec-hook install-info install-info-am \ -- install-man install-man1 install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \ -+.MAKE: $(am__recursive_targets) all install-am install-strip -+ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ -+ am--refresh check check-am clean clean-binPROGRAMS \ -+ clean-cscope clean-generic clean-noinstPROGRAMS cscope \ -+ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ -+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ -+ dist-zip distcheck distclean distclean-compile \ -+ distclean-generic distclean-hdr distclean-tags distcleancheck \ -+ distdir distuninstallcheck dvi dvi-am html html-am info \ -+ info-am install install-am install-binPROGRAMS install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-man1 install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ -+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-man uninstall-man1 - - -@@ -777,15 +1022,6 @@ - find $(distdir) -name CVS -exec rm -rvf '{}' ';' ; \ - done - --install-exec-hook: --@SUID_TRUE@ progname=$(DESTDIR)$(bindir)/`echo imwheel|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'` ; \ --@SUID_TRUE@ chown @suid@ $$progname ; \ --@SUID_TRUE@ chmod u+s $$progname -- $(mkinstalldirs) $(ETCDIR) -- -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true -- -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true -- -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc -- - extras: $(EXTRA_PROGRAMS) - - @NO_GPM_DOC_TRUE@Makefile.am: .premake -@@ -798,6 +1034,7 @@ - @NO_GPM_DOC_TRUE@.postmake: - @NO_GPM_DOC_TRUE@ @#End - @NO_GPM_DOC_TRUE@ @rm -f .premake -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: +diff --git a/mdetect/Makefile.in b/mdetect/Makefile.in +index 5fb52de..02facca 100644 --- a/mdetect/Makefile.in +++ b/mdetect/Makefile.in @@ -1,8 +1,8 @@ @@ -16066,7 +16085,7 @@ Last-Update: 2014-09-10 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,9 +77,9 @@ +@@ -37,9 +77,9 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : EXTRA_PROGRAMS = mdetect$(EXEEXT) @@ -16078,7 +16097,7 @@ Last-Update: 2014-09-10 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -@@ -47,26 +87,69 @@ +@@ -47,26 +87,69 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -16151,7 +16170,7 @@ Last-Update: 2014-09-10 AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ -@@ -87,7 +170,9 @@ +@@ -87,7 +170,9 @@ EXEEXT = @EXEEXT@ GETOPT_INCS = @GETOPT_INCS@ GETOPT_LIBS = @GETOPT_LIBS@ GPM_DIR = @GPM_DIR@ @@ -16161,7 +16180,7 @@ Last-Update: 2014-09-10 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -97,32 +182,31 @@ +@@ -97,32 +182,31 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -16201,7 +16220,7 @@ Last-Update: 2014-09-10 am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -130,7 +214,11 @@ +@@ -130,7 +214,11 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ @@ -16213,7 +16232,7 @@ Last-Update: 2014-09-10 exec_prefix = @exec_prefix@ extras = @extras@ extras_dist = @extras_dist@ -@@ -139,11 +227,13 @@ +@@ -139,11 +227,13 @@ getopt_dist = @getopt_dist@ gpm_dist = @gpm_dist@ gpm_imwheel = @gpm_imwheel@ host_alias = @host_alias@ @@ -16227,7 +16246,7 @@ Last-Update: 2014-09-10 localstatedir = @localstatedir@ mandir = @mandir@ mdetect = @mdetect@ -@@ -152,14 +242,21 @@ +@@ -152,14 +242,21 @@ mdump = @mdump@ mdump_dist = @mdump_dist@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -16249,7 +16268,7 @@ Last-Update: 2014-09-10 AM_CFLAGS = -I@top_srcdir@ all: all-am -@@ -169,14 +266,14 @@ +@@ -169,14 +266,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -16269,7 +16288,7 @@ Last-Update: 2014-09-10 .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -194,12 +291,14 @@ +@@ -194,12 +291,14 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -16286,7 +16305,7 @@ Last-Update: 2014-09-10 mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -210,92 +309,98 @@ +@@ -210,92 +309,98 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdetect.Po@am__quote@ .c.o: @@ -16310,13 +16329,7 @@ Last-Update: 2014-09-10 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -uninstall-info-am: -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+ -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-am -+TAGS: tags - +- -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ @@ -16330,6 +16343,13 @@ Last-Update: 2014-09-10 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++ID: $(am__tagged_files) ++ $(am__define_uniq_tagged_files); mkid -fID $$unique ++tags: tags-am ++TAGS: tags ++ +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ here=`pwd`; \ @@ -16449,7 +16469,7 @@ Last-Update: 2014-09-10 || exit 1; \ fi; \ done -@@ -316,16 +421,22 @@ +@@ -316,16 +421,22 @@ install-am: all-am installcheck: installcheck-am install-strip: @@ -16476,7 +16496,7 @@ Last-Update: 2014-09-10 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -346,18 +457,38 @@ +@@ -346,18 +457,38 @@ dvi-am: html: html-am @@ -16515,7 +16535,7 @@ Last-Update: 2014-09-10 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -377,22 +508,27 @@ +@@ -377,22 +508,27 @@ ps: ps-am ps-am: diff --git a/debian/patches/changelog-format b/debian/patches/changelog-format index fe33ff6..2418e06 100644 --- a/debian/patches/changelog-format +++ b/debian/patches/changelog-format @@ -1,9 +1,17 @@ -Description: Update the upstream changelog - Add missing information to the upstream changelog that ships with imwheel - - namely, the changes in the most recent releases, as described on the imwheel - homepage. Also standardize the formatting for readability. -Author: Christopher Martin +From: Christopher Martin +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Update the upstream changelog + +Add missing information to the upstream changelog that ships with imwheel - +namely, the changes in the most recent releases, as described on the imwheel +homepage. Also standardize the formatting for readability. Last-Update: 2010-02-20 +--- + ChangeLog | 836 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 457 insertions(+), 379 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index a63e64f..31c2feb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,398 +1,476 @@ diff --git a/debian/patches/imwheelrc-update b/debian/patches/imwheelrc-update index b3150d1..8aa2ac4 100644 --- a/debian/patches/imwheelrc-update +++ b/debian/patches/imwheelrc-update @@ -1,7 +1,15 @@ -Description: Update the default button mappings to reflect changes in - how X numbers mouse buttons, and just generally clean up a bit. -Author: Christopher Martin +From: Christopher Martin +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Update the default button mappings to reflect changes in + +how X numbers mouse buttons, and just generally clean up a bit. Last-Update: 2010-02-20 +--- + imwheelrc | 76 --------------------------------------------------------------- + 1 file changed, 76 deletions(-) + +diff --git a/imwheelrc b/imwheelrc +index f02eba2..8925f52 100644 --- a/imwheelrc +++ b/imwheelrc @@ -17,7 +17,6 @@ @@ -38,7 +46,7 @@ Last-Update: 2010-02-20 #Thanks to Mathias Weyland "^mutt.*" None, Up, Up -@@ -108,8 +88,6 @@ +@@ -108,8 +88,6 @@ Shift_L, Up, Control_L|Y Shift_L, Down, Control_L|E #None, Up, Page_Up #None, Down, Page_Down @@ -47,7 +55,7 @@ Last-Update: 2010-02-20 , Left, Shift_L|Left , Right, Shift_L|Right , Thumb1, Shift_L|Left -@@ -128,8 +106,6 @@ +@@ -128,8 +106,6 @@ Alt_L, Down, Down #Alt_L, Down, Shift_L|Page_Down #"^GnomeTerminal" @@ -56,7 +64,7 @@ Last-Update: 2010-02-20 #None, Up, Shift_L|Page_Up #None, Down, Shift_L|Page_Down -@@ -150,11 +126,8 @@ +@@ -150,11 +126,8 @@ Alt_L, Right, Control_L|E "^VMware" @Exclude @@ -68,7 +76,7 @@ Last-Update: 2010-02-20 #, Left, Alt_L|Left #, Right, Alt_L|Right # -@@ -187,14 +160,11 @@ +@@ -187,14 +160,11 @@ Shift_L, Thumb2, Down, 7, , Thumb2, R "^SDL_App" @@ -83,7 +91,7 @@ Last-Update: 2010-02-20 None, Down, Down, 4, 100, 100 None, Up, Up, 4, 100, 100 None, Thumb1, Right -@@ -203,8 +173,6 @@ +@@ -203,8 +173,6 @@ None, Thumb2, Left "^Netscape.*" , Thumb1, Alt_L|KP_Left , Thumb2, Alt_L|KP_Right @@ -92,7 +100,7 @@ Last-Update: 2010-02-20 "^Netscape" # -@@ -250,25 +218,11 @@ +@@ -250,25 +218,11 @@ None, Up, Control_L|Meta_L|Shift_L|parenleft , Down, j , Up, k @@ -118,7 +126,7 @@ Last-Update: 2010-02-20 "^xv grab" @Priority=1 @Exclude -@@ -278,46 +232,19 @@ +@@ -278,46 +232,19 @@ None, Down, Tab None, Up, Delete "^Untitled" @@ -165,7 +173,7 @@ Last-Update: 2010-02-20 # send event to the window manager when in the root window... "\(root\)" , Up, Control_L|N -@@ -334,7 +261,6 @@ +@@ -334,7 +261,6 @@ None, Up, Delete #".*" #@Priority=-1000 #@Exclude @@ -173,7 +181,7 @@ Last-Update: 2010-02-20 # # These are the defaults, but note that the defaults for the right side of the -@@ -346,8 +272,6 @@ +@@ -346,8 +272,6 @@ None, Up, Delete # #".*" #@Priority=-1001 diff --git a/debian/patches/makefile-update b/debian/patches/makefile-update index 587def0..5cd8c03 100644 --- a/debian/patches/makefile-update +++ b/debian/patches/makefile-update @@ -1,7 +1,15 @@ -Description: Remove makefile function which attempted to install files - directly (not compatible with packaging). -Author: Christopher Martin +From: Christopher Martin +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Remove makefile function which attempted to install files + +directly (not compatible with packaging). Last-Update: 2010-02-20 +--- + Makefile.am | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 9f93d75..dd93f62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ @@ -10,7 +18,7 @@ Last-Update: 2010-02-20 bin_PROGRAMS=imwheel -@@ -22,19 +22,6 @@ +@@ -22,19 +22,6 @@ dist-hook: find $(distdir) -name CVS -exec rm -rvf '{}' ';' ; \ done diff --git a/debian/patches/manpage-update b/debian/patches/manpage-update index 106679d..7a6eaf1 100644 --- a/debian/patches/manpage-update +++ b/debian/patches/manpage-update @@ -1,9 +1,17 @@ -Description: Revamp the imwheel manpage, eliminating references to aspects - of imwheel that are no longer relevant on modern systems, or to options - that have been disabled. Also update the imwheel command descriptions to - reflect patches, including the "more than 9 buttons" change. -Author: Christopher Martin +From: Christopher Martin +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Revamp the imwheel manpage, eliminating references to aspects + +of imwheel that are no longer relevant on modern systems, or to options +that have been disabled. Also update the imwheel command descriptions to +reflect patches, including the "more than 9 buttons" change. Last-Update: 2010-02-20 +--- + imwheel.1 | 447 ++++++++++++-------------------------------------------------- + 1 file changed, 85 insertions(+), 362 deletions(-) + +diff --git a/imwheel.1 b/imwheel.1 +index 32d1d9c..a355d45 100644 --- a/imwheel.1 +++ b/imwheel.1 @@ -1,17 +1,15 @@ @@ -30,7 +38,7 @@ Last-Update: 2010-02-20 server. .LP .SH "COMMAND LINE OPTIONS" -@@ -20,47 +18,53 @@ +@@ -20,47 +18,53 @@ Available command line options are as follows: \fB-4, --flip-buttons\fP Flips the mouse buttons so that 4 is 5 and 5 is 4, reversing the Up and Down actions. This would make 4 buttons somewhat useful! @@ -103,7 +111,7 @@ Last-Update: 2010-02-20 .br See also xmodmap(1). .RE -@@ -76,159 +80,49 @@ +@@ -76,159 +80,49 @@ suggest using the \fB-d\fP option to prevent imwheel from detaching from the controlling terminal. .TP \fB-d, --detach\fP @@ -229,7 +237,8 @@ Last-Update: 2010-02-20 -"Pointer"(XFree86 3.3) or -"InputDevice"(XFree86 4.x) -section: --.LP ++allowed, and may cause strange things to happen while using the wheel or buttons. + .LP -1 axis (vertical wheel): -.RS -.nf @@ -264,8 +273,7 @@ Last-Update: 2010-02-20 -.LP -The Buttons option may be greater than stated above if you have thumb -buttons, or other extras that qualify as buttons. -+allowed, and may cause strange things to happen while using the wheel or buttons. - .LP +-.LP -Make sure your Protocol is set to either "IMPS/2" for a PS/2 mouse -or for serial mice set it to "IntelliMouse" or "Auto". -This is for IntelliMouse compatible mice, other protocols may be required for other mice. @@ -278,7 +286,7 @@ Last-Update: 2010-02-20 .LP .B NOTE .br -@@ -239,105 +133,19 @@ +@@ -239,105 +133,19 @@ mouse and/or mouse button grabs and that don't specify specific buttons to grab. These clients fail when they try to grab the mouse because the buttons 4 and 5 are already grabbed by imwheel. XV is an example of a client that requires these types of grabs to succeed. KDE clients use the ZAxis for their @@ -390,7 +398,7 @@ Last-Update: 2010-02-20 come first served, so more generic matches should always occur later in the configuration file. .LP -@@ -353,18 +161,18 @@ +@@ -353,18 +161,18 @@ Window Resource Name (null) which matches "\\(null\\)" in the imwheelrc .fi .LP @@ -412,7 +420,7 @@ Last-Update: 2010-02-20 realize that the keys used should not be keys that may conflict with other key actions in the game or application you are aiming to make work! The included imwheelrc file has a "(null)" section included to demonstrate, and -@@ -374,15 +182,16 @@ +@@ -374,15 +182,16 @@ Each window/class/resource name \fImust\fP be enclosed in double quotes (") on a itself. .LP Inside each window section is any number of translation definitions or commands. @@ -434,7 +442,7 @@ Last-Update: 2010-02-20 .LP .B REQUIRED .br -@@ -402,7 +211,7 @@ +@@ -402,7 +211,7 @@ in use during the wheel action. If the field is blank then \fIany\fP modifier will match, so put these last in their window section. .TP \fIMouse Action Input\fP @@ -443,7 +451,7 @@ Last-Update: 2010-02-20 \fIonly\fP one: .nf -@@ -448,36 +257,10 @@ +@@ -448,36 +257,10 @@ Default is 0. Commands start with the `@' character. Commands are as follows: .TP \fB@Exclude\fP @@ -481,7 +489,7 @@ Last-Update: 2010-02-20 .TP \fB@Priority\fP=\fIpriority\fP Using this is allowed in each window/class/resource section. -@@ -486,30 +269,30 @@ +@@ -486,30 +269,30 @@ Equal priorities on sections make the imwheelrc file parsed from top to bottom to find the first match. Thus \fB@Priority\fP can be used to make the file search for matches out of order, then you dont have to keep the entries in order if you so please. @@ -518,7 +526,7 @@ Last-Update: 2010-02-20 the user in the first place but adding the \fB-R\fP option to indicate to itself that this is a restarted imwheel. The \fB-R\fP is not for use by the user, as it bypasses some configuration of imwheel. -@@ -529,41 +312,6 @@ +@@ -529,41 +312,6 @@ other! And not one after the other, they are both pressed at the same time essentially. .RE .LP @@ -560,7 +568,7 @@ Last-Update: 2010-02-20 Common Modifier Keysym names used in X: .nf Shift_L Shift_R -@@ -579,7 +327,8 @@ +@@ -579,7 +327,8 @@ Super_L Super_R Hyper_L Hyper_R .fi .LP @@ -570,7 +578,7 @@ Last-Update: 2010-02-20 Use the \fIxev\fP program to test your own keys on your keyboard! .LP .nf -@@ -605,19 +354,18 @@ +@@ -605,19 +354,18 @@ The path to this file may differ for you. Remember, there's always the configurator. And \fBxev\fP will also help here too! .LP @@ -594,7 +602,7 @@ Last-Update: 2010-02-20 left handed and imwheel use. .LP .RS -@@ -632,79 +380,54 @@ +@@ -632,79 +380,54 @@ NOTE: most of these are NOT going to work, because of all the limits in X. .fi .RE .LP diff --git a/debian/patches/prune-deps b/debian/patches/prune-deps index 7493368..825de26 100644 --- a/debian/patches/prune-deps +++ b/debian/patches/prune-deps @@ -1,9 +1,17 @@ -Description: Eliminate an unnecessary dependency. -Author: Christopher Martin +From: Christopher Martin +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Eliminate an unnecessary dependency. + Last-Update: 2010-02-20 +--- + configure.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.in b/configure.in +index b41560f..84a203a 100644 --- a/configure.in +++ b/configure.in -@@ -321,8 +321,6 @@ +@@ -321,8 +321,6 @@ LIBS= AC_CHECK_LIB(X11, XCreateWindow,, [ AC_MSG_ERROR([IMWheel depends on the X11 libraries!]) ], $LIBS_saved $X_LIBS) diff --git a/debian/patches/support-more-buttons b/debian/patches/support-more-buttons index 74b763a..34bb7a3 100644 --- a/debian/patches/support-more-buttons +++ b/debian/patches/support-more-buttons @@ -1,11 +1,22 @@ -Description: Several code changes here: 1) eliminate irrelevant or deprecated - imwheel options; 2) add support for more than 9 buttons; and 3) grab a few - upstream changes that were never released. -Author: Thomas Liebetraut and Christopher Martin +From: "Thomas Liebetraut thomas@tommie-lie.de and Christopher Martin" + +Date: Sat, 14 May 2022 03:32:58 +0800 +Subject: Several code changes here: 1) eliminate irrelevant or deprecated + +imwheel options; 2) add support for more than 9 buttons; and 3) grab a few +upstream changes that were never released. Last-Update: 2010-02-20 +--- + imwheel.c | 30 +++++++------- + util.c | 137 +++++++++++++++++++++++++++++++++++++++++++++----------------- + util.h | 10 +++-- + 3 files changed, 120 insertions(+), 57 deletions(-) + +diff --git a/imwheel.c b/imwheel.c +index 2232914..def185c 100644 --- a/imwheel.c +++ b/imwheel.c -@@ -59,22 +59,18 @@ +@@ -59,22 +59,18 @@ const struct option options[]= //{"restart", 0, 0, 'R'}, //not used by users! {"root-window", 0, 0, 'r'}, {"quit", 0, 0, 'q'}, @@ -31,7 +42,7 @@ Last-Update: 2010-02-20 {NULL, "Use event subwindow instead of XGetInputFocus"}, //f {NULL, "Disable the use of Focus Events for button grabs"}, //g {NULL, "For this help! Now you know"}, //h -@@ -84,11 +80,7 @@ +@@ -84,11 +80,7 @@ const char *optionusage[][2]= //{NULL, "RESERVED: used when imwheel reloads itself"}, //R {NULL, "Allow wheeling in the root window (no cfg dialog)"}, //r {NULL, "Don't start imwheel process, after args"}, //q @@ -43,7 +54,7 @@ Last-Update: 2010-02-20 {NULL, NULL} }; int buttonFlip=False, useFifo=False, detach=True, quit=False, -@@ -108,6 +100,7 @@ +@@ -108,6 +100,7 @@ int main(int argc, char **argv) getOptions(argc,argv,opts,options); setupstatebits(); @@ -51,7 +62,7 @@ Last-Update: 2010-02-20 if(!displayName) displayName=XDisplayName(NULL); Printf("display=%s\n",displayName); -@@ -137,7 +130,7 @@ +@@ -137,7 +130,7 @@ void grabButtons(Display *d, Window w) return; Printf("Grab buttons!\n"); grabbed=True; @@ -60,7 +71,7 @@ Last-Update: 2010-02-20 { if(buttons[i]) { -@@ -168,7 +161,7 @@ +@@ -168,7 +161,7 @@ void ungrabButtons(Display *d, Window w) Printf("Ungrab buttons!\n"); XSync(d,False); grabbed=False; @@ -69,7 +80,7 @@ Last-Update: 2010-02-20 { if(buttons[i]) { -@@ -331,7 +324,7 @@ +@@ -331,7 +324,7 @@ signed char getInput(Display *d, XEvent *e, XModifierKeymap **xmk, signed char k { //e->xbutton.button^=buttonFlip; button= buttonIndex(e->xbutton.button); @@ -78,7 +89,7 @@ Last-Update: 2010-02-20 e->xbutton.button= button= button+4; XQueryKeymap(d,km); if(debug) -@@ -635,9 +628,9 @@ +@@ -635,9 +628,9 @@ void eventLoop(Display *d, char **argv) int k; j=button-4; @@ -90,7 +101,7 @@ Last-Update: 2010-02-20 break; } k=statebits[makeModMask(xmk,km)&STATE_MASK]; -@@ -647,6 +640,11 @@ +@@ -647,6 +640,11 @@ void eventLoop(Display *d, char **argv) break; } @@ -102,47 +113,8 @@ Last-Update: 2010-02-20 out[0]=(char*)keys[j][k]; wa.reps=reps[k]; doWA(d,(XButtonEvent*)&e.xbutton,xmk,km,&wa); ---- a/util.h -+++ b/util.h -@@ -10,7 +10,7 @@ - - #define PIDFILE PIDDIR"/imwheel.pid" - --#define NUM_BUTTONS 6 -+#define NUM_STDCOMMANDS 6 - #define STATE_MASK (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask) - #define NUM_STATES 3 - #define MAX_MASKTRANS 8 -@@ -42,17 +42,18 @@ - int delayup;//microsecond delay while key down - }; - --extern int buttons[NUM_BUTTONS+1]; -+extern int *buttons; -+extern int buttons_cnt; - extern int statebits[STATE_MASK+1]; - extern int debug; - extern struct WinAction *wa; - extern int num_wa; - extern struct Trans masktrans[MAX_MASKTRANS]; - extern const int reps[1<id;p=&p[1]) { if(!cur || strcmp(cur->id,p->id)) -@@ -1091,7 +1154,7 @@ +@@ -1091,7 +1154,7 @@ void writeRC(struct WinAction *wa) { for(i=0; p->in[i]; i++) fprintf(f,"%s%s",(i?"|":""),p->in[i]); @@ -441,3 +413,46 @@ Last-Update: 2010-02-20 for(i=0; p->out[i]; i++) fprintf(f,"%s%s",(i?"|":""),p->out[i]); if(p->delayup>0||p->delay>0||p->reps>1||p->reps==0) +diff --git a/util.h b/util.h +index 24788b8..e326152 100644 +--- a/util.h ++++ b/util.h +@@ -10,7 +10,7 @@ + + #define PIDFILE PIDDIR"/imwheel.pid" + +-#define NUM_BUTTONS 6 ++#define NUM_STDCOMMANDS 6 + #define STATE_MASK (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask) + #define NUM_STATES 3 + #define MAX_MASKTRANS 8 +@@ -42,17 +42,18 @@ struct WinAction + int delayup;//microsecond delay while key down + }; + +-extern int buttons[NUM_BUTTONS+1]; ++extern int *buttons; ++extern int buttons_cnt; + extern int statebits[STATE_MASK+1]; + extern int debug; + extern struct WinAction *wa; + extern int num_wa; + extern struct Trans masktrans[MAX_MASKTRANS]; + extern const int reps[1<