Skip to content

Commit

Permalink
scope: Don't place AM_CONDITIONAL inside a shell condition
Browse files Browse the repository at this point in the history
This is not valid, because the AM_CONDITIONAL has to be known by
Automake in all cases.  Automake is smart enough to detect it if used
in a AutoShell conditional (like AS_IF/AS_CASE/...), but can't work any
magic inside a pure shell conditional (if/case/...).

So, move the AM_CONDITIONAL outside the conditional, as the value is
already conditional anyway.
  • Loading branch information
b4n committed Oct 29, 2018
1 parent b8d4f57 commit 92258f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/scope.m4
Expand Up @@ -11,13 +11,13 @@ AC_DEFUN([GP_CHECK_SCOPE],
GP_CHECK_GTK3([vte_package=vte-2.91], [vte_package="vte >= 0.17"])
GP_CHECK_PLUGIN_DEPS([scope], [VTE], [$vte_package])
AM_CONDITIONAL([GP_VTE291_USED], [test "$enable_scope" != no && test "$vte_package" = vte-2.91])
AC_CHECK_HEADERS([util.h pty.h libutil.h])
PTY_LIBS="-lutil"
;;
esac
AM_CONDITIONAL([GP_VTE291_USED], [test "$enable_scope" != no && test "$vte_package" = vte-2.91])
AC_SUBST(PTY_LIBS)
GP_COMMIT_PLUGIN_STATUS([Scope])
Expand Down

0 comments on commit 92258f0

Please sign in to comment.