Index: configure.in.in
===================================================================
--- configure.in.in	(revision 24314)
+++ configure.in.in	(working copy)
@@ -154,6 +154,23 @@
 if test x"$HAL_FOUND" = x"yes"; then
   dnl # substituted into exo-hal-0.3.pc
   HAL_STORAGE_DEPENDENCY="hal-storage"
+
+  dnl # Check if LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL is declared
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $HAL_CFLAGS"
+  AC_MSG_CHECKING([whether LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL is declared])
+  AC_COMPILE_IFELSE(AC_LANG_SOURCE(
+  [#include <libhal-storage.h>
+    int main (int argc, char **argv) { return LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL; }
+  ]),
+  [
+    AC_DEFINE([HAVE_LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL], [1], [Define if LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL present])
+    AC_MSG_RESULT([yes])
+  ],
+  [
+    AC_MSG_RESULT([no])
+  ])
+  CFLAGS="$save_CFLAGS"
 fi
 AC_SUBST([HAL_STORAGE_DEPENDENCY])
 
Index: exo-hal/exo-hal.c
===================================================================
--- exo-hal/exo-hal.c	(revision 24314)
+++ exo-hal/exo-hal.c	(working copy)
@@ -310,7 +310,11 @@
       else if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDRW) != 0
             && (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW) != 0)
         {
-          if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL) != 0 || (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL) != 0)
+          if ((cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL) != 0
+#ifdef HAVE_LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL
+              || (cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL) != 0
+#endif
+              )
             second = "/DVD±RW DL";
           else
             second = "/DVD±RW";
@@ -694,7 +698,7 @@
                   if (G_LIKELY (size < n * 10))
                     size_string = g_strdup_printf ("%.01f%c", ((gdouble) size) / ((gdouble) m), UNITS[n]);
                   else
-                    size_string = g_strdup_printf ("%lld%c", size / m, UNITS[n]);
+                    size_string = g_strdup_printf ("%llu%c", size / m, UNITS[n]);
                   break;
                 }
             }