diff -r -c3 findutils-4.1.7.bak/Makefile.in findutils-4.1.7/Makefile.in *** findutils-4.1.7.bak/Makefile.in Sun May 20 23:16:34 2001 --- findutils-4.1.7/Makefile.in Tue Oct 1 01:20:42 2002 *************** *** 160,188 **** $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) - config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi - stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h stamp-hT - @echo timestamp > stamp-hT 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @mv stamp-hT stamp-h - $(srcdir)/config.h.in: $(srcdir)/./stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h.in; \ - $(MAKE) $(srcdir)/./stamp-h.in; \ - else :; fi - $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null - cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in - distclean-hdr: -rm -f config.h intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in --- 160,165 ---- diff -r -c3 findutils-4.1.7.bak/config.guess findutils-4.1.7/config.guess *** findutils-4.1.7.bak/config.guess Sun May 20 22:39:11 2001 --- findutils-4.1.7/config.guess Tue Oct 1 01:04:02 2002 *************** *** 718,724 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` --- 718,736 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! rm -f $dummy.c ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` Only in findutils-4.1.7: config.guess.orig diff -r -c3 findutils-4.1.7.bak/config.sub findutils-4.1.7/config.sub *** findutils-4.1.7.bak/config.sub Sun May 20 22:39:11 2001 --- findutils-4.1.7/config.sub Tue Oct 1 01:04:02 2002 *************** *** 105,111 **** # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | storm-chaos*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; --- 105,111 ---- # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; Only in findutils-4.1.7: config.sub.orig diff -r -c3 findutils-4.1.7.bak/configure findutils-4.1.7/configure *** findutils-4.1.7.bak/configure Sun May 20 23:16:31 2001 --- findutils-4.1.7/configure Tue Oct 1 01:13:23 2002 *************** *** 6076,6081 **** --- 6076,6099 ---- fi if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF + #line 6114 "configure" + #include "confdefs.h" + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "f_type;" >/dev/null 2>&1; then + + cat >>confdefs.h <<\EOF + #define FSTYPE_STATFS 1 + EOF + fstype=4.4BSD/OSF1 + fi + rm -f conftest* + + fi + if test $fstype = no; then + cat >conftest.$ac_ext <<_ACEOF #line 6079 "configure" #include "confdefs.h" #include *************** *** 6111,6134 **** fi if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF - #line 6114 "configure" - #include "confdefs.h" - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "f_type;" >/dev/null 2>&1; then - - cat >>confdefs.h <<\EOF - #define FSTYPE_STATFS 1 - EOF - fstype=4.4BSD/OSF1 - fi - rm -f conftest* - - fi - if test $fstype = no; then - cat >conftest.$ac_ext <<_ACEOF #line 6132 "configure" #include "confdefs.h" #include --- 6129,6134 ---- diff -r -c3 findutils-4.1.7.bak/configure.in findutils-4.1.7/configure.in *** findutils-4.1.7.bak/configure.in Sun May 20 23:12:34 2001 --- findutils-4.1.7/configure.in Tue Oct 1 01:04:03 2002 *************** *** 59,68 **** #include ], AC_DEFINE(FSTYPE_AIX_STATFS, 1, [Define to use AIX3 statfs to get filesystem type.]) fstype=AIX) fi if test $fstype = no; then ! AC_TRY_CPP([#include ], AC_DEFINE(FSTYPE_MNTENT, 1, [Define to use 4.3BSD getmntent to get filesystem type.]) fstype=4.3BSD) fi if test $fstype = no; then ! AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, 1, [Define to use 4.4BSD and OSF1 statfs to get filesystem type.]) fstype=4.4BSD/OSF1) fi if test $fstype = no; then AC_TRY_CPP([#include --- 59,68 ---- #include ], AC_DEFINE(FSTYPE_AIX_STATFS, 1, [Define to use AIX3 statfs to get filesystem type.]) fstype=AIX) fi if test $fstype = no; then ! AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, 1, [Define to use 4.4BSD and OSF1 statfs to get filesystem type.]) fstype=4.4BSD/OSF1) fi if test $fstype = no; then ! AC_TRY_CPP([#include ], AC_DEFINE(FSTYPE_MNTENT, 1, [Define to use 4.3BSD getmntent to get filesystem type.]) fstype=4.3BSD) fi if test $fstype = no; then AC_TRY_CPP([#include Only in findutils-4.1.7: configure.in.orig Only in findutils-4.1.7: configure.orig diff -r -c3 findutils-4.1.7.bak/doc/Makefile.in findutils-4.1.7/doc/Makefile.in *** findutils-4.1.7.bak/doc/Makefile.in Sun May 20 23:16:40 2001 --- findutils-4.1.7/doc/Makefile.in Tue Oct 1 01:21:08 2002 *************** *** 134,154 **** && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - $(srcdir)/version.texi: $(srcdir)/stamp-vti - @: - - $(srcdir)/stamp-vti: find.texi $(top_srcdir)/configure.in - @(set `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/find.texi`; \ - echo "@set UPDATED $$1 $$2 $$3"; \ - echo "@set UPDATED-MONTH $$2 $$3"; \ - echo "@set EDITION $(VERSION)"; \ - echo "@set VERSION $(VERSION)") > vti.tmp - @cmp -s vti.tmp $(srcdir)/version.texi \ - || (echo "Updating $(srcdir)/version.texi"; \ - cp vti.tmp $(srcdir)/version.texi) - -@rm -f vti.tmp - @cp $(srcdir)/version.texi $@ - mostlyclean-vti: -rm -f vti.tmp --- 134,139 ---- diff -r -c3 findutils-4.1.7.bak/find/fstype.c findutils-4.1.7/find/fstype.c *** findutils-4.1.7.bak/find/fstype.c Sun May 20 22:39:37 2001 --- findutils-4.1.7/find/fstype.c Tue Oct 1 01:04:03 2002 *************** *** 74,79 **** --- 74,80 ---- #include /* NetBSD needs this. */ #include + #ifndef HAVE_F_FSTYPENAME_IN_STATFS #ifndef MFSNAMELEN /* NetBSD defines this. */ static char * fstype_to_string (t) *************** *** 126,131 **** --- 127,133 ---- #endif /* !INITMOUNTNAMES */ } #endif /* !MFSNAMELEN */ + #endif /* !HAVE_F_FSTYPENAME_IN_STATFS */ #endif /* FSTYPE_STATFS */ #ifdef FSTYPE_AIX_STATFS /* AIX. */ Only in findutils-4.1.7/find: fstype.c.orig diff -r -c3 findutils-4.1.7.bak/po/Makefile.in.in findutils-4.1.7/po/Makefile.in.in *** findutils-4.1.7.bak/po/Makefile.in.in Wed Apr 5 10:15:59 2000 --- findutils-4.1.7/po/Makefile.in.in Tue Oct 1 01:21:29 2002 *************** *** 82,109 **** all-yes: cat-id-tbl.c $(CATALOGS) all-no: - $(srcdir)/$(PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ - --files-from=$(srcdir)/POTFILES.in \ - && test ! -f $(PACKAGE).po \ - || ( rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) - - $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: - $(srcdir)/stamp-cat-id: $(PACKAGE).pot - rm -f cat-id-tbl.tmp - sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ - | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp - if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ - rm cat-id-tbl.tmp; \ - else \ - echo cat-id-tbl.c changed; \ - rm -f $(srcdir)/cat-id-tbl.c; \ - mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ - fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id - install: install-exec install-data install-exec: --- 82,87 ----