SF.net SVN: geany-plugins:[1748] trunk/geany-plugins

[frlan at users.sourceforge.net]

Revision: 1748
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1748&view=rev
Author:   frlan
Date:     2010-11-15 22:33:34 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
Fix make distcheck for Updatechecker plugin and make plugin compile at all with autotools. To do this patches by Colomban Wendling has been applied. Thanks for providing them

Modified Paths:
--------------
    trunk/geany-plugins/Makefile.am
    trunk/geany-plugins/build/geany.m4
    trunk/geany-plugins/build/status.m4
    trunk/geany-plugins/configure.ac
    trunk/geany-plugins/updatechecker/src/Makefile.am

Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am	2010-11-14 20:46:14 UTC (rev 1747)
+++ trunk/geany-plugins/Makefile.am	2010-11-15 22:33:34 UTC (rev 1748)
@@ -16,6 +16,7 @@
 	shiftcolumn \
 	spellcheck \
 	treebrowser \
+	updatechecker \
 	webhelper
 
 ACLOCAL_AMFLAGS = -I build/cache -I build --install

Modified: trunk/geany-plugins/build/geany.m4
===================================================================
--- trunk/geany-plugins/build/geany.m4	2010-11-14 20:46:14 UTC (rev 1747)
+++ trunk/geany-plugins/build/geany.m4	2010-11-15 22:33:34 UTC (rev 1748)
@@ -11,8 +11,9 @@
 
     PKG_CHECK_MODULES([GEANY], [geany >= $1])
     geanypluginsdir=$geany_libdir/geany
-    geanyversion=$(${PKG_CONFIG} --modversion geany)
+    GEANY_VERSION=$(${PKG_CONFIG} --modversion geany)
     AC_SUBST([geanypluginsdir])
+    AC_SUBST([GEANY_VERSION])
 
     export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}"
     test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH

Modified: trunk/geany-plugins/build/status.m4
===================================================================
--- trunk/geany-plugins/build/status.m4	2010-11-14 20:46:14 UTC (rev 1747)
+++ trunk/geany-plugins/build/status.m4	2010-11-15 22:33:34 UTC (rev 1748)
@@ -42,7 +42,7 @@
 ${PACKAGE}-${VERSION}
 
   Build Environment:
-    Geany version:                ${geanyversion}
+    Geany version:                ${GEANY_VERSION}
     Install prefix:               ${prefix}
     Datadir:                      ${expanded_datadir}/${PACKAGE_TARNAME}
     Libdir:                       ${expanded_libdir}/${PACKAGE_TARNAME}

Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac	2010-11-14 20:46:14 UTC (rev 1747)
+++ trunk/geany-plugins/configure.ac	2010-11-15 22:33:34 UTC (rev 1748)
@@ -39,6 +39,7 @@
 GP_CHECK_SHIFTCOLUMN
 GP_CHECK_SPELLCHECK
 GP_CHECK_TREEBROWSER
+GP_CHECK_UPDATECHECKER
 GP_CHECK_WEBHELPER
 
 AC_CONFIG_FILES([

Modified: trunk/geany-plugins/updatechecker/src/Makefile.am
===================================================================
--- trunk/geany-plugins/updatechecker/src/Makefile.am	2010-11-14 20:46:14 UTC (rev 1747)
+++ trunk/geany-plugins/updatechecker/src/Makefile.am	2010-11-15 22:33:34 UTC (rev 1748)
@@ -1,9 +1,20 @@
 include $(top_srcdir)/build/vars.build.mk
+plugin = updatechecker
 
 if ENABLE_UPDATECHECKER
 geanyplugins_LTLIBRARIES = updatechecker.la
 else
 EXTRA_LTLIBRARIES = updatechecker.la
 endif
+
 updatechecker_la_SOURCES = updatechecker.c
-updatechecker_la_LIBADD = $(COMMONLIBS)
+updatechecker_la_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DGEANY_VERSION=\"$(GEANY_VERSION)\" \
+	-DG_LOG_DOMAIN=\"Updatechecker\"
+updatechecker_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UPDATECHECKER_CFLAGS)
+updatechecker_la_LIBADD = \
+	$(COMMONLIBS) \
+	$(UPDATECHECKER_LIBS)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.