X Strike Force X.Org X11 SVN commit: r4119 - in trunk/util/xutils-dev: debian util-macros

To: debian-x@lists.debian.org
Subject: X Strike Force X.Org X11 SVN commit: r4119 - in trunk/util/xutils-dev: debian util-macros
From: X Strike Force SVN Repository Admin <branden+svnadmin@deadbeast.net>
Date: Sun, 3 Dec 2006 12:43:05 -0500 (EST)
Message-id: <[🔎] 20061203174305.11CE95C076@necrotic.deadbeast.net>
Mail-followup-to: debian-x@lists.debian.org
Author: dnusinow
Date: 2006-12-03 12:43:02 -0500 (Sun, 03 Dec 2006)
New Revision: 4119

Modified:
   trunk/util/xutils-dev/debian/changelog
   trunk/util/xutils-dev/util-macros/ChangeLog
   trunk/util/xutils-dev/util-macros/Makefile.in
   trunk/util/xutils-dev/util-macros/aclocal.m4
   trunk/util/xutils-dev/util-macros/configure
   trunk/util/xutils-dev/util-macros/configure.ac
   trunk/util/xutils-dev/util-macros/xorg-macros.m4
   trunk/util/xutils-dev/util-macros/xorg-macros.m4.in
Log:
* Add util-macros 1.1.2 to allow building docbook docs

Modified: trunk/util/xutils-dev/debian/changelog
===================================================================
--- trunk/util/xutils-dev/debian/changelog	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/debian/changelog	2006-12-03 17:43:02 UTC (rev 4119)
@@ -2,8 +2,9 @@
 
   * Remove obsolete qualifier about imake and old gcc conflict from long
     package description. Thanks Kevin B. McCarty. Closes: #362141
+  * Add util-macros 1.1.2 to allow building docbook docs
 
- -- David Nusinow <dnusinow@debian.org>  Sat, 14 Oct 2006 12:57:28 -0400
+ -- David Nusinow <dnusinow@debian.org>  Sun,  3 Dec 2006 12:42:37 -0500
 
 xutils-dev (1:7.1.ds-4) unstable; urgency=low
 

Modified: trunk/util/xutils-dev/util-macros/ChangeLog
===================================================================
--- trunk/util/xutils-dev/util-macros/ChangeLog	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/ChangeLog	2006-12-03 17:43:02 UTC (rev 4119)
@@ -1,3 +1,33 @@
+commit 0d92c7e31df95c09a9cf1215e9ccb069da97f27a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Nov 8 16:38:16 2006 +0200
+
+    bump to 1.1.2
+
+commit d7a63459d1b1313fbde2827c00b36ee1e9c37f70
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Fri Nov 3 12:43:12 2006 -0500
+
+    Introduce separate configure switches for each output format.
+
+commit 5dc687a27322c9c6f7f9fb69b7005f35030b9571
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date:   Thu Nov 2 19:49:29 2006 -0500
+
+    Fix handling of defs.ent to allow arbitrary install prefixes.
+
+commit 58a807e728bfbb3fac080adbb7c502ef3531d5f3
+Author: David Nusinow <dnusinow@debian.org>
+Date:   Sun Oct 29 18:48:34 2006 -0500
+
+    Add support for building docbook docs
+
+commit bcd763dd427d2afd9066d52990363398d15d2c6a
+Author: David Nusinow <dnusinow@debian.org>
+Date:   Sun Oct 15 22:45:58 2006 -0400
+
+    Make building pdf's configurable, though only disabled when it is explicitly set to no
+
 commit de2a4b2880117f1de38c9f870024cfb8a9f3ba8d
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sun Aug 27 12:59:25 2006 +0300

Modified: trunk/util/xutils-dev/util-macros/Makefile.in
===================================================================
--- trunk/util/xutils-dev/util-macros/Makefile.in	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/Makefile.in	2006-12-03 17:43:02 UTC (rev 4119)
@@ -90,6 +90,10 @@
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+AMCMDECHO = @AMCMDECHO@
+AMDEPSHOWCMDSAT = @AMDEPSHOWCMDSAT@
+AMPRETTYECHO = @AMPRETTYECHO@
+AMSHOWCMDSAT = @AMSHOWCMDSAT@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -107,6 +111,7 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+LT_QUIET = @LT_QUIET@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -162,43 +167,52 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      @AMPRETTYECHO@ '  [AUTOMAKE  ]  rebuild all'; \
+	      @AMCMDECHO@ ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
 	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	@AMPRETTYECHO@ '  [AUTOMAKE  ]  Makefile'; \
+	@AMCMDECHO@ ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
+	    @AMPRETTYECHO@ '  [SH        ]  config.status'; \
+	    @AMCMDECHO@ ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    @AMPRETTYECHO@ '  [SH        ]  config.status $@'; \
+	    @AMCMDECHO@ ' 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)
-	$(SHELL) ./config.status --recheck
+	@@AMPRETTYECHO@ '  [SH        ]  config.status'
+	@AMSHOWCMDSAT@$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	@@AMPRETTYECHO@ '  [AUTOCONF  ]  Regenerate'
+	@AMSHOWCMDSAT@cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	@@AMPRETTYECHO@ '  [ACLOCAL   ]  Regenerate'
+	@AMSHOWCMDSAT@cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 xorg-macros.m4: $(top_builddir)/config.status $(srcdir)/xorg-macros.m4.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 install-aclocalDATA: $(aclocal_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(aclocaldir)" || $(mkdir_p) "$(DESTDIR)$(aclocaldir)"
+	@@AMPRETTYECHO@ '  [MKDIR     ]  $(DESTDIR)$(aclocaldir)'
+	@AMSHOWCMDSAT@test -z "$(aclocaldir)" || $(mkdir_p) "$(DESTDIR)$(aclocaldir)"
 	@list='$(aclocal_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(aclocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(aclocaldir)/$$f'"; \
+	  @AMPRETTYECHO@ "  [INSTALL   ]  '$$d$$p' -> '$(DESTDIR)$(aclocaldir)/$$f'"; \
+	  @AMCMDECHO@ " $(aclocalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(aclocaldir)/$$f'"; \
 	  $(aclocalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(aclocaldir)/$$f"; \
 	done
 
@@ -206,7 +220,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(aclocal_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(aclocaldir)/$$f'"; \
+	  @AMPRETTYECHO@ "  [RM        ]  $(DESTDIR)$(aclocaldir)/$$f"; \
+	  @AMCMDECHO@ " rm -f '$(DESTDIR)$(aclocaldir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
 	done
 tags: TAGS
@@ -217,9 +232,11 @@
 
 
 distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
+	@AMSHOWCMDSAT@$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [MKDIR     ]  $(distdir)'
+	@AMSHOWCMDSAT@mkdir $(distdir)
+	@@AMPRETTYECHO@ '  [MKDIR     ]  $(distdir)/.'
+	@AMSHOWCMDSAT@$(mkdir_p) $(distdir)/.
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -246,59 +263,71 @@
 	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
+	@AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	@AMSHOWCMDSAT@-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	|| ( @AMPRETTYECHO@ '  [CHMOD     ]  a+r $(distdir)'; chmod -R a+r $(distdir) )
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [TAR.GZ    ]  $(distdir).tar.gz'
+	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [TAR.BZ2   ]  $(distdir).tar.bz2'
+	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [TAR.Z     ]  $(distdir).tar.Z'
+	@AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [SHAR.GZ   ]  $(distdir).shar.gz'
+	@AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	@@AMPRETTYECHO@ '  [ZIP       ]  $(distdir).zip'
+	@AMSHOWCMDSAT@-rm -f $(distdir).zip
+	@AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir)
+	@AMSHOWCMDSAT@$(am__remove_distdir)
 
 dist dist-all: 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)
+	@@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)
 
 # 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
-	case '$(DIST_ARCHIVES)' in \
+	@AMSHOWCMDSAT@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
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
+	@AMSHOWCMDSAT@chmod -R a-w $(distdir); chmod a+w $(distdir)
+	@AMSHOWCMDSAT@mkdir $(distdir)/_build
+	@AMSHOWCMDSAT@mkdir $(distdir)/_inst
+	@AMSHOWCMDSAT@chmod a-w $(distdir)
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && cd $(distdir)/_build \
@@ -350,8 +379,8 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(aclocaldir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	@AMSHOWCMDSAT@for dir in "$(DESTDIR)$(aclocaldir)"; do \
+	  test -z "$$dir" || ( @AMPRETTYECHO@ "  [MKDIR     ]  $$dir"; $(mkdir_p) "$$dir" ); \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -363,7 +392,7 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	@AMSHOWCMDSAT@$(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
@@ -372,7 +401,9 @@
 clean-generic:
 
 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	@@AMPRETTYECHO@ '  [RM        ]  $(CONFIG_CLEAN_FILES)'
+	@AMSHOWCMDSAT@-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	@@AMPRETTYECHO@ '  [RM        ]  $(DISTCLEANFILES)'
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -383,8 +414,10 @@
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
+	@@AMPRETTYECHO@ '  [RM        ]  $(am__CONFIG_DISTCLEAN_FILES)'
+	@AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	@@AMPRETTYECHO@ '  [RM        ]  Makefile'
+	@AMSHOWCMDSAT@-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -408,9 +441,12 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
+	@@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        ]  Makefile'
+	@AMSHOWCMDSAT@-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am

Modified: trunk/util/xutils-dev/util-macros/aclocal.m4
===================================================================
--- trunk/util/xutils-dev/util-macros/aclocal.m4	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/aclocal.m4	2006-12-03 17:43:02 UTC (rev 4119)
@@ -174,6 +174,7 @@
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
+AC_REQUIRE([AM_PRETTY_CMDS])
 ])
 
 
@@ -363,6 +364,42 @@
 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

Modified: trunk/util/xutils-dev/util-macros/configure
===================================================================
--- trunk/util/xutils-dev/util-macros/configure	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/configure	2006-12-03 17:43:02 UTC (rev 4119)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60a for util-macros 1.1.1.
+# Generated by GNU Autoconf 2.60 for util-macros 1.1.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -559,8 +559,8 @@
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='util-macros 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='util-macros 1.1.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL
@@ -621,6 +621,11 @@
 AMTAR
 am__tar
 am__untar
+AMSHOWCMDSAT
+AMDEPSHOWCMDSAT
+AMPRETTYECHO
+AMCMDECHO
+LT_QUIET
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1129,7 +1134,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-macros 1.1.1 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1195,10 +1200,16 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.1.1:";;
+     short | recursive ) echo "Configuration of util-macros 1.1.2:";;
    esac
   cat <<\_ACEOF
 
+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
+
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -1267,8 +1278,8 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.1.1
-generated by GNU Autoconf 2.60a
+util-macros configure 1.1.2
+generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1281,8 +1292,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-macros $as_me 1.1.1, which was
-generated by GNU Autoconf 2.60a.  Invocation command line was
+It was created by util-macros $as_me 1.1.2, which was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
 
@@ -1931,6 +1942,29 @@
 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
@@ -1951,7 +1985,7 @@
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.1.1'
+ VERSION='1.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2098,6 +2132,7 @@
 
 
 
+
 # Since this is the package that installs the xorgversion.m4 file, we
 # cannot use it here.  Therefore, we copy the code from the m4 file.
 # Please try to keep them in sync.
@@ -2531,8 +2566,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by util-macros $as_me 1.1.1, which was
-generated by GNU Autoconf 2.60a.  Invocation command line was
+This file was extended by util-macros $as_me 1.1.2, which was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2559,7 +2594,7 @@
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
+  -V, --version    print version number, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -2574,8 +2609,8 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-util-macros config.status 1.1.1
-configured by $0, generated by GNU Autoconf 2.60a,
+util-macros config.status 1.1.2
+configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -2793,11 +2828,16 @@
 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
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/util/xutils-dev/util-macros/configure.ac
===================================================================
--- trunk/util/xutils-dev/util-macros/configure.ac	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/configure.ac	2006-12-03 17:43:02 UTC (rev 4119)
@@ -23,7 +23,7 @@
 
 AC_PREREQ([2.57])
 AC_INIT([util-macros],
-        [1.1.1],
+        [1.1.2],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

Modified: trunk/util/xutils-dev/util-macros/xorg-macros.m4
===================================================================
--- trunk/util/xutils-dev/util-macros/xorg-macros.m4	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/xorg-macros.m4	2006-12-03 17:43:02 UTC (rev 4119)
@@ -45,7 +45,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
@@ -191,18 +191,17 @@
 # Whether or not the necessary tools and files are found can be checked
 # with the AM_CONDITIONAL "BUILD_LINUXDOC"
 AC_DEFUN([XORG_CHECK_LINUXDOC],[
-AC_CHECK_FILE(
-	[$prefix/share/X11/sgml/defs.ent], 
-	[DEFS_ENT_PATH=$prefix/share/X11/sgml],
-	[DEFS_ENT_PATH=]
-)
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
 
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
 
 AC_MSG_CHECKING([Whether to build documentation])
 
-if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
    BUILDDOC=yes
 else
    BUILDDOC=no
@@ -214,7 +213,7 @@
 
 AC_MSG_CHECKING([Whether to build pdf documentation])
 
-if test x$PS2PDF != x ; then
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
    BUILDPDFDOC=yes
 else
    BUILDPDFDOC=no
@@ -224,10 +223,10 @@
 
 AC_MSG_RESULT([$BUILDPDFDOC])
 
-MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
 MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC  -B html --split=0"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC  -B html --split=0"
 
 AC_SUBST(MAKE_TEXT)
 AC_SUBST(MAKE_PS)
@@ -235,6 +234,72 @@
 AC_SUBST(MAKE_HTML)
 ]) # XORG_CHECK_LINUXDOC
 
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([Whether to build text documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
+   test x$BUILD_TXTDOC != xno; then
+	BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([Whether to build PDF documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
+   test x$BUILD_PDFDOC != xno; then
+	BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([Whether to build PostScript documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
+   test x$BUILD_PSDOC != xno; then
+	BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([Whether to build HTML documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
+   test x$BUILD_HTMLDOC != xno; then
+	BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
 # XORG_CHECK_MALLOC_ZERO
 # ----------------------
 # Minimum version: 1.0.0

Modified: trunk/util/xutils-dev/util-macros/xorg-macros.m4.in
===================================================================
--- trunk/util/xutils-dev/util-macros/xorg-macros.m4.in	2006-12-03 00:18:47 UTC (rev 4118)
+++ trunk/util/xutils-dev/util-macros/xorg-macros.m4.in	2006-12-03 17:43:02 UTC (rev 4119)
@@ -191,18 +191,17 @@
 # Whether or not the necessary tools and files are found can be checked
 # with the AM_CONDITIONAL "BUILD_LINUXDOC"
 AC_DEFUN([XORG_CHECK_LINUXDOC],[
-AC_CHECK_FILE(
-	[$prefix/share/X11/sgml/defs.ent], 
-	[DEFS_ENT_PATH=$prefix/share/X11/sgml],
-	[DEFS_ENT_PATH=]
-)
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
 
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
 AC_PATH_PROG(LINUXDOC, linuxdoc)
 AC_PATH_PROG(PS2PDF, ps2pdf)
 
 AC_MSG_CHECKING([Whether to build documentation])
 
-if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
    BUILDDOC=yes
 else
    BUILDDOC=no
@@ -214,7 +213,7 @@
 
 AC_MSG_CHECKING([Whether to build pdf documentation])
 
-if test x$PS2PDF != x ; then
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
    BUILDPDFDOC=yes
 else
    BUILDPDFDOC=no
@@ -224,10 +223,10 @@
 
 AC_MSG_RESULT([$BUILDPDFDOC])
 
-MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
 MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC  -B html --split=0"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC  -B html --split=0"
 
 AC_SUBST(MAKE_TEXT)
 AC_SUBST(MAKE_PS)
@@ -235,6 +234,72 @@
 AC_SUBST(MAKE_HTML)
 ]) # XORG_CHECK_LINUXDOC
 
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([Whether to build text documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
+   test x$BUILD_TXTDOC != xno; then
+	BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([Whether to build PDF documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
+   test x$BUILD_PDFDOC != xno; then
+	BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([Whether to build PostScript documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
+   test x$BUILD_PSDOC != xno; then
+	BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([Whether to build HTML documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
+   test x$BUILD_HTMLDOC != xno; then
+	BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
 # XORG_CHECK_MALLOC_ZERO
 # ----------------------
 # Minimum version: 1.0.0
Reply to:
Prev by Date: Bug#6682: It discovered all the servers on my test network except one, a Microsoft ISA firewall server.
Next by Date: Bug#400181: Silicon Motion chip on amd64
Previous by thread: Bug#6682: It discovered all the servers on my test network except one, a Microsoft ISA firewall server.
Next by thread: Bug#400181: Silicon Motion chip on amd64
Index(es):
- Date
- Thread