[xml/sgml-commit] r166 - in packages/xmlto/trunk: . debian
format/docbook format/fo xmlif/test
Graham Wilson
graham at haydn.debian.org
Wed Sep 14 02:20:09 UTC 2005
Author: graham
Date: 2004-06-07 11:11:04 -0600 (Mon, 07 Jun 2004)
New Revision: 166
Added:
packages/xmlto/trunk/autogen.sh
packages/xmlto/trunk/debian/
packages/xmlto/trunk/debian/README.Debian
packages/xmlto/trunk/debian/changelog
packages/xmlto/trunk/debian/compat
packages/xmlto/trunk/debian/control
packages/xmlto/trunk/debian/copyright
packages/xmlto/trunk/debian/rules
packages/xmlto/trunk/debian/watch
packages/xmlto/trunk/mkinstalldirs
Modified:
packages/xmlto/trunk/Makefile.am
packages/xmlto/trunk/Makefile.in
packages/xmlto/trunk/aclocal.m4
packages/xmlto/trunk/compile
packages/xmlto/trunk/configure
packages/xmlto/trunk/configure.in
packages/xmlto/trunk/depcomp
packages/xmlto/trunk/format/docbook/dvi
packages/xmlto/trunk/format/docbook/fo
packages/xmlto/trunk/format/docbook/html
packages/xmlto/trunk/format/docbook/html-nochunks
packages/xmlto/trunk/format/docbook/htmlhelp
packages/xmlto/trunk/format/docbook/javahelp
packages/xmlto/trunk/format/docbook/man
packages/xmlto/trunk/format/docbook/pdf
packages/xmlto/trunk/format/docbook/ps
packages/xmlto/trunk/format/docbook/txt
packages/xmlto/trunk/format/docbook/xhtml
packages/xmlto/trunk/format/docbook/xhtml-nochunks
packages/xmlto/trunk/format/fo/dvi
packages/xmlto/trunk/format/fo/pdf
packages/xmlto/trunk/format/fo/ps
packages/xmlto/trunk/install-sh
packages/xmlto/trunk/missing
packages/xmlto/trunk/xmlif/test/run-test
packages/xmlto/trunk/xmlto.in
Log:
Load xmlto-0.0.18 into packages/xmlto/trunk.
Modified: packages/xmlto/trunk/Makefile.am
===================================================================
--- packages/xmlto/trunk/Makefile.am 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/Makefile.am 2004-06-07 17:11:04 UTC (rev 166)
@@ -56,7 +56,7 @@
for xml in xmlif.xml xmlto.xml; do \
FORMAT_DIR=$(top_srcdir)/format XSL_DIR=$(top_srcdir)/xsl \
bash ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
- done || ( RC=$$?; cat $(top_srcdir)/FAQ; exit $$RC )
+ done
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
TESTS = xmlif/test/run-test
Modified: packages/xmlto/trunk/Makefile.in
===================================================================
--- packages/xmlto/trunk/Makefile.in 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/Makefile.in 2004-06-07 17:11:04 UTC (rev 166)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,10 +14,6 @@
@SET_MAKE@
-
-
-SOURCES = $(xmlif_xmlif_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -25,6 +21,7 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -38,60 +35,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-bin_PROGRAMS = xmlif/xmlif$(EXEEXT)
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in $(srcdir)/xmlto.in \
- $(srcdir)/xmlto.spec.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS compile depcomp install-sh \
- missing xmlif/xmlif.c
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = xmlto xmlto.spec
-am__installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(pkgdatadir)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_xmlif_xmlif_OBJECTS = xmlif/xmlif.$(OBJEXT)
-xmlif_xmlif_OBJECTS = $(am_xmlif_xmlif_OBJECTS)
-xmlif_xmlif_LDADD = $(LDADD)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = xmlif/$(DEPDIR)/xmlif.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-SOURCES = $(xmlif_xmlif_SOURCES)
-DIST_SOURCES = $(xmlif_xmlif_SOURCES)
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(man1_MANS)
-nobase_pkgdataDATA_INSTALL = $(install_sh_DATA)
-DATA = $(nobase_pkgdata_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -125,6 +68,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
@@ -158,7 +104,6 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
-mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -167,8 +112,11 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
bin_SCRIPTS = xmlto
+bin_PROGRAMS = xmlif/xmlif
man1_MANS = man/man1/xmlto.1 man/man1/xmlif.1
+
xmlif_xmlif_SOURCES = xmlif/xmlif.l
+
nobase_pkgdata_DATA = format/docbook/dvi \
format/docbook/fo \
format/docbook/html \
@@ -186,6 +134,7 @@
format/fo/ps \
xmlto.mak
+
EXTRA_DIST = xmlto.spec \
FAQ \
format/docbook/fo \
@@ -217,8 +166,10 @@
xmlif/test/result-baz \
xmlif/test/result-bar
+
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
TESTS = xmlif/test/run-test
+
CLEANFILES = $(man1_MANS) \
xmlif/test/test-no-condition \
xmlif/test/test-unrelated-condition \
@@ -229,43 +180,64 @@
xmlif/test/test-baz \
xmlif/test/test-bar
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = xmlto xmlto.spec
+bin_PROGRAMS = xmlif/xmlif$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am__dirstamp = $(am__leading_dot)dirstamp
+am_xmlif_xmlif_OBJECTS = xmlif/xmlif.$(OBJEXT)
+xmlif_xmlif_OBJECTS = $(am_xmlif_xmlif_OBJECTS)
+xmlif_xmlif_LDADD = $(LDADD)
+xmlif_xmlif_DEPENDENCIES =
+xmlif_xmlif_LDFLAGS =
+SCRIPTS = $(bin_SCRIPTS)
+
+
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+ at AMDEP_TRUE@DEP_FILES = xmlif/$(DEPDIR)/xmlif.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+DIST_SOURCES = $(xmlif_xmlif_SOURCES)
+
+NROFF = nroff
+MANS = $(man1_MANS)
+DATA = $(nobase_pkgdata_DATA)
+
+DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 compile \
+ config.h.in configure configure.in depcomp install-sh missing \
+ mkinstalldirs xmlif/xmlif.c xmlto.in xmlto.spec.in
+SOURCES = $(xmlif_xmlif_SOURCES)
+
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .l .o .obj
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
+ $(AUTOMAKE) --foreign Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -277,20 +249,21 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
+ touch $(srcdir)/config.h.in
distclean-hdr:
-rm -f config.h stamp-h1
-xmlto: $(top_builddir)/config.status $(srcdir)/xmlto.in
+xmlto: $(top_builddir)/config.status xmlto.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-xmlto.spec: $(top_builddir)/config.status $(srcdir)/xmlto.spec.in
+xmlto.spec: $(top_builddir)/config.status xmlto.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -312,19 +285,20 @@
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
xmlif/$(am__dirstamp):
- @$(mkdir_p) xmlif
+ @$(mkinstalldirs) xmlif
@: > xmlif/$(am__dirstamp)
xmlif/$(DEPDIR)/$(am__dirstamp):
- @$(mkdir_p) xmlif/$(DEPDIR)
+ @$(mkinstalldirs) xmlif/$(DEPDIR)
@: > xmlif/$(DEPDIR)/$(am__dirstamp)
xmlif/xmlif.$(OBJEXT): xmlif/$(am__dirstamp) \
xmlif/$(DEPDIR)/$(am__dirstamp)
xmlif/xmlif$(EXEEXT): $(xmlif_xmlif_OBJECTS) $(xmlif_xmlif_DEPENDENCIES) xmlif/$(am__dirstamp)
@rm -f xmlif/xmlif$(EXEEXT)
$(LINK) $(xmlif_xmlif_LDFLAGS) $(xmlif_xmlif_OBJECTS) $(xmlif_xmlif_LDADD) $(LIBS)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(bindir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -343,7 +317,7 @@
done
mostlyclean-compile:
- -rm -f *.$(OBJEXT)
+ -rm -f *.$(OBJEXT) core *.core
-rm -f xmlif/xmlif.$(OBJEXT)
distclean-compile:
@@ -352,39 +326,51 @@
@AMDEP_TRUE@@am__include@ @am__quote at xmlif/$(DEPDIR)/xmlif.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+ at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+ at am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $<
+ at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+ at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+ at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+ at am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
xmlif/xmlif.o: xmlif/xmlif.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlif/xmlif.o -MD -MP -MF "xmlif/$(DEPDIR)/xmlif.Tpo" -c -o xmlif/xmlif.o `test -f 'xmlif/xmlif.c' || echo '$(srcdir)/'`xmlif/xmlif.c; \
- at am__fastdepCC_TRUE@ then mv -f "xmlif/$(DEPDIR)/xmlif.Tpo" "xmlif/$(DEPDIR)/xmlif.Po"; else rm -f "xmlif/$(DEPDIR)/xmlif.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlif/xmlif.o -MD -MP -MF "xmlif/$(DEPDIR)/xmlif.Tpo" \
+ at am__fastdepCC_TRUE@ -c -o xmlif/xmlif.o `test -f 'xmlif/xmlif.c' || echo '$(srcdir)/'`xmlif/xmlif.c; \
+ at am__fastdepCC_TRUE@ then mv -f "xmlif/$(DEPDIR)/xmlif.Tpo" "xmlif/$(DEPDIR)/xmlif.Po"; \
+ at am__fastdepCC_TRUE@ else rm -f "xmlif/$(DEPDIR)/xmlif.Tpo"; exit 1; \
+ at am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlif/xmlif.c' object='xmlif/xmlif.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='xmlif/$(DEPDIR)/xmlif.Po' tmpdepfile='xmlif/$(DEPDIR)/xmlif.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlif/xmlif.o `test -f 'xmlif/xmlif.c' || echo '$(srcdir)/'`xmlif/xmlif.c
xmlif/xmlif.obj: xmlif/xmlif.c
- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlif/xmlif.obj -MD -MP -MF "xmlif/$(DEPDIR)/xmlif.Tpo" -c -o xmlif/xmlif.obj `if test -f 'xmlif/xmlif.c'; then $(CYGPATH_W) 'xmlif/xmlif.c'; else $(CYGPATH_W) '$(srcdir)/xmlif/xmlif.c'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "xmlif/$(DEPDIR)/xmlif.Tpo" "xmlif/$(DEPDIR)/xmlif.Po"; else rm -f "xmlif/$(DEPDIR)/xmlif.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlif/xmlif.obj -MD -MP -MF "xmlif/$(DEPDIR)/xmlif.Tpo" \
+ at am__fastdepCC_TRUE@ -c -o xmlif/xmlif.obj `if test -f 'xmlif/xmlif.c'; then $(CYGPATH_W) 'xmlif/xmlif.c'; else $(CYGPATH_W) '$(srcdir)/xmlif/xmlif.c'; fi`; \
+ at am__fastdepCC_TRUE@ then mv -f "xmlif/$(DEPDIR)/xmlif.Tpo" "xmlif/$(DEPDIR)/xmlif.Po"; \
+ at am__fastdepCC_TRUE@ else rm -f "xmlif/$(DEPDIR)/xmlif.Tpo"; exit 1; \
+ at am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmlif/xmlif.c' object='xmlif/xmlif.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='xmlif/$(DEPDIR)/xmlif.Po' tmpdepfile='xmlif/$(DEPDIR)/xmlif.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlif/xmlif.obj `if test -f 'xmlif/xmlif.c'; then $(CYGPATH_W) 'xmlif/xmlif.c'; else $(CYGPATH_W) '$(srcdir)/xmlif/xmlif.c'; fi`
.l.c:
- $(LEXCOMPILE) $<
+ $(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
rm -f $(LEX_OUTPUT_ROOT).c
@@ -393,9 +379,11 @@
sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|xmlif/xmlif.c|' $(LEX_OUTPUT_ROOT).c >xmlif/xmlif.c
rm -f $(LEX_OUTPUT_ROOT).c
uninstall-info-am:
+
+man1dir = $(mandir)/man1
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(man1dir)
+ $(mkinstalldirs) $(DESTDIR)$(man1dir)
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@@ -438,32 +426,33 @@
echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
rm -f $(DESTDIR)$(man1dir)/$$inst; \
done
+nobase_pkgdataDATA_INSTALL = $(install_sh_DATA)
install-nobase_pkgdataDATA: $(nobase_pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkdir_p) $(DESTDIR)$(pkgdatadir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(nobase_pkgdata_DATA)'; for p in $$list; do \
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ @list='$(nobase_pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac; \
+ f="$$p"; \
echo " $(nobase_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
$(nobase_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
done
uninstall-nobase_pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- list='$(nobase_pkgdata_DATA)'; for p in $$list; do \
- case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac; \
+ @list='$(nobase_pkgdata_DATA)'; for p in $$list; do \
+ f="$$p"; \
echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
done
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -472,7 +461,6 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
-tags: TAGS
TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -487,6 +475,7 @@
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
+
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -523,24 +512,24 @@
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*" $$tst "*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
;; \
*) \
- echo "PASS: $$tst"; \
+ echo "PASS: $$tst"; \
;; \
esac; \
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*" $$tst "*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
;; \
*) \
- failed=`expr $$failed + 1`; \
- echo "FAIL: $$tst"; \
+ failed=`expr $$failed + 1`; \
+ echo "FAIL: $$tst"; \
;; \
esac; \
else \
@@ -582,11 +571,24 @@
echo "$$dashes"; \
test "$$failed" -eq 0; \
else :; fi
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/format/docbook $(distdir)/format/fo $(distdir)/xmlif $(distdir)/xmlif/test
+ $(mkinstalldirs) $(distdir)/. $(distdir)/doc $(distdir)/format/docbook $(distdir)/format/fo $(distdir)/xmlif $(distdir)/xmlif/test
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -598,7 +600,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -621,23 +623,11 @@
dist-gzip: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
+
dist-bzip2: distdir
$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-tarZ: distdir
- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
dist dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
@@ -647,18 +637,8 @@
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
@@ -678,20 +658,19 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkdir_p) "$$dc_destdir") \
+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -714,8 +693,9 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
+
installdirs:
- $(mkdir_p) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(pkgdatadir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(pkgdatadir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -752,15 +732,13 @@
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf xmlif/$(DEPDIR)
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-hdr distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
+ distclean-tags
dvi: dvi-am
dvi-am:
-html: html-am
-
info: info-am
info-am:
@@ -799,13 +777,12 @@
uninstall-man: uninstall-man1
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
- clean clean-binPROGRAMS clean-generic ctags dist dist-all \
- dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-compile distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-binSCRIPTS install-data \
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+ dist-gzip distcheck distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am info info-am install \
+ install-am install-binPROGRAMS install-binSCRIPTS install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-man1 \
install-nobase_pkgdataDATA install-strip installcheck \
@@ -821,7 +798,7 @@
for xml in xmlif.xml xmlto.xml; do \
FORMAT_DIR=$(top_srcdir)/format XSL_DIR=$(top_srcdir)/xsl \
bash ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
- done || ( RC=$$?; cat $(top_srcdir)/FAQ; exit $$RC )
+ done
tag:
cvs tag -c `echo V at VERSION@ | tr . _`
Modified: packages/xmlto/trunk/aclocal.m4
===================================================================
--- packages/xmlto/trunk/aclocal.m4 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/aclocal.m4 2004-06-07 17:11:04 UTC (rev 166)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11,10 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# -*- Autoconf -*-
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
+# Do all the work for Automake. -*- Autoconf -*-
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
@@ -28,23 +32,296 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+# serial 10
+
+AC_PREREQ([2.54])
+
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.8.2])])
+ [AM_AUTOMAKE_VERSION([1.7.9])])
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
# AM_AUX_DIR_EXPAND
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -99,16 +376,19 @@
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# AM_CONDITIONAL -*- Autoconf -*-
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -125,34 +405,86 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 6
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# -*- Autoconf -*-
+# Copyright (C) 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
else
- $1_TRUE='#'
- $1_FALSE=
+ am__leading_dot=_
fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
-# serial 6 -*- Autoconf -*-
+# serial 5 -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -300,8 +632,8 @@
# ------------
AC_DEFUN([AM_DEP_TRACK],
[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
@@ -312,7 +644,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -394,246 +726,6 @@
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 7
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 11
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# -*- Autoconf -*-
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 4
-
-# AM_PROG_LEX
-# -----------
-# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
-# "missing" invocation, for better error output.
-AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
- LEX=${am_missing_run}flex
-fi])
-
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
@@ -697,14 +789,10 @@
rm -f confinc confmf
])
-# serial 2
+# AM_CONDITIONAL -*- Autoconf -*-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
@@ -720,74 +808,34 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-])
+# serial 5
-# -*- Autoconf -*-
+AC_PREREQ(2.52)
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ $1_TRUE='#'
+ $1_FALSE=
fi
-])
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -804,47 +852,18 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined.
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
- # expensive solution, as it forces Make to start a sub-shell.)
- mkdir_p='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.
- for d in ./-p ./--;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+AC_PREREQ([2.52])
-# Helper functions for option handling. -*- Autoconf -*-
+# serial 6
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
@@ -862,35 +881,31 @@
# serial 2
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+]
+)
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+# serial 2
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
-#
-# Check to make sure that the build environment is sane.
-#
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
@@ -906,52 +921,25 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
fi
-AC_MSG_RESULT(yes)])
+])
-# AM_PROG_INSTALL_STRIP
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -968,23 +956,18 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# serial 3
+AC_PREREQ(2.50)
+
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN([AM_PROG_LEX],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+ LEX=${am_missing_run}flex
+fi])
+
Added: packages/xmlto/trunk/autogen.sh
===================================================================
--- packages/xmlto/trunk/autogen.sh 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/autogen.sh 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,13 @@
+#!/bin/sh
+# autogen.sh: refresh GNU autotools toolchain for xmlto
+set -e
+
+aclocal-1.7
+autoheader2.50
+automake-1.7 --foreign --add-missing --force-missing --copy
+autoconf2.50
+
+# clean up the junk that was created
+rm -rf autom4te.cache
+
+exit 0
Modified: packages/xmlto/trunk/compile
===================================================================
--- packages/xmlto/trunk/compile 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/compile 2004-06-07 17:11:04 UTC (rev 166)
@@ -1,9 +1,8 @@
#! /bin/sh
+
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright 1999, 2000 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -25,37 +24,18 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
+# Usage:
+# compile PROGRAM [ARGS]...
+# `-o FOO.o' is removed from the args passed to the actual compile.
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
+# Usage statement added by Billy Biggs <vektor at dumbterm.net>.
+if [ -z $1 ]; then
+ echo "Wrapper for compilers which do not understand '-c -o'."
+ echo "usage: compile PROGRAM [ARGS]..."
+ echo "'-o FOO.o' is removed from the args passed to the actual compile."
+ exit 1
+fi
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake at gnu.org>.
-EOF
- exit 0
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit 0
- ;;
-esac
-
-
prog=$1
shift
@@ -63,39 +43,39 @@
cfile=
args=
while test $# -gt 0; do
- case "$1" in
+ case "$1" in
-o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we do something ugly here.
+ ofile=$2
+ shift
+ case "$ofile" in
*.o | *.obj)
- ;;
+ ;;
*)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
+ args="$args -o $ofile"
+ ofile=
+ ;;
+ esac
;;
*.c)
- cfile=$1
- args="$args $1"
- ;;
+ cfile=$1
+ args="$args $1"
+ ;;
*)
- args="$args $1"
- ;;
- esac
- shift
+ args="$args $1"
+ ;;
+ esac
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$prog" $args
fi
# Name of file we expect compiler to create.
@@ -107,10 +87,10 @@
# object file name, since that is what matters with a parallel build.
lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir $lockdir > /dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir $lockdir; exit 1" 1 2 15
@@ -120,17 +100,8 @@
status=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
fi
rmdir $lockdir
exit $status
-
-# 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:
Property changes on: packages/xmlto/trunk/compile
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/configure
===================================================================
--- packages/xmlto/trunk/configure 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/configure 2004-06-07 17:11:04 UTC (rev 166)
@@ -272,7 +272,7 @@
PACKAGE_BUGREPORT=''
ac_unique_file="xmlto.spec.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT MKTEMP FIND BASH GETOPT LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT MKTEMP FIND BASH GETOPT LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -806,8 +806,10 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
+ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -916,7 +918,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd $ac_popdir
+ cd "$ac_popdir"
done
fi
@@ -1274,7 +1276,7 @@
-am__api_version="1.8"
+am__api_version="1.7"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
@@ -1437,6 +1439,7 @@
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
rm conftest.sed
+
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1450,31 +1453,6 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p -- . 2>/dev/null; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined.
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
- # expensive solution, as it forces Make to start a sub-shell.)
- mkdir_p='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.
- for d in ./-p ./--;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -1553,7 +1531,7 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
+ # test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -1702,6 +1680,31 @@
ac_config_headers="$ac_config_headers config.h"
+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 or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2270,8 +2273,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2329,8 +2331,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2446,8 +2447,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2501,8 +2501,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2547,8 +2546,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2592,8 +2590,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2984,8 +2981,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3051,8 +3047,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3141,8 +3136,7 @@
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'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3345,6 +3339,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -3909,10 +3910,12 @@
s, at STRIP@,$STRIP,;t t
s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s, at mkdir_p@,$mkdir_p,;t t
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
s, at am__leading_dot@,$am__leading_dot,;t t
+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s, at MAINT@,$MAINT,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
@@ -4104,11 +4107,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -4147,6 +4145,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
+
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Property changes on: packages/xmlto/trunk/configure
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/configure.in
===================================================================
--- packages/xmlto/trunk/configure.in 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/configure.in 2004-06-07 17:11:04 UTC (rev 166)
@@ -3,6 +3,8 @@
AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_LEX
Added: packages/xmlto/trunk/debian/README.Debian
===================================================================
--- packages/xmlto/trunk/debian/README.Debian 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/README.Debian 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,21 @@
+----------------------------
+Debian README file for xmlto
+----------------------------
+
+POSTSCRIPT OUTPUT
+-----------------
+There are some problems with generating PostScript or DVI output (see bug
+#170633). As a workaround, you can ask xmlto to generate PDF output:
+
+ $ xmlto pdf myfile.xml
+
+and then convert that to PostScript using pdf2ps (in the gs-common
+package):
+
+ $ pdf2ps myfile.pdf
+
+I don't current know of a way to generate DVI output, though.
+
+ -- Graham Wilson <bob at decoy.wox.org> $Date: 2003-10-13 22:32:06 -0500 (Mon, 13 Oct 2003) $
+
+vim:tw=79:
Added: packages/xmlto/trunk/debian/changelog
===================================================================
--- packages/xmlto/trunk/debian/changelog 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/changelog 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,220 @@
+xmlto (0.0.18-4) unstable; urgency=low
+
+ * Woohoo Debian XML catalog registration!
+ - bump docbook-xml dependency for the support (closes: #183744)
+
+ -- Graham Wilson <graham at debian.org> Tue, 03 Feb 2004 01:03:32 +0000
+
+xmlto (0.0.18-3) unstable; urgency=low
+
+ * Use HTTP URIs in the documentation files.
+ * Remove SGML_CATALOG_FILES hack from xmlto.in.
+ * Don't install the stupid FAQ.
+
+ -- Graham Wilson <graham at debian.org> Mon, 02 Feb 2004 22:47:42 +0000
+
+xmlto (0.0.18-2) unstable; urgency=low
+
+ * Add a watch file for uscan.
+ * Fix typo in autogen.sh, and put it the top-level directory.
+ * Fix some typos in the XSL-FO to other processing scripts.
+ * Use HTTP URIs instead of local ones when transforming.
+ - bump docbook-xsl dependency to match
+
+ -- Graham Wilson <graham at debian.org> Sun, 01 Feb 2004 18:17:19 +0000
+
+xmlto (0.0.18-1) unstable; urgency=low
+
+ * New upstream release.
+ * Build depend on at least debhelper 4.
+
+ -- Graham Wilson <graham at debian.org> Thu, 22 Jan 2004 02:43:24 +0000
+
+xmlto (0.0.17-3) unstable; urgency=low
+
+ * Check more header lines to see if the file is XSL-FO.
+
+ -- Graham Wilson <graham at debian.org> Sat, 13 Dec 2003 20:44:56 +0000
+
+xmlto (0.0.17-2) unstable; urgency=low
+
+ * Fix a problem with the build script I use.
+
+ -- Graham Wilson <graham at debian.org> Fri, 12 Dec 2003 23:46:22 +0000
+
+xmlto (0.0.17-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add a script to recreate auto* files.
+ * Correctly check DEB_BUILD_OPTIONS.
+ * Call head correctly. (closes: #221839)
+ * Suggest w3m, since it produces better table output.
+ * Remove a few empty directorys on clean.
+
+ -- Graham Wilson <graham at debian.org> Fri, 05 Dec 2003 20:27:20 +0000
+
+xmlto (0.0.14-3) unstable; urgency=low
+
+ * Remove testing framework, as it only made the diff larger, and I don't
+ think anybody used it.
+ * Change maintainer address.
+ * Increase standards version. No changes.
+
+ -- Graham Wilson <graham at debian.org> Thu, 11 Sep 2003 01:32:17 +0000
+
+xmlto (0.0.14-2) unstable; urgency=low
+
+ * The "woohoo debian xml catalog support oh wait" release.
+ * Really depend on libxml2-utils. (closes: #196376, #196967)
+ * Standards-Version: 3.6.0 (no changes)
+ * Minor improvements to the debian/test script.
+ * Export SGML_CATALOG_FILES: (closes: #204276)
+ - for xmllint and xsltproc
+ - also depend on sgml-base
+
+ -- Graham Wilson <bob at decoy.wox.org> Wed, 06 Aug 2003 20:46:48 +0000
+
+xmlto (0.0.14-1) unstable; urgency=low
+
+ * New upstream release.
+ * Enable maintainer mode in configure.in.
+ * Print a better message when PassiveTeX is not installed.
+ (closes: #190840)
+ * (Build-)Depend on xsltproc (>= 1.0.29). (closes: #189421)
+ * Depend on libxml2-utils. (closes: #196376, #196967)
+ * Really check the return code of xmllint.
+
+ -- Graham Wilson <bob at decoy.wox.org> Sat, 14 Jun 2003 05:41:35 +0000
+
+xmlto (0.0.12-7) unstable; urgency=low
+
+ * Adding 0.0.13pre4 patch.
+ * Various improvements to the testing framework, see README.test.
+ * Build-depend and depend on docbook-xsl (1.56.0):
+ - At this point db2man.xsl is included and the XHTML stylesheet
+ really produces XHTML. (closes: #183892)
+ - Don't depend on docbook-xml (>= 1.54.0). Oops.
+ * Update Standards-Version. No changes.
+
+ -- Graham Wilson <bob at decoy.wox.org> Thu, 20 Mar 2003 02:37:10 +0000
+
+xmlto (0.0.12-6) unstable; urgency=low
+
+ * Add myself to the copyright file. (closes: #180996)
+ * Suggest passivetex (>= 1.23). (closes: #179146)
+ - The newest version fixes some problems with XSL-FO files.
+ - Remove the note from README.Debian about this.
+ * Remove the patch code from the rules file.
+ - The patches will be included in the Debian diff.
+
+ -- Graham Wilson <bob at decoy.wox.org> Sat, 15 Feb 2003 17:27:43 +0000
+
+xmlto (0.0.12-5) unstable; urgency=low
+
+ * Added 00_0.0.13pre2.patch.
+ * Actually change Standards-Version to 3.5.8.
+ * debian/rules:
+ - Added a testing framework. Hopefully fewer bugs will get in now.
+ - Patches are numbered now, to avoid dependency problems.
+ - Call run-parts on the patches directory.
+ * Call xmllint with the --catalogs option. (closes: #173603)
+ * Only use paper information when converting from XSL-FO. (closes: #180070)
+ * Update 02_url patch to patch txt format script.
+
+ -- Graham Wilson <bob at decoy.wox.org> Fri, 31 Jan 2003 03:13:25 +0000
+
+xmlto (0.0.12-4) unstable; urgency=low
+
+ * Make URIs to point *XML* DTDs (man.patch). (closes: #177090)
+ * Supply default paper size if one doesn't exist (libpaper.patch).
+
+ -- Graham Wilson <bob at decoy.wox.org> Thu, 09 Jan 2003 05:42:38 +0000
+
+xmlto (0.0.12-3) unstable; urgency=low
+
+ * Update Standards-Version to 3.5.8.
+ - Support new DEB_BUILD_OPTIONS.
+ * Build-Depend on libxml2 and libpaper-utils, since xmlto uses them
+ it is called during build. (closes: #175166)
+ * Reupload so xmlto is a non-native package. (closes: #175425)
+
+ -- Graham Wilson <bob at decoy.wox.org> Mon, 06 Jan 2003 01:18:53 +0000
+
+xmlto (0.0.12-2) unstable; urgency=low
+
+ * Use local DTDs in man pages. (closes: #174804)
+ * Fix URI in url.patch.
+
+ -- Graham Wilson <bob at decoy.wox.org> Tue, 31 Dec 2002 07:45:41 +0000
+
+xmlto (0.0.12-1) unstable; urgency=low
+
+ * New upstream release:
+ - xmllint patch integrated upstream.
+ * Attempt to use libpaper-utils to determine papersize. (closes: #173090)
+ * Add 0.0.13pre1 patch:
+ - Don't try to validate XSL-FO input files. (closes: #170633)
+ - Tell xsltproc not to validate input, since xmllint does that.
+ * Clean up the description a little.
+ - Add upstream URL.
+ * Make sure to depend on libc6:
+ - Add ${shlibs:Depends} to Depends [control].
+ - Run dh_shlibdeps during binary-arch target [rules].
+ * Explicitly depend on libxml2, since we call xmllint.
+ * s/Author(s)/Author/ in copyright.
+ * Update rules to look for patches in debian/patches.
+ * Create README.Debian:
+ - Add note about PostScript and DVI output.
+
+ -- Graham Wilson <bob at decoy.wox.org> Tue, 31 Dec 2002 01:52:29 +0000
+
+xmlto (0.0.11-1) unstable; urgency=low
+
+ * New upstream release:
+ - Filenames can contain `_'. (closes: #163669)
+ * Calls xmllint correctly. (closes: #165226)
+ * Updated url.patch for newest upstream version.
+ * New maintainer. (closes: #171351)
+ * Depend on a docbook-xsl (>= 1.54.1) (closes: #161921)
+ * Make sure to strip executables.
+
+ -- Graham Wilson <bob at decoy.wox.org> Thu, 05 Dec 2002 23:18:29 +0000
+
+xmlto (0.0.10-3) unstable; urgency=low
+
+ * Suggest passivetex which is now available in debian (closes: #150067).
+
+ -- christophe barbe <christophe at debian.org> Mon, 2 Sep 2002 10:13:07 -0400
+
+xmlto (0.0.10-2) unstable; urgency=low
+
+ * Added dependency on debianutils >= 1.16 for 'mktemp -d' (closes: #151221).
+
+ -- christophe barbe <christophe at debian.org> Fri, 28 Jun 2002 08:46:54 -0400
+
+xmlto (0.0.10-1) unstable; urgency=low
+
+ * New Upstream Release.
+
+ -- christophe barbe <christophe at debian.org> Tue, 18 Jun 2002 22:02:38 -0400
+
+xmlto (0.0.8-3) unstable; urgency=low
+
+ * Description improvement (closes: #150378).
+
+ -- christophe barbe <christophe at debian.org> Tue, 18 Jun 2002 18:05:57 -0400
+
+xmlto (0.0.8-2) unstable; urgency=low
+
+ * Fix obvious bug in packaging (missing Build-Depends) (closes: #150030).
+
+ -- christophe barbe <christophe at debian.org> Fri, 14 Jun 2002 20:23:51 -0400
+
+xmlto (0.0.8-1) unstable; urgency=low
+
+ * Initial Release.
+ * close ITP (closes: #149610).
+
+ -- christophe barbe <christophe at debian.org> Wed, 5 Jun 2002 15:59:21 -0400
+
+ vim:ts=2:sw=2:et:tw=70:
Added: packages/xmlto/trunk/debian/compat
===================================================================
--- packages/xmlto/trunk/debian/compat 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/compat 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1 @@
+4
Added: packages/xmlto/trunk/debian/control
===================================================================
--- packages/xmlto/trunk/debian/control 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/control 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,25 @@
+Source: xmlto
+Section: text
+Priority: optional
+Maintainer: Graham Wilson <graham at debian.org>
+Build-Depends: debhelper (>> 4.0.0), docbook-xsl (>= 1.64.1.0), docbook-xml (>= 4.2-8), xsltproc (>= 1.0.29), libxml2-utils, libpaper-utils, sgml-base
+Standards-Version: 3.6.1
+
+Package: xmlto
+Architecture: any
+Depends: ${shlibs:Depends}, xsltproc (>= 1.0.29), docbook-xsl (>= 1.64.1.0), docbook-xml (>= 4.2-8), debianutils (>= 1.16), libpaper-utils, libxml2-utils, sgml-base
+Suggests: passivetex (>= 1.23), w3m
+Description: XML-to-any converter
+ xmlto is a front-end to an XSL toolchain. It chooses an appropriate
+ stylesheet for the conversion you want and applies it using an external
+ XSLT processor (currently, only xsltproc is supported). It also performs
+ any necessary post-processing.
+ .
+ It supports converting from DocBook XML to DVI, XSL-FO, HTML (multiple
+ pages), HTML (one page), man page, PDF, PostScript, and plain text. It
+ supports converting from XSL-FO to DVI, PDF and PostScript.
+ .
+ For DVI, PDF, and PostScript output, Sebastian Rahtz's PassiveTeX is
+ required.
+ .
+ See the homepage for more information: http://cyberelk.net/tim/xmlto/
Added: packages/xmlto/trunk/debian/copyright
===================================================================
--- packages/xmlto/trunk/debian/copyright 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/copyright 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,20 @@
+This package was debianized by christophe barbe <christophe at debian.org> on
+Wed, 5 Jun 2002 15:59:21 -0400. It is now maintained by Graham Wilson
+<bob at decoy.wox.org>.
+
+It was downloaded from: http://cyberelk.net/tim/data/xmlto/stable/
+
+Upstream Author: Tim Waugh <twaugh at redhat.com>
+
+Copyright:
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in /usr/share/common-licenses/GPL-2 file.
Added: packages/xmlto/trunk/debian/rules
===================================================================
--- packages/xmlto/trunk/debian/rules 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/rules 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,63 @@
+#!/usr/bin/make -f
+# $Id: rules 26 2003-12-05 20:29:15Z bob $
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+CFLAGS += -g
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+
+ CFLAGS="$(CFLAGS)" ./configure \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man
+
+build: build-stamp
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ -rm -f build-stamp
+ -rm -rf .deps man
+ -$(MAKE) distclean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/xmlto
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installman
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install test
+
+# vim:ts=4:sw=4:
Property changes on: packages/xmlto/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/xmlto/trunk/debian/watch
===================================================================
--- packages/xmlto/trunk/debian/watch 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/debian/watch 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,2 @@
+version=2
+http://cyberelk.net/tim/data/xmlto/stable/xmlto-([-0-9\.]*)\.tar\.(bz2|gz)
Modified: packages/xmlto/trunk/depcomp
===================================================================
--- packages/xmlto/trunk/depcomp 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/depcomp 2004-06-07 17:11:04 UTC (rev 166)
@@ -1,10 +1,8 @@
#! /bin/sh
+
# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
-scriptversion=2003-11-08.23
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
@@ -27,36 +25,6 @@
# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake at gnu.org>.
-EOF
- exit 0
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit 0
- ;;
-esac
-
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -509,12 +477,3 @@
esac
exit 0
-
-# 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:
Property changes on: packages/xmlto/trunk/depcomp
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/dvi
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/fo
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/html
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/html-nochunks
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/htmlhelp
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/javahelp
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/man
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/pdf
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/ps
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/txt
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/xhtml
___________________________________________________________________
Name: svn:executable
-
+ *
Property changes on: packages/xmlto/trunk/format/docbook/xhtml-nochunks
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/format/fo/dvi
===================================================================
--- packages/xmlto/trunk/format/fo/dvi 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/format/fo/dvi 2004-06-07 17:11:04 UTC (rev 166)
@@ -6,6 +6,10 @@
then
echo >&2 "Post-process XSL-FO to DVI"
fi
+ if [ ! -f /usr/share/texmf/tex/xmltex/passivetex/fotex.xmt ]; then
+ printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n"
+ exit 1
+ fi
# Work around stupid tetex bug with '_' in filenames
# Also work around stupid tetex limitation with long lines (bug #101055)
sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
Property changes on: packages/xmlto/trunk/format/fo/dvi
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/format/fo/pdf
===================================================================
--- packages/xmlto/trunk/format/fo/pdf 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/format/fo/pdf 2004-06-07 17:11:04 UTC (rev 166)
@@ -6,6 +6,10 @@
then
echo >&2 "Post-process XSL-FO to PDF"
fi
+ if [ ! -f /usr/share/texmf/tex/xmltex/passivetex/fotex.xmt ]; then
+ printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n"
+ exit 1
+ fi
# Work around stupid tetex bug with '_' in filenames
# Also work around stupid tetex limitation with long lines (bug #101055)
sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
Property changes on: packages/xmlto/trunk/format/fo/pdf
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/format/fo/ps
===================================================================
--- packages/xmlto/trunk/format/fo/ps 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/format/fo/ps 2004-06-07 17:11:04 UTC (rev 166)
@@ -6,6 +6,10 @@
then
echo >&2 "Post-process XSL-FO to DVI"
fi
+ if [ ! -f /usr/share/texmf/tex/xmltex/passivetex/fotex.xmt ]; then
+ printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n"
+ exit 1
+ fi
# Work around stupid tetex bug with '_' in filenames
# Also work around stupid tetex limitation with long lines (bug #101055)
sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
Property changes on: packages/xmlto/trunk/format/fo/ps
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/install-sh
===================================================================
--- packages/xmlto/trunk/install-sh 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/install-sh 2004-06-07 17:11:04 UTC (rev 166)
@@ -1,8 +1,7 @@
#!/bin/sh
+#
# install - install a program, script, or datafile
-
-scriptversion=2004-01-12.10
-
+#
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
@@ -42,11 +41,13 @@
# from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs.
+
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
@@ -58,253 +59,236 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=
-transform_arg=
+transformbasename=""
+transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
+src=""
+dst=""
+dir_arg=""
-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
- or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 -d DIRECTORIES...
+while [ x"$1" != x ]; do
+ case $1 in
+ -c) instcmd=$cpprog
+ shift
+ continue;;
-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-In the second, create the directory path DIR.
+ -d) dir_arg=true
+ shift
+ continue;;
-Options:
--b=TRANSFORMBASENAME
--c copy source (using $cpprog) instead of moving (using $mvprog).
--d create directories instead of installing files.
--g GROUP $chgrp installed files to GROUP.
--m MODE $chmod installed files to MODE.
--o USER $chown installed files to USER.
--s strip installed files (using $stripprog).
--t=TRANSFORM
---help display this help and exit.
---version display version info and exit.
+ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
-Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
-while test -n "$1"; do
- case $1 in
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
- -c) instcmd=$cpprog
- shift
- continue;;
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
- -d) dir_arg=true
- shift
- continue;;
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ shift
+ continue;;
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ shift
+ continue;;
- --help) echo "$usage"; exit 0;;
+ *) if [ x"$src" = x ]
+ then
+ src=$1
+ else
+ # this colon is to work around a 386BSD /bin/sh bug
+ :
+ dst=$1
+ fi
+ shift
+ continue;;
+ esac
+done
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
+if [ x"$src" = x ]
+then
+ echo "$0: no input file specified" >&2
+ exit 1
+else
+ :
+fi
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+if [ x"$dir_arg" != x ]; then
+ dst=$src
+ src=""
- -s) stripcmd=$stripprog
- shift
- continue;;
+ if [ -d "$dst" ]; then
+ instcmd=:
+ chmodcmd=""
+ else
+ instcmd=$mkdirprog
+ fi
+else
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
- --version) echo "$0 $scriptversion"; exit 0;;
+ if [ -f "$src" ] || [ -d "$src" ]
+ then
+ :
+ else
+ echo "$0: $src does not exist" >&2
+ exit 1
+ fi
- *) # When -d is used, all remaining arguments are directories to create.
- test -n "$dir_arg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
- break;;
- esac
-done
+ if [ x"$dst" = x ]
+ then
+ echo "$0: no destination specified" >&2
+ exit 1
+ else
+ :
+ fi
-if test -z "$1"; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
- fi
- # It's OK to call `install-sh -d' without argument.
- # This can happen when creating conditional directories.
- exit 0
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+ if [ -d "$dst" ]
+ then
+ dst=$dst/`basename "$src"`
+ else
+ :
+ fi
fi
-for src
-do
- # Protect names starting with `-'.
- case $src in
- -*) src=./$src ;;
- esac
+## this sed command emulates the dirname command
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
- if test -n "$dir_arg"; then
- dst=$src
- src=
+# Make sure that the destination directory exists.
+# this part is taken from Noah Friedman's mkinstalldirs script
- if test -d "$dst"; then
- instcmd=:
- chmodcmd=
- else
- instcmd=$mkdirprog
- fi
- else
- # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
- if test ! -f "$src" && test ! -d "$src"; then
- echo "$0: $src does not exist." >&2
- exit 1
- fi
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+ '
+IFS="${IFS-$defaultIFS}"
- if test -z "$dstarg"; then
- echo "$0: no destination specified." >&2
- exit 1
- fi
+oIFS=$IFS
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
- dst=$dstarg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst ;;
- esac
+pathcomp=''
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
- if test -d "$dst"; then
- dst=$dst/`basename "$src"`
- fi
- fi
+while [ $# -ne 0 ] ; do
+ pathcomp=$pathcomp$1
+ shift
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+ if [ ! -d "$pathcomp" ] ;
+ then
+ $mkdirprog "$pathcomp"
+ else
+ :
+ fi
- # Make sure that the destination directory exists.
+ pathcomp=$pathcomp/
+done
+fi
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
+if [ x"$dir_arg" != x ]
+then
+ $doit $instcmd "$dst" &&
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- IFS=$oIFS
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+else
- pathcomp=
+# If we're going to rename the final executable, determine the name now.
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
- shift
- test -d "$pathcomp" || $mkdirprog "$pathcomp"
- pathcomp=$pathcomp/
- done
- fi
+ if [ x"$transformarg" = x ]
+ then
+ dstfile=`basename "$dst"`
+ else
+ dstfile=`basename "$dst" $transformbasename |
+ sed $transformarg`$transformbasename
+ fi
- if test -n "$dir_arg"; then
- $doit $instcmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+# don't allow the sed command to completely eliminate the filename
- else
- # If we're going to rename the final executable, determine the name now.
- if test -z "$transformarg"; then
- dstfile=`basename "$dst"`
- else
- dstfile=`basename "$dst" $transformbasename \
- | sed $transformarg`$transformbasename
- fi
+ if [ x"$dstfile" = x ]
+ then
+ dstfile=`basename "$dst"`
+ else
+ :
+ fi
- # don't allow the sed command to completely eliminate the filename.
- test -z "$dstfile" && dstfile=`basename "$dst"`
+# Make a couple of temp file names in the proper directory.
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
- # Trap to clean up those temp files at exit.
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
- trap '(exit $?); exit' 1 2 13 15
+# Trap to clean up temp files at exit.
- # Move or copy the file name to the temp name
- $doit $instcmd "$src" "$dsttmp" &&
+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+ trap '(exit $?); exit' 1 2 13 15
- # and set any options; do chmod last to preserve setuid bits.
- #
- # If any of these fail, we abort the whole thing. If we want to
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $instcmd $src $dsttmp" command.
- #
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+# Move or copy the file name to the temp name
- # Now remove or move aside any old file at destination location. We
- # try this two ways since rm can't unlink itself on some systems and
- # the destination file might be busy for other reasons. In this case,
- # the final cleanup might fail but the new file should still install
- # successfully.
- {
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
- else
- :
- fi
- } &&
+ $doit $instcmd "$src" "$dsttmp" &&
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- fi || { (exit 1); exit; }
-done
+# and set any options; do chmod last to preserve setuid bits
+# If any of these fail, we abort the whole thing. If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location. We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons. In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+ if [ -f "$dstdir/$dstfile" ]
+ then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+ $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+ {
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit
+ }
+ else
+ :
+ fi
+} &&
+
+# Now rename the file to the real destination.
+
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+
+fi &&
+
# The final little trick to "correctly" pass the exit status to the exit trap.
+
{
- (exit 0); exit
+ (exit 0); exit
}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Property changes on: packages/xmlto/trunk/install-sh
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/missing
===================================================================
--- packages/xmlto/trunk/missing 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/missing 2004-06-07 17:11:04 UTC (rev 166)
@@ -1,10 +1,6 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -42,23 +38,12 @@
configure_ac=configure.in
fi
-msg="missing on your system"
-
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
;;
esac
@@ -89,13 +74,11 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake at gnu.org>."
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
+ echo "missing 0.4 - GNU automake"
;;
-*)
@@ -111,7 +94,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -125,7 +108,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -139,7 +122,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -163,7 +146,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -179,8 +162,8 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -202,7 +185,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -232,7 +215,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -260,7 +243,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -285,7 +268,7 @@
fi
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
+WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
@@ -340,8 +323,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -351,10 +334,3 @@
esac
exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
Property changes on: packages/xmlto/trunk/missing
___________________________________________________________________
Name: svn:executable
-
+ *
Added: packages/xmlto/trunk/mkinstalldirs
===================================================================
--- packages/xmlto/trunk/mkinstalldirs 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/mkinstalldirs 2004-06-07 17:11:04 UTC (rev 166)
@@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage" 1>&2
+ exit 0
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+done
+
+for file
+do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+ 0) exit 0 ;;
+esac
+
+case $dirmode in
+ '')
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ fi
+ ;;
+esac
+
+for file
+do
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
+
+ pathcomp="$pathcomp/"
+ done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here
Property changes on: packages/xmlto/trunk/xmlif/test/run-test
___________________________________________________________________
Name: svn:executable
-
+ *
Modified: packages/xmlto/trunk/xmlto.in
===================================================================
--- packages/xmlto/trunk/xmlto.in 2004-06-07 17:09:34 UTC (rev 165)
+++ packages/xmlto/trunk/xmlto.in 2004-06-07 17:11:04 UTC (rev 166)
@@ -93,32 +93,36 @@
XSLTOPTS=
SEARCHPATH=
-# Magic paper size, based on LC_PAPER
-if [ -x /usr/bin/locale ]
+# Setup papersize using libpaper
+if [ ! -f /etc/papersize ]
then
- # For paper sizes we know about, specify them.
- h=$(locale LC_PAPER 2>/dev/null | head -n 1)
- if [ "$h" = "297" ]
- then
- papertype=A4
- fi
+ export PAPERSIZE=letter
+fi
+papername=`paperconf -n`
+paperheight=`paperconf -mh`
+paperwidth=`paperconf -mw`
- if [ -n "$papertype" ]
- then
- papersizemod=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
- CLEANFILES[$CLEANFILE_COUNT]="$papersizemod"
- CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
- cat << EOF > "$papersizemod"
+PAPERSIZEMOD=$(${MKTEMP} ${TMPDIR:-/tmp}/@PACKAGE at -xsl.XXXXXX)
+CLEANFILES[$CLEANFILE_COUNT]="$PAPERSIZEMOD"
+CLEANFILE_COUNT=$(($CLEANFILE_COUNT + 1))
+cat << EOF > "$PAPERSIZEMOD"
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version='1.0'>
-<xsl:param name="paper.type" select="'$papertype'"/>
+
+<xsl:template name="root.messages">
+ <xsl:message>
+ <xsl:text>Making </xsl:text>
+ <xsl:value-of select="\$page.orientation"/>
+ <xsl:text> pages on $papername paper (${paperwidth} x ${paperheight})</xsl:text>
+ </xsl:message>
+</xsl:template>
+
+<xsl:param name="page.height">$paperheight</xsl:param>
+<xsl:param name="page.width">$paperwidth</xsl:param>
+
</xsl:stylesheet>
EOF
- XSL_MODS[$XSL_MOD_COUNT]="$papersizemod"
- XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
- fi
-fi
# Magic encoding, based on locale
if [ -x /usr/bin/locale ]
@@ -247,8 +251,17 @@
exit 1
fi
+# Since we know DEST_FORMAT, we know whether or not to use
+# PAPERSIZEMOD
+case "$DEST_FORMAT" in
+ pdf | ps | dvi)
+ XSL_MODS[$XSL_MOD_COUNT]="$PAPERSIZEMOD"
+ XSL_MOD_COUNT=$(($XSL_MOD_COUNT + 1))
+ ;;
+esac
+
# Decide what source format this is. Default to DocBook.
-rootel=$(head -n 2 "$INPUT_FILE" | \
+rootel=$(head -n 4 "$INPUT_FILE" | \
sed -e 's/^<?[^?>]*?>//g' -e 's/^<![^>]*>//g' -e 's/^<\([^ ]*\).*$/\1/')
case $(echo $rootel) in
fo:root)
Property changes on: packages/xmlto/trunk/xmlto.in
___________________________________________________________________
Name: svn:executable
-
+ *
More information about the debian-xml-sgml-commit
mailing list