Revision: 770 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=770&view=rev Author: hyperair Date: 2009-06-22 10:00:45 +0000 (Mon, 22 Jun 2009)
Log Message: ----------- Automagic for geanylua
Modified Paths: -------------- trunk/geany-plugins/build/geanylua.m4 trunk/geany-plugins/geanylua/Makefile.am trunk/geany-plugins/geanylua/docs/Makefile.am trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am trunk/geany-plugins/geanylua/examples/edit/Makefile.am trunk/geany-plugins/geanylua/examples/info/Makefile.am trunk/geany-plugins/geanylua/examples/scripting/Makefile.am trunk/geany-plugins/geanylua/examples/work/Makefile.am
Modified: trunk/geany-plugins/build/geanylua.m4 =================================================================== --- trunk/geany-plugins/build/geanylua.m4 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/build/geanylua.m4 2009-06-22 10:00:45 UTC (rev 770) @@ -1,5 +1,10 @@ AC_DEFUN([GP_CHECK_GEANYLUA], [ + AC_ARG_ENABLE(geanylua, + AC_HELP_STRING([--enable-geanylua=ARG], + [Enable GeanyLua plugin [[default=auto]]),, + [enable_geanylua=auto]) + AC_ARG_WITH([lua-pkg], AC_HELP_STRING([--with-lua-pkg=ARG], [name of Lua pkg-config script [[default=lua5.1]]]), @@ -11,8 +16,17 @@ [LUA_PKG_NAME=$L],[]) done])
- PKG_CHECK_MODULES(LUA, [${LUA_PKG_NAME} >= 5.1]) + 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) + AC_CONFIG_FILES([ geanylua/examples/edit/Makefile geanylua/examples/scripting/Makefile
Modified: trunk/geany-plugins/geanylua/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -1,11 +1,22 @@ +# don't install docs if disabled +if ENABLE_GEANYLUA include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +EXTRA_DIST = $(AUXFILES) +endif include $(top_srcdir)/build/vars.build.mk
plugin = geanylua
+# don't build if disabled +if ENABLE_GEANYLUA geanyplugins_LTLIBRARIES = geanylua.la geanyluadir = $(geanypluginsdir)/geanylua geanylua_LTLIBRARIES = libgeanylua.la +else +EXTRA_LTLIBRARIES = geanylua.la libgeanylua.la +endif
geanylua_la_SOURCES = geanylua.c libgeanylua_la_SOURCES = \
Modified: trunk/geany-plugins/geanylua/docs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/docs/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,7 +2,7 @@
plugin = geanylua
-htmldoc_DATA = \ +DOCFILES = \ geanylua-index.html \ geanylua-input.html \ geanylua-intro.html \ @@ -11,5 +11,9 @@ geanylua-ref.html \ luarefv51.html
+if ENABLE_GEANYLUA +htmldoc_DATA = $(DOCFILES) +endif + # make sure that these files are distributed as well EXTRA_DIST = $(htmldoc_DATA)
Modified: trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/dialogs/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -3,9 +3,14 @@ plugin = geanylua
dialogsdir = $(examplesdir)/dialogs -dialogs_DATA = \ + +EXAMPLES = \ basic-dialogs.lua \ complex-dialog.lua
+if ENABLE_GEANYLUA +dialogs_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(dialogs_DATA) +EXTRA_DIST = $(EXAMPLES)
Modified: trunk/geany-plugins/geanylua/examples/edit/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/edit/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/edit/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,7 +2,7 @@
plugin = geanylua editdir = $(examplesdir)/edit -edit_DATA = \ +EXAMPLES = \ calculator.lua \ lua-replace.lua \ proper-case.lua \ @@ -10,5 +10,9 @@ right-trim.lua \ select-block.lua
+if ENABLE_GEANYLUA +edit_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(edit_DATA) +EXTRA_DIST = $(EXAMPLES)
Modified: trunk/geany-plugins/geanylua/examples/info/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/info/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,7 +2,7 @@
plugin = geanylua exampleinfodir = $(examplesdir)/info -exampleinfo_DATA = \ +EXAMPLES = \ about.lua \ app-information.lua \ file-information.lua \ @@ -10,5 +10,9 @@ Makefile.am \ show-filename.lua
+if ENABLE_GEANYLUA +exampleinfo_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(exampleinfo_DATA) +EXTRA_DIST = $(EXAMPLES)
Modified: trunk/geany-plugins/geanylua/examples/scripting/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/scripting/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/scripting/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,11 +2,15 @@
plugin = geanylua scriptingdir = $(examplesdir)/scripting -scripting_DATA = \ +EXAMPLES = \ help.lua \ open-script.lua \ rebuild-menu.lua \ show-examples.lua
+if ENABLE_GEANYLUA +scripting_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(scripting_DATA) +EXTRA_DIST = $(EXAMPLES)
Modified: trunk/geany-plugins/geanylua/examples/work/Makefile.am =================================================================== --- trunk/geany-plugins/geanylua/examples/work/Makefile.am 2009-06-22 09:59:02 UTC (rev 769) +++ trunk/geany-plugins/geanylua/examples/work/Makefile.am 2009-06-22 10:00:45 UTC (rev 770) @@ -2,10 +2,14 @@
plugin = geanylua workdir = $(examplesdir)/work -work_DATA = \ +EXAMPLES = \ 01.edit-test-script.lua \ 02.run-test-script.lua \ 03.install-test-script.lua
+if ENABLE_GEANYLUA +work_DATA = $(EXAMPLES) +endif + # make sure that these files are distributed as well -EXTRA_DIST = $(work_DATA) +EXTRA_DIST = $(EXAMPLES)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.