diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index dd10f7997..81f228a66 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -22,7 +22,7 @@ AC_DEFUN([gl_FSUSAGE], #include #endif]]) gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no]) - if test $gl_cv_fs_space = yes; then + if test "$gl_cv_fs_space" = yes; then AC_LIBOBJ(fsusage) gl_PREREQ_FSUSAGE_EXTRA fi @@ -46,7 +46,7 @@ ac_fsusage_space=no # of a `struct statvfs' causes this test to fail (as it should) on such # systems. That system is reported to work fine with STAT_STATFS4 which # is what it gets when this test fails. -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # SVR4 AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs, [AC_TRY_LINK([#include @@ -59,14 +59,14 @@ one of the corresponding file systems is hard-mounted, but not available. [struct statvfs fsd; statvfs (0, &fsd);], fu_cv_sys_stat_statvfs=yes, fu_cv_sys_stat_statvfs=no)]) - if test $fu_cv_sys_stat_statvfs = yes; then + if test "$fu_cv_sys_stat_statvfs" = yes; then ac_fsusage_space=yes AC_DEFINE(STAT_STATVFS, 1, [ Define if there is a function named statvfs. (SVR4)]) fi fi -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # DEC Alpha running OSF/1 AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, @@ -84,14 +84,14 @@ if test $ac_fsusage_space = no; then fu_cv_sys_stat_statfs3_osf1=no, fu_cv_sys_stat_statfs3_osf1=no)]) AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) - if test $fu_cv_sys_stat_statfs3_osf1 = yes; then + if test "$fu_cv_sys_stat_statfs3_osf1" = yes; then ac_fsusage_space=yes AC_DEFINE(STAT_STATFS3_OSF1, 1, [ Define if statfs takes 3 args. (DEC Alpha running OSF/1)]) fi fi -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # AIX AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl member (AIX, 4.3BSD)]) @@ -116,7 +116,7 @@ member (AIX, 4.3BSD)]) fu_cv_sys_stat_statfs2_bsize=no, fu_cv_sys_stat_statfs2_bsize=no)]) AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) - if test $fu_cv_sys_stat_statfs2_bsize = yes; then + if test "$fu_cv_sys_stat_statfs2_bsize" = yes; then ac_fsusage_space=yes AC_DEFINE(STAT_STATFS2_BSIZE, 1, [ Define if statfs takes 2 args and struct statfs has a field named f_bsize. @@ -124,7 +124,7 @@ member (AIX, 4.3BSD)]) fi fi -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # SVR3 AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) AC_CACHE_VAL(fu_cv_sys_stat_statfs4, @@ -139,14 +139,14 @@ if test $ac_fsusage_space = no; then fu_cv_sys_stat_statfs4=no, fu_cv_sys_stat_statfs4=no)]) AC_MSG_RESULT($fu_cv_sys_stat_statfs4) - if test $fu_cv_sys_stat_statfs4 = yes; then + if test "$fu_cv_sys_stat_statfs4" = yes; then ac_fsusage_space=yes AC_DEFINE(STAT_STATFS4, 1, [ Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin)]) fi fi -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # 4.4BSD and NetBSD AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl member (4.4BSD and NetBSD)]) @@ -168,7 +168,7 @@ member (4.4BSD and NetBSD)]) fu_cv_sys_stat_statfs2_fsize=no, fu_cv_sys_stat_statfs2_fsize=no)]) AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) - if test $fu_cv_sys_stat_statfs2_fsize = yes; then + if test "$fu_cv_sys_stat_statfs2_fsize" = yes; then ac_fsusage_space=yes AC_DEFINE(STAT_STATFS2_FSIZE, 1, [ Define if statfs takes 2 args and struct statfs has a field named f_fsize. @@ -176,7 +176,7 @@ member (4.4BSD and NetBSD)]) fi fi -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # Ultrix AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) AC_CACHE_VAL(fu_cv_sys_stat_fs_data, @@ -201,7 +201,7 @@ if test $ac_fsusage_space = no; then fu_cv_sys_stat_fs_data=no, fu_cv_sys_stat_fs_data=no)]) AC_MSG_RESULT($fu_cv_sys_stat_fs_data) - if test $fu_cv_sys_stat_fs_data = yes; then + if test "$fu_cv_sys_stat_fs_data" = yes; then ac_fsusage_space=yes AC_DEFINE(STAT_STATFS2_FS_DATA, 1, [ Define if statfs takes 2 args and the second argument has @@ -209,7 +209,7 @@ if test $ac_fsusage_space = no; then fi fi -if test $ac_fsusage_space = no; then +if test "$ac_fsusage_space" = no; then # SVR2 AC_TRY_CPP([#include ], @@ -219,7 +219,7 @@ if test $ac_fsusage_space = no; then ac_fsusage_space=yes) fi -AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) +AS_IF([test "$ac_fsusage_space" = yes], [$1], [$2]) ]) @@ -240,7 +240,7 @@ choke -- this is a workaround for a Sun-specific problem [[struct statfs t; long c = *(t.f_spare);]])], [fu_cv_sys_truncating_statfs=yes], [fu_cv_sys_truncating_statfs=no])]) - if test $fu_cv_sys_truncating_statfs = yes; then + if test "$fu_cv_sys_truncating_statfs" = yes; then AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, [Define if the block counts reported by statfs may be truncated to 2GB and the correct values may be stored in the f_spare array. diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index ed243861c..986db9ba8 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -83,13 +83,13 @@ if test -z "$ac_list_mounted_fs"; then [#ifdef _CRAY yes #endif - ], [test $ac_cv_func_listmntent = yes \ + ], [test "$ac_cv_func_listmntent" = yes \ && fu_cv_sys_mounted_cray_listmntent=yes] ) ] ) AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent) - if test $fu_cv_sys_mounted_cray_listmntent = yes; then + if test "$fu_cv_sys_mounted_cray_listmntent" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_LISTMNTENT, 1, [Define if there is a function named listmntent that can be used to @@ -105,7 +105,7 @@ if test -z "$ac_list_mounted_fs"; then fu_cv_sys_mounted_vmount=yes, fu_cv_sys_mounted_vmount=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_vmount) - if test $fu_cv_sys_mounted_vmount = yes; then + if test "$fu_cv_sys_mounted_vmount" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_VMOUNT, 1, [Define if there is a function named mntctl that can be used to read @@ -114,7 +114,7 @@ if test -z "$ac_list_mounted_fs"; then fi fi -if test $ac_cv_func_getmntent = yes; then +if test "$ac_cv_func_getmntent" = yes; then # This system has the getmntent function. # Determine whether it's the one-argument variant or the two-argument one. @@ -144,7 +144,7 @@ if test $ac_cv_func_getmntent = yes; then fu_cv_sys_mounted_getmntent1=yes, fu_cv_sys_mounted_getmntent1=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) - if test $fu_cv_sys_mounted_getmntent1 = yes; then + if test "$fu_cv_sys_mounted_getmntent1" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTENT1, 1, [Define if there is a function named getmntent for reading the list @@ -161,7 +161,7 @@ if test $ac_cv_func_getmntent = yes; then fu_cv_sys_mounted_getmntent2=yes, fu_cv_sys_mounted_getmntent2=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) - if test $fu_cv_sys_mounted_getmntent2 = yes; then + if test "$fu_cv_sys_mounted_getmntent2" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTENT2, 1, [Define if there is a function named getmntent for reading the list of @@ -192,7 +192,7 @@ if test -z "$ac_list_mounted_fs"; then fu_cv_sys_mounted_getfsstat=yes, fu_cv_sys_mounted_getfsstat=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getfsstat) - if test $fu_cv_sys_mounted_getfsstat = yes; then + if test "$fu_cv_sys_mounted_getfsstat" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETFSSTAT, 1, [Define if there is a function named getfsstat for reading the @@ -211,7 +211,7 @@ if test -z "$ac_list_mounted_fs"; then fu_cv_sys_mounted_fread_fstyp=yes, fu_cv_sys_mounted_fread_fstyp=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp) - if test $fu_cv_sys_mounted_fread_fstyp = yes; then + if test "$fu_cv_sys_mounted_fread_fstyp" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_FREAD_FSTYP, 1, [Define if (like SVR2) there is no specific function for reading the @@ -230,7 +230,7 @@ if test -z "$ac_list_mounted_fs"; then || fu_cv_sys_mounted_getmntinfo=no ]) AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) - if test $fu_cv_sys_mounted_getmntinfo = yes; then + if test "$fu_cv_sys_mounted_getmntinfo" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTINFO, 1, [Define if there is a function named getmntinfo for reading the @@ -248,7 +248,7 @@ if test -z "$ac_list_mounted_fs"; then fu_cv_sys_mounted_getmnt=yes, fu_cv_sys_mounted_getmnt=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) - if test $fu_cv_sys_mounted_getmnt = yes; then + if test "$fu_cv_sys_mounted_getmnt" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNT, 1, [Define if there is a function named getmnt for reading the list of @@ -261,15 +261,15 @@ if test -z "$ac_list_mounted_fs"; then AC_CHECK_FUNCS(next_dev fs_stat_dev) AC_CHECK_HEADERS(fs_info.h) AC_MSG_CHECKING([for BEOS mounted file system support functions]) - if test $ac_cv_header_fs_info_h = yes \ - && test $ac_cv_func_next_dev = yes \ - && test $ac_cv_func_fs_stat_dev = yes; then + if test "$ac_cv_header_fs_info_h" = yes \ + && test "$ac_cv_func_next_dev" = yes \ + && test "$ac_cv_func_fs_stat_dev" = yes; then fu_result=yes else fu_result=no fi AC_MSG_RESULT($fu_result) - if test $fu_result = yes; then + if test "$fu_result" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_FS_STAT_DEV, 1, [Define if there are functions named next_dev and fs_stat_dev for @@ -285,7 +285,7 @@ if test -z "$ac_list_mounted_fs"; then fu_cv_sys_mounted_fread=yes, fu_cv_sys_mounted_fread=no)]) AC_MSG_RESULT($fu_cv_sys_mounted_fread) - if test $fu_cv_sys_mounted_fread = yes; then + if test "$fu_cv_sys_mounted_fread" = yes; then ac_list_mounted_fs=found AC_DEFINE(MOUNTED_FREAD, 1, [Define if there is no specific function for reading the list of @@ -300,6 +300,6 @@ if test -z "$ac_list_mounted_fs"; then # Can't build mountlist.c or anything that needs its functions fi -AS_IF([test $ac_list_mounted_fs = found], [$1], [$2]) +AS_IF([test "$ac_list_mounted_fs" = found], [$1], [$2]) ])