SF.net SVN: geany-plugins:[834] trunk/geany-plugins
hyperair at users.sourceforge.net
hyperair at xxxxx
Fri Jul 17 19:42:26 UTC 2009
Revision: 834
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=834&view=rev
Author: hyperair
Date: 2009-07-17 19:42:26 +0000 (Fri, 17 Jul 2009)
Log Message:
-----------
Add status message after configure output
Modified Paths:
--------------
trunk/geany-plugins/build/addons.m4
trunk/geany-plugins/build/geany.m4
trunk/geany-plugins/build/geanygdb.m4
trunk/geany-plugins/build/geanylatex.m4
trunk/geany-plugins/build/geanylipsum.m4
trunk/geany-plugins/build/geanylua.m4
trunk/geany-plugins/build/geanysendmail.m4
trunk/geany-plugins/build/geanyvc.m4
trunk/geany-plugins/build/shiftcolumn.m4
trunk/geany-plugins/configure.ac
Added Paths:
-----------
trunk/geany-plugins/build/expansions.m4
trunk/geany-plugins/build/status.m4
Modified: trunk/geany-plugins/build/addons.m4
===================================================================
--- trunk/geany-plugins/build/addons.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/addons.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_ADDONS],
[
+ GP_STATUS_PLUGIN_ADD([Addons], [yes])
AC_CONFIG_FILES([
addons/Makefile
addons/src/Makefile
Added: trunk/geany-plugins/build/expansions.m4
===================================================================
--- trunk/geany-plugins/build/expansions.m4 (rev 0)
+++ trunk/geany-plugins/build/expansions.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -0,0 +1,20 @@
+AC_DEFUN([_GP_EXPAND_PREFIX_],
+[
+ case $prefix in
+ NONE) prefix=$ac_default_prefix ;;
+ *) ;;
+ esac
+
+ case $exec_prefix in
+ NONE) exec_prefix=$prefix ;;
+ *) ;;
+ esac
+])
+
+AC_DEFUN([GP_EXPAND_DIR],
+[
+ AC_REQUIRE([_GP_EXPAND_PREFIX_])
+
+ expanded_$1=$(eval echo $$1)
+ expanded_$1=$(eval echo $expanded_$1)
+])
Modified: trunk/geany-plugins/build/geany.m4
===================================================================
--- trunk/geany-plugins/build/geany.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geany.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -12,7 +12,8 @@
export PKG_CONFIG_PATH="$geany_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
PKG_CHECK_MODULES([GEANY], [geany >= $1])
- geanypluginsdir=$($PKG_CONFIG --variable=libdir)/geany
+ geanypluginsdir=$($PKG_CONFIG --variable=libdir geany)/geany
+ geanyversion=$($PKG_CONFIG --modversion geany)
AC_SUBST([geanypluginsdir])
test -z $geany_prefix || \
Modified: trunk/geany-plugins/build/geanygdb.m4
===================================================================
--- trunk/geany-plugins/build/geanygdb.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geanygdb.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_GEANYGDB],
[
+ GP_STATUS_PLUGIN_ADD([GeanyGDB], [yes])
AC_CONFIG_FILES([
geanygdb/Makefile
geanygdb/src/Makefile
Modified: trunk/geany-plugins/build/geanylatex.m4
===================================================================
--- trunk/geany-plugins/build/geanylatex.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geanylatex.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_GEANYLATEX],
[
+ GP_STATUS_PLUGIN_ADD([GeanyLaTeX], [yes])
AC_CONFIG_FILES([
geanylatex/Makefile
geanylatex/src/Makefile
Modified: trunk/geany-plugins/build/geanylipsum.m4
===================================================================
--- trunk/geany-plugins/build/geanylipsum.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geanylipsum.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_GEANYLIPSUM],
[
+ GP_STATUS_PLUGIN_ADD([GeanyLipsum], [yes])
AC_CONFIG_FILES([
geanylipsum/Makefile
geanylipsum/src/Makefile
Modified: trunk/geany-plugins/build/geanylua.m4
===================================================================
--- trunk/geany-plugins/build/geanylua.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geanylua.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -27,6 +27,7 @@
fi
AM_CONDITIONAL(ENABLE_GEANYLUA, test $enable_geanylua = yes)
+ GP_STATUS_PLUGIN_ADD([GeanyLua], [$enable_geanylua])
AC_CONFIG_FILES([
geanylua/examples/edit/Makefile
Modified: trunk/geany-plugins/build/geanysendmail.m4
===================================================================
--- trunk/geany-plugins/build/geanysendmail.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geanysendmail.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_GEANYSENDMAIL],
[
+ GP_STATUS_PLUGIN_ADD([GeanySendmail], [yes])
AC_CONFIG_FILES([
geanysendmail/Makefile
geanysendmail/src/Makefile
Modified: trunk/geany-plugins/build/geanyvc.m4
===================================================================
--- trunk/geany-plugins/build/geanyvc.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/geanyvc.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_GEANYVC],
[
+ GP_STATUS_PLUGIN_ADD([GeanyVC], [yes])
AC_ARG_ENABLE(gtkspell,
AC_HELP_STRING([--enable-gtkspell=ARG],
[Enable GtkSpell support in GeanyVC. [[default=auto]]]),,
@@ -13,6 +14,7 @@
fi
AM_CONDITIONAL(USE_GTKSPELL, test $enable_gtkspell = yes)
+ GP_STATUS_FEATURE_ADD([GeanyVC GtkSpell support], [$enable_gtkspell])
AC_CONFIG_FILES([
geanyvc/Makefile
Modified: trunk/geany-plugins/build/shiftcolumn.m4
===================================================================
--- trunk/geany-plugins/build/shiftcolumn.m4 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/build/shiftcolumn.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -1,5 +1,6 @@
AC_DEFUN([GP_CHECK_SHIFTCOLUMN],
[
+ GP_STATUS_PLUGIN_ADD([ShiftColumn], [yes])
AC_CONFIG_FILES([
shiftcolumn/Makefile
shiftcolumn/src/Makefile
Added: trunk/geany-plugins/build/status.m4
===================================================================
--- trunk/geany-plugins/build/status.m4 (rev 0)
+++ trunk/geany-plugins/build/status.m4 2009-07-17 19:42:26 UTC (rev 834)
@@ -0,0 +1,60 @@
+dnl add plugin status message, e.g. GP_STATUS_PLUGIN_ADD(plugin,yes)
+AC_DEFUN([GP_STATUS_PLUGIN_ADD],
+[
+ plugins_statusmsg+="$1:$2
+"
+])
+
+dnl add feature status message, e.g. GP_STATUS_FEATURE_ADD(feature,yes)
+AC_DEFUN([GP_STATUS_FEATURE_ADD],
+[
+ feature_statusmsg+="$1:$2
+"
+])
+
+dnl indent $1_statusmsg with RHS at col $2
+AC_DEFUN([_GP_STATUS_PRINT_INDENT_],
+[
+ while read line; do
+ test -z "$line" && break;
+ plugin=" ${line%:*}:"
+ status=${line#*:}
+ let extracols=$2-${#plugin}
+ echo -n "$plugin"
+ for (( i=0; $i<$extracols; i++ )); do
+ echo -n ' '
+ done
+ echo $status
+ done << GPEOF
+$$1_statusmsg
+GPEOF
+])
+
+dnl print status message
+AC_DEFUN([GP_STATUS_PRINT],
+[
+ GP_EXPAND_DIR(datadir)
+ GP_EXPAND_DIR(libdir)
+ GP_EXPAND_DIR(docdir)
+
+ cat <<GPEOF
+
+${PACKAGE}-${VERSION}
+
+ Build Environment:
+ Geany version: ${geanyversion}
+ Install prefix: ${prefix}
+ Datadir: ${expanded_datadir}/${PACKAGE_TARNAME}
+ Libdir: ${expanded_libdir}${PACKAGE_TARNAME}
+ Docdir: ${expanded_docdir}
+ Plugins path: ${geanypluginsdir}
+
+ Plugins:
+GPEOF
+
+ _GP_STATUS_PRINT_INDENT_(plugins, 34)
+ echo
+ echo " Features:"
+ _GP_STATUS_PRINT_INDENT_(feature, 34)
+ echo
+])
Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac 2009-07-17 19:40:48 UTC (rev 833)
+++ trunk/geany-plugins/configure.ac 2009-07-17 19:42:26 UTC (rev 834)
@@ -34,3 +34,4 @@
po/Makefile.in
])
AC_OUTPUT
+GP_STATUS_PRINT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Plugins-Commits
mailing list