From e193fccf96bef1e42518e13321fd6cd2c3847dd1 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 22 Jun 2001 16:47:39 +0000 Subject: [PATCH] * acinclude.m4 (AC_GET_FS_INFO): Warn only once that the list of mounted filesystems cannot be read. Don't define NO_INFOMOUNT. Define HAVE_INFOMOUNT_LIST if a any suitable function has been found. * extraconf.h: Define HAVE_INFOMOUNT and HAVE_INFOMOUNT_QNX. --- ChangeLog | 8 ++++++++ acinclude.m4 | 11 +++-------- extraconf.h | 7 +++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe46360aa..fb61218f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-06-22 Pavel Roskin + + * acinclude.m4 (AC_GET_FS_INFO): Warn only once that the list of + mounted filesystems cannot be read. Don't define NO_INFOMOUNT. + Define HAVE_INFOMOUNT_LIST if a any suitable function has been + found. + * extraconf.h: Define HAVE_INFOMOUNT and HAVE_INFOMOUNT_QNX. + 2001-06-19 Pavel Roskin * configure.in: Check for telldir and seekdir. Join adjacent diff --git a/acinclude.m4 b/acinclude.m4 index 22d250c60..c181208d3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -117,11 +117,6 @@ AC_DEFUN([AC_GET_FS_INFO], [ fi fi - if test -z "$list_mounted_fs"; then - AC_MSG_WARN([could not determine how to read list of mounted fs]) - CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" - fi - fi if test -z "$list_mounted_fs"; then @@ -239,9 +234,9 @@ AC_DEFUN([AC_GET_FS_INFO], [ if test -z "$list_mounted_fs"; then AC_MSG_WARN([could not determine how to read list of mounted fs]) - CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" - # FIXME -- no need to abort building the whole package - # Can't build mountlist.c or anything that needs its functions + else + AC_DEFINE(HAVE_INFOMOUNT_LIST, 1, + [Can determine list of mounted filesystems]) fi dnl This configure.in code has been stolen from GNU fileutils-3.12. Its diff --git a/extraconf.h b/extraconf.h index 257a8f4c1..3c1552291 100644 --- a/extraconf.h +++ b/extraconf.h @@ -67,3 +67,10 @@ the need to embed this logic into configure.in. # undef USE_EXT2FSLIB #endif +#if defined (__QNX__) && !defined (HAVE_INFOMOUNT_LIST) +# define HAVE_INFOMOUNT_QNX +#endif + +#if defined(HAVE_INFOMOUNT_LIST) || defined(HAVE_INFOMOUNT_QNX) +# define HAVE_INFOMOUNT +#endif