[geany/geany-plugins] 327ed5: Unconditionally declare the AM_CONDITIONAL() after all checks are done
Colomban Wendling
git-noreply at geany.org
Tue Jan 29 21:51:11 UTC 2013
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Tue, 29 Jan 2013 21:51:11 UTC
Commit: 327ed5b96105002f58e3fecf01aae77b396fafa3
https://github.com/geany/geany-plugins/commit/327ed5b96105002f58e3fecf01aae77b396fafa3
Log Message:
-----------
Unconditionally declare the AM_CONDITIONAL() after all checks are done
Don't call AM_CONDITIONAL() from GP_ARG_ENABLE() or
GP_CHECK_PLUGIN_DEPS() depending on the argument of GP_ARG_ENABLE().
Instead, always call it after every checks are done.
Modified Paths:
--------------
build/addons.m4
build/codenav.m4
build/commander.m4
build/common.m4
build/debugger.m4
build/devhelp.m4
build/geanydoc.m4
build/geanyextrasel.m4
build/geanygendoc.m4
build/geanyinsertnum.m4
build/geanylatex.m4
build/geanylipsum.m4
build/geanylua.m4
build/geanymacro.m4
build/geanyminiscript.m4
build/geanynumberedbookmarks.m4
build/geanypg.m4
build/geanyprj.m4
build/geanysendmail.m4
build/geanyvc.m4
build/geniuspaste.m4
build/gproject.m4
build/markdown.m4
build/multiterm.m4
build/pretty-printer.m4
build/scope.m4
build/shiftcolumn.m4
build/spellcheck.m4
build/tableconvert.m4
build/treebrowser.m4
build/updatechecker.m4
build/webhelper.m4
build/xmlsnippets.m4
Modified: build/addons.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_ADDONS],
[
GP_ARG_DISABLE(Addons, yes)
- GP_STATUS_PLUGIN_ADD([Addons], [$enable_addons])
+ GP_COMMIT_PLUGIN_STATUS([Addons])
AC_CONFIG_FILES([
addons/Makefile
addons/src/Makefile
Modified: build/codenav.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_CODENAV],
[
GP_ARG_DISABLE([CodeNav], [yes])
- GP_STATUS_PLUGIN_ADD([CodeNav], [$enable_codenav])
+ GP_COMMIT_PLUGIN_STATUS([CodeNav])
AC_CONFIG_FILES([
codenav/Makefile
codenav/src/Makefile
Modified: build/commander.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -6,7 +6,7 @@ AC_DEFUN([GP_CHECK_COMMANDER],
[gtk+-2.0 >= 2.16
glib-2.0 >= 2.4])
- GP_STATUS_PLUGIN_ADD([Commander], [$enable_commander])
+ GP_COMMIT_PLUGIN_STATUS([Commander])
AC_CONFIG_FILES([
commander/Makefile
Modified: build/common.m4
20 files changed, 11 insertions(+), 9 deletions(-)
===================================================================
@@ -1,9 +1,7 @@
-
dnl GP_ARG_DISABLE(PluginName, default)
dnl - default can either be yes(enabled) or no(disabled), or auto(to be used
dnl with GP_CHECK_PLUGIN_DEPS)
dnl Generates --enable/disable options with help strings
-
AC_DEFUN([GP_ARG_DISABLE],
[
AC_ARG_ENABLE(m4_tolower(AS_TR_SH($1)),
@@ -13,13 +11,6 @@ AC_DEFUN([GP_ARG_DISABLE],
[Do not build the $1 plugin]),
m4_tolower(AS_TR_SH(enable_$1))=$enableval,
m4_tolower(AS_TR_SH(enable_$1))=$2)
-
- dnl if enableval is not auto, then we make the decision here. Otherwise this
- dnl this needs to be done in GP_CHECK_PLUGIN_DEPS
- if test "$m4_tolower(AS_TR_SH(enable_$1))" != "auto"; then
- AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_$1)),
- test "m4_tolower($AS_TR_SH(enable_$1))" = "yes")
- fi
])
dnl GP_CHECK_PLUGIN_DEPS(PluginName, VARIABLE-PREFIX, modules...)
@@ -34,7 +25,18 @@ AC_DEFUN([GP_CHECK_PLUGIN_DEPS],
[m4_tolower(AS_TR_SH(enable_$1))=yes],
[m4_tolower(AS_TR_SH(enable_$1))=no])
fi
+])
+dnl GP_COMMIT_PLUGIN_STATUS(PluginName)
+dnl Commits the enabled status of a plugin
+dnl This macro must be called once for each plugin after all other GP macros.
+AC_DEFUN([GP_COMMIT_PLUGIN_STATUS],
+[
+ dnl if choice wasn't made yet, enable it
+ if test "$m4_tolower(AS_TR_SH(enable_$1))" = "auto"; then
+ m4_tolower(AS_TR_SH(enable_$1))=yes
+ fi
AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_$1)),
test "$m4_tolower(AS_TR_SH(enable_$1))" = yes)
+ GP_STATUS_PLUGIN_ADD([$1], [$m4_tolower(AS_TR_SH(enable_$1))])
])
Modified: build/debugger.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@ AC_DEFUN([GP_CHECK_DEBUGGER],
GP_ARG_DISABLE([Debugger], [auto])
GP_CHECK_PLUGIN_DEPS([debugger], [VTE],
[vte >= 0.24])
- GP_STATUS_PLUGIN_ADD([Debugger], [$enable_debugger])
+ GP_COMMIT_PLUGIN_STATUS([Debugger])
AC_CONFIG_FILES([
debugger/Makefile
debugger/src/Makefile
Modified: build/devhelp.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -18,7 +18,7 @@ AC_DEFUN([GP_CHECK_DEVHELP],
gthread-2.0
zlib])
- GP_STATUS_PLUGIN_ADD([DevHelp], [$enable_devhelp])
+ GP_COMMIT_PLUGIN_STATUS([DevHelp])
AC_CONFIG_FILES([
devhelp/Makefile
Modified: build/geanydoc.m4
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,10 +1,10 @@
AC_DEFUN([GP_CHECK_GEANYDOC],
[
GP_ARG_DISABLE([GeanyDoc], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyDoc], [$enable_geanydoc])
+ GP_COMMIT_PLUGIN_STATUS([GeanyDoc])
AC_CONFIG_FILES([
geanydoc/Makefile
geanydoc/src/Makefile
- geanydoc/tests/Makefile
+ geanydoc/tests/Makefile
])
])
Modified: build/geanyextrasel.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYEXTRASEL],
[
GP_ARG_DISABLE([GeanyExtraSel], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyExtraSel], [$enable_geanyextrasel])
+ GP_COMMIT_PLUGIN_STATUS([GeanyExtraSel])
AC_CONFIG_FILES([
geanyextrasel/Makefile
geanyextrasel/src/Makefile
Modified: build/geanygendoc.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -17,7 +17,7 @@ AC_DEFUN([GP_CHECK_GEANYGENDOC],
AC_SUBST([RST2HTML])
AM_CONDITIONAL([BUILD_RST], [test "x$RST2HTML" != "xno"])
- GP_STATUS_PLUGIN_ADD([GeanyGenDoc], [$enable_geanygendoc])
+ GP_COMMIT_PLUGIN_STATUS([GeanyGenDoc])
AC_CONFIG_FILES([
geanygendoc/Makefile
Modified: build/geanyinsertnum.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYINSERTNUM],
[
GP_ARG_DISABLE([GeanyInsertNum], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyInsertNum], [$enable_geanyinsertnum])
+ GP_COMMIT_PLUGIN_STATUS([GeanyInsertNum])
AC_CONFIG_FILES([
geanyinsertnum/Makefile
geanyinsertnum/src/Makefile
Modified: build/geanylatex.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYLATEX],
[
GP_ARG_DISABLE([GeanyLaTeX], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyLaTeX], [$enable_geanylatex])
+ GP_COMMIT_PLUGIN_STATUS([GeanyLaTeX])
AC_CONFIG_FILES([
geanylatex/Makefile
geanylatex/doc/Makefile
Modified: build/geanylipsum.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYLIPSUM],
[
GP_ARG_DISABLE([GeanyLipsum], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyLipsum], [$enable_geanylipsum])
+ GP_COMMIT_PLUGIN_STATUS([GeanyLipsum])
AC_CONFIG_FILES([
geanylipsum/Makefile
geanylipsum/src/Makefile
Modified: build/geanylua.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -17,7 +17,7 @@ AC_DEFUN([GP_CHECK_GEANYLUA],
GP_CHECK_PLUGIN_DEPS([GeanyLua], [LUA],
[${LUA_PKG_NAME} >= ${LUA_VERSION}])
GP_CHECK_PLUGIN_DEPS([GeanyLua], [GMODULE], [gmodule-2.0])
- GP_STATUS_PLUGIN_ADD([GeanyLua], [$enable_geanylua])
+ GP_COMMIT_PLUGIN_STATUS([GeanyLua])
AC_CONFIG_FILES([
geanylua/examples/edit/Makefile
Modified: build/geanymacro.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYMACRO],
[
GP_ARG_DISABLE([GeanyMacro], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyMacro], [$enable_geanymacro])
+ GP_COMMIT_PLUGIN_STATUS([GeanyMacro])
AC_CONFIG_FILES([
geanymacro/Makefile
geanymacro/src/Makefile
Modified: build/geanyminiscript.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYMINISCRIPT],
[
GP_ARG_DISABLE([GeanyMiniScript], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyMiniScript], [$enable_geanyminiscript])
+ GP_COMMIT_PLUGIN_STATUS([GeanyMiniScript])
AC_CONFIG_FILES([
geanyminiscript/Makefile
geanyminiscript/src/Makefile
Modified: build/geanynumberedbookmarks.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYNUMBEREDBOOKMARKS],
[
GP_ARG_DISABLE([GeanyNumberedBookmarks], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyNumberedBookmarks], [$enable_geanynumberedbookmarks])
+ GP_COMMIT_PLUGIN_STATUS([GeanyNumberedBookmarks])
AC_CONFIG_FILES([
geanynumberedbookmarks/Makefile
geanynumberedbookmarks/src/Makefile
Modified: build/geanypg.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -15,7 +15,7 @@ AC_DEFUN([GP_CHECK_GEANYPG],
# necessary for gpgme
AC_SYS_LARGEFILE
- GP_STATUS_PLUGIN_ADD([GeanyPG], [$enable_geanypg])
+ GP_COMMIT_PLUGIN_STATUS([GeanyPG])
AC_CONFIG_FILES([
geanypg/Makefile
geanypg/src/Makefile
Modified: build/geanyprj.m4
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,10 +1,10 @@
AC_DEFUN([GP_CHECK_GEANYPRJ],
[
GP_ARG_DISABLE([GeanyPrj], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyPrj], [$enable_geanyprj])
+ GP_COMMIT_PLUGIN_STATUS([GeanyPrj])
AC_CONFIG_FILES([
geanyprj/Makefile
geanyprj/src/Makefile
- geanyprj/tests/Makefile
+ geanyprj/tests/Makefile
])
])
Modified: build/geanysendmail.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYSENDMAIL],
[
GP_ARG_DISABLE([GeanySendmail], [yes])
- GP_STATUS_PLUGIN_ADD([GeanySendmail], [$enable_geanysendmail])
+ GP_COMMIT_PLUGIN_STATUS([GeanySendmail])
AC_CONFIG_FILES([
geanysendmail/Makefile
geanysendmail/src/Makefile
Modified: build/geanyvc.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GEANYVC],
[
GP_ARG_DISABLE([GeanyVC], [yes])
- GP_STATUS_PLUGIN_ADD([GeanyVC], [$enable_geanyvc])
+ GP_COMMIT_PLUGIN_STATUS([GeanyVC])
AC_ARG_ENABLE(gtkspell,
AC_HELP_STRING([--enable-gtkspell=ARG],
[Enable GtkSpell support in GeanyVC. [[default=auto]]]),,
Modified: build/geniuspaste.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@ AC_DEFUN([GP_CHECK_GENIUSPASTE],
GP_CHECK_PLUGIN_DEPS([GeniusPaste], GENIUSPASTE,
[libsoup-2.4 >= 2.4.0])
- GP_STATUS_PLUGIN_ADD([GeniusPaste], [$enable_geniuspaste])
+ GP_COMMIT_PLUGIN_STATUS([GeniusPaste])
AC_CONFIG_FILES([
geniuspaste/Makefile
Modified: build/gproject.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_GPROJECT],
[
GP_ARG_DISABLE([GProject], [yes])
- GP_STATUS_PLUGIN_ADD([GProject], [$enable_gproject])
+ GP_COMMIT_PLUGIN_STATUS([GProject])
AC_CONFIG_FILES([
gproject/Makefile
gproject/src/Makefile
Modified: build/markdown.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -10,7 +10,7 @@ AC_DEFUN([GP_CHECK_MARKDOWN],
webkit-1.0 >= ${WEBKIT_VERSION}
gthread-2.0])
- GP_STATUS_PLUGIN_ADD([Markdown], [$enable_markdown])
+ GP_COMMIT_PLUGIN_STATUS([Markdown])
AC_CONFIG_FILES([
markdown/Makefile
Modified: build/multiterm.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -13,7 +13,7 @@ AC_DEFUN([GP_CHECK_MULTITERM],
[AC_MSG_ERROR([valac not found])])])
])
GP_CHECK_PLUGIN_DEPS([multiterm], [MULTITERM], [gtk+-2.0 geany vte])
- GP_STATUS_PLUGIN_ADD([MultiTerm], [$enable_multiterm])
+ GP_COMMIT_PLUGIN_STATUS([MultiTerm])
AC_CONFIG_FILES([
multiterm/Makefile
Modified: build/pretty-printer.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@ AC_DEFUN([GP_CHECK_PRETTYPRINTER],
GP_ARG_DISABLE([pretty-printer], [auto])
GP_CHECK_PLUGIN_DEPS([pretty-printer], [LIBXML],
[libxml-2.0 >= ${LIBXML_VERSION}])
- GP_STATUS_PLUGIN_ADD([Pretty Printer], [$enable_pretty_printer])
+ GP_COMMIT_PLUGIN_STATUS([Pretty Printer])
AC_CONFIG_FILES([
pretty-printer/Makefile
Modified: build/scope.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@ AC_DEFUN([GP_CHECK_SCOPE],
GP_CHECK_PLUGIN_DEPS([scope], [VTE],
[vte >= 0.17])
- GP_STATUS_PLUGIN_ADD([Scope], [$enable_scope])
+ GP_COMMIT_PLUGIN_STATUS([Scope])
case "$host_os" in
cygwin* | mingw* | win32*) PTY_LIBS="" ;;
Modified: build/shiftcolumn.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_SHIFTCOLUMN],
[
GP_ARG_DISABLE([ShiftColumn], [yes])
- GP_STATUS_PLUGIN_ADD([ShiftColumn], [$enable_shiftcolumn])
+ GP_COMMIT_PLUGIN_STATUS([ShiftColumn])
AC_CONFIG_FILES([
shiftcolumn/Makefile
shiftcolumn/src/Makefile
Modified: build/spellcheck.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -11,7 +11,7 @@ AC_DEFUN([GP_CHECK_SPELLCHECK],
[enchant >= ${ENCHANT_VERSION}])
AM_CONDITIONAL([HAVE_ENCHANT_1_5], [test "$have_enchant_1_5" = yes])
- GP_STATUS_PLUGIN_ADD([Spellcheck], [$enable_spellcheck])
+ GP_COMMIT_PLUGIN_STATUS([Spellcheck])
AC_CONFIG_FILES([
spellcheck/Makefile
Modified: build/tableconvert.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_TABLECONVERT],
[
GP_ARG_DISABLE([Tableconvert], [yes])
- GP_STATUS_PLUGIN_ADD([Tableconvert], [$enable_tableconvert])
+ GP_COMMIT_PLUGIN_STATUS([Tableconvert])
AC_CONFIG_FILES([
tableconvert/Makefile
tableconvert/src/Makefile
Modified: build/treebrowser.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -21,7 +21,7 @@ AC_DEFUN([GP_CHECK_TREEBROWSER],
[have_gio=no])
AM_CONDITIONAL(ENABLE_TREEBROWSER, test "x$enable_treebrowser" = "xyes")
- GP_STATUS_PLUGIN_ADD([TreeBrowser], [$enable_treebrowser])
+ GP_COMMIT_PLUGIN_STATUS([TreeBrowser])
GP_STATUS_FEATURE_ADD([TreeBrowser GIO support], [$have_gio])
AC_CONFIG_FILES([
Modified: build/updatechecker.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -5,7 +5,7 @@ AC_DEFUN([GP_CHECK_UPDATECHECKER],
GP_CHECK_PLUGIN_DEPS([Updatechecker], UPDATECHECKER,
[libsoup-2.4 >= 2.4.0])
- GP_STATUS_PLUGIN_ADD([Updatechecker], [$enable_updatechecker])
+ GP_COMMIT_PLUGIN_STATUS([Updatechecker])
AC_CONFIG_FILES([
updatechecker/Makefile
Modified: build/webhelper.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -27,7 +27,7 @@ AC_DEFUN([GP_CHECK_WEBHELPER],
gthread-2.0])
- GP_STATUS_PLUGIN_ADD([WebHelper], [$enable_webhelper])
+ GP_COMMIT_PLUGIN_STATUS([WebHelper])
AC_CONFIG_FILES([
webhelper/Makefile
Modified: build/xmlsnippets.m4
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
AC_DEFUN([GP_CHECK_XMLSNIPPETS],
[
GP_ARG_DISABLE(XMLSnippets, yes)
- GP_STATUS_PLUGIN_ADD([XMLSnippets], [$enable_xmlsnippets])
+ GP_COMMIT_PLUGIN_STATUS([XMLSnippets])
AC_CONFIG_FILES([
xmlsnippets/Makefile
xmlsnippets/src/Makefile
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Plugins-Commits
mailing list