configure.ac improvements, part 1
Since nk reintroduce dbus-glib in README.html (r7597), I decided to investigate to know exactly where it is required :
$ grep -R 'dbus.glib' src/* | grep -v '.svn'
src/common/dbus_support.py: import dbus.glib
src/common/zeroconf/zeroconf.py: import dbus.glib
src/gajim-remote.py: import dbus.glib
src/music_track_listener.py: import dbus.glib
src/network_manager_listener.py:import dbus.glib
src/notify.py: import dbus.glib
src/remote_control.py: import dbus.glib
Ok, dbus.glib and dbus are optionally needed everywhere, not only for zeroconf.
It means that configure.ac lies : currently, dbus is checked only if the remote option is enabled :
if test "x$enable_remote" = "xyes";then
PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60])
I think that configure.ac must reflect the needs and requirements of the program, else it is useless. That's why I improved it, I cut out it in several parts :
-
the begining of the file is the same as the old
-
./configure options
-
packages and libs checks (gtk, dbus, etc...)
-
another part from the old configure.ac
-
the last part, where we decide to build (or not) the modules/features, and where we produce the following output :
***************************** Configure options : --enable-remote .... yes --enable-gtkspell .. no --enable-idle ...... yes --enable-trayicon .. no --enable-nls ....... yes ***************************** Dependencies found : dbus-1 ........... yes dbus-glib-1 ...... yes gtkspell-2.0 ..... yes xscrnsaver ....... yes xscrnsaver libs .. yes gettext .......... yes ***************************** Build features: nls .............. true spell check ...... false idle module ...... true remote control ... true trayicon ......... false *****************************
I'll attach the patch (r7566 is reversed by it).
Notice that I haven't introduce zeroconf and avahi, it's for my next ticket.