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

[hyperair at users.sourceforge.net]

Revision: 721
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=721&view=rev
Author:   hyperair
Date:     2009-06-14 15:12:13 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Move *.m4 files into build/m4

Modified Paths:
--------------
    trunk/geany-plugins/Makefile.am
    trunk/geany-plugins/configure.ac

Added Paths:
-----------
    trunk/geany-plugins/build/m4/
    trunk/geany-plugins/build/m4/plugins/
    trunk/geany-plugins/build/m4/plugins/addons.m4
    trunk/geany-plugins/build/m4/plugins/geanygdb.m4

Removed Paths:
-------------
    trunk/geany-plugins/addons/build/plugin.m4
    trunk/geany-plugins/geanygdb/build/plugin.m4

Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am	2009-06-14 15:07:57 UTC (rev 720)
+++ trunk/geany-plugins/Makefile.am	2009-06-14 15:12:13 UTC (rev 721)
@@ -1,6 +1,6 @@
 plugins = addons geanygdb
 
-ACLOCAL_AMFLAGS = -I m4	-I addons/build -I geanygdb/build --install
+ACLOCAL_AMFLAGS = -Ibuild/m4/cache -Ibuild/m4/plugins --install
 
 SUBDIRS = \
 	po \

Deleted: trunk/geany-plugins/addons/build/plugin.m4
===================================================================
--- trunk/geany-plugins/addons/build/plugin.m4	2009-06-14 15:07:57 UTC (rev 720)
+++ trunk/geany-plugins/addons/build/plugin.m4	2009-06-14 15:12:13 UTC (rev 721)
@@ -1,7 +0,0 @@
-AC_DEFUN([GP_CHECK_ADDONS],
-[
-    AC_CONFIG_FILES([
-        addons/Makefile
-        addons/src/Makefile
-    ])
-])

Copied: trunk/geany-plugins/build/m4/plugins/addons.m4 (from rev 720, trunk/geany-plugins/addons/build/plugin.m4)
===================================================================
--- trunk/geany-plugins/build/m4/plugins/addons.m4	                        (rev 0)
+++ trunk/geany-plugins/build/m4/plugins/addons.m4	2009-06-14 15:12:13 UTC (rev 721)
@@ -0,0 +1,7 @@
+AC_DEFUN([GP_CHECK_ADDONS],
+[
+    AC_CONFIG_FILES([
+        addons/Makefile
+        addons/src/Makefile
+    ])
+])

Copied: trunk/geany-plugins/build/m4/plugins/geanygdb.m4 (from rev 720, trunk/geany-plugins/geanygdb/build/plugin.m4)
===================================================================
--- trunk/geany-plugins/build/m4/plugins/geanygdb.m4	                        (rev 0)
+++ trunk/geany-plugins/build/m4/plugins/geanygdb.m4	2009-06-14 15:12:13 UTC (rev 721)
@@ -0,0 +1,8 @@
+AC_DEFUN([GP_CHECK_GEANYGDB],
+[
+    AC_CONFIG_FILES([
+        geanygdb/Makefile
+        geanygdb/src/Makefile
+        geanygdb/tests/Makefile
+    ])
+])

Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac	2009-06-14 15:07:57 UTC (rev 720)
+++ trunk/geany-plugins/configure.ac	2009-06-14 15:12:13 UTC (rev 721)
@@ -4,7 +4,7 @@
 
 AC_CONFIG_SRCDIR([po/LINGUAS])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([build/m4/cache])
 
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -24,7 +24,6 @@
 dnl common checks
 PKG_CHECK_MODULES([GEANY], [geany >= 0.16])
 geanypluginsdir=`${PKG_CONFIG} --variable=libdir geany`/geany
-echo ${geanypluginsdir}
 AC_SUBST([geanypluginsdir])
 
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], 

Deleted: trunk/geany-plugins/geanygdb/build/plugin.m4
===================================================================
--- trunk/geany-plugins/geanygdb/build/plugin.m4	2009-06-14 15:07:57 UTC (rev 720)
+++ trunk/geany-plugins/geanygdb/build/plugin.m4	2009-06-14 15:12:13 UTC (rev 721)
@@ -1,8 +0,0 @@
-AC_DEFUN([GP_CHECK_GEANYGDB],
-[
-    AC_CONFIG_FILES([
-        geanygdb/Makefile
-        geanygdb/src/Makefile
-        geanygdb/tests/Makefile
-    ])
-])


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