2013-02-20 [paul] 3.9.0cvs94

	* configure.ac
		a little more report layout tweaking

diff --git a/ChangeLog b/ChangeLog
index d8f05b3268f14f45e91cb663b3372f483a3a71ba..4b20488cef35717c69c1327846e96f110059db06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20 [paul]      3.9.0cvs94
+
+       * configure.ac
+               a little more report layout tweaking
+

 2013-02-20 [colin]     3.9.0cvs93
 
        * src/common/plugin.c
 2013-02-20 [colin]     3.9.0cvs93
 
        * src/common/plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index ed3a8135a7c07e473804e4b3973c37be5efe1657..7214345e86ae3e51bd3b80d0280b7805f2aada02 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4591,3 +4591,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fetchinfo/Makefile.am;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/perl/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/python/Makefile.am;  ) > 3.9.0cvs91.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/gdata/Makefile.am;  ) > 3.9.0cvs92.patchset
 ( cvs diff -u -r 1.13.2.48 -r 1.13.2.49 src/common/plugin.c;  ) > 3.9.0cvs93.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fetchinfo/Makefile.am;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/perl/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/python/Makefile.am;  ) > 3.9.0cvs91.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/gdata/Makefile.am;  ) > 3.9.0cvs92.patchset
 ( cvs diff -u -r 1.13.2.48 -r 1.13.2.49 src/common/plugin.c;  ) > 3.9.0cvs93.patchset

+( cvs diff -u -r 1.654.2.4670 -r 1.654.2.4671 configure.ac;  ) > 3.9.0cvs94.patchset

diff --git a/configure.ac b/configure.ac
index 7c77ac300ee54775013894dbc0d80a404b9bd1d9..6d4406ec8b39892f21ade1f10accc93960a54a6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=93
+EXTRA_VERSION=94

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -1458,11 +1458,30 @@ if test x"$enable_notification_plugin" != xno; then
        AC_DEFINE(NOTIFICATION_TRAYICON, 1, Activate notification trayicon)
        AC_DEFINE(NOTIFICATION_LCDPROC, 1, Activate lcdproc support)
 
        AC_DEFINE(NOTIFICATION_TRAYICON, 1, Activate notification trayicon)
        AC_DEFINE(NOTIFICATION_LCDPROC, 1, Activate lcdproc support)
 

-       notification_features="(popup:yes banner:yes command:yes trayicon:yes lcdproc:yes"
-       notification_features="$notification_features libnotify:$HAVE_LIBNOTIFY"
-       notification_features="$notification_features libindicate:$HAVE_LIBINDICATE"
-       notification_features="$notification_features libcanberra-gtk:$HAVE_LIBCANBERRA_GTK"
-       notification_features="$notification_features hotkeys:$HAVE_HOTKEYS)"
+       notification_features="banner command"
+       notification_missing_dependencies=""
+       if test x"$HAVE_HOTKEYS" = xyes; then
+               notification_features="$notification_features hotkeys"
+       else
+               notification_missing_dependencies="$notification_missing_dependencies hotkeys"
+       fi
+       notification_features="$notification_features lcdproc"
+       if test x"$HAVE_LIBINDICATE" = xyes; then
+               notification_features="$notification_features libindicate"
+       else
+               notification_missing_dependencies="$notification_missing_dependencies libindicate"
+       fi
+       if test x"$HAVE_LIBNOTIFY" = xyes; then
+               notification_features="$notification_features libnotify"
+       else
+               notification_missing_dependencies="$notification_missing_dependencies libnotify"
+       fi
+       if test x"$HAVE_LIBCANBERRA_GTK" = xyes; then
+               notification_features="$notification_features libcanberra-gtk"
+       else
+               notification_missing_dependencies="$notification_missing_dependencies libcanberra-gtk"
+       fi
+       notification_features="$notification_features popup trayicon"

 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS notification"
        AC_MSG_RESULT(no)
 else
        DISABLED_PLUGINS="$DISABLED_PLUGINS notification"
        AC_MSG_RESULT(no)


@@ -1899,25 +1918,34 @@ echo "Generic UMPC code  : $enable_generic_umpc"
 echo "Maemo build        : $enable_maemo"
 echo "Config dir         : $with_config_dir"
 
 echo "Maemo build        : $enable_maemo"
 echo "Config dir         : $with_config_dir"
 

-echo "Plugins            : Built:"
+echo "Plugins"
+echo "   Built:"

 for plugin in $PLUGINS; do
 for plugin in $PLUGINS; do

-features=""
+echo "            - $plugin"

 if test x"$plugin" = xnotification; then
 if test x"$plugin" = xnotification; then

-       features="$notification_features"
+       echo "                Features:"
+       for notif_feature in $notification_features; do
+               echo "                    $notif_feature"
+       done;
+       if test "x$notification_missing_dependencies" != x; then
+               echo "                Disabled due to missing dependencies:"
+               for notif_miss_dep in $notification_missing_dependencies; do
+                       echo "                    $notif_miss_dep"
+               done;
+       fi

 fi
 fi

-echo "                      - $plugin $features"

 done;
 if test "x$DISABLED_PLUGINS" != x; then
 done;
 if test "x$DISABLED_PLUGINS" != x; then

-echo "                     Disabled:"
+echo "   Disabled:"

 for plugin in $DISABLED_PLUGINS; do
 for plugin in $DISABLED_PLUGINS; do

-echo "                      - $plugin"
+echo "            - $plugin"

 done;
 fi
 
 if test "x$MISSING_DEPS_PLUGINS" != x; then
 done;
 fi
 
 if test "x$MISSING_DEPS_PLUGINS" != x; then

-echo "                     Disabled due to missing dependencies:"
+echo "   Disabled due to missing dependencies:"

 for plugin in $MISSING_DEPS_PLUGINS; do
 for plugin in $MISSING_DEPS_PLUGINS; do

-echo "                      - $plugin"
+echo "            - $plugin"

 done;
 fi
 echo ""
 done;
 fi
 echo ""