| 1 |
commit: fa0ea89c147584ae3c5c5acf13273f75ce182753 |
| 2 |
Author: Issam E. Maghni <issam.e.maghni <AT> mailbox <DOT> org> |
| 3 |
AuthorDate: Thu Dec 17 18:29:55 2020 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 14:58:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eudev.git/commit/?id=fa0ea89c |
| 7 |
|
| 8 |
configure: test -a|o is not POSIX |
| 9 |
|
| 10 |
Fixes `test: too many arguments` when building Linux-PAM using sbase. |
| 11 |
This is due to a non-POSIX syntax test ... -a ... and test ... -o .... |
| 12 |
|
| 13 |
> The XSI extensions specifying the -a and -o binary primaries and the |
| 14 |
> '(' and ')' operators have been marked obsolescent. |
| 15 |
|
| 16 |
See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html |
| 17 |
|
| 18 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 19 |
|
| 20 |
configure.ac | 6 +++--- |
| 21 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 22 |
|
| 23 |
diff --git a/configure.ac b/configure.ac |
| 24 |
index fda10eac5..508ec4b86 100644 |
| 25 |
--- a/configure.ac |
| 26 |
+++ b/configure.ac |
| 27 |
@@ -208,7 +208,7 @@ AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [Disable optional blkid s |
| 28 |
if test "x$enable_blkid" != "xno"; then |
| 29 |
PKG_CHECK_MODULES([BLKID], [blkid >= 2.20], |
| 30 |
[AC_DEFINE(HAVE_BLKID, 1, [Define if blkid is available]) have_blkid=yes], have_blkid=no) |
| 31 |
- if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then |
| 32 |
+ if test "x$have_blkid" = xno && test "x$enable_blkid" = xyes; then |
| 33 |
AC_MSG_ERROR([*** blkid support requested but not found]) |
| 34 |
fi |
| 35 |
fi |
| 36 |
@@ -220,7 +220,7 @@ AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SEL |
| 37 |
if test "x$enable_selinux" != "xno"; then |
| 38 |
PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.1.9], |
| 39 |
[AC_DEFINE(HAVE_SELINUX, 1, [Define if SELinux is available]) have_selinux=yes], have_selinux=no) |
| 40 |
- if test "x$have_selinux" = xno -a "x$enable_selinux" = xyes; then |
| 41 |
+ if test "x$have_selinux" = xno && test "x$enable_selinux" = xyes; then |
| 42 |
AC_MSG_ERROR([*** SELinux support requested but libraries not found]) |
| 43 |
fi |
| 44 |
fi |
| 45 |
@@ -265,7 +265,7 @@ if test "x$enable_kmod" != "xno"; then |
| 46 |
[AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])], |
| 47 |
AC_MSG_ERROR([*** kmod version >= 15 not found])) |
| 48 |
fi |
| 49 |
- if test "x$have_kmod" = xno -a "x$enable_kmod" = xyes; then |
| 50 |
+ if test "x$have_kmod" = xno && test "x$enable_kmod" = xyes; then |
| 51 |
AC_MSG_ERROR([*** kmod support requested, but libraries not found]) |
| 52 |
fi |
| 53 |
fi |
Archives