the DBus plugin is now disabled when dbus is not installed instead of stopping the...

Fix a few warnings in drv_PICGraphic.c

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1064 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_PICGraphic.c b/drv_PICGraphic.c
index 3b689d032cf817acfaf75dfb8a3b2c366003b312..4679fb945a0e9105cf8e023a54d74092c95a0345 100644 (file)
--- a/drv_PICGraphic.c
+++ b/drv_PICGraphic.c
@@ -94,6 +94,7 @@ static char *fbPG = 0, delayDone = 0;
 
 void drv_PICGraphic_delay(void *arg)
 {
+    (void)arg;
     delayDone = 1;
     debug("delay done");
 }
@@ -224,7 +225,7 @@ static void drv_PICGraphic_blit(const int row, const int col, const int height,
        drv_PICGraphic_send(fbPG, DROWS * DCOLS / 8);
        usleep(20000);
        // wait for reception of confirmation code
-       status = drv_PICGraphic_recv(cmd, 2, "ff");
+       status = drv_PICGraphic_recv((char *) cmd, 2, "ff");
        if (!status) {
            info("received ff from device");
        } else {
@@ -293,7 +294,7 @@ static int drv_PICGraphic_start2(const char *section)
 {
     char *s;
     char cmd[2];
-    int contrast, status, bytes = 0, tick, tack;
+    int contrast, status, tick, tack;
 
     /* read display size from config */
     s = cfg_get(section, "Size", NULL);

diff --git a/plugins.m4 b/plugins.m4
index 949bdc29506b5e70f9192408594c35de70ca148d..2e211a32c28896b69d493f379856d8441a41652e 100644 (file)
--- a/plugins.m4
+++ b/plugins.m4
@@ -249,8 +249,8 @@ fi
 
 #DBus
 if test "$PLUGIN_DBUS" = "yes"; then
-   PKG_CHECK_MODULES(DBUS, dbus-1)
-   if test "x$DBUS_LIBS" != "x"; then
+   PKG_CHECK_MODULES(DBUS, dbus-1, dbus-1 >= 1.0, HAVE_DBUS="yes", HAVE_DBUS="no")
+   if test "x$HAVE_DBUS" != "xyes"; then
       PLUGINS="$PLUGINS plugin_dbus.o"
       PLUGINLIBS="$PLUGINLIBS $DBUS_LIBS"
       CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"