RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: xar rpm Date: 26-Jan-2008 09:51:20
Branch: rpm-5_0 Handle: 2008012608511702
Added files: (Branch: rpm-5_0)
xar Makefile.am
xar/include Makefile.am
xar/lib Makefile.am
xar/src Makefile.am
Modified files: (Branch: rpm-5_0)
rpm CHANGES
xar Makefile.in autogen.sh configure.ac
xar/include .cvsignore config.h.in
xar/lib .cvsignore
xar/src .cvsignore
Log:
- jbj: automake for xar internal.
Summary:
Revision Changes Path
1.2054.2.21 +1 -0 rpm/CHANGES
1.1.2.2 +9 -0 xar/Makefile.am
1.3.2.1 +637 -108 xar/Makefile.in
1.7.2.1 +41 -30 xar/autogen.sh
1.14.2.1 +26 -27 xar/configure.ac
1.1.2.1 +4 -0 xar/include/.cvsignore
1.1.2.2 +9 -0 xar/include/Makefile.am
1.3.2.1 +192 -28 xar/include/config.h.in
1.4.2.1 +4 -0 xar/lib/.cvsignore
1.1.2.2 +32 -0 xar/lib/Makefile.am
1.1.2.1 +4 -0 xar/src/.cvsignore
1.1.2.2 +27 -0 xar/src/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.20 -r1.2054.2.21 CHANGES
--- rpm/CHANGES 26 Jan 2008 04:13:32 -0000 1.2054.2.20
+++ rpm/CHANGES 26 Jan 2008 08:51:17 -0000 1.2054.2.21
@@ -1,4 +1,5 @@
5.0.0 -> 5.0.1:
+ - jbj: automake for xar internal.
- jbj: re-add PayloadFilesHavePrefix/CompressedFileNames w --lsb.
- jbj: QNX needs defines for fts.c.
- jbj: include <pthread.h> everywhere.
@@ .
patch -p0 <<'@@ .'
Index: xar/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1.2.2 Makefile.am
--- /dev/null 2008-01-26 09:44:00 +0100
+++ Makefile.am 2008-01-26 09:51:18 +0100
@@ -0,0 +1,9 @@
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+SUBDIRS = include lib src # test
+
+EXTRA_DIST = autogen.sh ChangeLog LICENSE xar.magic xar.spec xar.spec.in \
+ test/buffer.c test/attr test/heap test/data test/checksums \
+ test/compression test/data.xsl test/functions test/hardlink \
+ test/heap1.xsl test/validate.c
+
@@ .
patch -p0 <<'@@ .'
Index: xar/Makefile.in
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 Makefile.in
--- xar/Makefile.in 12 Sep 2007 15:47:41 -0000 1.3
+++ xar/Makefile.in 26 Jan 2008 08:51:18 -0000 1.3.2.1
@@ -1,108 +1,637 @@
-# Clear out all vpaths, then set just one (default vpath) for the main build
-# directory.
-vpath
-vpath % .
-
-# Clear the default suffixes, so that built-in rules are not used.
-.SUFFIXES :
-
-#
-# Standard definitions.
-#
-
-SHELL := /bin/sh
-CC := @CC@
-LD := @LD@
-AR := @AR@
-RANLIB := @RANLIB@
-INSTALL := @INSTALL@
-AUTOCONF := @AUTOCONF@
-
-#
-# Build parameters.
-#
-
-CPPFLAGS := @CPPFLAGS@
-CFLAGS := @CFLAGS@
-A_CFLAGS := $(CFLAGS)
-S_CFLAGS := $(CFLAGS) -fPIC -DPIC
-ifeq (macho, @abi@)
-S_CFLAGS += -dynamic
-endif
-LDFLAGS := @LDFLAGS@
-
-prefix := @PREFIX@
-bindir := @BINDIR@
-datadir := @DATADIR@
-libdir := @LIBDIR@
-includedir := @INCLUDEDIR@
-mandir := @MANDIR@
-
-PREFIX := $(prefix)
-BINDIR := $(bindir)
-DATADIR := $(datadir)
-LIBDIR := $(libdir)
-INCLUDEDIR := $(includedir)
-MANDIR := $(mandir)
-
-dir_names := lib src
-
-all : $(dir_names:%=%_all)
-
-install : $(dir_names:%=%_install)
-
-uninstall : $(dir_names:%=%_uninstall)
-
-clean : $(dir_names:%=%_clean)
-
-distclean : clean $(dir_names:%=%_distclean)
- rm -f @objroot@config.log
- rm -f @objroot@config.status
- rm -f @objroot@cfghdrs.stamp
- rm -f @objroot@cfgoutputs.stamp
- rm -f @objroot@configure.lineno
- rm -f @cfghdrs@
- rm -f @cfgoutputs@
- rm -rf @objroot@autom4te.cache
-
-relclean : distclean
- rm -f @objroot@configure
-
-# Include Makefile.inc files in subdirectories.
-include $(dir_names:%=%/Makefile.inc)
-
-#
-# Re-configuration rules.
-#
-ifeq (@enable_autogen@, 1)
-@srcroot@configure : @srcroot@configure.ac
- cd ./@srcroot@ && $(AUTOCONF)
-
-@objroot@config.status : @srcroot@configure
- ./@objroot@config.status --recheck
-
-# cfghdrs rules.
-@srcroot@cfghdrs.stamp.in : @srcroot@configure.ac
- echo stamp > @srcroot@cfghdrs.stamp.in
-
-$(patsubst %, @srcroot@%.in, @cfghdrs@) : @objroot@config.status
-
-@objroot@cfghdrs.stamp : $(patsubst %, @srcroot@%.in, @cfghdrs@)
- ./@objroot@config.status
- echo stamp > $@
-
-$(filter-out @objroot@cfghdrs.stamp, @cfghdrs@) : @objroot@cfghdrs.stamp
-
-# cfgoutputs rules.
-@srcroot@cfgoutputs.stamp.in : @srcroot@configure.ac
- echo stamp > @srcroot@cfgoutputs.stamp.in
-
-$(patsubst %, @srcroot@%.in, @cfgoutputs@) : @objroot@config.status
-
-@objroot@cfgoutputs.stamp : $(patsubst %, @srcroot@%.in, @cfgoutputs@)
- ./@objroot@config.status
-
-$(filter-out \
- @objroot@cfgoutputs.stamp, \
- $(patsubst %, @objroot@%, @cfgoutputs@)) : @objroot@cfgoutputs.stamp
-endif
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
+ $(srcdir)/../config.sub $(srcdir)/../install-sh \
+ $(srcdir)/../ltmain.sh $(srcdir)/../missing \
+ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog \
+ INSTALL
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BINDIR = @BINDIR@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIR = @DATADIR@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INCLUDEDIR = @INCLUDEDIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_REV = @LIB_REV@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANDIR = @MANDIR@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+RPATH = @RPATH@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XAR_MAJOR_VERSION = @XAR_MAJOR_VERSION@
+XAR_MINOR_VERSION = @XAR_MINOR_VERSION@
+XAR_VERSION = @XAR_VERSION@
+XML2_CONFIG = @XML2_CONFIG@
+abi = @abi@
+abs_builddir = @abs_builddir@
+abs_objroot = @abs_objroot@
+abs_srcdir = @abs_srcdir@
+abs_srcroot = @abs_srcroot@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cfgoutputs = @cfgoutputs@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_autogen = @enable_autogen@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+objroot = @objroot@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+shared = @shared@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+srcroot = @srcroot@
+static = @static@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = 1.4 foreign
+SUBDIRS = include lib src # test
+EXTRA_DIST = autogen.sh ChangeLog LICENSE xar.magic xar.spec xar.spec.in \
+ test/buffer.c test/attr test/heap test/data test/checksums \
+ test/compression test/data.xsl test/functions test/hardlink \
+ test/heap1.xsl test/validate.c
+
+all: all-recursive
+
+.SUFFIXES:
+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) --foreign '; \
+ cd $(srcdir) && $(AUTOMAKE) --foreign \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | 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
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$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) distcleancheck
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-libtool distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
@@ .
patch -p0 <<'@@ .'
Index: xar/autogen.sh
============================================================================
$ cvs diff -u -r1.7 -r1.7.2.1 autogen.sh
--- xar/autogen.sh 18 Nov 2007 09:18:06 -0000 1.7
+++ xar/autogen.sh 26 Jan 2008 08:51:18 -0000 1.7.2.1
@@ -1,35 +1,46 @@
#!/bin/sh
-for i in autoconf; do
- echo "---> generate files via $i"
- $i
- if [ $? -ne 0 ]; then
- echo "Error $? in $i"
- exit 1
- fi
-done
+# configure the requirements
+AMV="automake (GNU automake) 1.10"
+ACV="autoconf (GNU Autoconf) 2.61"
+LTV="libtoolize (GNU libtool) 1.5.24"
+GTT="gettextize (GNU gettext-tools) 0.17"
+USAGE="
+To build RPM from plain CVS sources the following
+installed developer tools are mandatory:
+ GNU automake 1.10
+ GNU autoconf 2.61
+ GNU libtool 1.5.24
+ GNU gettext 0.17
+"
-# RPM5: even if not using automake, we do need some files from it
-for f in install-sh config.guess config.sub; do
- if ! test -f $f; then
- if ! test -f ../$f; then
- echo "---> generating file $f"
- automake=`which automake`
- autobin=`dirname "$automake"`
- # this is of course cheating... bad.
- autodata=$autobin/../share/automake*
- cp $autodata/$f .
- fi
- fi
-done
+# wrapper for running GNU libtool's libtoolize(1)
+libtoolize () {
+ _libtoolize=`which glibtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize=`which libtoolize 2>/dev/null`
+ case "$_libtoolize" in
+ /* ) ;;
+ * ) _libtoolize="libtoolize" ;;
+ esac
+ ;;
+ esac
+ $_libtoolize ${1+"$@"}
+}
-if [ "$1" = "--noconfigure" ]; then
- exit 0
-fi
+# requirements sanity check
+[ "`automake --version | head -1`" != "$AMV" ] && echo "$USAGE" # && exit 1
+[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" # && exit 1
+[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" # && exit 1
+[ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
-echo "./configure --enable-autogen $@"
-./configure --enable-autogen $@
-if [ $? -ne 0 ]; then
- echo "Error $? in ./configure"
- exit 1
-fi
+echo "---> generate files via GNU libtool (libtoolize)"
+libtoolize --copy --force
+echo "---> generate files via GNU autoconf (aclocal, autoheader)"
+aclocal
+autoheader
+echo "---> generate files via GNU automake (automake)"
+automake -Wall -Wno-override -a -c
+echo "---> generate files via GNU autoconf (autoconf)"
+autoconf
@@ .
patch -p0 <<'@@ .'
Index: xar/configure.ac
============================================================================
$ cvs diff -u -r1.14 -r1.14.2.1 configure.ac
--- xar/configure.ac 17 Dec 2007 08:02:53 -0000 1.14
+++ xar/configure.ac 26 Jan 2008 08:51:18 -0000 1.14.2.1
@@ -1,6 +1,10 @@
AC_PREREQ(2.59)
AC_INIT([Xar], [1.6dev], [xar-devel@googlegroups.com], [xar])
AC_CONFIG_SRCDIR([LICENSE])
+AM_INIT_AUTOMAKE([-Wall foreign])
+AC_CONFIG_HEADERS([include/config.h])
+
+AC_PROG_LIBTOOL
dnl Revision number for libxar.
LIB_REV=1
@@ -65,9 +69,6 @@
cfgoutputs="${cfgoutputs} src/Makefile.inc"
cfgoutputs="${cfgoutputs} xar.spec"
-cfghdrs="${objroot}cfghdrs.stamp"
-cfghdrs="${cfghdrs} ${objroot}include/config.h"
-
dnl If CFLAGS isn't defined and using gcc, set CFLAGS to something reasonable.
dnl Otherwise, just prevent autoconf from molesting CFLAGS.
CFLAGS=$CFLAGS
@@ -207,48 +208,48 @@
AC_CHECK_SIZEOF(uid_t)
if test $ac_cv_sizeof_uid_t = "4"; then
-AC_DEFINE(UID_STRING, RId32)
-AC_DEFINE(UID_CAST, (uint32_t))
+AC_DEFINE(UID_STRING, RId32, [Define format for uid_t])
+AC_DEFINE(UID_CAST, (uint32_t), [Define cast for uid_t])
elif test $ac_cv_sizeof_uid_t = "8"; then
-AC_DEFINE(UID_STRING, PRId64)
-AC_DEFINE(UID_CAST, (uint64_t))
+AC_DEFINE(UID_STRING, PRId64, [Define format for uid_t])
+AC_DEFINE(UID_CAST, (uint64_t), [Define cast for uid_t])
else
AC_ERROR(can not detect the size of your system's uid_t type)
fi
AC_CHECK_SIZEOF(gid_t)
if test $ac_cv_sizeof_gid_t = "4"; then
-AC_DEFINE(GID_STRING, PRId32)
-AC_DEFINE(GID_CAST, (uint32_t))
+AC_DEFINE(GID_STRING, PRId32, [Define format for gid_t])
+AC_DEFINE(GID_CAST, (uint32_t), [Define cast for gid_t])
elif test $ac_cv_sizeof_gid_t = "8"; then
-AC_DEFINE(GID_STRING, PRId64)
-AC_DEFINE(GID_CAST, (uint64_t))
+AC_DEFINE(GID_STRING, PRId64, [Define format for gid_t])
+AC_DEFINE(GID_CAST, (uint64_t), [Define cast for gid_t])
else
AC_ERROR(can not detect the size of your system's gid_t type)
fi
AC_CHECK_SIZEOF(ino_t)
if test $ac_cv_sizeof_ino_t = "4"; then
-AC_DEFINE(INO_STRING, PRId32)
-AC_DEFINE(INO_HEXSTRING, PRIx32)
-AC_DEFINE(INO_CAST, (uint32_t))
+AC_DEFINE(INO_STRING, PRId32, [Define format for ino_t])
+AC_DEFINE(INO_HEXSTRING, PRIx32, [Define hex format for ino_t])
+AC_DEFINE(INO_CAST, (uint32_t), [Define cast for ino_t])
elif test $ac_cv_sizeof_ino_t = "8"; then
-AC_DEFINE(INO_STRING, PRId64)
-AC_DEFINE(INO_HEXSTRING, PRIx64)
-AC_DEFINE(INO_CAST, (uint64_t))
+AC_DEFINE(INO_STRING, PRId64, [Define format for ino_t])
+AC_DEFINE(INO_HEXSTRING, PRIx64, [Define hex format for ino_t])
+AC_DEFINE(INO_CAST, (uint64_t), [Define cast for ino_t])
else
AC_ERROR(can not detect the size of your system's ino_t type)
fi
AC_CHECK_SIZEOF(dev_t)
if test $ac_cv_sizeof_dev_t = "4"; then
-AC_DEFINE(DEV_STRING, PRId32)
-AC_DEFINE(DEV_HEXSTRING, PRIx32)
-AC_DEFINE(DEV_CAST, (uint32_t))
+AC_DEFINE(DEV_STRING, PRId32, [Define format for dev_t])
+AC_DEFINE(DEV_HEXSTRING, PRIx32, [Define hex format for dev_t])
+AC_DEFINE(DEV_CAST, (uint32_t), [Define cast for dev_t])
elif test $ac_cv_sizeof_dev_t = "8"; then
-AC_DEFINE(DEV_STRING, PRId64)
-AC_DEFINE(DEV_HEXSTRING, PRIx64)
-AC_DEFINE(DEV_CAST, (uint64_t))
+AC_DEFINE(DEV_STRING, PRId64, [Define format for dev_t])
+AC_DEFINE(DEV_HEXSTRING, PRIx64, [Define hex format for dev_t])
+AC_DEFINE(DEV_CAST, (uint64_t), [Define cast for dev_t])
else
AC_ERROR(can not detect the size of your system's dev_t type)
fi
@@ -258,7 +259,7 @@
dnl Check for paths
AC_PREFIX_DEFAULT(/usr/local)
-AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF]))
+AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF], 1, [Define as 1 if you have asprintf()]))
dnl
dnl Configure libxml2.
@@ -377,10 +378,8 @@
dnl
dnl Process .in files.
dnl
-AC_SUBST([cfghdrs])
-AC_CONFIG_HEADER([$cfghdrs])
AC_SUBST([cfgoutputs])
-AC_CONFIG_FILES([$cfgoutputs])
+AC_CONFIG_FILES([Makefile include/Makefile lib/Makefile src/Makefile $cfgoutputs])
AC_OUTPUT
@@ .
patch -p0 <<'@@ .'
Index: xar/include/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 .cvsignore
--- xar/include/.cvsignore 30 May 2007 04:04:50 -0000 1.1
+++ xar/include/.cvsignore 26 Jan 2008 08:51:18 -0000 1.1.2.1
@@ -1,2 +1,6 @@
+Makefile
+Makefile.in
config.h
+stamp-h1
+stamp-h2
xar.h
@@ .
patch -p0 <<'@@ .'
Index: xar/include/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1.2.2 Makefile.am
--- /dev/null 2008-01-26 09:44:00 +0100
+++ Makefile.am 2008-01-26 09:51:19 +0100
@@ -0,0 +1,9 @@
+# Makefile for rpm library.
+
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+EXTRA_DIST = xar.h.in
+
+pkginclude_HEADERS = xar.h
+
+all:
@@ .
patch -p0 <<'@@ .'
Index: xar/include/config.h.in
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 config.h.in
--- xar/include/config.h.in 2 Oct 2007 21:51:55 -0000 1.3
+++ xar/include/config.h.in 26 Jan 2008 08:51:18 -0000 1.3.2.1
@@ -1,35 +1,199 @@
-#undef HAVE_SYS_STATFS_H
-#undef HAVE_SYS_XATTR_H
-#undef HAVE_SYS_EXTATTR_H
-#undef HAVE_SYS_PARAM_H
+/* include/config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define cast for dev_t */
+#undef DEV_CAST
+
+/* Define hex format for dev_t */
+#undef DEV_HEXSTRING
+
+/* Define format for dev_t */
+#undef DEV_STRING
+
+/* Define cast for gid_t */
+#undef GID_CAST
+
+/* Define format for gid_t */
+#undef GID_STRING
+
+/* Define as 1 if you have asprintf() */
+#undef HAVE_ASPRINTF
+
+/* Define to 1 if you have the <bzlib.h> header file. */
+#undef HAVE_BZLIB_H
+
+/* Define to 1 if you have the `chflags' function. */
+#undef HAVE_CHFLAGS
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <ext2fs/ext2_fs.h> header file. */
+#undef HAVE_EXT2FS_EXT2_FS_H
+
+/* Define to 1 if you have the `getattrlist' function. */
+#undef HAVE_GETATTRLIST
+
+/* Define to 1 if you have the `getxattr' function. */
+#undef HAVE_GETXATTR
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `lchmod' function. */
+#undef HAVE_LCHMOD
+
+/* Define to 1 if you have the `lchown' function. */
+#undef HAVE_LCHOWN
+
+/* Define to 1 if you have the `lgetxattr' function. */
#undef HAVE_LGETXATTR
+
+/* Define to 1 if you have the `acl' library (-lacl). */
+#undef HAVE_LIBACL
+
+/* Define to 1 if you have the `bz2' library (-lbz2). */
+#undef HAVE_LIBBZ2
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#undef HAVE_LIBCRYPTO
+
+/* Define to 1 if you have the `lzma' library (-llzma). */
+#undef HAVE_LIBLZMA
+
+/* Define to 1 if you have the <libutil.h> header file. */
+#undef HAVE_LIBUTIL_H
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the `lsetxattr' function. */
#undef HAVE_LSETXATTR
-#undef HAVE_GETXATTR
-#undef HAVE_SETXATTR
-#undef HAVE_GETATTRLIST
+
+/* Define to 1 if you have the <lzma.h> header file. */
+#undef HAVE_LZMA_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+#undef HAVE_OPENSSL_EVP_H
+
+/* Define to 1 if you have the `setattrlist' function. */
#undef HAVE_SETATTRLIST
-#undef HAVE_CHFLAGS
-#undef HAVE_STATVFS
+
+/* Define to 1 if you have the `setxattr' function. */
+#undef HAVE_SETXATTR
+
+/* Define to 1 if you have the `statfs' function. */
#undef HAVE_STATFS
-#undef HAVE_EXT2FS_EXT2_FS_H
-#undef HAVE_STRUCT_STAT_ST_FLAGS
-#undef HAVE_STRUCT_STATVFS_F_FSTYPENAME
+
+/* Define to 1 if you have the `statvfs' function. */
+#undef HAVE_STATVFS
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strmode' function. */
+#undef HAVE_STRMODE
+
+/* Define to 1 if `f_fstypename' is member of `struct statfs'. */
#undef HAVE_STRUCT_STATFS_F_FSTYPENAME
+
+/* Define to 1 if `f_fstypename' is member of `struct statvfs'. */
+#undef HAVE_STRUCT_STATVFS_F_FSTYPENAME
+
+/* Define to 1 if `st_flags' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_FLAGS
+
+/* define if you have sys/acl.h and it has a working acl_t type */
#undef HAVE_SYS_ACL_H
-#undef HAVE_LIBUTIL_H
-#undef HAVE_ASPRINTF
-#undef HAVE_LIBBZ2
-#undef HAVE_LIBLZMA
-#undef HAVE_LCHOWN
-#undef HAVE_LCHMOD
-#undef HAVE_STRMODE
-#undef UID_STRING
-#undef UID_CAST
-#undef GID_STRING
-#undef GID_CAST
-#undef INO_STRING
-#undef INO_HEXSTRING
+
+/* Define to 1 if you have the <sys/extattr.h> header file. */
+#undef HAVE_SYS_EXTATTR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+#undef HAVE_SYS_STATFS_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/xattr.h> header file. */
+#undef HAVE_SYS_XATTR_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
+
+/* Define cast for ino_t */
#undef INO_CAST
-#undef DEV_STRING
-#undef DEV_HEXSTRING
-#undef DEV_CAST
+
+/* Define hex format for ino_t */
+#undef INO_HEXSTRING
+
+/* Define format for ino_t */
+#undef INO_STRING
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `dev_t', as computed by sizeof. */
+#undef SIZEOF_DEV_T
+
+/* The size of `gid_t', as computed by sizeof. */
+#undef SIZEOF_GID_T
+
+/* The size of `ino_t', as computed by sizeof. */
+#undef SIZEOF_INO_T
+
+/* The size of `uid_t', as computed by sizeof. */
+#undef SIZEOF_UID_T
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define cast for uid_t */
+#undef UID_CAST
+
+/* Define format for uid_t */
+#undef UID_STRING
+
+/* Version number of package */
+#undef VERSION
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
@@ .
patch -p0 <<'@@ .'
Index: xar/lib/.cvsignore
============================================================================
$ cvs diff -u -r1.4 -r1.4.2.1 .cvsignore
--- xar/lib/.cvsignore 11 Nov 2007 14:58:01 -0000 1.4
+++ xar/lib/.cvsignore 26 Jan 2008 08:51:19 -0000 1.4.2.1
@@ -6,5 +6,9 @@
libxar.a
libxar.la
libxar.la.in
+Makefile
+Makefile.in
Makefile.inc
+.deps
.libs
+*.lo
@@ .
patch -p0 <<'@@ .'
Index: xar/lib/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1.2.2 Makefile.am
--- /dev/null 2008-01-26 09:44:00 +0100
+++ Makefile.am 2008-01-26 09:51:19 +0100
@@ -0,0 +1,32 @@
+# Makefile for rpm library.
+
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+LINT = splint
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/include
+
+EXTRA_DIST =
+
+noinst_HEADERS = \
+ appledouble.h archive.h arcmod.h asprintf.h b64.h bzxar.h \
+ darwinattr.h data.h ea.h ext2.h fbsdattr.h filetree.h \
+ hash.h io.h linuxattr.h lzmaxar.h macho.h script.h signature.h \
+ stat.h strmode.h subdoc.h util.h zxar.h
+
+usrlibdir = $(libdir)
+usrlib_LTLIBRARIES = libxar.la
+libxar_la_SOURCES = \
+ archive.c arcmod.c b64.c bzxar.c darwinattr.c data.c ea.c \
+ err.c ext2.c fbsdattr.c filetree.c hash.c io.c linuxattr.c \
+ lzmaxar.c macho.c script.c signature.c stat.c subdoc.c \
+ util.c zxar.c
+
+.PHONY: sources
+sources:
+ @echo $(libxar_la_SOURCES:%=xar/lib/%)
+
+.PHONY: lint
+lint:
+ $(LINT) $(DEFS) $(INCLUDES) $(libxar_la_SOURCES)
@@ .
patch -p0 <<'@@ .'
Index: xar/src/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 .cvsignore
--- xar/src/.cvsignore 30 May 2007 04:04:50 -0000 1.1
+++ xar/src/.cvsignore 26 Jan 2008 08:51:19 -0000 1.1.2.1
@@ -1,4 +1,8 @@
+.deps
+.libs
*.d
+Makefile
+Makefile.in
Makefile.inc
ixar
xar
@@ .
patch -p0 <<'@@ .'
Index: xar/src/Makefile.am
============================================================================
$ cvs diff -u -r0 -r1.1.2.2 Makefile.am
--- /dev/null 2008-01-26 09:44:00 +0100
+++ Makefile.am 2008-01-26 09:51:20 +0100
@@ -0,0 +1,27 @@
+# Makefile for rpm library.
+
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+LINT = splint
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/include
+
+myLDADD = \
+ $(top_builddir)/lib/libxar.la
+
+EXTRA_DIST = xar.1
+
+EXTRA_PROGRAMS =
+
+bin_PROGRAMS = xar
+xar_SOURCES = xar.c
+xar_LDADD = $(myLDADD)
+
+.PHONY: sources
+sources:
+ @echo $(xar_SOURCES:%=xar/src/%)
+
+.PHONY: lint
+lint:
+ $(LINT) $(DEFS) $(INCLUDES) $(xar_SOURCES)
@@ .
Received on Sat Jan 26 09:51:20 2008