Pádraig Brady <[email protected]> writes:

> * gl/modules/smack: Require gl_FUNC_ACL_ARG so we
> use a consistent --without-libsmack option.
> * NEWS: Mention the Build-related change.

Consistent with --without-selinux, I assume?

>  configure.ac:
>  # Check whether libsmack is available
>  LIB_SMACK=
> -AC_ARG_ENABLE([libsmack],
> -  AS_HELP_STRING([--disable-libsmack], [disable libsmack support]))
> -if test "X$enable_libsmack" != "Xno"; then
> +AC_REQUIRE([gl_FUNC_ACL_ARG])
> +if test "X$with_libsmack" != "Xno"; then
>    AC_CHECK_LIB([smack], [smack_new_label_from_self],
>      [AC_CHECK_LIB([smack], [smack_new_label_from_path],
>        [AC_CHECK_HEADER([sys/smack.h],
> @@ -19,7 +19,7 @@ if test "X$enable_libsmack" != "Xno"; then
>           AC_DEFINE([HAVE_SMACK], [1], [libsmack usability])]
>        )])])
>    if test "X$LIB_SMACK" = "X"; then
> -    if test "X$enable_libsmack" = "Xyes"; then
> +    if test "X$with_libsmack" = "Xyes"; then
>        AC_MSG_ERROR([libsmack library was not found or not usable])
>      fi
>    fi

Unrelated, but it's tempting to change those test invocations to be a
bit more modern. I.e., use 'test -z' and 'test -n'. IIRC, the only place
it is needed nowadays is Solaris 10 /bin/sh. The Solaris 10 cfarm
machine seems to be on vacation, so I can't test that, though.

Collin

Reply via email to