diff options
| author | Dan McGee <dan@archlinux.org> | 2011-04-16 01:41:49 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-04-16 01:41:49 +0200 |
| commit | efd8ae483fe587feccd32c90fbee474aa19a5557 (patch) | |
| tree | 02dfc2f4597d69dcaa18050b604f5c1df5450cd4 /acinclude.m4 | |
| parent | 202ade1398ca57070e56de24c3639f3048ecd784 (diff) | |
| parent | 21a881ec6875dccf42bd602496fa93c5a61f2640 (diff) | |
| download | pacman-efd8ae483fe587feccd32c90fbee474aa19a5557.tar.gz pacman-efd8ae483fe587feccd32c90fbee474aa19a5557.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/alpm.h
lib/libalpm/trans.c
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7309d731..df4f83a4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -123,6 +123,13 @@ extern int getmntinfo (struct statfs **, int); ) AC_DEFINE_UNQUOTED(FSSTATSTYPE, [$fs_stats_cv_type], [Defined as the filesystem stats type ('statvfs' or 'statfs')]) + if test $ac_cv_func_getmntinfo = yes; then + if test "$fs_stats_cv_type" = "struct statvfs"; then + AC_DEFINE([HAVE_GETMNTINFO_STATVFS], 1, [Define if getmntinfo() uses statvfs.]) + else + AC_DEFINE([HAVE_GETMNTINFO_STATFS], 1, [Define if getmntinfo() uses statfs.]) + fi + fi ]) dnl Checks for PATH_MAX and defines it if not present |