hal: Branch 'master'

[David Zeuthen]

 configure.in        |    2 +-
 doc/man/Makefile.am |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
diff-tree 627a4c08677b5a9c703d51d694c945110ce1d8cf (from 6a3d21ee7d309c8107098e175f8d15f8ea191684)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed May 2 23:18:16 2007 -0400

    incorporate autotools changes
    
    Suggested here
    
     http://lists.freedesktop.org/archives/hal/2007-May/008218.html

diff --git a/configure.in b/configure.in
index 57c2781..b2447bc 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl Process this file with autoconf to p
 
 AC_PREREQ(2.59c)
 AC_INIT(hal, 0.5.10, david at fubar.dk)
-AM_INIT_AUTOMAKE([gnu 1.5])
+AM_INIT_AUTOMAKE([gnu 1.9])
 AM_MAINTAINER_MODE
 
 glib_module="glib-2.0 >= 2.6.0 gobject-2.0 > 2.6.0 dbus-glib-1 >= 0.61"
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 49f6de9..c90154a 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,17 +1,13 @@
 
-if MAN_PAGES_ENABLED
-
-MAN_IN_FILES = hald.8.in lshal.1.in hal-get-property.1.in hal-set-property.1.in hal-find-by-property.1.in hal-find-by-capability.1.in hal-is-caller-locked-out.1.in hal-lock.1.in hal-disable-polling.1.in 
+MAN_IN_FILES = hald.8.in lshal.1.in hal-get-property.1.in hal-set-property.1.in hal-find-by-property.1.in hal-find-by-capability.1.in hal-is-caller-locked-out.1.in hal-lock.1.in hal-disable-polling.1.in hal-is-caller-privileged.1.in
 
-if HAVE_POLKIT
-MAN_IN_FILES += hal-is-caller-privileged.1.in
-endif
+if MAN_PAGES_ENABLED
 
 man_MANS = $(MAN_IN_FILES:.in=)
 
 endif # MAN_PAGES_ENABLED
 
-EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES)
+EXTRA_DIST=$(MAN_IN_FILES)
 
 clean-local:
 	rm -f *~ *.1 *.8