hal: Branch 'master'

[Danny Kukawka]

 NEWS         |    7 ++++---
 configure.in |   37 +++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 17 deletions(-)

New commits:
diff-tree b11bf7d875ae74a6f4f402d5a2d4d264abc7bdbb (from 3a5e6376eb23fe3f44b2a10c40549cae29c2200d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jul 3 10:56:17 2007 +0200

    don't compile Re-map keys without gperf
    
    This fixes a problem with the "Re-map multimedia keys" feature while
    compiling. If you have an older, or not up-to-date kernel the complete
    compiling fail because hal-setup-keymap-hash-name.h may conatains
    defines which would not work with your kernel version or your headers.
    
    From now hal-setup-keymap-hash-name.h get always new genereated and
    you are only able to compile the re-map feature if you have gperf
    available.

diff --git a/NEWS b/NEWS
index 801708d..590ba40 100644
--- a/NEWS
+++ b/NEWS
@@ -12,13 +12,14 @@ Requirements for HAL 0.5.10 "":
  - glib             >= 2.6.0
  - expat            >= 1.95.8
  - hal-info         >= 20070402
- - libusb           >= 0.1.10a (optional)
- - pciutils         >= 2.2.3     (optional
+ - libusb           >= 0.1.10a   (optional)
+ - pciutils         >= 2.2.3     (optional)
  - dmidecode        >= 2.7       (optional)
  - parted           == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.86 (optional)
  - cryptsetup-luks  >= 1.0.1     (optional, needs LUKS patches)
- - libsmbios	    >= 0.13.4    (optional for DELL machines, Linux only)
+ - libsmbios	    >= 0.13.4    (optional, for DELL machines, Linux only)
  - dellWirelessCtl  >= 0.13.4    (optional, for Dell machines, must live in /usr/bin/, Linux only)
+ - gperf            >= ??????    (optional, for Re-map multimedia keys, Linux only)
  - ConsoleKit       >= 0.2.0
  - pm-utils         >= 0.99.2 or newer (optional)
 
diff --git a/configure.in b/configure.in
index bc1eb8a..609a156 100644
--- a/configure.in
+++ b/configure.in
@@ -470,14 +470,32 @@ if test "x$enable_console_kit" != "xno";
    msg_conkit=yes
 fi
 
+AC_PATH_PROG(GPERF, [gperf], [no])
+AC_MSG_CHECKING([whether to rebuild gperf header files])
+if test x$GPERF = xno ; then
+    have_gperf=no
+else
+    have_gperf=yes
+fi
+AC_SUBST(HAVE_GPERF)
+AM_CONDITIONAL(HAVE_GPERF, [test x$have_gperf = xyes])
+
 AC_ARG_WITH([keymaps], AS_HELP_STRING([--with-keymaps], [Re-map multimedia keys (auto)]))
 BUILD_KEYMAPS=no
-if test "x$with_keymaps" = "xyes" ; then
-   BUILD_KEYMAPS=yes
+if test "x$with_keymaps" = "xyes"; then
+   if test "x$have_gperf" = "xyes"; then
+      BUILD_KEYMAPS=yes
+   else
+      BUILD_KEYMAPS=no
+   fi
 elif test "x$with_keymaps" = "x" ; then
   case "${HALD_BACKEND}" in
     linux)
-      BUILD_KEYMAPS=yes
+      if test "x$have_gperf" = "xyes"; then
+        BUILD_KEYMAPS=yes
+      else
+        BUILD_KEYMAPS=no
+      fi
       ;;
     *)
       ;;
@@ -658,16 +676,6 @@ else
     have_xmllint=yes
 fi
 
-AC_PATH_PROG(GPERF, [gperf], [no])
-AC_MSG_CHECKING([whether to rebuild gperf header files])
-if test x$GPERF = xno ; then
-    have_gperf=no
-else
-    have_gperf=yes
-fi
-AC_SUBST(HAVE_GPERF)
-AM_CONDITIONAL(HAVE_GPERF, [test x$have_gperf = xyes])
-
 if test x$enable_docbook_docs = xauto ; then
     if test x$have_xmlto = xno || test x$have_xmllint = xno ; then
         enable_docbook_docs=no
@@ -1001,6 +1009,7 @@ echo "
         use libusb:                  ${USE_LIBUSB}
         use libpci:                  ${USE_LIBPCI}
         use libparted:               ${USE_PARTED}
+        use gperf:                   ${HAVE_GPERF}
         use PolicyKit:               ${msg_polkit}
         use ConsoleKit:              ${msg_conkit}
         use ACL management:          ${msg_aclmgmt}
@@ -1014,7 +1023,7 @@ echo "
         Macbook Pro utils:           ${BUILD_MACBOOKPRO} (Linux only, x86 only, requires libpci)
         OMAP utils:                  ${BUILD_OMAP} (Linux only, arm only)
         CPU frequency scaling:       ${BUILD_CPUFREQ} (Linux only)
-        Re-map multimedia keys:      ${BUILD_KEYMAPS} (Linux only)
+        Re-map multimedia keys:      ${BUILD_KEYMAPS} (Linux only, requires gperf)
         Forward IBM ACPI events:     ${BUILD_ACPI_IBM} (Linux only)
         Forward Toshiba ACPI events: ${BUILD_ACPI_TOSHIBA} (Linux only)
 	USB wireless mouse power:    ${BUILD_USBCSR} (Linux only, requires libusb)