Plugins-Commits November 2010

plugins-commits@lists.geany.org

8 participants
64 discussions

SF.net SVN: geany-plugins:[1710] trunk/geany-plugins/geanyextrasel
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1710 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1710&view=rev Author: hyperair Date: 2010-11-05 18:35:38 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Add AM_CONDITIONAL hooks for GeanyExtrasel Modified Paths: -------------- trunk/geany-plugins/geanyextrasel/Makefile.am trunk/geany-plugins/geanyextrasel/src/Makefile.am Modified: trunk/geany-plugins/geanyextrasel/Makefile.am =================================================================== --- trunk/geany-plugins/geanyextrasel/Makefile.am 2010-11-05 18:35:08 UTC (rev 1709) +++ trunk/geany-plugins/geanyextrasel/Makefile.am 2010-11-05 18:35:38 UTC (rev 1710) @@ -1,4 +1,8 @@ +if ENABLE_GEANYEXTRASEL include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif SUBDIRS = src plugin = geanyextrasel Modified: trunk/geany-plugins/geanyextrasel/src/Makefile.am =================================================================== --- trunk/geany-plugins/geanyextrasel/src/Makefile.am 2010-11-05 18:35:08 UTC (rev 1709) +++ trunk/geany-plugins/geanyextrasel/src/Makefile.am 2010-11-05 18:35:38 UTC (rev 1710) @@ -1,5 +1,10 @@ include $(top_srcdir)/build/vars.build.mk +if ENABLE_GEANYEXTRASEL geanyplugins_LTLIBRARIES = geanyextrasel.la +else +EXTRA_LTLIBRARIES = geanyextrasel.la +endif + geanyextrasel_la_SOURCES = extrasel.c geanyextrasel_la_LIBADD = $(COMMONLIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1709] trunk/geany-plugins/geanydoc
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1709 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1709&view=rev Author: hyperair Date: 2010-11-05 18:35:08 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Add AM_CONDITIONAL hooks for GeanyDoc Modified Paths: -------------- trunk/geany-plugins/geanydoc/Makefile.am trunk/geany-plugins/geanydoc/src/Makefile.am Modified: trunk/geany-plugins/geanydoc/Makefile.am =================================================================== --- trunk/geany-plugins/geanydoc/Makefile.am 2010-11-05 18:34:36 UTC (rev 1708) +++ trunk/geany-plugins/geanydoc/Makefile.am 2010-11-05 18:35:08 UTC (rev 1709) @@ -1,4 +1,8 @@ +if ENABLE_GEANYDOC include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif SUBDIRS = src tests plugin = geanydoc Modified: trunk/geany-plugins/geanydoc/src/Makefile.am =================================================================== --- trunk/geany-plugins/geanydoc/src/Makefile.am 2010-11-05 18:34:36 UTC (rev 1708) +++ trunk/geany-plugins/geanydoc/src/Makefile.am 2010-11-05 18:35:08 UTC (rev 1709) @@ -1,6 +1,11 @@ include $(top_srcdir)/build/vars.build.mk +if ENABLE_GEANYDOC geanyplugins_LTLIBRARIES = geanydoc.la +else +EXTRA_LTLIBRARIES = geanydoc.la +endif + geanydoc_la_SOURCES = \ config.c \ geanydoc.c \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1708] trunk/geany-plugins/codenav
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1708 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1708&view=rev Author: hyperair Date: 2010-11-05 18:34:36 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Add AM_CONDITIONAL hooks for codenav Modified Paths: -------------- trunk/geany-plugins/codenav/Makefile.am trunk/geany-plugins/codenav/src/Makefile.am Modified: trunk/geany-plugins/codenav/Makefile.am =================================================================== --- trunk/geany-plugins/codenav/Makefile.am 2010-11-05 18:34:06 UTC (rev 1707) +++ trunk/geany-plugins/codenav/Makefile.am 2010-11-05 18:34:36 UTC (rev 1708) @@ -1,4 +1,8 @@ +if ENABLE_CODENAV include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif SUBDIRS = src plugin = codenav Modified: trunk/geany-plugins/codenav/src/Makefile.am =================================================================== --- trunk/geany-plugins/codenav/src/Makefile.am 2010-11-05 18:34:06 UTC (rev 1707) +++ trunk/geany-plugins/codenav/src/Makefile.am 2010-11-05 18:34:36 UTC (rev 1708) @@ -1,6 +1,10 @@ include $(top_srcdir)/build/vars.build.mk +if ENABLE_CODENAV geanyplugins_LTLIBRARIES = codenav.la +else +EXTRA_LTLIBRARIES = codenav.la +endif codenav_la_SOURCES = \ codenavigation.c \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1707] trunk/geany-plugins/addons
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1707 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1707&view=rev Author: hyperair Date: 2010-11-05 18:34:06 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Add hooks for ENABLE_ADDONS conditional in Makefile.am Modified Paths: -------------- trunk/geany-plugins/addons/Makefile.am trunk/geany-plugins/addons/src/Makefile.am Modified: trunk/geany-plugins/addons/Makefile.am =================================================================== --- trunk/geany-plugins/addons/Makefile.am 2010-11-05 18:33:35 UTC (rev 1706) +++ trunk/geany-plugins/addons/Makefile.am 2010-11-05 18:34:06 UTC (rev 1707) @@ -1,4 +1,8 @@ +if ENABLE_ADDONS include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif SUBDIRS = src plugin = addons Modified: trunk/geany-plugins/addons/src/Makefile.am =================================================================== --- trunk/geany-plugins/addons/src/Makefile.am 2010-11-05 18:33:35 UTC (rev 1706) +++ trunk/geany-plugins/addons/src/Makefile.am 2010-11-05 18:34:06 UTC (rev 1707) @@ -1,7 +1,10 @@ include $(top_srcdir)/build/vars.build.mk -geanyplugins_LTLIBRARIES = \ - addons.la +if ENABLE_ADDONS +geanyplugins_LTLIBRARIES = addons.la +else +EXTRA_LTLIBRARIES = addons.la +endif addons_la_SOURCES = \ addons.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1706] trunk/geany-plugins/build/common.m4
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1706 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1706&view=rev Author: hyperair Date: 2010-11-05 18:33:35 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Wrap ENABLE_$PLUGIN conditionals with AS_TR_SH Modified Paths: -------------- trunk/geany-plugins/build/common.m4 Modified: trunk/geany-plugins/build/common.m4 =================================================================== --- trunk/geany-plugins/build/common.m4 2010-11-05 18:33:09 UTC (rev 1705) +++ trunk/geany-plugins/build/common.m4 2010-11-05 18:33:35 UTC (rev 1706) @@ -15,7 +15,7 @@ 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(ENABLE_$1), + AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_$1)), test "m4_tolower($AS_TR_SH(enable_$1))" = "yes") fi ]) @@ -33,5 +33,5 @@ [m4_tolower(AS_TR_SH(enable_$1))=no]) fi - AM_CONDITIONAL(m4_toupper(ENABLE_$2), test "$m4_tolower(AS_TR_SH(enable_$1_)" = yes) + AM_CONDITIONAL(m4_toupper(AS_TR_SH(ENABLE_$2)), test "$m4_tolower(AS_TR_SH(enable_$1_)" = yes) ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1705] trunk/geany-plugins/build
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1705 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1705&view=rev Author: hyperair Date: 2010-11-05 18:33:09 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Use the new macros on all plugins Modified Paths: -------------- trunk/geany-plugins/build/addons.m4 trunk/geany-plugins/build/codenav.m4 trunk/geany-plugins/build/geanydoc.m4 trunk/geany-plugins/build/geanyextrasel.m4 trunk/geany-plugins/build/geanygdb.m4 trunk/geany-plugins/build/geanygendoc.m4 trunk/geany-plugins/build/geanyinsertnum.m4 trunk/geany-plugins/build/geanylatex.m4 trunk/geany-plugins/build/geanylipsum.m4 trunk/geany-plugins/build/geanylua.m4 trunk/geany-plugins/build/geanyprj.m4 trunk/geany-plugins/build/geanysendmail.m4 trunk/geany-plugins/build/geanyvc.m4 trunk/geany-plugins/build/pretty-printer.m4 trunk/geany-plugins/build/shiftcolumn.m4 trunk/geany-plugins/build/spellcheck.m4 trunk/geany-plugins/build/treebrowser.m4 trunk/geany-plugins/build/webhelper.m4 Modified: trunk/geany-plugins/build/addons.m4 =================================================================== --- trunk/geany-plugins/build/addons.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/addons.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_ADDONS], [ - GP_STATUS_PLUGIN_ADD([Addons], [yes]) + GP_ARG_DISABLE(Addons, yes) + GP_STATUS_PLUGIN_ADD([Addons], [$enable_addons]) AC_CONFIG_FILES([ addons/Makefile addons/src/Makefile Modified: trunk/geany-plugins/build/codenav.m4 =================================================================== --- trunk/geany-plugins/build/codenav.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/codenav.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_CODENAV], [ - GP_STATUS_PLUGIN_ADD([CodeNav], [yes]) + GP_ARG_DISABLE([CodeNav], [yes]) + GP_STATUS_PLUGIN_ADD([CodeNav], [$enable_codenav]) AC_CONFIG_FILES([ codenav/Makefile codenav/src/Makefile Modified: trunk/geany-plugins/build/geanydoc.m4 =================================================================== --- trunk/geany-plugins/build/geanydoc.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanydoc.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYDOC], [ - GP_STATUS_PLUGIN_ADD([GeanyDoc], [yes]) + GP_ARG_DISABLE([GeanyDoc], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyDoc], [$enable_geanydoc]) AC_CONFIG_FILES([ geanydoc/Makefile geanydoc/src/Makefile Modified: trunk/geany-plugins/build/geanyextrasel.m4 =================================================================== --- trunk/geany-plugins/build/geanyextrasel.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanyextrasel.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYEXTRASEL], [ - GP_STATUS_PLUGIN_ADD([GeanyExtraSel], [yes]) + GP_ARG_DISABLE([GeanyExtraSel], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyExtraSel], [$enable_geanyextrasel]) AC_CONFIG_FILES([ geanyextrasel/Makefile geanyextrasel/src/Makefile Modified: trunk/geany-plugins/build/geanygdb.m4 =================================================================== --- trunk/geany-plugins/build/geanygdb.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanygdb.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYGDB], [ - GP_STATUS_PLUGIN_ADD([GeanyGDB], [yes]) + GP_ARG_DISABLE([GeanyGDB], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyGDB], [$enable_geanygdb]) AC_CHECK_HEADERS([elf.h]) AC_CHECK_HEADERS([elf_abi.h]) AC_CONFIG_FILES([ Modified: trunk/geany-plugins/build/geanygendoc.m4 =================================================================== --- trunk/geany-plugins/build/geanygendoc.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanygendoc.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,52 +1,22 @@ AC_DEFUN([GP_CHECK_GEANYGENDOC], [ - AC_ARG_ENABLE(geanygendoc, - AC_HELP_STRING([--enable-geanygendoc=ARG], - [Enable GeanyGenDoc plugin [[default=auto]]]),, - [enable_geanygendoc=auto]) + GP_ARG_DISABLE([GeanyGenDoc], [auto]) GTK_VERSION=2.12 GLIB_VERSION=2.14 GIO_VERSION=2.18 CTPL_VERSION=0.3 - geanygendoc_have_gtk=no - geanygendoc_have_glib=no - geanygendoc_have_gio=no - geanygendoc_have_ctpl=no - if [[ x"$enable_geanygendoc" = "xauto" ]]; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= ${GTK_VERSION}], - [geanygendoc_have_gtk=yes], - [geanygendoc_have_gtk=no]) - PKG_CHECK_MODULES(GLIB, [glib-2.0 >= ${GLIB_VERSION}], - [geanygendoc_have_glib=yes], - [geanygendoc_have_glib=no]) - PKG_CHECK_MODULES(GIO, [gio-2.0 >= ${GIO_VERSION}], - [geanygendoc_have_gio=yes], - [geanygendoc_have_gio=no]) - PKG_CHECK_MODULES(CTPL, [ctpl >= ${CTPL_VERSION}], - [geanygendoc_have_ctpl=yes], - [geanygendoc_have_ctpl=no]) - if [[ $geanygendoc_have_gtk = yes ]] && - [[ $geanygendoc_have_glib = yes ]] && - [[ $geanygendoc_have_gio = yes ]] && - [[ $geanygendoc_have_ctpl = yes ]]; then - enable_geanygendoc=yes - else - enable_geanygendoc=no - fi - elif [[ x"$enable_geanygendoc" = "xyes" ]]; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= ${GTK_VERSION}]) - PKG_CHECK_MODULES(GLIB, [glib-2.0 >= ${GLIB_VERSION}]) - PKG_CHECK_MODULES(GIO, [gio-2.0 >= ${GIO_VERSION}]) - PKG_CHECK_MODULES(CTPL, [ctpl >= ${CTPL_VERSION}]) - fi + GP_CHECK_PLUGIN_DEPS([GeanyGenDoc], GEANYGENDOC, + [gtk+-2.0 >= ${GK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + ctpl >= ${CTPL_VERSION}]) AC_PATH_PROG([RST2HTML], [rst2html], [no]) AC_SUBST([RST2HTML]) AM_CONDITIONAL([BUILD_RST], [test "x$RST2HTML" != "xno"]) - AM_CONDITIONAL(ENABLE_GEANYGENDOC, test $enable_geanygendoc = yes) GP_STATUS_PLUGIN_ADD([GeanyGenDoc], [$enable_geanygendoc]) AC_CONFIG_FILES([ Modified: trunk/geany-plugins/build/geanyinsertnum.m4 =================================================================== --- trunk/geany-plugins/build/geanyinsertnum.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanyinsertnum.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYINSERTNUM], [ - GP_STATUS_PLUGIN_ADD([GeanyInsertNum], [yes]) + GP_ARG_DISABLE([GeanyInsertNum], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyInsertNum], [$enable_geanyinsertnum]) AC_CONFIG_FILES([ geanyinsertnum/Makefile geanyinsertnum/src/Makefile Modified: trunk/geany-plugins/build/geanylatex.m4 =================================================================== --- trunk/geany-plugins/build/geanylatex.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanylatex.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYLATEX], [ - GP_STATUS_PLUGIN_ADD([GeanyLaTeX], [yes]) + GP_ARG_DISABLE([GeanyLaTeX], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyLaTeX], [$enable_geanylatex]) AC_CONFIG_FILES([ geanylatex/Makefile geanylatex/src/Makefile Modified: trunk/geany-plugins/build/geanylipsum.m4 =================================================================== --- trunk/geany-plugins/build/geanylipsum.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanylipsum.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYLIPSUM], [ - GP_STATUS_PLUGIN_ADD([GeanyLipsum], [yes]) + GP_ARG_DISABLE([GeanyLipsum], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyLipsum], [$enable_geanylipsum]) AC_CONFIG_FILES([ geanylipsum/Makefile geanylipsum/src/Makefile Modified: trunk/geany-plugins/build/geanylua.m4 =================================================================== --- trunk/geany-plugins/build/geanylua.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanylua.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,9 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYLUA], [ - AC_ARG_ENABLE(geanylua, - AC_HELP_STRING([--enable-geanylua=ARG], - [Enable GeanyLua plugin [[default=auto]]]),, - [enable_geanylua=auto]) + GP_ARG_DISABLE([GeanyLua], [auto]) AC_ARG_WITH([lua-pkg], AC_HELP_STRING([--with-lua-pkg=ARG], @@ -18,15 +15,8 @@ done]) LUA_VERSION=5.1 - if [[ x"$enable_geanylua" = "xauto" ]]; then - PKG_CHECK_MODULES(LUA, [${LUA_PKG_NAME} >= ${LUA_VERSION}], - [enable_geanylua=yes], - [enable_geanylua=no]) - elif [[ x"$enable_geanylua" = "xyes" ]]; then - PKG_CHECK_MODULES(LUA, [${LUA_PKG_NAME} >= ${LUA_VERSION}]) - fi - - AM_CONDITIONAL(ENABLE_GEANYLUA, test $enable_geanylua = yes) + GP_CHECK_PLUGIN_DEPS([GeanyLua], [LUA], + [${LUA_PKG_NAME} >= ${LUA_VERSION}]) GP_STATUS_PLUGIN_ADD([GeanyLua], [$enable_geanylua]) AC_CONFIG_FILES([ Modified: trunk/geany-plugins/build/geanyprj.m4 =================================================================== --- trunk/geany-plugins/build/geanyprj.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanyprj.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYPRJ], [ - GP_STATUS_PLUGIN_ADD([GeanyPrj], [yes]) + GP_ARG_DISABLE([GeanyPrj], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyPrj], [$enable_geanyprj]) AC_CONFIG_FILES([ geanyprj/Makefile geanyprj/src/Makefile Modified: trunk/geany-plugins/build/geanysendmail.m4 =================================================================== --- trunk/geany-plugins/build/geanysendmail.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanysendmail.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYSENDMAIL], [ - GP_STATUS_PLUGIN_ADD([GeanySendmail], [yes]) + GP_ARG_DISABLE([GeanySendmail], [yes]) + GP_STATUS_PLUGIN_ADD([GeanySendmail], [$enable_geanysendmail]) AC_CONFIG_FILES([ geanysendmail/Makefile geanysendmail/src/Makefile Modified: trunk/geany-plugins/build/geanyvc.m4 =================================================================== --- trunk/geany-plugins/build/geanyvc.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/geanyvc.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_GEANYVC], [ - GP_STATUS_PLUGIN_ADD([GeanyVC], [yes]) + GP_ARG_DISABLE([GeanyVC], [yes]) + GP_STATUS_PLUGIN_ADD([GeanyVC], [$enable_geanyvc]) AC_ARG_ENABLE(gtkspell, AC_HELP_STRING([--enable-gtkspell=ARG], [Enable GtkSpell support in GeanyVC. [[default=auto]]]),, @@ -13,12 +14,16 @@ PKG_CHECK_MODULES(GTKSPELL, [gtkspell-2.0]) fi + if [[ "$enable_gtkspell" = yes -a "$enable_geanyvc" no ]]; then + AC_MSG_WARN([GtkSpell support for GeanyVC enabled, but GeanyVC itself not enabled.]) + fi + AM_CONDITIONAL(USE_GTKSPELL, test $enable_gtkspell = yes) GP_STATUS_FEATURE_ADD([GeanyVC GtkSpell support], [$enable_gtkspell]) AC_CONFIG_FILES([ geanyvc/Makefile geanyvc/src/Makefile - geanyvc/tests/Makefile + geanyvc/tests/Makefile ]) ]) Modified: trunk/geany-plugins/build/pretty-printer.m4 =================================================================== --- trunk/geany-plugins/build/pretty-printer.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/pretty-printer.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,21 +1,10 @@ AC_DEFUN([GP_CHECK_PRETTYPRINTER], [ - AC_ARG_ENABLE([prettyprinter], - AC_HELP_STRING([--enable-prettyprinter=ARG], - [Enable the pretty-printer plugin [[default=auto]]]),, - enable_prettyprinter=auto) - LIBXML_VERSION=2.6.27 - if [[ x"$enable_prettyprinter" = "xauto" ]]; then - PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= $LIBXML_VERSION], - [enable_prettyprinter=yes], - [enable_prettyprinter=no]) - elif [[ x"$enable_prettyprinter" = "xyes" ]]; then - PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= $LIBXML_VERSION]) - fi - AM_CONDITIONAL(ENABLE_PRETTYPRINTER, test $enable_prettyprinter = yes) - + 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_prettyprinter]) AC_CONFIG_FILES([ Modified: trunk/geany-plugins/build/shiftcolumn.m4 =================================================================== --- trunk/geany-plugins/build/shiftcolumn.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/shiftcolumn.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,6 +1,7 @@ AC_DEFUN([GP_CHECK_SHIFTCOLUMN], [ - GP_STATUS_PLUGIN_ADD([ShiftColumn], [yes]) + GP_ARG_DISABLE([ShiftColumn], [yes]) + GP_STATUS_PLUGIN_ADD([ShiftColumn], [$enable_shiftcolumn]) AC_CONFIG_FILES([ shiftcolumn/Makefile shiftcolumn/src/Makefile Modified: trunk/geany-plugins/build/spellcheck.m4 =================================================================== --- trunk/geany-plugins/build/spellcheck.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/spellcheck.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,30 +1,15 @@ AC_DEFUN([GP_CHECK_SPELLCHECK], [ - AC_ARG_ENABLE([spellcheck], - AC_HELP_STRING([--enable-spellcheck=ARG], - [Enable the spellcheck plugin [[default=auto]]]),, - enable_spellcheck=auto) + GP_ARG_DISABLE([spellcheck], [auto]) ENCHANT_VERSION=1.3 OPT_ENCHANT_VERSION=1.5 + GP_CHECK_PLUGIN_DEPS([spellcheck], [ENCHANT], + [enchant >= ${ENCHANT_VERSION}]) + PKG_CHECK_MODULES([ENCHANT], [enchant >= $OPT_ENCHANT_VERSION], + have_enchant_1_5=yes, + have_enchant_1_5=no) - if [[ x"$enable_spellcheck" = "xauto" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $OPT_ENCHANT_VERSION], - [have_enchant_1_5=yes; enable_spellcheck=yes], - [have_enchant_1_5=no; enable_spellcheck=auto]) - if [[ "$enable_spellcheck" = "auto" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION], - [enable_spellcheck=yes], - [enable_spellcheck=no]) - fi - elif [[ x"$enable_spellcheck" = "xyes" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $OPT_ENCHANT_VERSION], - [have_enchant_1_5=yes], - [have_enchant_1_5=no; - PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION])]) - fi - - AM_CONDITIONAL(ENABLE_SPELLCHECK, test $enable_spellcheck = yes) AM_CONDITIONAL(HAVE_ENCHANT_1_5, test $have_enchant_1_5 = yes) GP_STATUS_PLUGIN_ADD([Spellcheck], [$enable_spellcheck]) Modified: trunk/geany-plugins/build/treebrowser.m4 =================================================================== --- trunk/geany-plugins/build/treebrowser.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/treebrowser.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,14 +1,18 @@ AC_DEFUN([GP_CHECK_TREEBROWSER], [ - AC_ARG_ENABLE(treebrowser, - AC_HELP_STRING([--enable-treebrowser=ARG], - [Enable TreeBrowser plugin [[default=auto]]]),, - [enable_treebrowser=auto]) + GP_ARG_DISABLE([Treebrowser], [auto]) + if [[ "$enable_treebrowser" != no ]]; then + AC_CHECK_FUNC([creat],, + [ + if [[ "$enable_treebrowser" = auto ]]; then + enable_treebrowser=no + else + AC_MSG_ERROR([Treebrowser cannot be enabled because creat() is missing. + Please disable it (--disable-treebrowser) or make sure creat() + works on your system.]) + fi + ]) - treebrowser_have_creat=yes - AC_CHECK_HEADERS([sys/types.h sys/stat.h fcntl.h], - [], [treebrowser_have_creat=no]) - AC_CHECK_FUNC([creat], [], [treebrowser_have_creat=no]) PKG_CHECK_MODULES([GIO], [gio-2.0], [AC_DEFINE([HAVE_GIO], 1, [Whether we have GIO])], [AC_MSG_NOTICE([Treebrowser GIO support is disabled because of the following problem: $GIO1_PKG_ERRORS])]) Modified: trunk/geany-plugins/build/webhelper.m4 =================================================================== --- trunk/geany-plugins/build/webhelper.m4 2010-11-05 18:32:13 UTC (rev 1704) +++ trunk/geany-plugins/build/webhelper.m4 2010-11-05 18:33:09 UTC (rev 1705) @@ -1,10 +1,6 @@ AC_DEFUN([GP_CHECK_WEBHELPER], [ - AC_ARG_ENABLE([webhelper], - AC_HELP_STRING([--enable-webhelper=ARG], - [Enable WebHelper plugin [[default=auto]]]), - [], - [enable_webhelper=auto]) + GP_ARG_DISABLE([WebHelper], [auto]) GTK_VERSION=2.16 GLIB_VERSION=2.16 @@ -12,44 +8,6 @@ GDK_PIXBUF_VERSION=2.0 WEBKIT_VERSION=1.1.18 - webhelper_have_gtk=no - webhelper_have_glib=no - webhelper_have_gio=no - webhelper_have_gdk_pixbuf=no - webhelper_have_webkit=no - if [[ x"$enable_webhelper" = "xauto" ]]; then - PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_VERSION}], - [webhelper_have_gtk=yes], - [webhelper_have_gtk=no]) - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= ${GLIB_VERSION}], - [webhelper_have_glib=yes], - [webhelper_have_glib=no]) - PKG_CHECK_MODULES([GIO], [gio-2.0 >= ${GIO_VERSION}], - [webhelper_have_gio=yes], - [webhelper_have_gio=no]) - PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}], - [webhelper_have_gdk_pixbuf=yes], - [webhelper_have_gdk_pixbuf=no]) - PKG_CHECK_MODULES([WEBKIT], [webkit-1.0 >= ${WEBKIT_VERSION}], - [webhelper_have_webkit=yes], - [webhelper_have_webkit=no]) - if [[ $webhelper_have_gtk = yes ]] && - [[ $webhelper_have_glib = yes ]] && - [[ $webhelper_have_gio = yes ]] && - [[ $webhelper_have_gdk_pixbuf = yes ]] && - [[ $webhelper_have_webkit = yes ]]; then - enable_webhelper=yes - else - enable_webhelper=no - fi - elif [[ x"$enable_webhelper" = "xyes" ]]; then - PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_VERSION}]) - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= ${GLIB_VERSION}]) - PKG_CHECK_MODULES([GIO], [gio-2.0 >= ${GIO_VERSION}]) - PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION}]) - PKG_CHECK_MODULES([WEBKIT], [webkit-1.0 >= ${WEBKIT_VERSION}]) - fi - AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums], [no]) AC_SUBST([GLIB_MKENUMS]) if [[ x"$GLIB_MKENUMS" = "xno" ]]; then @@ -60,7 +18,14 @@ fi fi - AM_CONDITIONAL(ENABLE_WEBHELPER, test $enable_webhelper = yes) + GP_CHECK_PLUGIN_DEPS([WebHelper], [WEBHELPER], + [gtk-2.0 >= ${GTK_VERSION} + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} + webkit-1.0 >= ${WEBKIT_VERSION}]) + + GP_STATUS_PLUGIN_ADD([WebHelper], [$enable_webhelper]) AC_CONFIG_FILES([ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1704] trunk/geany-plugins/build/common.m4
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1704 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1704&view=rev Author: hyperair Date: 2010-11-05 18:32:13 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Add helper macros for enable/disable plugin granularity * GP_ARG_DISABLE -- wrapper over AC_ARG_ENABLE for plugins * GP_CHECK_PLUGIN_DEPS -- wrapper for PKG_CHECK_MODULES Added Paths: ----------- trunk/geany-plugins/build/common.m4 Added: trunk/geany-plugins/build/common.m4 =================================================================== --- trunk/geany-plugins/build/common.m4 (rev 0) +++ trunk/geany-plugins/build/common.m4 2010-11-05 18:32:13 UTC (rev 1704) @@ -0,0 +1,37 @@ +dnl GP_ARG_DISABLE(PluginName, default) +dnl - default can either be yes(enabled) or no(disabled) +dnl Generates --enable/disable options with help strings + +AC_DEFUN([GP_ARG_DISABLE], +[ + AC_ARG_ENABLE(m4_tolower(AS_TR_SH($1)), + AS_HELP_STRING(m4_join(-, + --m4_if($2, no, enable, disable), + m4_tolower(AS_TR_SH($1))), + [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(ENABLE_$1), + test "m4_tolower($AS_TR_SH(enable_$1))" = "yes") + fi +]) + +dnl GP_CHECK_PLUGIN_DEPS(PluginName, VARIABLE-PREFIX, modules...) +dnl Checks whether modules exist using PKG_CHECK_MODULES, and enables/disables +dnl plugins appropriately if enable_$plugin=auto +AC_DEFUN([GP_CHECK_PLUGIN_DEPS], +[ + if test "$m4_tolower(AS_TR_SH(enable_$1))" = "yes"; then + PKG_CHECK_MODULES($2, $3) + elif test "$m4_tolower(AS_TR_SH(enable_$1))" = "auto"; then + PKG_CHECK_MODULES($2, $3, + [m4_tolower(AS_TR_SH(enable_$1))=yes], + [m4_tolower(AS_TR_SH(enable_$1))=no]) + fi + + AM_CONDITIONAL(m4_toupper(ENABLE_$2), test "$m4_tolower(AS_TR_SH(enable_$1_)" = yes) +]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1703] trunk/geany-plugins/autogen.sh
by hyperair＠users.sourceforge.net 05 Nov '10

05 Nov '10

Revision: 1703 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1703&view=rev Author: hyperair Date: 2010-11-05 18:31:44 +0000 (Fri, 05 Nov 2010) Log Message: ----------- Allow skipping configure during autogen by setting NOCONFIGURE=1 Modified Paths: -------------- trunk/geany-plugins/autogen.sh Modified: trunk/geany-plugins/autogen.sh =================================================================== --- trunk/geany-plugins/autogen.sh 2010-11-02 21:43:46 UTC (rev 1702) +++ trunk/geany-plugins/autogen.sh 2010-11-05 18:31:44 UTC (rev 1703) @@ -4,4 +4,8 @@ intltoolize -c -f autoreconf -vfi -./configure "$@" +if [ "$NOCONFIGURE" = 1 ]; then + echo "Done. configure skipped." + exit 0; +fi +exec ./configure "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1702] www/staging/.htaccess
by dmaphy＠users.sourceforge.net 02 Nov '10

02 Nov '10

Revision: 1702 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1702&view=rev Author: dmaphy Date: 2010-11-02 21:43:46 +0000 (Tue, 02 Nov 2010) Log Message: ----------- website: pass GET parameters to index.php via rewrite rules (sorry, Michael, should be fixed now) Modified Paths: -------------- www/staging/.htaccess Modified: www/staging/.htaccess =================================================================== --- www/staging/.htaccess 2010-11-02 15:54:32 UTC (rev 1701) +++ www/staging/.htaccess 2010-11-02 21:43:46 UTC (rev 1702) @@ -14,13 +14,13 @@ RewriteCond %{REQUEST_URI} !site RewriteCond %{REQUEST_URI} !^/$ RewriteCond %{REQUEST_URI} !html|css|png|php|tar|gz|bz2$ -RewriteRule ^(.+) index.php?site=$1 [L] +RewriteRule ^(.+) index.php?site=$1&%{QUERY_STRING} [L] RewriteCond %{REQUEST_URI} !site -RewriteRule ^(.+).html index.php?site=$1 [L] +RewriteRule ^(.+).html index.php?site=$1&%{QUERY_STRING} [L] RewriteCond %{REQUEST_URI} !html|css|png|php|tar|gz|bz2$ -RewriteRule ^site\/(.+) index.php?site=$1 [L] -RewriteRule ^site\/(.+).html index.php?site=$1 [L] +RewriteRule ^site\/(.+) index.php?site=$1&%{QUERY_STRING} [L] +RewriteRule ^site\/(.+).html index.php?/p?site=$1&%{QUERY_STRING} [L] RewriteRule ^site\/images(.+) /images$1 [L] RewriteRule ^site\/stylesheets(.+) /stylesheets$1 [L] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1701] www/staging/content/downloads.html
by any0n3＠users.sourceforge.net 02 Nov '10

02 Nov '10

Revision: 1701 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1701&view=rev Author: any0n3 Date: 2010-11-02 15:54:32 +0000 (Tue, 02 Nov 2010) Log Message: ----------- Made 2 urls valid. Modified Paths: -------------- www/staging/content/downloads.html Modified: www/staging/content/downloads.html =================================================================== --- www/staging/content/downloads.html 2010-11-01 17:02:36 UTC (rev 1700) +++ www/staging/content/downloads.html 2010-11-02 15:54:32 UTC (rev 1701) @@ -1,6 +1,6 @@ <h2>Download Geany-Plugins</h2> <?php - $dir = "./geany-plugins/"; +$dir = "./geany-plugins/"; if($handle = opendir('geany-plugins')) { @@ -31,14 +31,14 @@ echo " <th>"; if ($_GET['hash'] != "md5") { - echo "<a href=\"?site=downloads&hash=md5\">MD5</a> "; + echo "<a href=\"?site=downloads&hash=md5\">MD5</a> "; } else { echo "MD5 "; } echo "/"; if ($_GET['hash'] != "sha1") { - echo " <a href=\"?site=downloads&hash=sha1\">SHA1</a> "; + echo " <a href=\"?site=downloads&hash=sha1\">SHA1</a> "; } else { echo " SHA1"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits November 2010