diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | acconfig.h | 9 | ||||
| -rw-r--r-- | configure.in | 21 | ||||
| -rw-r--r-- | lib/transaction.c | 14 | ||||
| -rw-r--r-- | po/rpm.pot | 8 |
5 files changed, 48 insertions, 5 deletions
@@ -3,6 +3,7 @@ - pgp5 support (Carlo Wood <carlo@runaway.xs4all.nl>) - fix: segfault from double close on ftpGetFileDesc ftpAbort path. - fix: don't add header if signature generation failed (Carlo Wood). + - more DU 4.0D fiddles (Shing-Gene Yung). 2.91 -> 2.92 - update with libtool-2.4f. diff --git a/acconfig.h b/acconfig.h index a2f04604a..45584c6ac 100644 --- a/acconfig.h +++ b/acconfig.h @@ -111,6 +111,15 @@ /* Full path to macros configuration file (usually /usr/lib/rpm/macros) */ #undef MACROFILES +/* statfs in <sys/vfs.h> (for linux systems) */ +#undef STATFS_IN_SYS_VFS + +/* statfs in <sys/mount.h> (for Digital Unix 4.0D systems) */ +#undef STATFS_IN_SYS_MOUNT + +/* statfs in <sys/statfs.h> (for Irix 6.4 systems) */ +#undef STATFS_IN_SYS_STATFS + ^L /* Leave that blank line there!! Autoheader needs it. If you're adding to this file, keep in mind: diff --git a/configure.in b/configure.in index c509ba367..2c0c083a3 100644 --- a/configure.in +++ b/configure.in @@ -364,6 +364,27 @@ AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h) AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h) AC_CHECK_HEADERS(bzlib.h libio.h zlib.h) +dnl DU 4.0 fiddles. +AC_CHECK_HEADERS(glob.h) +AC_MSG_CHECKING(for struct statfs) +AC_EGREP_HEADER(struct statfs,sys/vfs.h,[ + AC_MSG_RESULT(in sys/vfs.h) + AC_DEFINE(STATFS_IN_SYS_VFS)], +[ + AC_EGREP_HEADER(struct statfs,sys/mount.h,[ + AC_MSG_RESULT(in sys/mount.h) + AC_DEFINE(STATFS_IN_SYS_MOUNT)], + [ + AC_EGREP_HEADER(struct statfs,sys/statfs.h,[ + AC_MSG_RESULT(in sys/statfs.h) + AC_DEFINE(STATFS_IN_SYS_STATFS)], + [ + AC_MSG_RESULT(not found) + ]) + ]) +]) + + AC_C_INLINE dnl look for libc features diff --git a/lib/transaction.c b/lib/transaction.c index e9b7a304c..1e39a87cb 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -11,7 +11,19 @@ #include "misc.h" #include "rpmdb.h" -#include <sys/vfs.h> +/* XXX FIXME: merge with existing (broken?) tests in system.h */ +/* DU 4.0 fiddles */ +#if STATFS_IN_SYS_VFS +# include <sys/vfs.h> +#else +# if STATFS_IN_SYS_MOUNT +# include <sys/mount.h> +# else +# if STATFS_IN_SYS_STATFS +# include <sys/statfs.h> +# endif +# endif +#endif struct fileInfo { /* for all packages */ diff --git a/po/rpm.pot b/po/rpm.pot index 1b5e39204..48c19c74a 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-03-22 12:20-0500\n" +"POT-Creation-Date: 1999-03-22 13:09-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3170,17 +3170,17 @@ msgstr "" msgid "Invalid %%_signature spec in macro file" msgstr "" -#: ../lib/transaction.c:744 +#: ../lib/transaction.c:756 #, c-format msgid "relocating %s to %s\n" msgstr "" -#: ../lib/transaction.c:750 +#: ../lib/transaction.c:762 #, c-format msgid "excluding %s\n" msgstr "" -#: ../lib/transaction.c:838 +#: ../lib/transaction.c:850 #, c-format msgid "%s skipped due to missingok flag\n" msgstr "" |