--- xfs-1.0.4.orig/aclocal.m4
+++ xfs-1.0.4/aclocal.m4
@@ -149,7 +149,8 @@
 
 _PKG_TEXT
 ])],
-		[$4])
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
 	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
@@ -215,7 +216,7 @@
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-	[XORG_MACROS_version=1.1.1
+	[XORG_MACROS_version=1.1.2
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1181,7 +1182,6 @@
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
-AC_REQUIRE([AM_PRETTY_CMDS])
 ])
 
 
@@ -1452,42 +1452,6 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# 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.
-
-# serial 8
-
-
-# AM_PRETTY_CMDS
-# ------------
-AC_DEFUN([AM_PRETTY_CMDS],
-[AC_ARG_ENABLE(pretty-cmds,
-[  --disable-pretty-cmds          show all commands executed
-  --enable-pretty-cmds           do not output the entire command lines])
-AMSHOWCMDSAT=''
-AMDEPSHOWCMDSAT=''
-AMPRETTYECHO=true
-AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
-then
-  AMSHOWCMDSAT='@'
-  _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@'
-  AMPRETTYECHO=echo
-  AMCMDECHO=true
-  LT_QUIET='--quiet'
-fi
-AC_SUBST([AMSHOWCMDSAT])
-AC_SUBST([AMDEPSHOWCMDSAT])
-AC_SUBST([AMPRETTYECHO])
-AC_SUBST([AMCMDECHO])
-AC_SUBST([LT_QUIET])
-])
-
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--- xfs-1.0.4.orig/config.sub
+++ xfs-1.0.4/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -274,11 +276,11 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
@@ -286,9 +288,6 @@
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -373,8 +372,6 @@
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -1128,7 +1125,7 @@
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1217,7 +1214,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1369,6 +1366,9 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1378,9 +1378,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
--- xfs-1.0.4.orig/Makefile.in
+++ xfs-1.0.4/Makefile.in
@@ -62,7 +62,8 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh missing
+	config.guess config.sub depcomp install-sh missing \
+	mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -70,7 +71,7 @@
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
@@ -124,12 +125,8 @@
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMCMDECHO = @AMCMDECHO@
-AMDEPSHOWCMDSAT = @AMDEPSHOWCMDSAT@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
-AMPRETTYECHO = @AMPRETTYECHO@
-AMSHOWCMDSAT = @AMSHOWCMDSAT@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -162,7 +159,6 @@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LTLIBOBJS = @LTLIBOBJS@
-LT_QUIET = @LT_QUIET@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
@@ -227,7 +223,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-configdir = $(libdir)/X11/fs
+configdir = $(sysconfdir)/X11/fs
 FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
 AM_CFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
 		-DDEFAULT_CONFIG_FILE=\"$(configdir)/config\" $(FONT_FLAGS) \
@@ -336,40 +332,33 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      @AMPRETTYECHO@ '  [AUTOMAKE  ]  rebuild all'; \
-	      @AMCMDECHO@ ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
 	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	@AMPRETTYECHO@ '  [AUTOMAKE  ]  Makefile'; \
-	@AMCMDECHO@ ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
-	    @AMPRETTYECHO@ '  [SH        ]  config.status'; \
-	    @AMCMDECHO@ ' $(SHELL) ./config.status'; \
+	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    @AMPRETTYECHO@ '  [SH        ]  config.status $@'; \
-	    @AMCMDECHO@ ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	@@AMPRETTYECHO@ '  [SH        ]  config.status'
-	@AMSHOWCMDSAT@$(SHELL) ./config.status --recheck
+	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	@@AMPRETTYECHO@ '  [AUTOCONF  ]  Regenerate'
-	@AMSHOWCMDSAT@cd $(srcdir) && $(AUTOCONF)
+	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	@@AMPRETTYECHO@ '  [ACLOCAL   ]  Regenerate'
-	@AMSHOWCMDSAT@cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
@@ -379,27 +368,23 @@
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
-	@@AMPRETTYECHO@ '  [SH        ]  Regenerate config.h'
-	@AMSHOWCMDSAT@cd $(top_builddir) && $(SHELL) ./config.status config.h
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	@@AMPRETTYECHO@ '  [AUTOHEADER]  Regenerate'
-	@AMSHOWCMDSAT@cd $(top_srcdir) && $(AUTOHEADER)
-	@AMSHOWCMDSAT@rm -f stamp-h1
-	@AMSHOWCMDSAT@touch $@
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
 
 distclean-hdr:
-	@@AMPRETTYECHO@ '  [RM        ]  config.h stamp-h1'
-	@AMSHOWCMDSAT@-rm -f config.h stamp-h1
+	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	@AMSHOWCMDSAT@test -z "$(bindir)" || ( @AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(bindir)'; $(mkdir_p) "$(DESTDIR)$(bindir)" )
+	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)/'`; \
-	   @AMPRETTYECHO@ "  [INSTALL   ]  $$p -> $(DESTDIR)$(bindir)/$$f"; \
-	   @AMCMDECHO@ " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
 	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
@@ -408,25 +393,21 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(bindir)/$$f"; \
-	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
 clean-binPROGRAMS:
-	@AMSHOWCMDSAT@-test -z "$(bin_PROGRAMS)" || ( @AMPRETTYECHO@ '  [RM        ]  $(bin_PROGRAMS)'; rm -f $(bin_PROGRAMS) )
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 xfs$(EXEEXT): $(xfs_OBJECTS) $(xfs_DEPENDENCIES) 
-	@@AMPRETTYECHO@ '  [LD        ]  xfs$(EXEEXT)'
 	@rm -f xfs$(EXEEXT)
-	@AMSHOWCMDSAT@$(LINK) $(xfs_LDFLAGS) $(xfs_OBJECTS) $(xfs_LDADD) $(LIBS)
+	$(LINK) $(xfs_LDFLAGS) $(xfs_OBJECTS) $(xfs_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	@@AMPRETTYECHO@ '  [RM        ]  *.$(OBJEXT)'
-	@AMSHOWCMDSAT@-rm -f *.$(OBJEXT)
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
-	@@AMPRETTYECHO@ '  [RM        ]  *.tab.c'
-	@AMSHOWCMDSAT@-rm -f *.tab.c
+	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atom.Po@am__quote@
@@ -457,462 +438,404 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfstrans.Po@am__quote@
 
 .c.o:
-	@@AMPRETTYECHO@ '  [C         ]  $<'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -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@	@AMSHOWCMDSAT@source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	@@AMPRETTYECHO@ '  [C         ]  $<'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@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@	@AMSHOWCMDSAT@source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 atom.o: difs/atom.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/atom.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.o -MD -MP -MF "$(DEPDIR)/atom.Tpo" -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.o -MD -MP -MF "$(DEPDIR)/atom.Tpo" -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atom.Tpo" "$(DEPDIR)/atom.Po"; else rm -f "$(DEPDIR)/atom.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/atom.c' object='atom.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/atom.c' object='atom.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atom.o `test -f 'difs/atom.c' || echo '$(srcdir)/'`difs/atom.c
 
 atom.obj: difs/atom.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/atom.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.obj -MD -MP -MF "$(DEPDIR)/atom.Tpo" -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atom.obj -MD -MP -MF "$(DEPDIR)/atom.Tpo" -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atom.Tpo" "$(DEPDIR)/atom.Po"; else rm -f "$(DEPDIR)/atom.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/atom.c' object='atom.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/atom.c' object='atom.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atom.obj `if test -f 'difs/atom.c'; then $(CYGPATH_W) 'difs/atom.c'; else $(CYGPATH_W) '$(srcdir)/difs/atom.c'; fi`
 
 cache.o: difs/cache.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/cache.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.o -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.o -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/cache.c' object='cache.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/cache.c' object='cache.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.o `test -f 'difs/cache.c' || echo '$(srcdir)/'`difs/cache.c
 
 cache.obj: difs/cache.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/cache.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.obj -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cache.obj -MD -MP -MF "$(DEPDIR)/cache.Tpo" -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cache.Tpo" "$(DEPDIR)/cache.Po"; else rm -f "$(DEPDIR)/cache.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/cache.c' object='cache.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/cache.c' object='cache.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cache.obj `if test -f 'difs/cache.c'; then $(CYGPATH_W) 'difs/cache.c'; else $(CYGPATH_W) '$(srcdir)/difs/cache.c'; fi`
 
 charinfo.o: difs/charinfo.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/charinfo.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.o -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.o -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/charinfo.Tpo" "$(DEPDIR)/charinfo.Po"; else rm -f "$(DEPDIR)/charinfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/charinfo.c' object='charinfo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/charinfo.c' object='charinfo.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o charinfo.o `test -f 'difs/charinfo.c' || echo '$(srcdir)/'`difs/charinfo.c
 
 charinfo.obj: difs/charinfo.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/charinfo.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.obj -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT charinfo.obj -MD -MP -MF "$(DEPDIR)/charinfo.Tpo" -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/charinfo.Tpo" "$(DEPDIR)/charinfo.Po"; else rm -f "$(DEPDIR)/charinfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/charinfo.c' object='charinfo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/charinfo.c' object='charinfo.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o charinfo.obj `if test -f 'difs/charinfo.c'; then $(CYGPATH_W) 'difs/charinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/charinfo.c'; fi`
 
 difsutils.o: difs/difsutils.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/difsutils.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.o -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.o -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/difsutils.Tpo" "$(DEPDIR)/difsutils.Po"; else rm -f "$(DEPDIR)/difsutils.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/difsutils.c' object='difsutils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/difsutils.c' object='difsutils.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o difsutils.o `test -f 'difs/difsutils.c' || echo '$(srcdir)/'`difs/difsutils.c
 
 difsutils.obj: difs/difsutils.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/difsutils.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.obj -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT difsutils.obj -MD -MP -MF "$(DEPDIR)/difsutils.Tpo" -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/difsutils.Tpo" "$(DEPDIR)/difsutils.Po"; else rm -f "$(DEPDIR)/difsutils.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/difsutils.c' object='difsutils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/difsutils.c' object='difsutils.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o difsutils.obj `if test -f 'difs/difsutils.c'; then $(CYGPATH_W) 'difs/difsutils.c'; else $(CYGPATH_W) '$(srcdir)/difs/difsutils.c'; fi`
 
 dispatch.o: difs/dispatch.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/dispatch.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.o -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.o -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/dispatch.Tpo" "$(DEPDIR)/dispatch.Po"; else rm -f "$(DEPDIR)/dispatch.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/dispatch.c' object='dispatch.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/dispatch.c' object='dispatch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatch.o `test -f 'difs/dispatch.c' || echo '$(srcdir)/'`difs/dispatch.c
 
 dispatch.obj: difs/dispatch.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/dispatch.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.obj -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dispatch.obj -MD -MP -MF "$(DEPDIR)/dispatch.Tpo" -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/dispatch.Tpo" "$(DEPDIR)/dispatch.Po"; else rm -f "$(DEPDIR)/dispatch.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/dispatch.c' object='dispatch.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/dispatch.c' object='dispatch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dispatch.obj `if test -f 'difs/dispatch.c'; then $(CYGPATH_W) 'difs/dispatch.c'; else $(CYGPATH_W) '$(srcdir)/difs/dispatch.c'; fi`
 
 events.o: difs/events.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/events.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.o -MD -MP -MF "$(DEPDIR)/events.Tpo" -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.o -MD -MP -MF "$(DEPDIR)/events.Tpo" -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/events.Tpo" "$(DEPDIR)/events.Po"; else rm -f "$(DEPDIR)/events.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/events.c' object='events.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/events.c' object='events.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o events.o `test -f 'difs/events.c' || echo '$(srcdir)/'`difs/events.c
 
 events.obj: difs/events.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/events.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.obj -MD -MP -MF "$(DEPDIR)/events.Tpo" -c -o events.obj `if test -f 'difs/events.c'; then $(CYGPATH_W) 'difs/events.c'; else $(CYGPATH_W) '$(srcdir)/difs/events.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT events.obj -MD -MP -MF "$(DEPDIR)/events.Tpo" -c -o events.obj `if test -f 'difs/events.c'; then $(CYGPATH_W) 'difs/events.c'; else $(CYGPATH_W) '$(srcdir)/difs/events.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/events.Tpo" "$(DEPDIR)/events.Po"; else rm -f "$(DEPDIR)/events.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/events.c' object='events.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/events.c' object='events.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o events.obj `if test -f 'difs/events.c'; then $(CYGPATH_W) 'difs/events.c'; else $(CYGPATH_W) '$(srcdir)/difs/events.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o events.obj `if test -f 'difs/events.c'; then $(CYGPATH_W) 'difs/events.c'; else $(CYGPATH_W) '$(srcdir)/difs/events.c'; fi`
 
 extensions.o: difs/extensions.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/extensions.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT extensions.o -MD -MP -MF "$(DEPDIR)/extensions.Tpo" -c -o extensions.o `test -f 'difs/extensions.c' || echo '$(srcdir)/'`difs/extensions.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT extensions.o -MD -MP -MF "$(DEPDIR)/extensions.Tpo" -c -o extensions.o `test -f 'difs/extensions.c' || echo '$(srcdir)/'`difs/extensions.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/extensions.Tpo" "$(DEPDIR)/extensions.Po"; else rm -f "$(DEPDIR)/extensions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/extensions.c' object='extensions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/extensions.c' object='extensions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o extensions.o `test -f 'difs/extensions.c' || echo '$(srcdir)/'`difs/extensions.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o extensions.o `test -f 'difs/extensions.c' || echo '$(srcdir)/'`difs/extensions.c
 
 extensions.obj: difs/extensions.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/extensions.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT extensions.obj -MD -MP -MF "$(DEPDIR)/extensions.Tpo" -c -o extensions.obj `if test -f 'difs/extensions.c'; then $(CYGPATH_W) 'difs/extensions.c'; else $(CYGPATH_W) '$(srcdir)/difs/extensions.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT extensions.obj -MD -MP -MF "$(DEPDIR)/extensions.Tpo" -c -o extensions.obj `if test -f 'difs/extensions.c'; then $(CYGPATH_W) 'difs/extensions.c'; else $(CYGPATH_W) '$(srcdir)/difs/extensions.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/extensions.Tpo" "$(DEPDIR)/extensions.Po"; else rm -f "$(DEPDIR)/extensions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/extensions.c' object='extensions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/extensions.c' object='extensions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o extensions.obj `if test -f 'difs/extensions.c'; then $(CYGPATH_W) 'difs/extensions.c'; else $(CYGPATH_W) '$(srcdir)/difs/extensions.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o extensions.obj `if test -f 'difs/extensions.c'; then $(CYGPATH_W) 'difs/extensions.c'; else $(CYGPATH_W) '$(srcdir)/difs/extensions.c'; fi`
 
 fontinfo.o: difs/fontinfo.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/fontinfo.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fontinfo.o -MD -MP -MF "$(DEPDIR)/fontinfo.Tpo" -c -o fontinfo.o `test -f 'difs/fontinfo.c' || echo '$(srcdir)/'`difs/fontinfo.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fontinfo.o -MD -MP -MF "$(DEPDIR)/fontinfo.Tpo" -c -o fontinfo.o `test -f 'difs/fontinfo.c' || echo '$(srcdir)/'`difs/fontinfo.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fontinfo.Tpo" "$(DEPDIR)/fontinfo.Po"; else rm -f "$(DEPDIR)/fontinfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/fontinfo.c' object='fontinfo.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/fontinfo.c' object='fontinfo.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fontinfo.o `test -f 'difs/fontinfo.c' || echo '$(srcdir)/'`difs/fontinfo.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fontinfo.o `test -f 'difs/fontinfo.c' || echo '$(srcdir)/'`difs/fontinfo.c
 
 fontinfo.obj: difs/fontinfo.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/fontinfo.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fontinfo.obj -MD -MP -MF "$(DEPDIR)/fontinfo.Tpo" -c -o fontinfo.obj `if test -f 'difs/fontinfo.c'; then $(CYGPATH_W) 'difs/fontinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/fontinfo.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fontinfo.obj -MD -MP -MF "$(DEPDIR)/fontinfo.Tpo" -c -o fontinfo.obj `if test -f 'difs/fontinfo.c'; then $(CYGPATH_W) 'difs/fontinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/fontinfo.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fontinfo.Tpo" "$(DEPDIR)/fontinfo.Po"; else rm -f "$(DEPDIR)/fontinfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/fontinfo.c' object='fontinfo.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/fontinfo.c' object='fontinfo.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fontinfo.obj `if test -f 'difs/fontinfo.c'; then $(CYGPATH_W) 'difs/fontinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/fontinfo.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fontinfo.obj `if test -f 'difs/fontinfo.c'; then $(CYGPATH_W) 'difs/fontinfo.c'; else $(CYGPATH_W) '$(srcdir)/difs/fontinfo.c'; fi`
 
 fonts.o: difs/fonts.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/fonts.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fonts.o -MD -MP -MF "$(DEPDIR)/fonts.Tpo" -c -o fonts.o `test -f 'difs/fonts.c' || echo '$(srcdir)/'`difs/fonts.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fonts.o -MD -MP -MF "$(DEPDIR)/fonts.Tpo" -c -o fonts.o `test -f 'difs/fonts.c' || echo '$(srcdir)/'`difs/fonts.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonts.Tpo" "$(DEPDIR)/fonts.Po"; else rm -f "$(DEPDIR)/fonts.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/fonts.c' object='fonts.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/fonts.c' object='fonts.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fonts.o `test -f 'difs/fonts.c' || echo '$(srcdir)/'`difs/fonts.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fonts.o `test -f 'difs/fonts.c' || echo '$(srcdir)/'`difs/fonts.c
 
 fonts.obj: difs/fonts.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/fonts.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fonts.obj -MD -MP -MF "$(DEPDIR)/fonts.Tpo" -c -o fonts.obj `if test -f 'difs/fonts.c'; then $(CYGPATH_W) 'difs/fonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/fonts.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fonts.obj -MD -MP -MF "$(DEPDIR)/fonts.Tpo" -c -o fonts.obj `if test -f 'difs/fonts.c'; then $(CYGPATH_W) 'difs/fonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/fonts.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/fonts.Tpo" "$(DEPDIR)/fonts.Po"; else rm -f "$(DEPDIR)/fonts.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/fonts.c' object='fonts.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/fonts.c' object='fonts.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fonts.obj `if test -f 'difs/fonts.c'; then $(CYGPATH_W) 'difs/fonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/fonts.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fonts.obj `if test -f 'difs/fonts.c'; then $(CYGPATH_W) 'difs/fonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/fonts.c'; fi`
 
 globals.o: difs/globals.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/globals.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT globals.o -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.o `test -f 'difs/globals.c' || echo '$(srcdir)/'`difs/globals.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT globals.o -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.o `test -f 'difs/globals.c' || echo '$(srcdir)/'`difs/globals.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/globals.Tpo" "$(DEPDIR)/globals.Po"; else rm -f "$(DEPDIR)/globals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/globals.c' object='globals.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/globals.c' object='globals.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o globals.o `test -f 'difs/globals.c' || echo '$(srcdir)/'`difs/globals.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o globals.o `test -f 'difs/globals.c' || echo '$(srcdir)/'`difs/globals.c
 
 globals.obj: difs/globals.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/globals.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT globals.obj -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.obj `if test -f 'difs/globals.c'; then $(CYGPATH_W) 'difs/globals.c'; else $(CYGPATH_W) '$(srcdir)/difs/globals.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT globals.obj -MD -MP -MF "$(DEPDIR)/globals.Tpo" -c -o globals.obj `if test -f 'difs/globals.c'; then $(CYGPATH_W) 'difs/globals.c'; else $(CYGPATH_W) '$(srcdir)/difs/globals.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/globals.Tpo" "$(DEPDIR)/globals.Po"; else rm -f "$(DEPDIR)/globals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/globals.c' object='globals.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/globals.c' object='globals.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o globals.obj `if test -f 'difs/globals.c'; then $(CYGPATH_W) 'difs/globals.c'; else $(CYGPATH_W) '$(srcdir)/difs/globals.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o globals.obj `if test -f 'difs/globals.c'; then $(CYGPATH_W) 'difs/globals.c'; else $(CYGPATH_W) '$(srcdir)/difs/globals.c'; fi`
 
 initfonts.o: difs/initfonts.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/initfonts.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initfonts.o -MD -MP -MF "$(DEPDIR)/initfonts.Tpo" -c -o initfonts.o `test -f 'difs/initfonts.c' || echo '$(srcdir)/'`difs/initfonts.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initfonts.o -MD -MP -MF "$(DEPDIR)/initfonts.Tpo" -c -o initfonts.o `test -f 'difs/initfonts.c' || echo '$(srcdir)/'`difs/initfonts.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/initfonts.Tpo" "$(DEPDIR)/initfonts.Po"; else rm -f "$(DEPDIR)/initfonts.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/initfonts.c' object='initfonts.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/initfonts.c' object='initfonts.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initfonts.o `test -f 'difs/initfonts.c' || echo '$(srcdir)/'`difs/initfonts.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initfonts.o `test -f 'difs/initfonts.c' || echo '$(srcdir)/'`difs/initfonts.c
 
 initfonts.obj: difs/initfonts.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/initfonts.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initfonts.obj -MD -MP -MF "$(DEPDIR)/initfonts.Tpo" -c -o initfonts.obj `if test -f 'difs/initfonts.c'; then $(CYGPATH_W) 'difs/initfonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/initfonts.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initfonts.obj -MD -MP -MF "$(DEPDIR)/initfonts.Tpo" -c -o initfonts.obj `if test -f 'difs/initfonts.c'; then $(CYGPATH_W) 'difs/initfonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/initfonts.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/initfonts.Tpo" "$(DEPDIR)/initfonts.Po"; else rm -f "$(DEPDIR)/initfonts.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/initfonts.c' object='initfonts.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/initfonts.c' object='initfonts.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initfonts.obj `if test -f 'difs/initfonts.c'; then $(CYGPATH_W) 'difs/initfonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/initfonts.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initfonts.obj `if test -f 'difs/initfonts.c'; then $(CYGPATH_W) 'difs/initfonts.c'; else $(CYGPATH_W) '$(srcdir)/difs/initfonts.c'; fi`
 
 main.o: difs/main.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/main.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF "$(DEPDIR)/main.Tpo" -c -o main.o `test -f 'difs/main.c' || echo '$(srcdir)/'`difs/main.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF "$(DEPDIR)/main.Tpo" -c -o main.o `test -f 'difs/main.c' || echo '$(srcdir)/'`difs/main.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/main.Tpo" "$(DEPDIR)/main.Po"; else rm -f "$(DEPDIR)/main.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'difs/main.c' || echo '$(srcdir)/'`difs/main.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'difs/main.c' || echo '$(srcdir)/'`difs/main.c
 
 main.obj: difs/main.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/main.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF "$(DEPDIR)/main.Tpo" -c -o main.obj `if test -f 'difs/main.c'; then $(CYGPATH_W) 'difs/main.c'; else $(CYGPATH_W) '$(srcdir)/difs/main.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF "$(DEPDIR)/main.Tpo" -c -o main.obj `if test -f 'difs/main.c'; then $(CYGPATH_W) 'difs/main.c'; else $(CYGPATH_W) '$(srcdir)/difs/main.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/main.Tpo" "$(DEPDIR)/main.Po"; else rm -f "$(DEPDIR)/main.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'difs/main.c'; then $(CYGPATH_W) 'difs/main.c'; else $(CYGPATH_W) '$(srcdir)/difs/main.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'difs/main.c'; then $(CYGPATH_W) 'difs/main.c'; else $(CYGPATH_W) '$(srcdir)/difs/main.c'; fi`
 
 resource.o: difs/resource.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/resource.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resource.o -MD -MP -MF "$(DEPDIR)/resource.Tpo" -c -o resource.o `test -f 'difs/resource.c' || echo '$(srcdir)/'`difs/resource.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resource.o -MD -MP -MF "$(DEPDIR)/resource.Tpo" -c -o resource.o `test -f 'difs/resource.c' || echo '$(srcdir)/'`difs/resource.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/resource.Tpo" "$(DEPDIR)/resource.Po"; else rm -f "$(DEPDIR)/resource.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/resource.c' object='resource.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/resource.c' object='resource.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resource.o `test -f 'difs/resource.c' || echo '$(srcdir)/'`difs/resource.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resource.o `test -f 'difs/resource.c' || echo '$(srcdir)/'`difs/resource.c
 
 resource.obj: difs/resource.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/resource.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resource.obj -MD -MP -MF "$(DEPDIR)/resource.Tpo" -c -o resource.obj `if test -f 'difs/resource.c'; then $(CYGPATH_W) 'difs/resource.c'; else $(CYGPATH_W) '$(srcdir)/difs/resource.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resource.obj -MD -MP -MF "$(DEPDIR)/resource.Tpo" -c -o resource.obj `if test -f 'difs/resource.c'; then $(CYGPATH_W) 'difs/resource.c'; else $(CYGPATH_W) '$(srcdir)/difs/resource.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/resource.Tpo" "$(DEPDIR)/resource.Po"; else rm -f "$(DEPDIR)/resource.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/resource.c' object='resource.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/resource.c' object='resource.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resource.obj `if test -f 'difs/resource.c'; then $(CYGPATH_W) 'difs/resource.c'; else $(CYGPATH_W) '$(srcdir)/difs/resource.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resource.obj `if test -f 'difs/resource.c'; then $(CYGPATH_W) 'difs/resource.c'; else $(CYGPATH_W) '$(srcdir)/difs/resource.c'; fi`
 
 swaprep.o: difs/swaprep.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/swaprep.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swaprep.o -MD -MP -MF "$(DEPDIR)/swaprep.Tpo" -c -o swaprep.o `test -f 'difs/swaprep.c' || echo '$(srcdir)/'`difs/swaprep.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swaprep.o -MD -MP -MF "$(DEPDIR)/swaprep.Tpo" -c -o swaprep.o `test -f 'difs/swaprep.c' || echo '$(srcdir)/'`difs/swaprep.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swaprep.Tpo" "$(DEPDIR)/swaprep.Po"; else rm -f "$(DEPDIR)/swaprep.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/swaprep.c' object='swaprep.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/swaprep.c' object='swaprep.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swaprep.o `test -f 'difs/swaprep.c' || echo '$(srcdir)/'`difs/swaprep.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swaprep.o `test -f 'difs/swaprep.c' || echo '$(srcdir)/'`difs/swaprep.c
 
 swaprep.obj: difs/swaprep.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/swaprep.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swaprep.obj -MD -MP -MF "$(DEPDIR)/swaprep.Tpo" -c -o swaprep.obj `if test -f 'difs/swaprep.c'; then $(CYGPATH_W) 'difs/swaprep.c'; else $(CYGPATH_W) '$(srcdir)/difs/swaprep.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swaprep.obj -MD -MP -MF "$(DEPDIR)/swaprep.Tpo" -c -o swaprep.obj `if test -f 'difs/swaprep.c'; then $(CYGPATH_W) 'difs/swaprep.c'; else $(CYGPATH_W) '$(srcdir)/difs/swaprep.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swaprep.Tpo" "$(DEPDIR)/swaprep.Po"; else rm -f "$(DEPDIR)/swaprep.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/swaprep.c' object='swaprep.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/swaprep.c' object='swaprep.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swaprep.obj `if test -f 'difs/swaprep.c'; then $(CYGPATH_W) 'difs/swaprep.c'; else $(CYGPATH_W) '$(srcdir)/difs/swaprep.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swaprep.obj `if test -f 'difs/swaprep.c'; then $(CYGPATH_W) 'difs/swaprep.c'; else $(CYGPATH_W) '$(srcdir)/difs/swaprep.c'; fi`
 
 swapreq.o: difs/swapreq.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/swapreq.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swapreq.o -MD -MP -MF "$(DEPDIR)/swapreq.Tpo" -c -o swapreq.o `test -f 'difs/swapreq.c' || echo '$(srcdir)/'`difs/swapreq.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swapreq.o -MD -MP -MF "$(DEPDIR)/swapreq.Tpo" -c -o swapreq.o `test -f 'difs/swapreq.c' || echo '$(srcdir)/'`difs/swapreq.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapreq.Tpo" "$(DEPDIR)/swapreq.Po"; else rm -f "$(DEPDIR)/swapreq.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/swapreq.c' object='swapreq.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/swapreq.c' object='swapreq.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swapreq.o `test -f 'difs/swapreq.c' || echo '$(srcdir)/'`difs/swapreq.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swapreq.o `test -f 'difs/swapreq.c' || echo '$(srcdir)/'`difs/swapreq.c
 
 swapreq.obj: difs/swapreq.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/swapreq.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swapreq.obj -MD -MP -MF "$(DEPDIR)/swapreq.Tpo" -c -o swapreq.obj `if test -f 'difs/swapreq.c'; then $(CYGPATH_W) 'difs/swapreq.c'; else $(CYGPATH_W) '$(srcdir)/difs/swapreq.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT swapreq.obj -MD -MP -MF "$(DEPDIR)/swapreq.Tpo" -c -o swapreq.obj `if test -f 'difs/swapreq.c'; then $(CYGPATH_W) 'difs/swapreq.c'; else $(CYGPATH_W) '$(srcdir)/difs/swapreq.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapreq.Tpo" "$(DEPDIR)/swapreq.Po"; else rm -f "$(DEPDIR)/swapreq.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/swapreq.c' object='swapreq.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/swapreq.c' object='swapreq.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swapreq.obj `if test -f 'difs/swapreq.c'; then $(CYGPATH_W) 'difs/swapreq.c'; else $(CYGPATH_W) '$(srcdir)/difs/swapreq.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o swapreq.obj `if test -f 'difs/swapreq.c'; then $(CYGPATH_W) 'difs/swapreq.c'; else $(CYGPATH_W) '$(srcdir)/difs/swapreq.c'; fi`
 
 tables.o: difs/tables.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/tables.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tables.o -MD -MP -MF "$(DEPDIR)/tables.Tpo" -c -o tables.o `test -f 'difs/tables.c' || echo '$(srcdir)/'`difs/tables.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tables.o -MD -MP -MF "$(DEPDIR)/tables.Tpo" -c -o tables.o `test -f 'difs/tables.c' || echo '$(srcdir)/'`difs/tables.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/tables.Tpo" "$(DEPDIR)/tables.Po"; else rm -f "$(DEPDIR)/tables.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/tables.c' object='tables.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/tables.c' object='tables.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tables.o `test -f 'difs/tables.c' || echo '$(srcdir)/'`difs/tables.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tables.o `test -f 'difs/tables.c' || echo '$(srcdir)/'`difs/tables.c
 
 tables.obj: difs/tables.c
-	@@AMPRETTYECHO@ '  [C         ]  difs/tables.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tables.obj -MD -MP -MF "$(DEPDIR)/tables.Tpo" -c -o tables.obj `if test -f 'difs/tables.c'; then $(CYGPATH_W) 'difs/tables.c'; else $(CYGPATH_W) '$(srcdir)/difs/tables.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tables.obj -MD -MP -MF "$(DEPDIR)/tables.Tpo" -c -o tables.obj `if test -f 'difs/tables.c'; then $(CYGPATH_W) 'difs/tables.c'; else $(CYGPATH_W) '$(srcdir)/difs/tables.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/tables.Tpo" "$(DEPDIR)/tables.Po"; else rm -f "$(DEPDIR)/tables.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='difs/tables.c' object='tables.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='difs/tables.c' object='tables.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tables.obj `if test -f 'difs/tables.c'; then $(CYGPATH_W) 'difs/tables.c'; else $(CYGPATH_W) '$(srcdir)/difs/tables.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tables.obj `if test -f 'difs/tables.c'; then $(CYGPATH_W) 'difs/tables.c'; else $(CYGPATH_W) '$(srcdir)/difs/tables.c'; fi`
 
 access.o: os/access.c
-	@@AMPRETTYECHO@ '  [C         ]  os/access.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT access.o -MD -MP -MF "$(DEPDIR)/access.Tpo" -c -o access.o `test -f 'os/access.c' || echo '$(srcdir)/'`os/access.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT access.o -MD -MP -MF "$(DEPDIR)/access.Tpo" -c -o access.o `test -f 'os/access.c' || echo '$(srcdir)/'`os/access.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/access.Tpo" "$(DEPDIR)/access.Po"; else rm -f "$(DEPDIR)/access.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/access.c' object='access.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/access.c' object='access.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o access.o `test -f 'os/access.c' || echo '$(srcdir)/'`os/access.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o access.o `test -f 'os/access.c' || echo '$(srcdir)/'`os/access.c
 
 access.obj: os/access.c
-	@@AMPRETTYECHO@ '  [C         ]  os/access.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT access.obj -MD -MP -MF "$(DEPDIR)/access.Tpo" -c -o access.obj `if test -f 'os/access.c'; then $(CYGPATH_W) 'os/access.c'; else $(CYGPATH_W) '$(srcdir)/os/access.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT access.obj -MD -MP -MF "$(DEPDIR)/access.Tpo" -c -o access.obj `if test -f 'os/access.c'; then $(CYGPATH_W) 'os/access.c'; else $(CYGPATH_W) '$(srcdir)/os/access.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/access.Tpo" "$(DEPDIR)/access.Po"; else rm -f "$(DEPDIR)/access.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/access.c' object='access.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/access.c' object='access.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o access.obj `if test -f 'os/access.c'; then $(CYGPATH_W) 'os/access.c'; else $(CYGPATH_W) '$(srcdir)/os/access.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o access.obj `if test -f 'os/access.c'; then $(CYGPATH_W) 'os/access.c'; else $(CYGPATH_W) '$(srcdir)/os/access.c'; fi`
 
 config.o: os/config.c
-	@@AMPRETTYECHO@ '  [C         ]  os/config.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.o `test -f 'os/config.c' || echo '$(srcdir)/'`os/config.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config.o -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.o `test -f 'os/config.c' || echo '$(srcdir)/'`os/config.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/config.c' object='config.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/config.c' object='config.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config.o `test -f 'os/config.c' || echo '$(srcdir)/'`os/config.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config.o `test -f 'os/config.c' || echo '$(srcdir)/'`os/config.c
 
 config.obj: os/config.c
-	@@AMPRETTYECHO@ '  [C         ]  os/config.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config.obj -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.obj `if test -f 'os/config.c'; then $(CYGPATH_W) 'os/config.c'; else $(CYGPATH_W) '$(srcdir)/os/config.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config.obj -MD -MP -MF "$(DEPDIR)/config.Tpo" -c -o config.obj `if test -f 'os/config.c'; then $(CYGPATH_W) 'os/config.c'; else $(CYGPATH_W) '$(srcdir)/os/config.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/config.Tpo" "$(DEPDIR)/config.Po"; else rm -f "$(DEPDIR)/config.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/config.c' object='config.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/config.c' object='config.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config.obj `if test -f 'os/config.c'; then $(CYGPATH_W) 'os/config.c'; else $(CYGPATH_W) '$(srcdir)/os/config.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o config.obj `if test -f 'os/config.c'; then $(CYGPATH_W) 'os/config.c'; else $(CYGPATH_W) '$(srcdir)/os/config.c'; fi`
 
 connection.o: os/connection.c
-	@@AMPRETTYECHO@ '  [C         ]  os/connection.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT connection.o -MD -MP -MF "$(DEPDIR)/connection.Tpo" -c -o connection.o `test -f 'os/connection.c' || echo '$(srcdir)/'`os/connection.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT connection.o -MD -MP -MF "$(DEPDIR)/connection.Tpo" -c -o connection.o `test -f 'os/connection.c' || echo '$(srcdir)/'`os/connection.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/connection.Tpo" "$(DEPDIR)/connection.Po"; else rm -f "$(DEPDIR)/connection.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/connection.c' object='connection.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/connection.c' object='connection.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o connection.o `test -f 'os/connection.c' || echo '$(srcdir)/'`os/connection.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o connection.o `test -f 'os/connection.c' || echo '$(srcdir)/'`os/connection.c
 
 connection.obj: os/connection.c
-	@@AMPRETTYECHO@ '  [C         ]  os/connection.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT connection.obj -MD -MP -MF "$(DEPDIR)/connection.Tpo" -c -o connection.obj `if test -f 'os/connection.c'; then $(CYGPATH_W) 'os/connection.c'; else $(CYGPATH_W) '$(srcdir)/os/connection.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT connection.obj -MD -MP -MF "$(DEPDIR)/connection.Tpo" -c -o connection.obj `if test -f 'os/connection.c'; then $(CYGPATH_W) 'os/connection.c'; else $(CYGPATH_W) '$(srcdir)/os/connection.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/connection.Tpo" "$(DEPDIR)/connection.Po"; else rm -f "$(DEPDIR)/connection.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/connection.c' object='connection.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/connection.c' object='connection.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o connection.obj `if test -f 'os/connection.c'; then $(CYGPATH_W) 'os/connection.c'; else $(CYGPATH_W) '$(srcdir)/os/connection.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o connection.obj `if test -f 'os/connection.c'; then $(CYGPATH_W) 'os/connection.c'; else $(CYGPATH_W) '$(srcdir)/os/connection.c'; fi`
 
 daemon.o: os/daemon.c
-	@@AMPRETTYECHO@ '  [C         ]  os/daemon.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT daemon.o -MD -MP -MF "$(DEPDIR)/daemon.Tpo" -c -o daemon.o `test -f 'os/daemon.c' || echo '$(srcdir)/'`os/daemon.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT daemon.o -MD -MP -MF "$(DEPDIR)/daemon.Tpo" -c -o daemon.o `test -f 'os/daemon.c' || echo '$(srcdir)/'`os/daemon.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/daemon.Tpo" "$(DEPDIR)/daemon.Po"; else rm -f "$(DEPDIR)/daemon.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/daemon.c' object='daemon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/daemon.c' object='daemon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o daemon.o `test -f 'os/daemon.c' || echo '$(srcdir)/'`os/daemon.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o daemon.o `test -f 'os/daemon.c' || echo '$(srcdir)/'`os/daemon.c
 
 daemon.obj: os/daemon.c
-	@@AMPRETTYECHO@ '  [C         ]  os/daemon.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT daemon.obj -MD -MP -MF "$(DEPDIR)/daemon.Tpo" -c -o daemon.obj `if test -f 'os/daemon.c'; then $(CYGPATH_W) 'os/daemon.c'; else $(CYGPATH_W) '$(srcdir)/os/daemon.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT daemon.obj -MD -MP -MF "$(DEPDIR)/daemon.Tpo" -c -o daemon.obj `if test -f 'os/daemon.c'; then $(CYGPATH_W) 'os/daemon.c'; else $(CYGPATH_W) '$(srcdir)/os/daemon.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/daemon.Tpo" "$(DEPDIR)/daemon.Po"; else rm -f "$(DEPDIR)/daemon.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/daemon.c' object='daemon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/daemon.c' object='daemon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o daemon.obj `if test -f 'os/daemon.c'; then $(CYGPATH_W) 'os/daemon.c'; else $(CYGPATH_W) '$(srcdir)/os/daemon.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o daemon.obj `if test -f 'os/daemon.c'; then $(CYGPATH_W) 'os/daemon.c'; else $(CYGPATH_W) '$(srcdir)/os/daemon.c'; fi`
 
 error.o: os/error.c
-	@@AMPRETTYECHO@ '  [C         ]  os/error.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.o -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.o `test -f 'os/error.c' || echo '$(srcdir)/'`os/error.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.o -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.o `test -f 'os/error.c' || echo '$(srcdir)/'`os/error.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; else rm -f "$(DEPDIR)/error.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/error.c' object='error.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/error.c' object='error.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.o `test -f 'os/error.c' || echo '$(srcdir)/'`os/error.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.o `test -f 'os/error.c' || echo '$(srcdir)/'`os/error.c
 
 error.obj: os/error.c
-	@@AMPRETTYECHO@ '  [C         ]  os/error.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.obj -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.obj `if test -f 'os/error.c'; then $(CYGPATH_W) 'os/error.c'; else $(CYGPATH_W) '$(srcdir)/os/error.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.obj -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.obj `if test -f 'os/error.c'; then $(CYGPATH_W) 'os/error.c'; else $(CYGPATH_W) '$(srcdir)/os/error.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; else rm -f "$(DEPDIR)/error.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/error.c' object='error.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/error.c' object='error.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.obj `if test -f 'os/error.c'; then $(CYGPATH_W) 'os/error.c'; else $(CYGPATH_W) '$(srcdir)/os/error.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.obj `if test -f 'os/error.c'; then $(CYGPATH_W) 'os/error.c'; else $(CYGPATH_W) '$(srcdir)/os/error.c'; fi`
 
 io.o: os/io.c
-	@@AMPRETTYECHO@ '  [C         ]  os/io.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io.o -MD -MP -MF "$(DEPDIR)/io.Tpo" -c -o io.o `test -f 'os/io.c' || echo '$(srcdir)/'`os/io.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io.o -MD -MP -MF "$(DEPDIR)/io.Tpo" -c -o io.o `test -f 'os/io.c' || echo '$(srcdir)/'`os/io.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/io.Tpo" "$(DEPDIR)/io.Po"; else rm -f "$(DEPDIR)/io.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/io.c' object='io.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/io.c' object='io.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io.o `test -f 'os/io.c' || echo '$(srcdir)/'`os/io.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io.o `test -f 'os/io.c' || echo '$(srcdir)/'`os/io.c
 
 io.obj: os/io.c
-	@@AMPRETTYECHO@ '  [C         ]  os/io.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io.obj -MD -MP -MF "$(DEPDIR)/io.Tpo" -c -o io.obj `if test -f 'os/io.c'; then $(CYGPATH_W) 'os/io.c'; else $(CYGPATH_W) '$(srcdir)/os/io.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io.obj -MD -MP -MF "$(DEPDIR)/io.Tpo" -c -o io.obj `if test -f 'os/io.c'; then $(CYGPATH_W) 'os/io.c'; else $(CYGPATH_W) '$(srcdir)/os/io.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/io.Tpo" "$(DEPDIR)/io.Po"; else rm -f "$(DEPDIR)/io.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/io.c' object='io.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/io.c' object='io.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io.obj `if test -f 'os/io.c'; then $(CYGPATH_W) 'os/io.c'; else $(CYGPATH_W) '$(srcdir)/os/io.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io.obj `if test -f 'os/io.c'; then $(CYGPATH_W) 'os/io.c'; else $(CYGPATH_W) '$(srcdir)/os/io.c'; fi`
 
 osglue.o: os/osglue.c
-	@@AMPRETTYECHO@ '  [C         ]  os/osglue.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osglue.o -MD -MP -MF "$(DEPDIR)/osglue.Tpo" -c -o osglue.o `test -f 'os/osglue.c' || echo '$(srcdir)/'`os/osglue.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osglue.o -MD -MP -MF "$(DEPDIR)/osglue.Tpo" -c -o osglue.o `test -f 'os/osglue.c' || echo '$(srcdir)/'`os/osglue.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/osglue.Tpo" "$(DEPDIR)/osglue.Po"; else rm -f "$(DEPDIR)/osglue.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/osglue.c' object='osglue.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/osglue.c' object='osglue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osglue.o `test -f 'os/osglue.c' || echo '$(srcdir)/'`os/osglue.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osglue.o `test -f 'os/osglue.c' || echo '$(srcdir)/'`os/osglue.c
 
 osglue.obj: os/osglue.c
-	@@AMPRETTYECHO@ '  [C         ]  os/osglue.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osglue.obj -MD -MP -MF "$(DEPDIR)/osglue.Tpo" -c -o osglue.obj `if test -f 'os/osglue.c'; then $(CYGPATH_W) 'os/osglue.c'; else $(CYGPATH_W) '$(srcdir)/os/osglue.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osglue.obj -MD -MP -MF "$(DEPDIR)/osglue.Tpo" -c -o osglue.obj `if test -f 'os/osglue.c'; then $(CYGPATH_W) 'os/osglue.c'; else $(CYGPATH_W) '$(srcdir)/os/osglue.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/osglue.Tpo" "$(DEPDIR)/osglue.Po"; else rm -f "$(DEPDIR)/osglue.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/osglue.c' object='osglue.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/osglue.c' object='osglue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osglue.obj `if test -f 'os/osglue.c'; then $(CYGPATH_W) 'os/osglue.c'; else $(CYGPATH_W) '$(srcdir)/os/osglue.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osglue.obj `if test -f 'os/osglue.c'; then $(CYGPATH_W) 'os/osglue.c'; else $(CYGPATH_W) '$(srcdir)/os/osglue.c'; fi`
 
 osinit.o: os/osinit.c
-	@@AMPRETTYECHO@ '  [C         ]  os/osinit.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osinit.o -MD -MP -MF "$(DEPDIR)/osinit.Tpo" -c -o osinit.o `test -f 'os/osinit.c' || echo '$(srcdir)/'`os/osinit.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osinit.o -MD -MP -MF "$(DEPDIR)/osinit.Tpo" -c -o osinit.o `test -f 'os/osinit.c' || echo '$(srcdir)/'`os/osinit.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/osinit.Tpo" "$(DEPDIR)/osinit.Po"; else rm -f "$(DEPDIR)/osinit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/osinit.c' object='osinit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/osinit.c' object='osinit.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osinit.o `test -f 'os/osinit.c' || echo '$(srcdir)/'`os/osinit.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osinit.o `test -f 'os/osinit.c' || echo '$(srcdir)/'`os/osinit.c
 
 osinit.obj: os/osinit.c
-	@@AMPRETTYECHO@ '  [C         ]  os/osinit.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osinit.obj -MD -MP -MF "$(DEPDIR)/osinit.Tpo" -c -o osinit.obj `if test -f 'os/osinit.c'; then $(CYGPATH_W) 'os/osinit.c'; else $(CYGPATH_W) '$(srcdir)/os/osinit.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT osinit.obj -MD -MP -MF "$(DEPDIR)/osinit.Tpo" -c -o osinit.obj `if test -f 'os/osinit.c'; then $(CYGPATH_W) 'os/osinit.c'; else $(CYGPATH_W) '$(srcdir)/os/osinit.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/osinit.Tpo" "$(DEPDIR)/osinit.Po"; else rm -f "$(DEPDIR)/osinit.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/osinit.c' object='osinit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/osinit.c' object='osinit.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osinit.obj `if test -f 'os/osinit.c'; then $(CYGPATH_W) 'os/osinit.c'; else $(CYGPATH_W) '$(srcdir)/os/osinit.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o osinit.obj `if test -f 'os/osinit.c'; then $(CYGPATH_W) 'os/osinit.c'; else $(CYGPATH_W) '$(srcdir)/os/osinit.c'; fi`
 
 utils.o: os/utils.c
-	@@AMPRETTYECHO@ '  [C         ]  os/utils.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.o -MD -MP -MF "$(DEPDIR)/utils.Tpo" -c -o utils.o `test -f 'os/utils.c' || echo '$(srcdir)/'`os/utils.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.o -MD -MP -MF "$(DEPDIR)/utils.Tpo" -c -o utils.o `test -f 'os/utils.c' || echo '$(srcdir)/'`os/utils.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/utils.Tpo" "$(DEPDIR)/utils.Po"; else rm -f "$(DEPDIR)/utils.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/utils.c' object='utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/utils.c' object='utils.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.o `test -f 'os/utils.c' || echo '$(srcdir)/'`os/utils.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.o `test -f 'os/utils.c' || echo '$(srcdir)/'`os/utils.c
 
 utils.obj: os/utils.c
-	@@AMPRETTYECHO@ '  [C         ]  os/utils.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.obj -MD -MP -MF "$(DEPDIR)/utils.Tpo" -c -o utils.obj `if test -f 'os/utils.c'; then $(CYGPATH_W) 'os/utils.c'; else $(CYGPATH_W) '$(srcdir)/os/utils.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT utils.obj -MD -MP -MF "$(DEPDIR)/utils.Tpo" -c -o utils.obj `if test -f 'os/utils.c'; then $(CYGPATH_W) 'os/utils.c'; else $(CYGPATH_W) '$(srcdir)/os/utils.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/utils.Tpo" "$(DEPDIR)/utils.Po"; else rm -f "$(DEPDIR)/utils.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/utils.c' object='utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/utils.c' object='utils.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.obj `if test -f 'os/utils.c'; then $(CYGPATH_W) 'os/utils.c'; else $(CYGPATH_W) '$(srcdir)/os/utils.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o utils.obj `if test -f 'os/utils.c'; then $(CYGPATH_W) 'os/utils.c'; else $(CYGPATH_W) '$(srcdir)/os/utils.c'; fi`
 
 waitfor.o: os/waitfor.c
-	@@AMPRETTYECHO@ '  [C         ]  os/waitfor.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT waitfor.o -MD -MP -MF "$(DEPDIR)/waitfor.Tpo" -c -o waitfor.o `test -f 'os/waitfor.c' || echo '$(srcdir)/'`os/waitfor.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT waitfor.o -MD -MP -MF "$(DEPDIR)/waitfor.Tpo" -c -o waitfor.o `test -f 'os/waitfor.c' || echo '$(srcdir)/'`os/waitfor.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/waitfor.Tpo" "$(DEPDIR)/waitfor.Po"; else rm -f "$(DEPDIR)/waitfor.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/waitfor.c' object='waitfor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/waitfor.c' object='waitfor.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o waitfor.o `test -f 'os/waitfor.c' || echo '$(srcdir)/'`os/waitfor.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o waitfor.o `test -f 'os/waitfor.c' || echo '$(srcdir)/'`os/waitfor.c
 
 waitfor.obj: os/waitfor.c
-	@@AMPRETTYECHO@ '  [C         ]  os/waitfor.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT waitfor.obj -MD -MP -MF "$(DEPDIR)/waitfor.Tpo" -c -o waitfor.obj `if test -f 'os/waitfor.c'; then $(CYGPATH_W) 'os/waitfor.c'; else $(CYGPATH_W) '$(srcdir)/os/waitfor.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT waitfor.obj -MD -MP -MF "$(DEPDIR)/waitfor.Tpo" -c -o waitfor.obj `if test -f 'os/waitfor.c'; then $(CYGPATH_W) 'os/waitfor.c'; else $(CYGPATH_W) '$(srcdir)/os/waitfor.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/waitfor.Tpo" "$(DEPDIR)/waitfor.Po"; else rm -f "$(DEPDIR)/waitfor.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/waitfor.c' object='waitfor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/waitfor.c' object='waitfor.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o waitfor.obj `if test -f 'os/waitfor.c'; then $(CYGPATH_W) 'os/waitfor.c'; else $(CYGPATH_W) '$(srcdir)/os/waitfor.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o waitfor.obj `if test -f 'os/waitfor.c'; then $(CYGPATH_W) 'os/waitfor.c'; else $(CYGPATH_W) '$(srcdir)/os/waitfor.c'; fi`
 
 xfstrans.o: os/xfstrans.c
-	@@AMPRETTYECHO@ '  [C         ]  os/xfstrans.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xfstrans.o -MD -MP -MF "$(DEPDIR)/xfstrans.Tpo" -c -o xfstrans.o `test -f 'os/xfstrans.c' || echo '$(srcdir)/'`os/xfstrans.c; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xfstrans.o -MD -MP -MF "$(DEPDIR)/xfstrans.Tpo" -c -o xfstrans.o `test -f 'os/xfstrans.c' || echo '$(srcdir)/'`os/xfstrans.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfstrans.Tpo" "$(DEPDIR)/xfstrans.Po"; else rm -f "$(DEPDIR)/xfstrans.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/xfstrans.c' object='xfstrans.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/xfstrans.c' object='xfstrans.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xfstrans.o `test -f 'os/xfstrans.c' || echo '$(srcdir)/'`os/xfstrans.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xfstrans.o `test -f 'os/xfstrans.c' || echo '$(srcdir)/'`os/xfstrans.c
 
 xfstrans.obj: os/xfstrans.c
-	@@AMPRETTYECHO@ '  [C         ]  os/xfstrans.c'
-@am__fastdepCC_TRUE@	@AMSHOWCMDSAT@if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xfstrans.obj -MD -MP -MF "$(DEPDIR)/xfstrans.Tpo" -c -o xfstrans.obj `if test -f 'os/xfstrans.c'; then $(CYGPATH_W) 'os/xfstrans.c'; else $(CYGPATH_W) '$(srcdir)/os/xfstrans.c'; fi`; \
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xfstrans.obj -MD -MP -MF "$(DEPDIR)/xfstrans.Tpo" -c -o xfstrans.obj `if test -f 'os/xfstrans.c'; then $(CYGPATH_W) 'os/xfstrans.c'; else $(CYGPATH_W) '$(srcdir)/os/xfstrans.c'; fi`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xfstrans.Tpo" "$(DEPDIR)/xfstrans.Po"; else rm -f "$(DEPDIR)/xfstrans.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	@AMSHOWCMDSAT@source='os/xfstrans.c' object='xfstrans.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os/xfstrans.c' object='xfstrans.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	@AMDEPSHOWCMDSAT@$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xfstrans.obj `if test -f 'os/xfstrans.c'; then $(CYGPATH_W) 'os/xfstrans.c'; else $(CYGPATH_W) '$(srcdir)/os/xfstrans.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xfstrans.obj `if test -f 'os/xfstrans.c'; then $(CYGPATH_W) 'os/xfstrans.c'; else $(CYGPATH_W) '$(srcdir)/os/xfstrans.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
-	@@AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(appmandir)'
-	@AMSHOWCMDSAT@test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
+	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
 	@list='$(appman_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  @AMPRETTYECHO@ "  [INSTALL   ]  '$$d$$p' -> '$(DESTDIR)$(appmandir)/$$f'"; \
-	  @AMCMDECHO@ " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
+	  echo " $(appmanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appmandir)/$$f'"; \
 	  $(appmanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appmandir)/$$f"; \
 	done
 
@@ -920,19 +843,16 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(appman_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(appmandir)/$$f"; \
-	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
+	  echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(appmandir)/$$f"; \
 	done
 install-configDATA: $(config_DATA)
 	@$(NORMAL_INSTALL)
-	@@AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(configdir)'
-	@AMSHOWCMDSAT@test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
+	test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  @AMPRETTYECHO@ "  [INSTALL   ]  '$$d$$p' -> '$(DESTDIR)$(configdir)/$$f'"; \
-	  @AMCMDECHO@ " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
+	  echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
 	  $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
 	done
 
@@ -940,25 +860,23 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(config_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(configdir)/$$f"; \
-	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
+	  echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(configdir)/$$f"; \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	@AMSHOWCMDSAT@list='$(SOURCES) $(HEADERS) $(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; }'`; \
-	@AMPRETTYECHO@ '  [MKID      ]  $$unique'; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	@AMSHOWCMDSAT@tags=; \
+	tags=; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -968,14 +886,13 @@
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  @AMPRETTYECHO@ "  [ETAGS     ]  $$tags"; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	@AMSHOWCMDSAT@tags=; \
+	tags=; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -984,26 +901,20 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || ( \
-	     @AMPRETTYECHO@ "  [CTAGS     ]  $$tags"; \
-	     $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique )
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
 GTAGS:
-	@@AMPRETTYECHO@ '  [GTAGS     ]'
-	@AMSHOWCMDSAT@here=`$(am__cd) $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	@@AMPRETTYECHO@ '  [RM        ]  TAGS ID GTAGS GRTAGS GSYMS GPATH tags'
-	@AMSHOWCMDSAT@-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@AMSHOWCMDSAT@$(am__remove_distdir)
-	@@AMPRETTYECHO@ '  [MKDIR     ]  $(distdir)'
-	@AMSHOWCMDSAT@mkdir $(distdir)
-	@@AMPRETTYECHO@ '  [MKDIR     ]  '
+	$(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 \
@@ -1030,68 +941,56 @@
 	    || exit 1; \
 	  fi; \
 	done
-	@AMSHOWCMDSAT@-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| ( @AMPRETTYECHO@ '  [CHMOD     ]  a+r $(distdir)'; chmod -R a+r $(distdir) )
+	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
-	@@AMPRETTYECHO@ '  [TAR.GZ    ]  $(distdir).tar.gz'
-	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	@AMSHOWCMDSAT@$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 dist-bzip2: distdir
-	@@AMPRETTYECHO@ '  [TAR.BZ2   ]  $(distdir).tar.bz2'
-	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	@AMSHOWCMDSAT@$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
 dist-tarZ: distdir
-	@@AMPRETTYECHO@ '  [TAR.Z     ]  $(distdir).tar.Z'
-	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	@AMSHOWCMDSAT@$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
 
 dist-shar: distdir
-	@@AMPRETTYECHO@ '  [SHAR.GZ   ]  $(distdir).shar.gz'
-	@AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	@AMSHOWCMDSAT@$(am__remove_distdir)
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
 
 dist-zip: distdir
-	@@AMPRETTYECHO@ '  [ZIP       ]  $(distdir).zip'
-	@AMSHOWCMDSAT@-rm -f $(distdir).zip
-	@AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir)
-	@AMSHOWCMDSAT@$(am__remove_distdir)
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
 
 dist dist-all: distdir
-	@@AMPRETTYECHO@ '  [TAR.GZ    ]  $(distdir).tar.gz'
-	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	@@AMPRETTYECHO@ '  [TAR.BZ2   ]  $(distdir).tar.bz2'
-	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	@AMSHOWCMDSAT@$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	@AMSHOWCMDSAT@case '$(DIST_ARCHIVES)' in \
+	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  @AMPRETTYECHO@ '  [UNTAR.GZ  ]  $(distdir).tar.gz'; \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  @AMPRETTYECHO@ '  [UNTAR.BZ2 ]  $(distdir).tar.bz2'; \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.Z*) \
-	  @AMPRETTYECHO@ '  [UNTAR.Z   ]  $(distdir).tar.Z'; \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  @AMPRETTYECHO@ '  [UNSHAR.GZ ]  $(distdir).shar.gz'; \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
-	  @AMPRETTYECHO@ '  [UNZIP     ]  $(distdir).zip'; \
 	  unzip $(distdir).zip ;;\
 	esac
-	@AMSHOWCMDSAT@chmod -R a-w $(distdir); chmod a+w $(distdir)
-	@AMSHOWCMDSAT@mkdir $(distdir)/_build
-	@AMSHOWCMDSAT@mkdir $(distdir)/_inst
-	@AMSHOWCMDSAT@chmod a-w $(distdir)
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && cd $(distdir)/_build \
@@ -1143,8 +1042,8 @@
 check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
 installdirs:
-	@AMSHOWCMDSAT@for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(configdir)"; do \
-	  test -z "$$dir" || ( @AMPRETTYECHO@ "  [MKDIR     ]  $$dir"; $(mkdir_p) "$$dir" ); \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(configdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -1156,19 +1055,17 @@
 
 installcheck: installcheck-am
 install-strip:
-	@AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	$(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
 mostlyclean-generic:
 
 clean-generic:
-	@@AMPRETTYECHO@ '  [RM        ]  $(CLEANFILES)'
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	@@AMPRETTYECHO@ '  [RM        ]  $(CONFIG_CLEAN_FILES)'
-	@AMSHOWCMDSAT@-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1178,12 +1075,9 @@
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
-	@@AMPRETTYECHO@ '  [RM        ]  $(am__CONFIG_DISTCLEAN_FILES)'
-	@AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	@@AMPRETTYECHO@ '  [RM        ]  ./$(DEPDIR)'
-	@AMSHOWCMDSAT@-rm -rf ./$(DEPDIR)
-	@@AMPRETTYECHO@ '  [RM        ]  Makefile'
-	@AMSHOWCMDSAT@-rm -f Makefile
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
 
@@ -1208,14 +1102,10 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	@@AMPRETTYECHO@ '  [RM        ]  $(am__CONFIG_DISTCLEAN_FILES)'
-	@AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	@@AMPRETTYECHO@ '  [RM        ]  autom4te.cache/'
-	@AMSHOWCMDSAT@-rm -rf $(top_srcdir)/autom4te.cache
-	@@AMPRETTYECHO@ '  [RM        ]  ./$(DEPDIR)'
-	@AMSHOWCMDSAT@-rm -rf ./$(DEPDIR)
-	@@AMPRETTYECHO@ '  [RM        ]  Makefile'
-	@AMSHOWCMDSAT@-rm -f Makefile
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
--- xfs-1.0.4.orig/autogen.sh
+++ xfs-1.0.4/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
--- xfs-1.0.4.orig/config.guess
+++ xfs-1.0.4/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -780,9 +783,6 @@
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS_NT-*:*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
     i*:windows32*:*)
     	# uname -m includes "-pc" on this system.
     	echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -989,7 +992,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
--- xfs-1.0.4.orig/configure
+++ xfs-1.0.4/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for xfs 1.0.4.
+# Generated by GNU Autoconf 2.61 for xfs 1.0.4.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -12,7 +12,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -21,10 +22,13 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -217,7 +221,7 @@
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -235,7 +239,6 @@
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -244,10 +247,12 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -255,7 +260,6 @@
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -264,10 +268,12 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -514,19 +520,28 @@
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -621,11 +636,6 @@
 AMTAR
 am__tar
 am__untar
-AMSHOWCMDSAT
-AMDEPSHOWCMDSAT
-AMPRETTYECHO
-AMCMDECHO
-LT_QUIET
 MAINTAINER_MODE_TRUE
 MAINTAINER_MODE_FALSE
 MAINT
@@ -677,6 +687,7 @@
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 PKG_CONFIG
 XFS_CFLAGS
@@ -786,10 +797,10 @@
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
@@ -805,10 +816,10 @@
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1002,19 +1013,19 @@
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=no ;;
 
   --x)
@@ -1260,8 +1271,6 @@
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-pretty-cmds          show all commands executed
-  --enable-pretty-cmds           do not output the entire command lines
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
@@ -1281,6 +1290,7 @@
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   PKG_CONFIG  path to pkg-config utility
@@ -1352,7 +1362,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 xfs configure 1.0.4
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1366,7 +1376,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by xfs $as_me 1.0.4, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -1786,7 +1796,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1952,7 +1962,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2015,29 +2025,6 @@
 fi
 rmdir .tst 2>/dev/null
 
-# Check whether --enable-pretty-cmds was given.
-if test "${enable_pretty_cmds+set}" = set; then
-  enableval=$enable_pretty_cmds;
-fi
-
-AMSHOWCMDSAT=''
-AMDEPSHOWCMDSAT=''
-AMPRETTYECHO=true
-AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
-then
-  AMSHOWCMDSAT='@'
-  test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@'
-  AMPRETTYECHO=echo
-  AMCMDECHO=true
-  LT_QUIET='--quiet'
-fi
-
-
-
-
-
-
 # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -2110,7 +2097,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2150,7 +2137,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2204,7 +2191,6 @@
 
 
 
-
 { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -2255,7 +2241,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2295,7 +2281,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2352,7 +2338,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2393,7 +2379,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2451,7 +2437,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2495,7 +2481,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2636,7 +2622,7 @@
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -2664,6 +2650,12 @@
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -2675,8 +2667,6 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
@@ -2854,27 +2844,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2929,27 +2902,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2984,27 +2940,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -3040,27 +2979,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3176,27 +3098,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
@@ -3443,7 +3348,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3603,7 +3508,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3646,7 +3551,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3853,27 +3758,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_type_signal=int
 else
   echo "$as_me: failed program was:" >&5
@@ -3978,27 +3866,11 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_socket=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -4007,7 +3879,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_socket+set}" = set; then
   break
@@ -4077,27 +3949,11 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_search_gethostbyname=$ac_res
 else
   echo "$as_me: failed program was:" >&5
@@ -4106,7 +3962,7 @@
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_gethostbyname+set}" = set; then
   break
@@ -4197,27 +4053,11 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_getaddrinfo=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4226,7 +4066,7 @@
 	ac_cv_func_getaddrinfo=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
@@ -4292,27 +4132,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_in_sin_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4353,27 +4176,10 @@
   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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_sockaddr_in_sin_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4632,7 +4438,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -4641,10 +4448,13 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -4868,19 +4678,28 @@
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -4896,7 +4715,7 @@
 # values after options handling.
 ac_log="
 This file was extended by xfs $as_me 1.0.4, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4925,7 +4744,7 @@
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -4949,7 +4768,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 xfs config.status 1.0.4
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -5184,11 +5003,6 @@
 AMTAR!$AMTAR$ac_delim
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
-AMSHOWCMDSAT!$AMSHOWCMDSAT$ac_delim
-AMDEPSHOWCMDSAT!$AMDEPSHOWCMDSAT$ac_delim
-AMPRETTYECHO!$AMPRETTYECHO$ac_delim
-AMCMDECHO!$AMCMDECHO$ac_delim
-LT_QUIET!$LT_QUIET$ac_delim
 MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
 MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
 MAINT!$MAINT$ac_delim
@@ -5223,6 +5037,11 @@
 LIB_MAN_SUFFIX!$LIB_MAN_SUFFIX$ac_delim
 FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim
 MISC_MAN_SUFFIX!$MISC_MAN_SUFFIX$ac_delim
+DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
+ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
+APP_MAN_DIR!$APP_MAN_DIR$ac_delim
+LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim
+FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -5264,11 +5083,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
-ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
-APP_MAN_DIR!$APP_MAN_DIR$ac_delim
-LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim
-FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
 MISC_MAN_DIR!$MISC_MAN_DIR$ac_delim
 DRIVER_MAN_DIR!$DRIVER_MAN_DIR$ac_delim
 ADMIN_MAN_DIR!$ADMIN_MAN_DIR$ac_delim
@@ -5276,7 +5090,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- xfs-1.0.4.orig/debian/copyright
+++ xfs-1.0.4/debian/copyright
@@ -0,0 +1,25 @@
+Copyright (c) 1988  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
--- xfs-1.0.4.orig/debian/patches/01_xfs_fixes.diff
+++ xfs-1.0.4/debian/patches/01_xfs_fixes.diff
@@ -0,0 +1,769 @@
+$Id: 003b_xfs_fixes.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+This patch by Branden Robinson, Matthieu Herrb, and Nikita V. Youshchenko.
+
+os/utils.c:
+  - Handle pid files the way most other Unix daemons do.  Use Matthieu
+    Herrb's version of StorePid(), which refuses to open pre-existing pid
+    files, and is more careful with the type of Pid_t.
+  - Allow the user to specify the pid filename on the command line with a
+    "-pid" option (courtesy of Nikita V. Youshchenko).
+  - Add RemovePid() function which removes the process ID file, and
+    register it with atexit() so that it is automatically invoked when xfs
+    exits.
+  - Sort options in usage message alphabetically.
+  - Refer to "user ID" and "process ID" in diagnostic messages, not
+    "userid" and "process-id".
+  - Remove duplicate unconditional #include of stdlib.h.
+  - Wrap long lines.
+  - Whitespace police.
+
+xfs.man:
+  - Document the new "-pid" option (courtesy of Nikita V. Youshchenko).
+  - Add "FUTURE DIRECTIONS" section.
+  - Perform massive cleanup and reformatting.
+
+Not submitted upstream yet.
+
+Index: os/utils.c
+===================================================================
+--- os/utils.c.orig	2007-03-03 01:02:00.000000000 +0100
++++ os/utils.c	2007-03-03 01:07:29.000000000 +0100
+@@ -3,7 +3,7 @@
+  * misc os utilities
+  */
+ /*
+- 
++
+ Copyright 1990, 1991, 1998  The Open Group
+ 
+ Permission to use, copy, modify, distribute, and sell this software and its
+@@ -27,7 +27,7 @@
+ in this Software without prior written authorization from The Open Group.
+ 
+  * Copyright 1990, 1991 Network Computing Devices;
+- * Portions Copyright 1987 by Digital Equipment Corporation 
++ * Portions Copyright 1987 by Digital Equipment Corporation
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and
+  * its documentation for any purpose is hereby granted without fee, provided
+@@ -90,8 +90,6 @@
+ #define SIGNALS_RESET_WHEN_CAUGHT
+ #endif
+ 
+-#include <stdlib.h>
+-
+ extern char *configfilename;
+ static Bool dropPriv = FALSE; /* whether or not to drop root privileges */
+ #ifdef DEFAULT_DAEMON
+@@ -116,7 +114,8 @@
+ static char *pidFile = XFSPIDDIR "/xfs.pid";
+ static int  pidFd;
+ static FILE *pidFilePtr;
+-static int  StorePid (void);
++static long StorePid (void);
++static void RemovePid (void);
+ 
+ /* ARGSUSED */
+ SIGVAL
+@@ -219,7 +218,9 @@
+ static void
+ usage(void)
+ {
+-    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket]\n",
++    fprintf(stderr, "usage: %s [-config config_file] [-daemon] [-droppriv]"
++                   " [-ls listen_socket] [-nodaemon] [-pid pid_file]"
++                   " [-port tcp_port] [-user user_name]\n",
+ 	    progname);
+     exit(1);
+ }
+@@ -242,7 +243,7 @@
+  *
+  * [] denotes optional and ... denotes repitition.
+  *
+- * The string must be _exactly_ in the above format. 
++ * The string must be _exactly_ in the above format.
+  */
+ 
+ void
+@@ -260,7 +261,7 @@
+ 	    count++;
+ 	ptr++;
+     }
+-  
++
+     OldListenCount = count + 1;
+     OldListen = (OldListenRec *) malloc (
+ 	OldListenCount * sizeof (OldListenRec));
+@@ -349,6 +350,11 @@
+ 		configfilename = argv[++i];
+ 	    else
+ 		usage();
++       } else if (!strcmp(argv[i], "-pid")) {
++           if (argv[i + 1])
++               pidFile = argv[++i];
++           else
++               usage();
+ 	}
+ #ifdef MEMBUG
+ 	else if ( strcmp( argv[i], "-alloc") == 0)
+@@ -392,7 +398,7 @@
+ FSalloc (unsigned long amount)
+ {
+     register pointer  ptr;
+-	
++
+     if ((long)amount < 0)
+ 	return 0;
+     if (amount == 0)
+@@ -462,21 +468,21 @@
+ 	FatalError("out of memory\n");
+     return 0;
+ }
+-                    
++
+ /*****************
+  *  FSfree
+- *    calls free 
+- *****************/    
++ *    calls free
++ *****************/
+ 
+ void
+ FSfree(pointer ptr)
+ {
+ #ifdef MEMBUG
+     if (ptr)
+-	ffree((char *)ptr); 
++       ffree((char *)ptr);
+ #else
+     if (ptr)
+-	free((char *)ptr); 
++       free((char *)ptr);
+ #endif
+ }
+ 
+@@ -511,11 +517,12 @@
+ 	    }
+ #endif /* QNX4 */
+ 	    if (setuid(pwent->pw_uid)) {
+-		FatalError("fatal: couldn't set userid to %s user\n", user);
++               FatalError("fatal: couldn't set user ID to %s user\n", user);
+ 	    }
+ 	}
+     } else if (dropPriv || userId) {
+-	FatalError("fatal: -droppriv or -user flag specified, but xfs not run as root\n");
++       FatalError("fatal: -droppriv or -user flag specified, but xfs not"
++                  " invoked by root user\n");
+     }
+ }
+ 
+@@ -523,48 +530,76 @@
+ void
+ SetDaemonState(void)
+ {
+-    int	    oldpid;
++    long       oldpid;
+ 
+     if (becomeDaemon) {
+ 	BecomeDaemon();
+ 	if ((oldpid = StorePid ())) {
+ 	    if (oldpid == -1)
+-		ErrorF ("error opening process-id file %s\n", pidFile);
++               ErrorF ("error opening process ID file %s\n", pidFile);
+ 	    else
+ 		ErrorF ("process-id file %s indicates another xfs is "
+-			  "running (pid %d); exiting\n", pidFile, oldpid);
++                         "running (pid %ld); exiting\n", pidFile, oldpid);
+ 	    exit(1);
+ 	}
++       if (atexit (RemovePid))
++           ErrorF ("could not register RemovePid() with atexit()\n");
+     }
+ }
+ 
+ 
+-static int
++static long
++/*
++ * Create and populate file storing process ID.
++ */
+ StorePid (void)
+ {
+-    int		oldpid;
++    long       oldpid;
++    char       pidstr[11]; /* enough space for a 32-bit pid plus \0 */
++    size_t     pidstrlen;
+ 
+-    if (pidFile[0] != '\0') {
+-	pidFd = open (pidFile, O_RDWR);
+-	if (pidFd == -1 && errno == ENOENT)
+-	    pidFd = open (pidFile, O_RDWR|O_CREAT, 0666);
+-	if (pidFd == -1 || !(pidFilePtr = fdopen (pidFd, "r+")))
++    if (pidFile[0] != '\0')
++    {
++       pidFd = open (pidFile, O_WRONLY|O_CREAT|O_EXCL, 0666);
++       if (pidFd == -1)
+ 	{
+-	    ErrorF ("cannot open process-id file %s: %s\n", pidFile,
+-		    strerror (errno));
+-	    return -1;
++           if (errno == EEXIST)
++           {
++               /* pidFile already exists; see if we can open it */
++               pidFilePtr = fopen (pidFile, "r");
++               if (pidFilePtr == NULL)
++               {
++                   ErrorF ("cannot open process ID file %s for reading: "
++                           "%s\n", pidFile, strerror (errno));
++                   return -1;
++               }
++               if (fscanf (pidFilePtr, "%ld\n", &oldpid) != 1)
++               {
++                   ErrorF ("existing process ID file %s empty or contains "
++                           "garbage\n", pidFile);
++                   oldpid = -1;
++               }
++               fclose (pidFilePtr);
++               return oldpid;
++           }
++               else
++           {
++               ErrorF ("cannot fdopen process ID file %s for writing: "
++                       "%s\n", pidFile, strerror (errno));
++               return -1;
++           }
+ 	}
+-	if (fscanf (pidFilePtr, "%d\n", &oldpid) != 1)
+-	    oldpid = -1;
+-	if (fseek (pidFilePtr, 0L, SEEK_SET) == -1)
++       if ((pidFilePtr = fdopen (pidFd, "w")) == NULL)
+ 	{
+-	    ErrorF ("cannot seek process-id file %s: %s\n", pidFile,
+-		     strerror (errno));
+-	    return -1;
++               ErrorF ("cannot open process ID file %s for writing: %s\n",
++                       pidFile, strerror (errno));
++               return -1;
+ 	}
+-	if (fprintf (pidFilePtr, "%5ld\n", (long) getpid ()) != 6)
++       (void) snprintf (pidstr, 11, "%ld", (long) getpid());
++       pidstrlen = strlen (pidstr);
++       if (fprintf (pidFilePtr, "%s\n", pidstr) != ( pidstrlen + 1))
+ 	{
+-	    ErrorF ("cannot write to process-id file %s: %s\n", pidFile,
++           ErrorF ("cannot write to process ID file %s: %s\n", pidFile,
+ 		    strerror (errno));
+ 	    return -1;
+ 	}
+@@ -573,3 +608,19 @@
+     }
+     return 0;
+ }
++
++
++/*
++ * Remove process ID file.  This function should be registered with atexit().
++ */
++static void
++RemovePid (void)
++{
++#ifdef DEBUG
++    fprintf (stderr, "unlinking process ID file %s\n", pidFile);
++#endif
++    if (unlink (pidFile))
++       if (errno != ENOENT)
++           ErrorF ("cannot remove process ID file %s: %s\n", pidFile,
++                   strerror (errno));
++}
+Index: xfs.man
+===================================================================
+--- xfs.man.orig	2007-03-03 01:02:00.000000000 +0100
++++ xfs.man	2007-03-03 01:12:48.000000000 +0100
+@@ -37,206 +37,320 @@
+ .\" suitability of this software for any purpose.  It is provided "as is"
+ .\" without express or implied warranty.
+ .\" $Xorg: xfs.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $
+-.TH XFS 1 __xorgversion__
++.TH xfs __appmansuffix__ __xorgversion__
+ .SH NAME
+ xfs \- X font server
+ .SH SYNOPSIS
+-.B "xfs"
+-[\-config \fIconfiguration_file\fP]
+-[\-daemon]
+-[\-droppriv]
+-[\-ls \fIlisten_socket\fP]
+-[\-nodaemon]
+-[\-port \fItcp_port\fP]
+-[\-user \fIusername\fP]
++.B xfs
++[
++.BI "\-config " configuration_file
++]
++[
++.B \-daemon
++]
++[
++.B \-droppriv
++]
++[
++.BI "\-ls " listen_socket
++]
++[
++.B \-nodaemon
++]
++[
++.BI "\-pid " pid_file
++]
++[
++.BI "\-port " tcp_port
++]
++[
++.BI "\-user " username
++]
+ .SH DESCRIPTION
++.B xfs
++is the X Window System font server.
++It supplies fonts to X Window System display servers.
++The server is usually run by a system administrator, and started via
++.BR init (__adminmansuffix__).
++Users may also wish to start private font servers for specific sets of
++fonts.
+ .PP
+-.I Xfs
+-is the X Window System font server.  It supplies fonts to X Window
+-System display servers.
+-.SH "STARTING THE SERVER"
+-The server is usually run by a system administrator, and started via 
+-boot files like \fI/etc/rc.local\fR.  Users may also wish to start
+-private font servers for specific sets of fonts.
+-.SH "OPTIONS"
+-.TP 8
+-.B \-config configuration_file
+-Specifies the configuration file the font server will use.  If this
+-parameter is not specified, the default file, \fI__configdir__/config\fR
++To connect to a font server, see the documentation for your X server; it
++likely supports the syntax documented in the \(lqFONT SERVER NAMES\(rq
++section of
++.BR X (__miscmansuffix__).
++.SH OPTIONS
++.TP
++.BI "\-config " configuration_file
++specifies the configuration file
++.B xfs
++will use.
++If this parameter is not specified, the default file,
++.IR __configdir__/config ,
+ will be used.
+-.TP 8
+-.B \-ls listen_socket
+-Specifies a file descriptor which is already set up to be used as the
+-listen socket.  This option is only intended to be used by the font server
+-itself when automatically spawning another copy of itself to handle
+-additional connections.
+-.TP 8
+-.B \-port tcp_port
+-Specifies the TCP port number on which the server will listen for connections.
+-The default port number is 7100.
+-.TP 8
++.TP
+ .B \-daemon
+-Instructs xfs to fork and go into the background automatically at
+-startup  If this option is not specified, xfs will run as a regular
+-process (unless xfs was built to daemonize by default).
+-.TP 8
++instructs
++.B xfs
++to fork and go into the background automatically at startup.
++If this option is not specified,
++.B xfs
++will run as a regular process (unless it was built to daemonize by
++default).
++When running as a daemon,
++.B xfs
++will attempt to create a file in which it stores its process ID, and will
++delete that file upon exit; see
++.BR \-pid .
++.TP
+ .B \-droppriv
+-If specified, xfs will attempt to run as user and group \fIxfs\fR (unless
+-the
++instructs
++.B xfs
++to attempt to run as user and group
++.I xfs
++(unless the
+ .B \-user
+-option is used). This
+-has been implemented for security reasons, as xfs may have undiscovered
+-buffer overflows or other paths for possible exploit, both local and
+-remote.  With this option, you may also wish to specify
+-"no-listen = tcp"
+-in the config file, which ensures that xfs will not to use a TCP port at all.
+-.TP 8
++option is used).
++This has been implemented for security reasons, as
++.B xfs
++may have undiscovered buffer overflows or other paths for possible exploit,
++both local and remote.
++When using this option, you may also wish to specify \(oqno\-listen =
++tcp\(cq in the config file, which ensures that
++.B xfs
++will not to use a TCP port at all.
++By default,
++.B xfs
++runs with the user and group IDs of the user who invoked it.
++.TP
++.BI "\-ls " listen_socket
++specifies a file descriptor which is already set up to be used as the
++listen socket.
++This option is only intended to be used by the font server itself when
++automatically spawning another copy of itself to handle additional
++connections.
++.TP
+ .B \-nodaemon
+-When xfs is built to daemonize (run in the background) by default,
+-this prevents that and starts xfs up as a regular process.
+-.TP 8
+-.B \-user username
+-This is equivalent to
++instructs
++.B xfs
++not to daemonize (fork and detach from its controlling terminal).
++This option only has an effect if
++.B xfs
++is built to daemonize by default, which is not the stock configuration.
++.TP
++.BI "\-pid " pid_file
++instructs
++.B xfs
++to save its process ID into
++.IR pid_file ,
++instead of the default,
++.IR /var/run/xfs.pid .
++If
++.B xfs
++is not running as a daemon, this option has no effect.
++.TP
++.BI "\-port " tcp_port
++specifies the TCP port number on which the server will listen for
++connections.
++The default port number is 7100.
++This option is ignored if
++.B xfs
++is configured to not listen to TCP transports at all (see \(lqConfiguration
++File Format\(rq below).
++.TP
++.BI "\-user " username
++instructs
++.B xfs
++to run as the user
++.IR username.
++See
+ .B \-droppriv
+-except that xfs will run as user \fIusername\fR.
+-.SH "SIGNALS"
+-.TP 8
+-.I SIGTERM
+-This causes the font server to exit cleanly.
+-.TP 8
+-.I SIGUSR1
+-This signal is used to cause the server to re-read its configuration file.
+-.TP 8
+-.I SIGUSR2
+-This signal is used to cause the server to flush any cached data it
+-may have.
+-.TP 8
+-.I SIGHUP
+-This signal is used to cause the server to reset, closing all active
+-connections and re-reading the configuration file.
+-.SH "CONFIGURATION"
++for why this may be desired.
++By default,
++.B xfs
++runs with the user and group IDs of the user who invoked it.
++.SH "INPUT FILES"
++.B xfs
++reads and serves any font file format recognized by the X server itself.
++It locates font files through the specification of a
++.IR catalogue ,
++which is delcared in
++.BR xfs 's
++configuration file.
++.SS "Configuration File Format"
++.B xfs
++reads its configuration from
++.I __configdir__/config
++by default (see the
++.B \-config
++option in the \(lqOPTIONS\(rq section above).
+ The configuration language is a list of keyword and value pairs.
+-Each keyword is followed by an '=' and then the desired value.
++Each keyword is followed by an equals sign (\(oq=\(cq) and then the desired
++value.
+ .PP
+ Recognized keywords include:
+-.sp
+-.\" .IP "cache-size (cardinal)"
+-.\" Size in bytes of the font server cache.
+-.IP "catalogue (list of string)"
+-Ordered list of font path element names.
+-Use of the keyword "catalogue" is very misleading at present,
+-the current implementation only supports a single catalogue ("all"),
++.TP
++.BR alternate\-servers " (list of \fIstring\fPs)"
++lists alternate servers for this font server.
++See the \(lqFONT SERVER NAMES\(rq section of
++.BR X (__miscmansuffix__)
++for the syntax of the string.
++.\" .TP
++.\" .BR cache\-size " (\fIcardinal\fP)"
++.\" determines the size (in bytes) of the font server cache.
++.TP
++.BR catalogue " (list of \fIstring\fPs)"
++declares as ordered list of font path element names from which fonts will
++be served.
++Use of the keyword \(oqcatalogue\(cq is very misleading at present: the
++current implementation only supports a single catalogue (\(oqall\(cq),
+ containing all of the specified fonts.
+-.IP "alternate-servers (list of string)"
+-List of alternate servers for this font server.
+-.IP "client-limit (cardinal)"
+-Number of clients this font server will support 
+-before refusing service.  This is useful for tuning 
+-the load on each individual font server.
+-.IP "clone-self (boolean)"
+-Whether this font server should attempt to clone itself
+-when it reachs the client-limit.
+-.IP "default-point-size (cardinal)"
+-The default pointsize (in decipoints) for fonts that 
+-don't specify.  The default is 120.
+-.IP "default-resolutions (list of resolutions)"
+-Resolutions the server supports by default.
+-This information may be used as a hint for 
+-pre-rendering, and substituted for scaled fonts 
+-which do not specify a resolution.
+-A resolution is a comma-separated pair of x and y resolutions in
+-pixels per inch.
++.TP
++.BR client\-limit " (\fIcardinal\fP)"
++determines the number of clients this font server will support before
++refusing service.
++This is useful for tuning the load on each individual font server.
++.TP
++.BR clone\-self " (\fIboolean\fP)"
++indicates whether this font server should attempt to clone itself when the
++number of connected clients reaches the
++.BR client\-limit .
++.TP
++.BR default\-point\-size " (\fIcardinal\fP)"
++The default pointsize (in decipoints) for font requests that don't specify
++a point size.
++The default is 120.
++.TP
++.BR default\-resolutions " (list of \fIresolution\fPs)"
++indicates the resolutions the server supports by default.
++This information may be used as a hint for pre-rendering, and substituted
++into requests for scaled fonts which do not specify a resolution.
++A
++.I resolution
++is a comma-separated pair of horizontal and vertical resolutions in pixels
++per inch.
+ Multiple resolutions are separated by commas.
+-.IP "error-file (string)"
+-Filename of the error file.  All warnings and errors
+-will be logged here.
+-.IP "no-listen (trans-type)"
+-Disable a transport  type. For example, TCP/IP connections can
+-be disabled with no-listen tcp
+-.IP "port (cardinal)"
+-TCP port on which the server will listen for connections.
+-.IP "use-syslog (boolean)"
+-Whether syslog(3) (on supported systems) is to be used 
+-for errors.
+-.IP "deferglyphs (string)"
+-Set the mode for delayed fetching and caching of glyphs.  Value is
+-"none", meaning deferred glyphs is disabled, "all", meaning it is
+-enabled for all fonts, and "16", meaning it is enabled only for
+-16-bits fonts.
+-.\" .IP "trusted-clients (list of string)"
+-.\" Those clients the fontserver will talk to.  Others
+-.\" will be refused for the initial connection.  An empty
+-.\" list means the server will talk to any client.
+-.SH "EXAMPLE"
++.TP
++.BR deferglyphs " (\fIstring\fP)"
++sets the mode for delayed fetching and caching of glyphs.
++.I string
++should be one of \(oqnone\(cq, meaning glyphs deferment is disabled,
++\(oqall\(cq, meaning it is enabled for all fonts, and \(oq16\(cq, meaning
++it is enabled only for 16-bit fonts.
++.TP
++.BR error\-file " (\fIstring\fP)"
++indicates the filename of the error file.
++All warnings and errors will be logged here, unless
++.B use\-syslog
++is set to a true value (see below).
++.TP
++.BR no\-listen " (\fItrans-type\fP)"
++disables the specified transport type.
++For example, TCP/IP connections can be disabled with \(oqno\-listen =
++tcp\(cq.
++.TP
++.BR port " (\fIcardinal\fP)"
++indicates the TCP port on which the server will listen for connections.
++.\" .TP
++.\" .BR trusted-clients " (list of \fIstring\fPs)"
++.\" idefntifies the clients the font server will talk to.
++.\" Others will be refused for the initial connection.
++.\" An empty list means the server will talk to any client.
++.TP
++.BR use\-syslog " (\fIboolean\fP)"
++determines whether errors and diagnostics should be reported via
++.BR syslog (__libmansuffix__)
++(on supported systems) instead of being written to the
++.B error\-file
++(see above).
++.SS "Example Configuration File"
+ .nf
+ XCOMM
+ XCOMM sample font server configuration file
+ XCOMM
+ 
+-XCOMM allow a max of 10 clients to connect to this font server
+-client-limit = 10
++XCOMM allow a max of 10 clients to connect to this font server.
++client\-limit = 10
+ 
+-XCOMM when a font server reaches its limit, start up a new one
+-clone-self = on
++XCOMM When a font server reaches the above limit, start up a new one.
++clone\-self = on
+ 
+-XCOMM alternate font servers for clients to use
+-alternate-servers = hansen:7101,hansen:7102
++XCOMM Identify alternate font servers for clients to use.
++alternate\-servers = hansen:7101,hansen:7102
+ 
+-XCOMM where to look for fonts
+-XCOMM the first is a set of Speedo outlines, the second is a set of 
+-XCOMM misc bitmaps and the last is a set of 100dpi bitmaps
++XCOMM Look for fonts in the following directories.  The first is a set of
++XCOMM Speedo outlines, the second is a set of misc bitmaps (such as terminal
++XCOMM and cursor fonts), and the last is a set of 100dpi bitmaps.
+ XCOMM
+ catalogue = /usr/X11R6/lib/X11/fonts/speedo,
+-	/usr/X11R6/lib/X11/fonts/misc,
+-	/usr/X11R6/lib/X11/fonts/100dpi/
++            /usr/X11R6/lib/X11/fonts/misc,
++            /usr/X11R6/lib/X11/fonts/100dpi/
+ 
+ XCOMM in 12 points, decipoints
+-default-point-size = 120
++default\-point\-size = 120
+ 
+ XCOMM 100 x 100 and 75 x 75
+-default-resolutions = 100,100,75,75
+-use-syslog = off
+-.fi
+-.sp
+-.SH "FONT SERVER NAMES"
+-One of the following forms can be used to name a font server that
+-accepts TCP connections:
+-.sp
+-.nf
+-    tcp/\fIhostname\fP:\fIport\fP
+-    tcp/\fIhostname\fP:\fIport\fP/\fIcataloguelist\fP
+-.fi
+-.PP
+-The \fIhostname\fP specifies the name (or decimal numeric address)
+-of the machine on which the font server is running.  The \fIport\fP
+-is the decimal TCP port on which the font server is listening for connections.
+-The \fIcataloguelist\fP specifies a list of catalogue names,
+-with '+' as a separator.
+-.PP
+-Examples: \fItcp/fs.x.org:7100\fP, \fItcp/18.30.0.212:7101/all\fP.
+-.PP
+-One of the following forms can be used to name a font server that
+-accepts DECnet connections:
+-.sp
+-.nf
+-    decnet/\fInodename\fP::font$\fIobjname\fP
+-    decnet/\fInodename\fP::font$\fIobjname\fP/\fIcataloguelist\fP
++default\-resolutions = 100,100,75,75
++
++XCOMM Specify our log filename.
++error\-file = /var/log/xfs.log
++
++XCOMM Direct diagnostics to our own log file instead of using syslog.
++use\-syslog = off
+ .fi
+-.PP
+-The \fInodename\fP specifies the name (or decimal numeric address)
+-of the machine on which the font server is running.
+-The \fIobjname\fP is a normal, case-insensitive DECnet object name.
+-The \fIcataloguelist\fP specifies a list of catalogue names,
+-with '+' as a separator.
+-.PP
+-Examples: \fIDECnet/SRVNOD::FONT$DEFAULT\fP, \fIdecnet/44.70::font$special/symbols\fP.
+-.SH "SEE ALSO"
+-X(__miscmansuffix__), \fIThe X Font Service Protocol\fP,
+-.br
+-\fIFont server implementation overview\fP
++.SH "OUTPUT FILES"
++When operating in daemon mode,
++.B xfs
++sends diagnostic messages (errors and warnings) to the system log via the
++.B syslog
++C library function by default.
++However, these messages can be sent to an alternate location via the
++.B error\-file
++and
++.B use\-syslog
++configuration variables; see \(lqConfiguration File Format\(rq, above.
++.SH "ASYNCHRONOUS EVENTS"
++.B xfs
++handles the following signals specially:
++.TP
++.I SIGTERM
++causes the font server to exit cleanly.
++.TP
++.I SIGUSR1
++causes
++.B xfs
++to re-read its configuration file.
++.TP
++.I SIGUSR2
++causes
++.B xfs
++to flush any cached data it may have.
++.TP
++.I SIGHUP
++causes
++.B xfs
++to reset, closing all active connections and re-reading the configuration
++file.
+ .SH BUGS
+ Multiple catalogues should be supported.
++.SH "FUTURE DIRECTIONS"
++Significant further development of
++.B xfs
++is unlikely.
++One of the original motivations behind it was the single-threaded nature of
++the X server \(em a user's X session could seem to \(oqfreeze up\(cq while
++the X server took a moment to rasterize a font.
++This problem with the X server, which remains single-threaded in all
++popular implementations to this day, has been mitigated on two fronts:
++machines have gotten much faster, and client-side font rendering
++(particularly via the Xft library) is the norm in contemporary software.
+ .SH AUTHORS
+ Dave Lemke, Network Computing Devices, Inc
+ .br
+ Keith Packard, Massachusetts Institute of Technology
++.SH "SEE ALSO"
++.BR X (__miscmansuffix__),
++.BR init (__adminmansuffix__),
++.BR syslog (__libmansuffix__),
++.IR "The X Font Service Protocol" ,
++.I Font Server Implementation Overview
--- xfs-1.0.4.orig/debian/patches/02_debian_setup.diff
+++ xfs-1.0.4/debian/patches/02_debian_setup.diff
@@ -0,0 +1,38 @@
+$Id: 906_debian_xfs.diff 428 2005-07-28 04:30:44Z dnusinow $
+
+Set up defaults that make more sense for Debian.
+
+This patch by Branden Robinson.
+
+Index: config.cpp
+===================================================================
+--- config.cpp.orig	2006-03-07 22:09:01.000000000 -0500
++++ config.cpp	2006-03-07 22:13:53.000000000 -0500
+@@ -1,15 +1,19 @@
+ XCOMM font server configuration file
+ XCOMM $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $
+ 
++XCOMM allow a maximum of 10 clients to connect to this font server
++client-limit = 10
++XCOMM when a font server reaches its limit, start up a new one
+ clone-self = on
+-use-syslog = off
+-catalogue = DEFAULTFONTPATH
++XCOMM log messages to FSERRORS (if syslog is not used)
+ error-file = FSERRORS
++XCOMM log errors using syslog
++use-syslog = on
++XCOMM turn off TCP port listening (Unix domain connections are still permitted)
++no-listen = tcp
++XCOMM paths to search for fonts
++catalogue = /usr/share/fonts/X11/misc/,/usr/share/fonts/X11/cyrillic/,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1/,/usr/share/fonts/X11/100dpi/,/usr/share/fonts/X11/75dpi/
+ XCOMM in decipoints
+ default-point-size = 120
+-default-resolutions = 75,75,100,100
+-
+-XCOMM font cache control, specified in KB
+-cache-hi-mark = 2048
+-cache-low-mark = 1433
+-cache-balance = 70
++XCOMM x1,y1,x2,y2,...
++default-resolutions = 100,100,75,75
--- xfs-1.0.4.orig/debian/patches/100_cve_2007_4568_QueryXBits.patch
+++ xfs-1.0.4/debian/patches/100_cve_2007_4568_QueryXBits.patch
@@ -0,0 +1,88 @@
+diff --git a/configure.ac b/configure.ac
+index 748b8ce..6924e10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,6 +41,8 @@ case $host_os in
+         ;;
+ esac
+ 
++AC_CHECK_HEADERS([stdint.h])
++
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XFS, libfs xfont xtrans)
+ XFS_CFLAGS="$XFS_CFLAGS $OS_CFLAGS"
+diff --git a/difs/dispatch.c b/difs/dispatch.c
+index f1a0a85..9a6b87c 100644
+--- a/difs/dispatch.c
++++ b/difs/dispatch.c
+@@ -933,6 +933,13 @@ ProcQueryXExtents(ClientPtr client)
+     }
+     item_size = (stuff->reqType == FS_QueryXExtents8) ? 1 : 2;
+ 
++    if (stuff->num_ranges >
++	 ((stuff->length << 2) - SIZEOF(fsQueryXExtents8Req))/item_size) {
++	int num_ranges = stuff->num_ranges;
++	SendErrToClient(client, FSBadLength, (pointer)&num_ranges);
++	return FSBadLength;
++    }
++		
+     /* get the extents */
+     err = QueryExtents(client, cfp, item_size,
+ 		       stuff->num_ranges, stuff->range,
+@@ -969,6 +976,12 @@ ProcQueryXBitmaps(ClientPtr client)
+     assert((stuff->reqType == FS_QueryXBitmaps8) || (stuff->reqType == FS_QueryXBitmaps16));
+     item_size = (stuff->reqType == FS_QueryXBitmaps8) ? 1 : 2;
+ 
++    if (stuff->num_ranges > 
++	((stuff->length << 2) - SIZEOF(fsQueryXBitmaps8Req))/item_size) {
++	int num_ranges = stuff->num_ranges;
++	SendErrToClient(client, FSBadLength, (pointer)&num_ranges);
++	return FSBadLength;
++    }
+     /* get the glyphs */
+     err = QueryBitmaps(client, cfp, item_size, stuff->format,
+ 		       stuff->num_ranges, stuff->range,
+diff --git a/difs/fontinfo.c b/difs/fontinfo.c
+index 23893e0..e7e627d 100644
+--- a/difs/fontinfo.c
++++ b/difs/fontinfo.c
+@@ -62,6 +62,21 @@ in this Software without prior written authorization from The Open Group.
+ #include	<swapreq.h>
+ #include	<swaprep.h>
+ 
++#ifdef HAVE_CONFIG_H
++#include	<config.h>
++#endif
++#ifdef HAVE_STDINT_H
++#include	<stdint.h>
++#endif
++#include	<limits.h>
++#ifndef SIZE_MAX
++# ifdef ULONG_MAX
++#  define SIZE_MAX ULONG_MAX
++# else
++#  define SIZE_MAX UINT_MAX
++# endif
++#endif
++
+ void
+ CopyCharInfo(
+     CharInfoPtr ci,
+@@ -181,6 +196,8 @@ build_range(
+ 	    return new;
+ 	}
+ 
++	if (src_num >= SIZE_MAX / sizeof(fsRange) * 2 - 1) 
++		return NULL;
+ 	np = new = (fsRange *) fsalloc(sizeof(fsRange) * (src_num + 1) / 2);
+ 	if (!np)
+ 	    return np;
+@@ -210,6 +227,8 @@ build_range(
+ 	unsigned char      *pp = src;
+ 
+ 	src_num = *num;
++	if (src_num >= SIZE_MAX / sizeof(fsRange)) 
++		return NULL;
+ 	np = new = (fsRange *) fsalloc(SIZEOF(fsRange) * src_num);
+ 	if (!np)
+ 	    return np;
--- xfs-1.0.4.orig/debian/patches/03_configurable_config_location.diff
+++ xfs-1.0.4/debian/patches/03_configurable_config_location.diff
@@ -0,0 +1,11 @@
+diff -Nur xfs-1.0.1.orig/Makefile.am xfs-1.0.1/Makefile.am
+--- xfs-1.0.1.orig/Makefile.am	2006-03-06 01:13:54.000000000 +0000
++++ xfs-1.0.1/Makefile.am	2006-04-29 16:03:07.000000000 +0000
+@@ -19,7 +19,7 @@
+ #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ #  PERFORMANCE OF THIS SOFTWARE.
+ 
+-configdir = $(libdir)/X11/fs
++configdir = $(sysconfdir)/X11/fs
+ 
+ bin_PROGRAMS = xfs
--- xfs-1.0.4.orig/debian/patches/series
+++ xfs-1.0.4/debian/patches/series
@@ -0,0 +1,4 @@
+01_xfs_fixes.diff -p0
+02_debian_setup.diff -p0
+03_configurable_config_location.diff -p1
+100_cve_2007_4568_QueryXBits.patch
--- xfs-1.0.4.orig/debian/xfs.postinst.in
+++ xfs-1.0.4/debian/xfs.postinst.in
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Debian xfs package post-installation script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfs.postinst.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=xfs
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+check_symlinks_and_bomb /usr/lib/X11/fs
+
+# now safe to finish migrations started in preinst
+if [ -e /usr/X11R6/lib/X11/fs.moved-by-preinst ] && \
+   [ -L /usr/X11R6/lib/X11/fs ]; then
+  rm -r /usr/X11R6/lib/X11/fs.moved-by-preinst
+fi
+if [ -e /etc/X11/xfs.moved-by-preinst ]; then
+  rm /etc/X11/xfs.moved-by-preinst
+fi
+
+# deal with a bug in very old versions of xbase
+for DIR in rc0.d rc1.d rc6.d; do
+  if [ -L "/etc/$DIR/K1xfs" ]; then
+    mv "/etc/$DIR/K1xfs" "/etc/$DIR/K01xfs"
+  fi
+done
+
+# Registering the init scripts or starting the daemon may cause output to
+# stdout, which can confuse debconf.
+db_stop
+
+if [ -e /etc/init.d/xfs ]; then
+  update-rc.d xfs defaults
+fi
+
+# If we are not installing, we may or may not need to restart the daemon, but we
+# always start the daemon on install.
+NOSTART=
+if ! [ -e /var/run/xfs.install ]; then
+  # Don't start the daemon if it wasn't stopped...
+  if [ -e /var/run/xfs.daemon-not-stopped ]; then
+    NOSTART=yes
+  fi
+  # ...or if the options file says not to.
+  if ! fgrep -qsx "restart-on-upgrade" /etc/X11/fs/xfs.options; then
+    NOSTART=yes
+  fi
+fi
+
+[ -n "$NOSTART" ] || invoke-rc.d xfs start || true
+
+#DEBHELPER#
+
+# Remove install flag file.  Leave the "daemon not stopped" flag file, if it
+# exists, so that it will be seen by the init script.
+rm -f /var/run/xfs.install
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
--- xfs-1.0.4.orig/debian/xfs.postrm.in
+++ xfs-1.0.4/debian/xfs.postrm.in
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Debian xfs package post-removal script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfs.postrm.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=xfs
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+  if [ -d /usr/X11R6/lib/X11/fs.moved-by-preinst ] && \
+     [ -L /usr/X11R6/lib/X11/fs ]; then
+    rm /usr/X11R6/lib/X11/fs
+    mv /usr/X11R6/lib/X11/fs.moved-by-preinst /usr/X11R6/lib/X11/fs
+  fi
+  if [ -e /etc/X11/xfs.moved-by-preinst ] && [ -d /etc/X11/fs ] && \
+     ! [ -e /etc/X11/xfs ]; then
+    mv /etc/X11/fs /etc/X11/xfs
+    rm /etc/X11/xfs.moved-by-preinst
+  fi
+
+fi
+
+if [ "$1" = "abort-install" ]; then
+  rm -f /var/run/xfs.install
+fi
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ]; then
+  update-rc.d xfs remove
+  if [ -d /etc/X11/fs ]; then
+    rm -r /etc/X11/fs
+  fi
+fi
+
+if [ "$1" = "abort-upgrade" ]; then
+  # NOTE: The following is copied from the postinst script and isn't necessary
+  # if dpkg executes a package's postinst script with the "configure" argument
+  # after unwinding from a failed upgrade.  (See section 6.5 of the Debian
+  # Policy Manual, "Details of unpack phase of installation or upgrade".)
+
+  # Don't start the daemon if it wasn't stopped...
+  if [ -e /var/run/xfs.daemon-not-stopped ]; then
+    NOSTART=yes
+  fi
+  # ...or if the options file says not to.
+  if ! fgrep -qsx "restart-on-upgrade" /etc/X11/fs/xfs.options; then
+    NOSTART=yes
+  fi
+
+  [ -n "$NOSTART" ] || invoke-rc.d xfs start || true
+
+  # Remove flag files.
+  rm -f /var/run/xfs.install /var/run/xfs.daemon-not-stopped
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
--- xfs-1.0.4.orig/debian/compat
+++ xfs-1.0.4/debian/compat
@@ -0,0 +1 @@
+4
--- xfs-1.0.4.orig/debian/xfs.init
+++ xfs-1.0.4/debian/xfs.init
@@ -0,0 +1,166 @@
+#!/bin/sh
+
+# $Id: xfs.init 189 2005-06-11 00:04:27Z branden $
+
+# Copyright 1998-2004 Branden Robinson <branden@debian.org>.
+#
+# This is free software; you may 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 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 with
+# the Debian operating system, in /usr/share/common-licenses/GPL;  if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+### BEGIN INIT INFO
+# Provides:          xfs
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      $network
+# Should-Stop:       $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      S 0 1 6
+### END INIT INFO
+
+set -e
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/usr/bin/xfs
+PIDFILE=/var/run/xfs.pid
+UPGRADEFILE=/var/run/xfs.daemon-not-stopped
+SOCKET_DIR=/tmp/.font-unix
+
+test -x $DAEMON || exit 0
+
+do_restorecon () {
+  # Restore file security context (SELinux).
+  if which restorecon >/dev/null 2>&1; then
+    restorecon "$1"
+  fi
+}
+
+set_up_socket_dir () {
+  echo -n "Setting up X font server socket directory $SOCKET_DIR..."
+  if [ -e $SOCKET_DIR ] && ! [ -d $SOCKET_DIR ]; then
+    mv $SOCKET_DIR $SOCKET_DIR.$$
+  fi
+  if ! [ -d $SOCKET_DIR ]; then
+    mkdir -m 1777 $SOCKET_DIR || :
+    do_restorecon $SOCKET_DIR || :
+  fi
+  echo "done."
+}
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2>/dev/null)" : "$DAEMON" >/dev/null \
+    2>&1; then
+    true
+  else
+    if [ -e $PIDFILE ]; then
+      echo -n " (removing stale $PIDFILE)"
+      rm $PIDFILE
+    fi
+    false
+  fi
+}
+
+# If we have upgraded the daemon since we last started it, we can't use the
+# --exec argument to start-stop-daemon, because the daemon's inode will have
+# changed.  The risk here is that in a situation where the daemon died, its
+# pidfile was not cleaned up, we've upgraded it, *and* some other process is now
+# running under that pid, start-stop-daemon will send signals to an innocent
+# process.  However, this seems like a corner case.  C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_START_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+  SSD_STOP_ARGS="--pidfile $PIDFILE --name ${DAEMON#**/}"
+else
+  SSD_START_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+  SSD_STOP_ARGS="$SSD_START_ARGS"
+fi
+
+case "$1" in
+  start)
+    set_up_socket_dir
+    echo -n "Starting X font server: xfs"
+    start-stop-daemon --start --quiet $SSD_START_ARGS -- -daemon \
+      || echo -n " already running"
+    echo "."
+  ;;
+
+  restart)
+    /etc/init.d/xfs stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/xfs start
+  ;;
+
+  reload)
+    echo -n "Reloading X font server configuration..."
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_STOP_ARGS; then
+      echo "done."
+    else
+      echo "xfs not running."
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/xfs reload
+  ;;
+
+  stop)
+    echo -n "Stopping X font server: xfs"
+    if ! [ -f $PIDFILE ]; then
+      echo " not running ($PIDFILE not found)"
+      # The daemon is not running; do not tell the maintainer scripts that it
+      # has not stopped.
+      rm -f $UPGRADEFILE
+    else
+      DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]')
+      KILLCOUNT=1
+      if ! [ -e $UPGRADEFILE ]; then
+        if start-stop-daemon --stop --quiet $SSD_STOP_ARGS; then
+          # give xfs's signal handler a second to catch its breath
+          sleep 1
+        else
+          echo -n " not running"
+        fi
+      fi
+      while [ $KILLCOUNT -le 5 ]; do
+        if stillrunning; then
+          kill $DAEMONPID
+        else
+          break
+        fi
+        sleep 1
+        KILLCOUNT=$(( $KILLCOUNT + 1 ))
+      done
+      if stillrunning; then
+        echo -n " not responding to TERM signal (pid $DAEMONPID)"
+      else
+        # The daemon is not running; do not tell the maintainer scripts that it
+        # has not stopped.
+        rm -f $UPGRADEFILE
+      fi
+    fi
+    echo "."
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/xfs {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
--- xfs-1.0.4.orig/debian/xfs.prerm.in
+++ xfs-1.0.4/debian/xfs.prerm.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+# Debian xfs package pre-removal script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfs.prerm.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=xfs
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+  upgrade|failed-upgrade)
+    REMOVING=
+    ;;
+  remove|deconfigure)
+    REMOVING=yes
+    ;;
+esac
+
+STOP=
+# Are we supposed to restart on upgrade?  If removing the package, we always
+# stop the daemon.
+if grep -qs ^restart-on-upgrade /etc/X11/fs/xfs.options || \
+   [ -n "$REMOVING" ]; then
+  STOP=yes
+fi
+
+if [ -n "$STOP" ]; then
+  invoke-rc.d xfs stop || true
+else
+  # Create a flag file that tells the postinst and postrm scripts that the
+  # daemon was not stopped.
+  : >/var/run/xfs.daemon-not-stopped
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
--- xfs-1.0.4.orig/debian/changelog
+++ xfs-1.0.4/debian/changelog
@@ -0,0 +1,74 @@
+xfs (1:1.0.4-2ubuntu1) gutsy; urgency=low
+
+  * CVE-2007-4568:  Added debian/patches/100_cve_2007_4568_QueryXBits.patch
+    to fix several vulnerabilities with QueryXBitmaps and QueryXExtents
+    protocol requests.  (Closes LP: #148940)
+  * debian/control: Set maintainer to Ubuntu
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 04 Oct 2007 15:18:29 -0700
+
+xfs (1:1.0.4-2) unstable; urgency=high
+
+  * High urgency upload for security fix.
+  * Fix race condition in the xfs init script (CVE-2007-3103).
+  * Remove obsolete information from README.Debian (closes: #376763).
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 19 Jul 2007 15:24:35 +0200
+
+xfs (1:1.0.4-1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * New upstream release.
+    + Update patch 01_xfs_fixes.diff.
+    + Install the manpage as xfs.1, not xfs.1x.
+  * Don't put debug symbols in a nonexistent xfs-dbg package
+    (closes: #424113).
+  * Fix substitutions in xfs(1). (closes: #406829).
+  * Bump Standards-Version to 3.7.2 (no changes).
+  * Add LSB dependency info in xfs.init (closes: #335389). Thanks, Petter
+    Reinholdtsen!
+
+  [ Brice Goglin ]
+  * Drop useless -DLIBXCURSOR from debian/rules.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 16 May 2007 13:50:33 +0200
+
+xfs (1:1.0.1-5) unstable; urgency=low
+
+  * Move config file back to /etc/X11/fs where it belongs. Thanks to Mike
+    Brodbelt, Otavio Salvador, and Margarita Manterola. Thanks to
+    Andreas Metzler for the patch. (closes: #362492)
+  * Run dh_install with --list-missing
+  * Add quilt to build-depends
+
+ -- David Nusinow <dnusinow@debian.org>  Mon,  8 May 2006 00:29:18 -0400
+
+xfs (1:1.0.1-4) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Tue,  4 Apr 2006 18:44:42 -0400
+
+xfs (1:1.0.1-3) experimental; urgency=low
+
+  * Provide the correct copyright info
+
+ -- David Nusinow <dnusinow@debian.org>  Wed,  8 Mar 2006 00:42:29 -0500
+
+xfs (1:1.0.1-2) experimental; urgency=low
+
+  * Provide all our old packaging infrastrcture that I totally forgot. Thanks
+    Rasmus Bøg Hansen. (closes: #355762)
+    + Update config.cpp patch for our font locations and remove the cache
+      options because they're not working
+
+ -- David Nusinow <dnusinow@debian.org>  Tue,  7 Mar 2006 22:14:35 -0500
+
+xfs (1:1.0.1-1) experimental; urgency=low
+
+  * First modular upload to Debian
+  * Port patches from trunk
+    + general/003b_xfs_fixes.diff
+    + debian/906_debian_xfs.diff
+
+ -- David Nusinow <dnusinow@debian.org>  Sun,  5 Mar 2006 20:12:51 -0500
--- xfs-1.0.4.orig/debian/rules
+++ xfs-1.0.4/debian/rules
@@ -0,0 +1,97 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian xfs package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow@debian.org>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# set this to the name of the main shlib's binary package
+PACKAGE = xfs
+
+include debian/xsfbs/xsfbs.mk
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+confflags += --enable-man-pages=3
+
+build: patch build-stamp
+build-stamp:
+	dh_testdir
+
+	mkdir obj-$(DEB_BUILD_GNU_TYPE)
+	cd obj-$(DEB_BUILD_GNU_TYPE) && \
+	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+	             --infodir=\$${prefix}/share/info \
+				 --sysconfdir=/etc $(confflags) \
+	             CFLAGS="$(CFLAGS)" 
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+
+	touch build-stamp
+
+clean: xsfclean
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	rm -f config.cache config.log config.status
+	rm -f */config.cache */config.log */config.status
+	rm -f conftest* */conftest*
+	rm -rf autom4te.cache */autom4te.cache
+	rm -rf obj-*
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs
+	dh_install --sourcedir=debian/tmp --list-missing
+	dh_installchangelogs
+	dh_installexamples
+	dh_installinit
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_makeshlibs
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- xfs-1.0.4.orig/debian/watch
+++ xfs-1.0.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xorg.freedesktop.org/releases/individual/app/ xfs-(.*)\.tar\.gz
--- xfs-1.0.4.orig/debian/xfs.README.Debian
+++ xfs-1.0.4/debian/xfs.README.Debian
@@ -0,0 +1,28 @@
+Debian README for xfs package
+=============================
+
+The default font catalogue for xfs as shipped with Debian GNU/Linux
+searches the "misc" font directory before searching "cyrillic".  Some fonts
+in both of these directories claim the same font alias names (like
+"fixed").  Therefore, the X font server will use whichever font it finds
+first with that alias.  To preferentially use Cyrillic fonts instead of the
+Latin ones in misc, simply switch the order in which the paths appear in
+the xfs font catalogue, defined in /etc/X11/fs/config.
+
+Also, be aware that, as of xfs 3.3.3.1-3, the default xfs configuration has
+TCP port listening disabled for security reasons.  If you have xfs serving
+fonts to remote hosts via TCP, you will need to re-enable TCP connections;
+you can do this by simply commenting out the "no-listen = tcp" line in
+/etc/X11/fs/config.
+
+To use xfs you must add it to the X server's FontPath, in the "Files" section
+of your xorg.conf file.
+
+Section "Files"
+	FontPath	"unix/:7100"
+EndSection
+
+For information on the /etc/X11/fs/config file, see the xfs(1)
+manual page.
+
+vim:set ai et sts=4 sw=4 tw=80:
--- xfs-1.0.4.orig/debian/xfs.install
+++ xfs-1.0.4/debian/xfs.install
@@ -0,0 +1,3 @@
+usr/bin/xfs
+usr/share/man/man1/xfs.1
+etc/X11/fs/config
--- xfs-1.0.4.orig/debian/control
+++ xfs-1.0.4/debian/control
@@ -0,0 +1,22 @@
+Source: xfs
+Section: x11
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libxfont-dev (>= 1:1.0.0-1), xtrans-dev (>= 1.0.0-1), quilt
+Standards-Version: 3.7.2
+
+Package: xfs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-base, xfonts-scalable
+Description: X font server
+ xfs is a daemon that listens on a network port and serves X fonts to X
+ servers (and thus to X clients).  All X servers have the ability to serve
+ locally installed fonts for themselves, but xfs makes it possible to offload
+ that job from the X server, and/or have a central repository of fonts on a
+ networked machine running xfs so that all the machines running X servers on a
+ network do not require their own set of fonts.  xfs may also be invoked by
+ users to, for instance, make available X fonts in user accounts that are not
+ available to the X server or to an already running system xfs.
--- xfs-1.0.4.orig/debian/xsfbs/xsfbs.mk
+++ xfs-1.0.4/debian/xsfbs/xsfbs.mk
@@ -0,0 +1,388 @@
+#!/usr/bin/make -f
+
+# Debian X Strike Force Build System (XSFBS): Make portion
+
+# Copyright 1996 Stephen Early
+# Copyright 1997 Mark Eichin
+# Copyright 1998-2005, 2007 Branden Robinson
+# Copyright 2005 David Nusinow
+#
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+# Originally by Stephen Early <sde1000@debian.org>
+# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us>
+# Modified by Adam Heath <doogie@debian.org>
+# Modified by Branden Robinson <branden@debian.org>
+# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net>
+# Modified by David Nusinow <dnusinow@debian.org>
+# Acknowledgements to Manoj Srivastava.
+
+# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
+export DH_OPTIONS
+
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
+# Set up parameters for the upstream build environment.
+
+# Determine (source) package name from Debian changelog.
+SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \
+                        | grep '^Source:' | awk '{print $$2}')
+
+# Determine package version from Debian changelog.
+SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \
+                        | grep '^Version:' | awk '{print $$2}')
+
+# Determine upstream version number.
+UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//')
+
+# Determine the source version without the epoch for make-orig-tar-gz
+NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
+
+# Figure out who's building this package.
+BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
+
+# Find out if this is an official build; an official build has nothing but
+# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# version number.  Anything else indicates an unofficial build.
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
+
+# Set up parameters for the Debian build environment.
+
+# Determine our architecture.
+BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# Work around some old-time dpkg braindamage.
+BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH))
+# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy.
+ifdef DEB_HOST_ARCH
+ ARCH:=$(DEB_HOST_ARCH)
+else
+ # dpkg-cross sets the ARCH environment variable; if set, use it.
+ ifdef ARCH
+  ARCH:=$(ARCH)
+ else
+  ARCH:=$(BUILD_ARCH)
+ endif
+endif
+
+# $(STAMP_DIR) houses stamp files for complex targets.
+STAMP_DIR:=stampdir
+
+# $(SOURCE_DIR) houses one or more source trees.
+SOURCE_DIR:=build-tree
+
+# $(SOURCE_TREE) is the location of the source tree to be compiled.  If there
+# is more than one, others are found using this name plus a suffix to indicate
+# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom).  The
+# "setup" target is responsible for creating such trees.
+#SOURCE_TREE:=$(SOURCE_DIR)/xc
+#FIXME We need to define this in our debian/rules file
+
+# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
+# their files.
+DEBTREEDIR:=$(CURDIR)/debian/tmp
+
+# All "important" targets have four lines:
+#   1) A target name that is invoked by a package-building tool or the user.
+#      This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart.
+#   2) A line delcaring 1) as a phony target (".PHONY:").
+#   3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may
+#   depend on other targets.
+#   4) A line declaring 3) as a member of the $(stampdir_targets) variable; the
+#   "$(STAMP_DIR)/" prefix is omitted.
+#
+# This indirection is needed so that the "stamp" files that signify when a rule
+# is done can be located in a separate "stampdir".  Recall that make has no way
+# to know when a goal has been met for a phony target (like "build" or
+# "install").
+#
+# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@"
+# so that the target will not be run again.  Removing the file will make Make
+# run the target over.
+
+# All phony targets should be declared as dependencies of .PHONY, even if they
+# do not have "($STAMP_DIR)/"-prefixed counterparts.
+
+# Define a harmless default rule to keep things from going nuts by accident.
+.PHONY: default
+default:
+
+# Set up the $(STAMP_DIR) directory.
+.PHONY: stampdir
+stampdir_targets+=stampdir
+stampdir: $(STAMP_DIR)/stampdir
+$(STAMP_DIR)/stampdir:
+	mkdir $(STAMP_DIR)
+	>$@
+
+# Set up the package build directory as quilt expects to find it.
+.PHONY: prepare
+stampdir_targets+=prepare
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+	if [ ! -e $(STAMP_DIR)/patches ]; then \
+		mkdir $(STAMP_DIR)/patches; \
+		ln -s $(STAMP_DIR)/patches .pc; \
+		echo 2 >$(STAMP_DIR)/patches/.version; \
+	fi; \
+	if [ ! -e $(STAMP_DIR)/log ]; then \
+		mkdir $(STAMP_DIR)/log; \
+	fi; \
+	if [ -e debian/patches ] && [ ! -e patches ]; then \
+		ln -s debian/patches patches; \
+	fi; \
+	>$@
+
+# Apply all patches to the upstream source.
+.PHONY: patch
+stampdir_targets+=patch
+patch: $(STAMP_DIR)/patch
+$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
+	if ! [ `which quilt` ]; then \
+		echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
+		exit 1; \
+	fi; \
+	if $(QUILT) next >/dev/null 2>&1; then \
+	  echo -n "Applying patches..."; \
+	  if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+	    cat $(STAMP_DIR)/log/patch; \
+	    echo "successful."; \
+	  else \
+	    cat $(STAMP_DIR)/log/patch; \
+	    echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
+	    exit 1; \
+	  fi; \
+	else \
+	  echo "No patches to apply"; \
+	fi; \
+	>$@
+
+# Revert all patches to the upstream source.
+.PHONY: unpatch
+unpatch:
+	rm -f $(STAMP_DIR)/patch
+	@echo -n "Unapplying patches..."; \
+	if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+	  if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+	    cat $(STAMP_DIR)/log/unpatch; \
+	    echo "successful."; \
+	  else \
+	    cat $(STAMP_DIR)/log/unpatch; \
+	    echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
+	    exit 1; \
+	  fi; \
+	else \
+	  echo "nothing to do."; \
+	fi
+
+# Clean the generated maintainer scripts.
+.PHONY: cleanscripts
+cleanscripts:
+	rm -f $(STAMP_DIR)/genscripts
+	rm -f debian/*.config \
+	      debian/*.postinst \
+	      debian/*.postrm \
+	      debian/*.preinst \
+	      debian/*.prerm
+
+# Clean the package build tree.
+.PHONY: xsfclean
+xsfclean: cleanscripts unpatch
+	dh_testdir
+	rm -f .pc patches
+	rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+	rm -rf imports
+	dh_clean debian/shlibs.local \
+	         debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
+	         debian/po/pothead
+
+# Generate the debconf templates POT file header.
+debian/po/pothead: debian/po/pothead.in
+	sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
+	  -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
+
+# Update POT and PO files.
+.PHONY: updatepo
+updatepo: debian/po/pothead
+	debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+
+# Use the MANIFEST files to determine whether we're shipping everything we
+# expect to ship, and not shipping anything we don't expect to ship.
+.PHONY: check-manifest
+stampdir_targets+=check-manifest
+check-manifest: $(STAMP_DIR)/check-manifest
+$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
+	# Compare manifests.
+	(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \
+	  >debian/MANIFEST.$(ARCH).new
+	# Construct MANIFEST files from MANIFEST.$(ARCH).in and
+	# MANIFEST.$(ARCH).all or MANIFEST.all.
+	if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \
+	  : "-DBuildFonts=NO" >/dev/null 2>&1; then \
+	  LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
+	else \
+	  if [ -e debian/MANIFEST.$(ARCH).all ]; then \
+	    LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
+	  else \
+	    LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \
+	  fi; \
+	fi
+	# Confirm that the installed file list has not changed.
+	if [ -e debian/MANIFEST.$(ARCH) ]; then \
+	  if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then \
+	    diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new || DIFFSTATUS=$$?; \
+	    case $${DIFFSTATUS:-0} in \
+	      0) ;; \
+	      1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
+	           echo 'MANIFEST check failed; ignoring problem because \$$IGNORE_MANIFEST_CHANGES set' >&2; \
+	           echo 'Please ensure that the package maintainer has an up-to-date version of the' >&2; \
+	           echo 'MANIFEST.$(ARCH).in file.' >&2; \
+	         else \
+	           echo 'MANIFEST check failed; please see debian/README' >&2; \
+	           exit 1; \
+	         fi; \
+	         ;; \
+	      *) echo "diff reported unexpected exit status $$DIFFSTATUS when performing MANIFEST check" >&2; \
+	         exit 1; \
+	         ;; \
+	    esac; \
+	  fi; \
+	fi
+	>$@
+
+# Because we build (and install) different files depending on whether or not
+# any architecture-independent packages are being created, the list of files we
+# expect to see will differ; see the discussion of the "build" target above.
+.PHONY: check-manifest-arch check-manifest-indep
+check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO -DInstallHardcopyDocs=NO
+check-manifest-arch: check-manifest
+check-manifest-indep: check-manifest
+
+# Remove files from the upstream source tree that we don't need, or which have
+# licensing problems.  It must be run before creating the .orig.tar.gz.
+#
+# Note: This rule is for Debian package maintainers' convenience, and is not
+# needed for conventional build scenarios.
+.PHONY: prune-upstream-tree
+prune-upstream-tree:
+	# Ensure we're in the correct directory.
+	dh_testdir
+	grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
+
+# Change to what should be the correct directory, ensure it is, and if
+# so, create the .orig.tar.gz file.  Exclude the debian directory and its
+# contents, and any .svn directories and their contents (so that we can safely
+# build an .orig.tar.gz from SVN checkout, not just an export).
+#
+# Note: This rule is for Debian package maintainers' convenience, and is not
+# needed for conventional build scenarios.
+#
+# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
+# for the rare situations when one is needed.
+.PHONY: make-orig-tar-gz
+make-orig-tar-gz: clean prune-upstream-tree
+	( cd .. \
+	  && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \
+	    echo "Our current working directory has the wrong name. Renaming..." >&2; \
+		mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \
+	  fi; \
+	    tar --exclude=debian --exclude=debian/* \
+	        --exclude=.svn --exclude=.svn/* \
+	        -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \
+	    | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \
+	   )
+
+# Verify that there are no offsets or fuzz in the patches we apply.
+#
+# Note: This rule is for Debian package maintainers' convenience, and is not
+# needed for conventional build scenarios.
+.PHONY: patch-audit
+patch-audit: prepare unpatch
+	@echo -n "Auditing patches..."; \
+	>$(STAMP_DIR)/log/patch; \
+	FUZZY=; \
+	while [ -n "$$($(QUILT) next)" ]; do \
+	  RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+	  case "$$RESULT" in \
+	    succeeded) \
+	      echo "fuzzy patch: $$($(QUILT) top)" \
+	        | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
+	      FUZZY=yes; \
+	      ;; \
+	    FAILED) \
+	      echo "broken patch: $$($(QUILT) next)" \
+	        | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
+	      exit 1; \
+	      ;; \
+	  esac; \
+	done; \
+	if [ -n "$$FUZZY" ]; then \
+	  echo "there were fuzzy patches; please fix."; \
+	  exit 1; \
+	else \
+	  echo "done."; \
+	fi
+
+# Generate the maintainer scripts.
+.PHONY: genscripts
+stampdir_targets+=genscripts
+genscripts: $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
+	for FILE in debian/*.config.in \
+	            debian/*.postinst.in \
+	            debian/*.postrm.in \
+	            debian/*.preinst.in \
+	            debian/*.prerm.in; do \
+	  if [ -e "$$FILE" ]; then \
+	    MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \
+	    sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \
+	      | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \
+	    cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \
+	    sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \
+	      | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
+	    sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
+	        -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
+	        -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
+	      <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
+	    rm $$MAINTSCRIPT.tmp; \
+	  fi; \
+	done
+	# Validate syntax of generated shell scripts.
+	#sh debian/scripts/validate-posix-sh debian/*.config \
+	#                                    debian/*.postinst \
+	#                                    debian/*.postrm \
+	#                                    debian/*.preinst \
+	#                                    debian/*.prerm
+	>$@
+
+# Generate the shlibs.local file.
+debian/shlibs.local:
+	cat debian/*.shlibs >$@
+
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERMINVERS),)
+	@echo error: xserver-xorg-dev needs to be installed
+	@exit 1
+else
+	echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+	echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+endif
+
+include debian/xsfbs/xsfbs-autoreconf.mk
+
+# vim:set noet ai sts=8 sw=8 tw=0:
--- xfs-1.0.4.orig/debian/xsfbs/xsfbs.sh
+++ xfs-1.0.4/debian/xsfbs/xsfbs.sh
@@ -0,0 +1,907 @@
+# $Id$
+
+# This is the X Strike Force shell library for X Window System package
+# maintainer scripts.  It serves to define shell functions commonly used by
+# such packages, and performs some error checking necessary for proper operation
+# of those functions.  By itself, it does not "do" much; the maintainer scripts
+# invoke the functions defined here to accomplish package installation and
+# removal tasks.
+
+# If you are reading this within a Debian package maintainer script (e.g.,
+# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# skip past this library by scanning forward in this file to the string
+# "GOBSTOPPER".
+
+SOURCE_VERSION=@SOURCE_VERSION@
+OFFICIAL_BUILD=@OFFICIAL_BUILD@
+
+# Use special abnormal exit codes so that problems with this library are more
+# easily tracked down.
+SHELL_LIB_INTERNAL_ERROR=86
+SHELL_LIB_THROWN_ERROR=74
+SHELL_LIB_USAGE_ERROR=99
+
+# old -> new variable names
+if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then
+  DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE"
+fi
+if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then
+  DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF"
+fi
+
+# initial sanity checks
+if [ -z "$THIS_PACKAGE" ]; then
+  cat >&2 <<EOF
+Error: package maintainer script attempted to use shell library without
+definining \$THIS_PACKAGE shell variable.  Please report the package name,
+version, and the text of this error message to the Debian Bug Tracking System.
+Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for
+instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the
+"doc-debian" package, or install the "reportbug" package and use the command of
+the same name to file a report against version $SOURCE_VERSION of this package.
+EOF
+  exit $SHELL_LIB_USAGE_ERROR
+fi
+
+if [ -z "$THIS_SCRIPT" ]; then
+  cat >&2 <<EOF
+Error: package maintainer script attempted to use shell library without
+definining \$THIS_SCRIPT shell variable.  Please report the package name,
+version, and the text of this error message to the Debian Bug Tracking System.
+Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for
+instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the
+"doc-debian" package, or install the "reportbug" package and use the command of
+the same name to file a report against version $SOURCE_VERSION of the
+"$THIS_PACKAGE" package.
+EOF
+  exit $SHELL_LIB_USAGE_ERROR
+fi
+
+ARCHITECTURE="$(dpkg --print-installation-architecture)"
+
+LAPTOP=""
+if [ -n "$(which laptop-detect)" ]; then
+    if laptop-detect >/dev/null; then
+	LAPTOP=true
+    fi
+fi
+
+if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+  RECONFIGURE="true"
+else
+  RECONFIGURE=
+fi
+
+if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then
+  FIRSTINST="yes"
+fi
+
+if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then
+  UPGRADE="yes"
+fi
+
+trap "message;\
+      message \"Received signal.  Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\
+      message;\
+      exit 1" HUP INT QUIT TERM
+
+reject_nondigits () {
+  # syntax: reject_nondigits [ operand ... ]
+  #
+  # scan operands (typically shell variables whose values cannot be trusted) for
+  # characters other than decimal digits and barf if any are found
+  while [ -n "$1" ]; do
+    # does the operand contain anything but digits?
+    if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then
+      # can't use die(), because it wraps message() which wraps this function
+      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \
+           "possibly malicious garbage \"$1\"" >&2
+      exit $SHELL_LIB_THROWN_ERROR
+    fi
+    shift
+  done
+}
+
+reject_whitespace () {
+  # syntax: reject_whitespace [ operand ]
+  #
+  # scan operand (typically a shell variable whose value cannot be trusted) for
+  # whitespace characters and barf if any are found
+  if [ -n "$1" ]; then
+    # does the operand contain any whitespace?
+    if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
+      # can't use die(), because I want to avoid forward references
+      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
+           "possibly malicious garbage \"$1\"" >&2
+      exit $SHELL_LIB_THROWN_ERROR
+    fi
+  fi
+}
+
+reject_unlikely_path_chars () {
+  # syntax: reject_unlikely_path_chars [ operand ... ]
+  #
+  # scan operands (typically shell variables whose values cannot be trusted) for
+  # characters unlikely to be seen in a path and which the shell might
+  # interpret and barf if any are found
+  while [ -n "$1" ]; do
+    # does the operand contain any funny characters?
+    if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then
+      # can't use die(), because I want to avoid forward references
+      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \
+           "encountered possibly malicious garbage \"$1\"" >&2
+      exit $SHELL_LIB_THROWN_ERROR
+    fi
+    shift
+  done
+}
+
+# Query the terminal to establish a default number of columns to use for
+# displaying messages to the user.  This is used only as a fallback in the
+# event the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while
+# the script is running, and this cannot, only being calculated once.)
+DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true
+if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then
+  DEFCOLUMNS=80
+fi
+
+message () {
+  # pretty-print messages of arbitrary length
+  reject_nondigits "$COLUMNS"
+  echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2
+}
+
+observe () {
+  # syntax: observe message ...
+  #
+  # issue observational message suitable for logging someday when support for
+  # it exists in dpkg
+  if [ -n "$DEBUG_XORG_PACKAGE" ]; then
+    message "$THIS_PACKAGE $THIS_SCRIPT note: $*"
+  fi
+}
+
+warn () {
+  # syntax: warn message ...
+  #
+  # issue warning message suitable for logging someday when support for
+  # it exists in dpkg; also send to standard error
+  message "$THIS_PACKAGE $THIS_SCRIPT warning: $*"
+}
+
+die () {
+  # syntax: die message ...
+  #
+  # exit script with error message
+  message "$THIS_PACKAGE $THIS_SCRIPT error: $*"
+  exit $SHELL_LIB_THROWN_ERROR
+}
+
+internal_error () {
+  # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
+  message "internal error: $*"
+  if [ -n "$OFFICIAL_BUILD" ]; then
+    message "Please report a bug in the $THIS_SCRIPT script of the" \
+            "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \
+            "Tracking System.  Include all messages above that mention the" \
+            "$THIS_PACKAGE package.  Visit " \
+            "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \
+            "instructions, read the file" \
+            "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \
+            "package, or install the reportbug package and use the command of" \
+            "the same name to file a report."
+  fi
+  exit $SHELL_LIB_INTERNAL_ERROR
+}
+
+usage_error () {
+  message "usage error: $*"
+  message "Please report a bug in the $THIS_SCRIPT script of the" \
+          "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \
+          "Tracking System.  Include all messages above that mention the" \
+          "$THIS_PACKAGE package.  Visit " \
+          "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \
+          "instructions, read the file" \
+          "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \
+          "package, or install the reportbug package and use the command of" \
+          "the same name to file a report."
+  exit $SHELL_LIB_USAGE_ERROR
+}
+
+
+maplink () {
+  # returns what symlink should point to; i.e., what the "sane" answer is
+  # Keep this in sync with the debian/*.links files.
+  # This is only needed for symlinks to directories.
+  #
+  # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
+  # If we've stopped using this function, fixing it might enable us to re-enable
+  # it again and catch more errors.
+  case "$1" in
+    /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
+    /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
+    /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
+    /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
+    /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
+    /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
+    /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
+    /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
+    /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
+    /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
+    /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
+    /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
+    /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
+    /usr/bin/X11) echo ../X11R6/bin ;;
+    /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
+    /usr/include/X11) echo ../X11R6/include/X11 ;;
+    /usr/lib/X11) echo ../X11R6/lib/X11 ;;
+    *) internal_error "maplink() called with unknown path \"$1\"" ;;
+  esac
+}
+
+analyze_path () {
+  # given a supplied set of pathnames, break each one up by directory and do an
+  # ls -dl on each component, cumulatively; i.e.
+  # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
+  # Thanks to Randolph Chung for this clever hack.
+
+  #local f g
+
+  while [ -n "$1" ]; do
+    reject_whitespace "$1"
+    _g=
+    message "Analyzing $1:"
+    for _f in $(echo "$1" | tr / \  ); do
+      if [ -e /$_g$_f ]; then
+        ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true
+        _g=$_g$_f/
+      else
+        message "/$_g$_f: nonexistent; directory contents of /$_g:"
+        ls -l /$_g
+        break
+      fi
+    done
+    shift
+  done
+}
+
+find_culprits () {
+  #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
+  #  msg
+
+  reject_whitespace "$1"
+  message "Searching for overlapping packages..."
+  _dpkg_info_dir=/var/lib/dpkg/info
+  if [ -d $_dpkg_info_dir ]; then
+    if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then
+      _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \
+        "(xbase-clients|x11-common|xfs|xlibs)")
+      if [ -n "$_possible_culprits" ]; then
+        _smoking_guns=$(grep -l "$1" $_possible_culprits || true)
+        if [ -n "$_smoking_guns" ]; then
+          _bad_packages=$(printf "\\n")
+          for f in $_smoking_guns; do
+            # too bad you can't nest parameter expansion voodoo
+            p=${f%*.list}      # strip off the trailing ".list"
+            _package=${p##*/}   # strip off the directories
+            _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package")
+          done
+          _msg=$(cat <<EOF
+The following packages appear to have file overlaps with the X.Org packages;
+these packages are either very old, or in violation of Debian Policy.  Try
+upgrading each of these packages to the latest available version if possible:
+for example, with the command "apt-get install".  If no newer version of a
+package is available, you will have to remove it; for example, with the command
+"apt-get remove".  If even the latest available version of the package has
+this file overlap, please file a bug against that package with the Debian Bug
+Tracking System.  You may want to refer the package maintainer to section 12.8
+of the Debian Policy manual.
+EOF
+)
+          message "$_msg"
+          message "The overlapping packages are: $_bad_packages"
+        else
+          message "no overlaps found."
+        fi
+      fi
+    else
+      message "cannot search; no matches for $_dpkg_info_dir/*.list."
+    fi
+  else
+    message "cannot search; $_dpkg_info_dir does not exist."
+  fi
+}
+
+# we require a readlink command or shell function
+if ! which readlink > /dev/null 2>&1; then
+  message "The readlink command was not found.  Please install version" \
+          "1.13.1 or later of the debianutils package."
+  readlink () {
+    # returns what symlink in $1 actually points to
+    perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
+  }
+fi
+
+check_symlink () {
+  # syntax: check_symlink symlink
+  #
+  # See if specified symlink points where it is supposed to.  Return 0 if it
+  # does, and 1 if it does not.
+  #
+  # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
+
+  #local symlink
+
+  # validate arguments
+  if [ $# -ne 1 ]; then
+    usage_error "check_symlink() called with wrong number of arguments;" \
+                "expected 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _symlink="$1"
+
+  if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+check_symlinks_and_warn () {
+  # syntax: check_symlinks_and_warn symlink ...
+  #
+  # For each argument, check for symlink sanity, and warn if it isn't sane.
+  #
+  # Call this function from a preinst script in the event $1 is "upgrade" or
+  # "install".
+
+  #local errmsg symlink
+
+  # validate arguments
+  if [ $# -lt 1 ]; then
+    usage_error "check_symlinks_and_warn() called with wrong number of" \
+                "arguments; expected at least 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  while [ -n "$1" ]; do
+    _symlink="$1"
+    if [ -L "$_symlink" ]; then
+      if ! check_symlink "$_symlink"; then
+        observe "$_symlink symbolic link points to wrong location" \
+                "$(readlink "$_symlink"); removing"
+        rm "$_symlink"
+      fi
+    elif [ -e "$_symlink" ]; then
+      _errmsg="$_symlink exists and is not a symbolic link; this package cannot"
+      _errmsg="$_errmsg be installed until this"
+      if [ -f "$_symlink" ]; then
+        _errmsg="$_errmsg file"
+      elif [ -d "$_symlink" ]; then
+        _errmsg="$_errmsg directory"
+      else
+        _errmsg="$_errmsg thing"
+      fi
+      _errmsg="$_errmsg is removed"
+      die "$_errmsg"
+    fi
+    shift
+  done
+}
+
+check_symlinks_and_bomb () {
+  # syntax: check_symlinks_and_bomb symlink ...
+  #
+  # For each argument, check for symlink sanity, and bomb if it isn't sane.
+  #
+  # Call this function from a postinst script.
+
+  #local problem symlink
+
+  # validate arguments
+  if [ $# -lt 1 ]; then
+    usage_error "check_symlinks_and_bomb() called with wrong number of"
+                "arguments; expected at least 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  while [ -n "$1" ]; do
+    _problem=
+    _symlink="$1"
+    if [ -L "$_symlink" ]; then
+      if ! check_symlink "$_symlink"; then
+        _problem=yes
+        warn "$_symlink symbolic link points to wrong location" \
+             "$(readlink "$_symlink")"
+      fi
+    elif [ -e "$_symlink" ]; then
+      _problem=yes
+      warn "$_symlink is not a symbolic link"
+    else
+      _problem=yes
+      warn "$_symlink symbolic link does not exist"
+    fi
+    if [ -n "$_problem" ]; then
+      analyze_path "$_symlink" "$(readlink "$_symlink")"
+      find_culprits "$_symlink"
+      die "bad symbolic links on system"
+    fi
+    shift
+  done
+}
+
+font_update () {
+  # run $UPDATECMDS in $FONTDIRS
+
+  #local dir cmd shortcmd x_font_dir_prefix
+
+  _x_font_dir_prefix="/usr/share/fonts/X11"
+
+  if [ -z "$UPDATECMDS" ]; then
+    usage_error "font_update() called but \$UPDATECMDS not set"
+  fi
+  if [ -z "$FONTDIRS" ]; then
+    usage_error "font_update() called but \$FONTDIRS not set"
+  fi
+
+  reject_unlikely_path_chars "$UPDATECMDS"
+  reject_unlikely_path_chars "$FONTDIRS"
+
+  for _dir in $FONTDIRS; do
+    if [ -d "$_x_font_dir_prefix/$_dir" ]; then
+      for _cmd in $UPDATECMDS; do
+        if which "$_cmd" > /dev/null 2>&1; then
+          _shortcmd=${_cmd##*/}
+          observe "running $_shortcmd in $_dir font directory"
+	  _cmd_opts=
+          if [ "$_shortcmd" = "update-fonts-alias" ]; then
+            _cmd_opts=--x11r7-layout
+          fi
+          if [ "$_shortcmd" = "update-fonts-dir" ]; then
+            _cmd_opts=--x11r7-layout
+          fi
+          if [ "$_shortcmd" = "update-fonts-scale" ]; then
+            _cmd_opts=--x11r7-layout
+          fi
+          $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \
+                              "failed; font directory data may not" \
+                              "be up to date"
+        else
+          warn "$_cmd not found; not updating corresponding $_dir font" \
+               "directory data"
+        fi
+      done
+    else
+      warn "$_dir is not a directory; not updating font directory data"
+    fi
+  done
+}
+
+remove_conffile_prepare () {
+  # syntax: remove_conffile_prepare filename official_md5sum ...
+  #
+  # Check a conffile "filename" against a list of canonical MD5 checksums.
+  # If the file's current MD5 checksum matches one of the "official_md5sum"
+  # operands provided, then prepare the conffile for removal from the system.
+  # We defer actual deletion until the package is configured so that we can
+  # roll this operation back if package installation fails.
+  #
+  # Call this function from a preinst script in the event $1 is "upgrade" or
+  # "install" and verify $2 to ensure the package is being upgraded from a
+  # version (or installed over a version removed-but-not-purged) prior to the
+  # one in which the conffile was obsoleted.
+
+  #local conffile current_checksum
+
+  # validate arguments
+  if [ $# -lt 2 ]; then
+    usage_error "remove_conffile_prepare() called with wrong number of" \
+                "arguments; expected at least 2, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _conffile="$1"
+  shift
+
+  # does the _conffile even exist?
+  if [ -e "$_conffile" ]; then
+    # calculate its checksum
+    _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//')
+    # compare it to each supplied checksum
+    while [ -n "$1" ]; do
+      if [ "$_current_checksum" = "$1" ]; then
+        # we found a match; move the confffile and stop looking
+        observe "preparing obsolete conffile $_conffile for removal"
+        mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp"
+        break
+      fi
+      shift
+    done
+  fi
+}
+
+remove_conffile_commit () {
+  # syntax: remove_conffile_commit filename
+  #
+  # Complete the removal of a conffile "filename" that has become obsolete.
+  #
+  # Call this function from a postinst script after having used
+  # remove_conffile_prepare() in the preinst.
+
+  #local conffile
+
+  # validate arguments
+  if [ $# -ne 1 ]; then
+    usage_error "remove_conffile_commit() called with wrong number of" \
+                "arguments; expected 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _conffile="$1"
+
+  # if the temporary file created by remove_conffile_prepare() exists, remove it
+  if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then
+    observe "committing removal of obsolete conffile $_conffile"
+    rm "$_conffile.$THIS_PACKAGE-tmp"
+  fi
+}
+
+remove_conffile_rollback () {
+  # syntax: remove_conffile_rollback filename
+  #
+  # Roll back the removal of a conffile "filename".
+  #
+  # Call this function from a postrm script in the event $1 is "abort-upgrade"
+  # or "abort-install" is  after having used remove_conffile_prepare() in the
+  # preinst.
+
+  #local conffile
+
+  # validate arguments
+  if [ $# -ne 1 ]; then
+    usage_error "remove_conffile_rollback() called with wrong number of" \
+                "arguments; expected 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _conffile="$1"
+
+  # if the temporary file created by remove_conffile_prepare() exists, move it
+  # back
+  if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then
+    observe "rolling back removal of obsolete conffile $_conffile"
+    mv "$_conffile.$THIS_PACKAGE-tmp" "$_conffile"
+  fi
+}
+
+replace_conffile_with_symlink_prepare () {
+  # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \
+  # official_md5sum ...
+  #
+  # Check a conffile "oldfilename" against a list of canonical MD5 checksums.
+  # If the file's current MD5 checksum matches one of the "official_md5sum"
+  # operands provided, then prepare the conffile for removal from the system.
+  # We defer actual deletion until the package is configured so that we can
+  # roll this operation back if package installation fails. Otherwise copy it
+  # to newfilename and let dpkg handle it through conffiles mechanism.
+  #
+  # Call this function from a preinst script in the event $1 is "upgrade" or
+  # "install" and verify $2 to ensure the package is being upgraded from a
+  # version (or installed over a version removed-but-not-purged) prior to the
+  # one in which the conffile was obsoleted.
+
+  #local conffile current_checksum
+
+  # validate arguments
+  if [ $# -lt 3 ]; then
+    usage_error "replace_conffile_with_symlink_prepare() called with wrong" \
+                " number of arguments; expected at least 3, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _oldconffile="$1"
+  shift
+  _newconffile="$1"
+  shift
+
+  remove_conffile_prepare "$_oldconffile" "$@"
+  # If $_oldconffile still exists, then md5sums didn't match.
+  # Copy it to new one.
+  if [ -f "$_oldconffile" ]; then
+    cp "$_oldconffile" "$_newconffile"
+  fi
+
+}
+
+replace_conffile_with_symlink_commit () {
+  # syntax: replace_conffile_with_symlink_commit oldfilename
+  #
+  # Complete the removal of a conffile "oldfilename" that has been
+  # replaced by a symlink.
+  #
+  # Call this function from a postinst script after having used
+  # replace_conffile_with_symlink_prepare() in the preinst.
+
+  #local conffile
+
+  # validate arguments
+  if [ $# -ne 1 ]; then
+    usage_error "replace_conffile_with_symlink_commit() called with wrong" \
+                "number of arguments; expected 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _conffile="$1"
+
+  remove_conffile_commit "$_conffile"
+}
+
+replace_conffile_with_symlink_rollback () {
+  # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename
+  #
+  # Roll back the replacing of a conffile "oldfilename" with symlink to
+  # "newfilename".
+  #
+  # Call this function from a postrm script in the event $1 is "abort-upgrade"
+  # or "abort-install" and verify $2 to ensure the package failed to upgrade
+  # from a version (or install over a version removed-but-not-purged) prior
+  # to the one in which the conffile was obsoleted.
+  # You should have  used replace_conffile_with_symlink_prepare() in the
+  # preinst.
+
+  #local conffile
+
+  # validate arguments
+  if [ $# -ne 2 ]; then
+    usage_error "replace_conffile_with_symlink_rollback() called with wrong" \
+                "number of arguments; expected 2, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  _oldconffile="$1"
+  _newconffile="$2"
+
+  remove_conffile_rollback "$_oldconffile"
+  if [ -f "$_newconffile" ]; then
+    rm "$_newconffile"
+  fi
+}
+
+run () {
+  # syntax: run command [ argument ... ]
+  #
+  # Run specified command with optional arguments and report its exit status.
+  # Useful for commands whose exit status may be nonzero, but still acceptable,
+  # or commands whose failure is not fatal to us.
+  #
+  # NOTE: Do *not* use this function with db_get or db_metaget commands; in
+  # those cases the return value of the debconf command *must* be checked
+  # before the string returned by debconf is used for anything.
+
+  #local retval
+
+  # validate arguments
+  if [ $# -lt 1 ]; then
+    usage_error "run() called with wrong number of arguments; expected at" \
+                "least 1, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  "$@" || _retval=$?
+
+  if [ ${_retval:-0} -ne 0 ]; then
+    observe "command \"$*\" exited with status $_retval"
+  fi
+}
+
+register_x_lib_dir_with_ld_so () {
+  # syntax: register_x_lib_dir_with_ld_so
+  #
+  # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
+  # libraries.
+  #
+  # Call this function from the postinst script of a package that places a
+  # shared library in /usr/X11R6/lib, before invoking ldconfig.
+
+  #local dir ldsoconf
+
+  _dir="/usr/X11R6/lib"
+  _ldsoconf="/etc/ld.so.conf"
+
+  # is the line not already present?
+  if ! fgrep -qsx "$_dir" "$_ldsoconf"; then
+    observe "adding $_dir directory to $_ldsoconf"
+    echo "$_dir" >> "$_ldsoconf"
+  fi
+}
+
+deregister_x_lib_dir_with_ld_so () {
+  # syntax: deregister_x_lib_dir_with_ld_so
+  #
+  # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
+  # libraries, if and only if no shared libaries remain there.
+  #
+  # Call this function from the postrm script of a package that places a shared
+  # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
+  # invoking ldconfig.
+
+  #local dir ldsoconf fgrep_status cmp_status
+
+  _dir="/usr/X11R6/lib"
+  _ldsoconf="/etc/ld.so.conf"
+
+  # is the line present?
+  if fgrep -qsx "$_dir" "$_ldsoconf"; then
+    # are there any shared objects in the directory?
+    if [ "$(echo "$_dir"/lib*.so.*.*)" = "$_dir/lib*.so.*.*" ]; then
+      # glob expansion produced nothing, so no shared libraries are present
+      observe "removing $_dir directory from $_ldsoconf"
+      # rewrite the file (very carefully)
+      set +e
+      fgrep -svx "$_dir" "$_ldsoconf" > "$_ldsoconf.dpkg-tmp"
+      _fgrep_status=$?
+      set -e
+      case $_fgrep_status in
+        0|1) ;; # we don't actually care if any lines matched or not
+        *) die "error reading \"$_ldsoconf\"; fgrep exited with status" \
+          "$_fgrep_status" ;;
+      esac
+      set +e
+      cmp -s "$_ldsoconf.dpkg-tmp" "$_ldsoconf"
+      _cmp_status=$?
+      set -e
+      case $_cmp_status in
+        0) rm "$_ldsoconf.dpkg-tmp" ;; # files are identical
+        1) mv "$_ldsoconf.dpkg-tmp" "$_ldsoconf" ;; # files differ
+        *) die "error comparing \"$_ldsoconf.dpkg-tmp\" to \"$_ldsoconf\";" \
+          "cmp exited with status $_cmp_status" ;;
+      esac
+    fi
+  fi
+}
+
+make_symlink_sane () {
+  # syntax: make_symlink_sane symlink target
+  #
+  # Ensure that the symbolic link symlink exists, and points to target.
+  #
+  # If symlink does not exist, create it and point it at target.
+  #
+  # If symlink exists but is not a symbolic link, back it up.
+  #
+  # If symlink exists, is a symbolic link, but points to the wrong location, fix
+  # it.
+  #
+  # If symlink exists, is a symbolic link, and already points to target, do
+  # nothing.
+  #
+  # This function wouldn't be needed if ln had an -I, --idempotent option.
+
+  # Validate arguments.
+  if [ $# -ne 2 ]; then
+    usage_error "make_symlink_sane() called with wrong number of arguments;" \
+      "expected 2, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  # We could just use the positional parameters as-is, but that makes things
+  # harder to follow.
+  #local symlink target
+
+  _symlink="$1"
+  _target="$2"
+
+  if [ -L "$_symlink" ] && [ "$(readlink "$_symlink")" = "$_target" ]; then
+      observe "link from $_symlink to $_target already exists"
+  else
+    observe "creating symbolic link from $_symlink to $_target"
+    mkdir -p "${_target%/*}" "${_symlink%/*}"
+    ln -s -b -S ".dpkg-old" "$_target" "$_symlink"
+  fi
+}
+
+migrate_dir_to_symlink () {
+  # syntax: migrate_dir_to_symlink old_location new_location
+  #
+  # Per Debian Policy section 6.5.4, "A directory will never be replaced by a
+  # symbolic link to a directory or vice versa; instead, the existing state
+  # (symlink or not) will be left alone and dpkg will follow the symlink if
+  # there is one."
+  #
+  # We have to do it ourselves.
+  #
+  # This function moves the contents of old_location, a directory, into
+  # new_location, a directory, then makes old_location a symbolic link to
+  # new_location.
+  #
+  # old_location need not exist, but if it does, it must be a directory (or a
+  # symlink to a directory).  If it is not, it is backed up.  If new_location
+  # exists already and is not a directory, it is backed up.
+  #
+  # This function should be called from a package's preinst so that other
+  # packages unpacked after this one --- but before this package's postinst runs
+  # --- are unpacked into new_location even if their payloads contain
+  # old_location filespecs.
+
+  # Validate arguments.
+  if [ $# -ne 2 ]; then
+    usage_error "migrate_dir_to_symlink() called with wrong number of"
+                "arguments; expected 2, got $#"
+    exit $SHELL_LIB_USAGE_ERROR
+  fi
+
+  # We could just use the positional parameters as-is, but that makes things
+  # harder to follow.
+  local _new _old
+
+  _old="$1"
+  _new="$2"
+
+  # Is old location a symlink?
+  if [ -L "$_old" ]; then
+    # Does it already point to new location?
+    if [ "$(readlink "$_old")" = "$_new" ]; then
+      # Nothing to do; migration has already been done.
+      observe "migration of $_old to $_new already done"
+      return 0
+    else
+      # Back it up.
+      warn "backing up symbolic link $_old as $_old.dpkg-old"
+      mv -b "$_old" "$_old.dpkg-old"
+    fi
+  fi
+
+  # Does old location exist, but is not a directory?
+  if [ -e "$_old" ] && ! [ -d "$_old" ]; then
+      # Back it up.
+      warn "backing up non-directory $_old as $_old.dpkg-old"
+      mv -b "$_old" "$_old.dpkg-old"
+  fi
+
+  observe "migrating $_old to $_new"
+
+  # Is new location a symlink?
+  if [ -L "$_new" ]; then
+    # Does it point the wrong way, i.e., back to where we're migrating from?
+    if [ "$(readlink "$_new")" = "$_old" ]; then
+      # Get rid of it.
+      observe "removing symbolic link $_new which points to $_old"
+      rm "$_new"
+    else
+      # Back it up.
+      warn "backing up symbolic link $_new as $_new.dpkg-old"
+      mv -b "$_new" "$_new.dpkg-old"
+    fi
+  fi
+
+  # Does new location exist, but is not a directory?
+  if [ -e "$_new" ] && ! [ -d "$_new" ]; then
+    warn "backing up non-directory $_new as $_new.dpkg-old"
+    mv -b "$_new" "$_new.dpkg-old"
+  fi
+
+  # Create new directory if it does not yet exist.
+  if ! [ -e "$_new" ]; then
+    observe "creating $_new"
+    mkdir -p "$_new"
+  fi
+
+  # Copy files in old location to new location.  Back up any filenames that
+  # already exist in the new location with the extension ".dpkg-old".
+  observe "copying files from $_old to $_new"
+  if ! (cd "$_old" && cp -a -b -S ".dpkg-old" . "$_new"); then
+    die "error(s) encountered while copying files from $_old to $_new"
+  fi
+
+  # Remove files at old location.
+  observe "removing $_old"
+  rm -r "$_old"
+
+  # Create symlink from old location to new location.
+  make_symlink_sane "$_old" "$_new"
+}
+
+# vim:set ai et sw=2 ts=2 tw=80:
+
+# GOBSTOPPER: The X Strike Force shell library ends here.
--- xfs-1.0.4.orig/debian/xsfbs/xsfbs-autoreconf.mk
+++ xfs-1.0.4/debian/xsfbs/xsfbs-autoreconf.mk
@@ -0,0 +1,150 @@
+#!/usr/bin/make -f
+# $Id$
+
+# Automagical conversion of autoreconf results into quilt patches.
+
+# Copyright 2006 Eugene Konev
+#
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+
+# The idea behind this is storing changes produced by autoreconf as a 
+# separate patch on quilt stack (on top of stack actually).
+# The only usable target here is 'autoreconf`. Other targets are not
+# supposed to be called directly. DO NOT invoke them, unless you know what
+# you are doing.
+# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
+# were changed during patching (from upstream version or from previously
+# autoreconfed version) and call actual autoreconfing if they were.
+# The actual autoreconfing target (doautoreconf) WILL FAIL after 
+# calling autoreconf and pushing changes into quilt stack by design. It
+# should never be invoked by automatic build process.
+# The proposed use is adding autoreconf into clean's prerequisites before
+# xsfclean like:
+# - clean: xsfclean
+# + clean: autoreconf xsfclean
+# This will ensure it is called when you build package with dpkg-buildpackage.
+
+# This dir will be used for producing diff of autoreconfed tree
+RECONF_DIR := xsfautoreconf
+
+# This files will be checked for changes
+RECONF_CHECKFILES += configure.ac Makefile.am
+
+# This files will not be hardlinked but copied
+RECONF_NOLINKFILES += aclocal.m4
+
+# This files/dirs will be pruned after autoreconf run
+RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
+
+# Internal target. Never invoke directly.
+stampdir_target+=check.md5sum
+$(STAMP_DIR)/check.md5sum:
+	dh_testdir
+	$(MAKE) -f debian/rules prepare
+	for F in $(RECONF_CHECKFILES); do \
+	  find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
+	    LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
+	done
+
+# Internal target. Never invoke directly.
+$(STAMP_DIR)/clean.md5sum:
+	dh_testdir
+	$(MAKE) -f debian/rules unpatch
+	rm -f $(STAMP_DIR)/check.md5sum
+	$(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
+	mv $(STAMP_DIR)/check.md5sum $@
+
+# Internal target. Never invoke directly.
+debian/patches/patched.md5sum:
+	dh_testdir
+	[ -f $(STAMP_DIR)/clean.md5sum ] || \
+	  $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
+
+	$(MAKE) -f debian/rules patch
+	rm -f $(STAMP_DIR)/check.md5sum
+	$(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
+	if ! diff $(STAMP_DIR)/clean.md5sum \
+	          $(STAMP_DIR)/check.md5sum > /dev/null; then \
+	  $(MAKE) -f debian/rules doautoreconf; \
+	else \
+	  mv $(STAMP_DIR)/check.md5sum $@; \
+	fi
+
+# Internal target. Never invoke directly.
+,PHONY: doautoreconf
+doautoreconf: patch
+	quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
+	if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
+	  quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
+	  quilt rename -p autoreconf.diff autoreconf-old.diff \
+	       >>$(STAMP_DIR)/log/autoreconf 2>&1; \
+	  quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
+	  quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
+	fi
+
+	if [ -e $(RECONF_DIR) ]; then \
+	  echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
+	  exit 1; \
+	fi
+
+	mkdir -p $(RECONF_DIR)/before
+	find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
+	     -a ! -wholename ./debian -a ! -wholename ./patches \
+	     -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
+	  xargs -i{} cp -al {} $(RECONF_DIR)/before/
+
+	for F in $(RECONF_PRUNEFILES); do \
+	  find $(RECONF_DIR)/before -name $$F -print | \
+	    xargs --no-run-if-empty rm -r; \
+	done
+
+	cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
+
+	for F in $(RECONF_NOLINKFILES); do \
+	  find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
+	       -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
+	       -print | \
+	    xargs --no-run-if-empty -i{} cp --remove-destination {} \
+	      $(RECONF_DIR)/after/{}; \
+	done
+
+	cd $(RECONF_DIR)/after && autoreconf -v --install && \
+	  for F in $(RECONF_PRUNEFILES); do \
+	    find . -name $$F -print | \
+	      xargs --no-run-if-empty rm -r; \
+	  done
+
+	cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
+
+	quilt import $(RECONF_DIR)/autoreconf.diff \
+	      >>$(STAMP_DIR)/log/autoreconf 2>&1
+
+	mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
+
+	rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
+
+	@echo 
+	@echo "****************************************************************"
+	@echo "  This target is made to fail INTENTIONALLY. It should NEVER    "
+	@echo "  be invoked during automatic builds.                           "
+	@echo 
+	@echo "  This target was invoked because you added/removed/changed     "
+	@echo "  patches which modify either configure.ac or Makefile.am and,  "
+	@echo "  thus, require autoreconf run. And all autoreconfing should    "
+	@echo "  happen before uploading.                                      "
+	@echo 
+	@echo "  (See also debian/xsfbs/xsfbs-autoreconf.mk)                   "
+	@echo 
+	@echo "  If you see this message, autoreconfing actually SUCCEEDED,    "
+	@echo "  and your build should finish successfully, when rerun.        "
+	@echo "****************************************************************"
+	@echo 
+	exit 1;
+
+.PHONY: autoreconf
+autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
+	if ! diff $(STAMP_DIR)/check.md5sum \
+	          debian/patches/patched.md5sum > /dev/null; then \
+	  $(MAKE) -f debian/rules doautoreconf; \
+	fi
--- xfs-1.0.4.orig/debian/xfs.preinst.in
+++ xfs-1.0.4/debian/xfs.preinst.in
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Debian xfs package pre-installation script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfs.preinst.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=xfs
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+  # fs dir moved to /etc/X11 in 4.x
+  if [ -e /usr/X11R6/lib/X11/fs ] && ! [ -L /usr/X11R6/lib/X11/fs ]; then
+    observe "removing obsolete /usr/X11R6/lib/X11/fs directory"
+    mv /usr/X11R6/lib/X11/fs /usr/X11R6/lib/X11/fs.moved-by-preinst
+  fi
+
+  # /etc/X11/xfs dir renamed to /etc/X11/fs in 4.x
+  if [ -d /etc/X11/xfs ] && ! [ -e /etc/X11/fs ]; then
+    observe "moving X font server configuration directory /etc/X11/xfs" \
+            "to /etc/X11/fs"
+    mv /etc/X11/xfs /etc/X11/fs
+    touch /etc/X11/xfs.moved-by-preinst
+  fi
+
+  check_symlinks_and_warn /usr/lib/X11/fs
+fi
+
+if [ "$1" = "install" ]; then
+  # Create a flag file that tells the postinst script this is an install, not
+  # an upgrade.
+  : >/var/run/xfs.install
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
--- xfs-1.0.4.orig/mkinstalldirs
+++ xfs-1.0.4/mkinstalldirs
@@ -0,0 +1,158 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+
+scriptversion=2005-06-29.22
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+errstatus=0
+dirmode=
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit $?
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+  '')
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
+esac
+
+for file
+do
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
+  shift
+  IFS=$oIFS
+
+  for d
+  do
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+	errstatus=$lasterr
+      else
+	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+	  lasterr=
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
+      fi
+    fi
+
+    pathcomp=$pathcomp/
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End: