michael@428: Index: Makefile.in
michael@428: --- Makefile.in.orig	2011-12-24 19:05:17.000000000 +0100
michael@428: +++ Makefile.in	2011-12-26 08:30:54.000000000 +0100
michael@431: @@ -1094,7 +1094,7 @@
michael@428:  lib_LTLIBRARIES = libarchive.la
michael@428:  noinst_LTLIBRARIES = libarchive_fe.la
michael@428:  man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
michael@428: -BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h
michael@428: +BUILT_SOURCES =
michael@428:  TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
michael@428:  # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
michael@428:  DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
michael@428: Index: cpio/cmdline.c
michael@428: --- cpio/cmdline.c.orig	2011-12-24 18:56:24.000000000 +0100
michael@428: +++ cpio/cmdline.c	2011-12-26 08:29:08.000000000 +0100
michael@428: @@ -56,7 +56,7 @@
michael@428:  /*
michael@428:   * Long options for cpio.  Please keep this sorted.
michael@428:   */
michael@428: -static const struct option {
michael@428: +static const struct libarchive_option {
michael@428:  	const char *name;
michael@428:  	int required;	/* 1 if this option requires an argument */
michael@428:  	int equivalent;	/* Equivalent short option. */
michael@428: @@ -104,7 +104,7 @@
michael@428:  	static int state = state_start;
michael@428:  	static char *opt_word;
michael@428:  
michael@428: -	const struct option *popt, *match = NULL, *match2 = NULL;
michael@428: +	const struct libarchive_option *popt, *match = NULL, *match2 = NULL;
michael@428:  	const char *p, *long_prefix = "--";
michael@428:  	size_t optlength;
michael@428:  	int opt = '?';