hal ChangeLog, 1.853, 1.854 Makefile.am, 1.16, 1.17 configure.in, 1.123, 1.124

[David Zeuthen]

Update of /cvs/hal/hal
In directory kemper:/tmp/cvs-serv28520

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
2006-03-07  David Zeuthen  <davidz at redhat.com>

        Move libhal-policy to a dedicated package PolicyKit (available in
        HAL CVS).

        * configure.in: Require PolicyKit (available in hal CVS) and don't
        build libhal-policy. Extract some useful POLKIT variables for
        user, group and txtsrc for PolicyKit

        * Makefile.am: Don't build libhal-policy or hal-policy.pc

        * policy/txt/Makefile.am: Use new POLKIT_TXTSRC variable on where
        to install policy

        * tools/Makefile.am: Don't build hal-policy-is-privileged as it is
        obsoleted by PolicyKit's polkit-is-privileged

        * tools/hal-storage-mount.c: Use new libpolkit instead of
        libhal-policy

        * tools/hal-system-power-hibernate,
        tools/hal-system-power-suspend, tools/hal-system-power-reboot,
        tools/hal-system-power-shutdown: Use polkit-is-privileged instead
        of hal-policy-is-privileged

        * libhal-policy/libhal-policy.c, libhal-policy/libhal-policy.h,
        libhal-policy/libhal-policy-test.c, libhal-policy/Makefile.am,
        tools/hal-policy-is-privileged.c, tools/hal-system-storage-mount:
        Remove these files.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -d -r1.853 -r1.854
--- ChangeLog	7 Mar 2006 16:31:40 -0000	1.853
+++ ChangeLog	8 Mar 2006 04:14:09 -0000	1.854
@@ -1,5 +1,35 @@
 2006-03-07  David Zeuthen  <davidz at redhat.com>
 
+	Move libhal-policy to a dedicated package PolicyKit (available in
+	HAL CVS).
+
+	* configure.in: Require PolicyKit (available in hal CVS) and don't
+	build libhal-policy. Extract some useful POLKIT variables for
+	user, group and txtsrc for PolicyKit
+
+	* Makefile.am: Don't build libhal-policy or hal-policy.pc
+
+	* policy/txt/Makefile.am: Use new POLKIT_TXTSRC variable on where
+	to install policy
+
+	* tools/Makefile.am: Don't build hal-policy-is-privileged as it is
+	obsoleted by PolicyKit's polkit-is-privileged
+
+	* tools/hal-storage-mount.c: Use new libpolkit instead of
+	libhal-policy
+
+	* tools/hal-system-power-hibernate,
+	tools/hal-system-power-suspend, tools/hal-system-power-reboot,
+	tools/hal-system-power-shutdown: Use polkit-is-privileged instead
+	of hal-policy-is-privileged
+
+	* libhal-policy/libhal-policy.c, libhal-policy/libhal-policy.h,
+	libhal-policy/libhal-policy-test.c, libhal-policy/Makefile.am,
+	tools/hal-policy-is-privileged.c, tools/hal-system-storage-mount:
+	Remove these files.
+
+2006-03-07  David Zeuthen  <davidz at redhat.com>
+
 	* fdi/information/10freedesktop/10-wireless-mice.fdi: Add entry for
 	my wireless mouse+keyboard combo
 

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	1 Mar 2006 17:37:05 -0000	1.16
+++ Makefile.am	8 Mar 2006 04:14:09 -0000	1.17
@@ -1,18 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = volume_id libhal libhal-storage libhal-policy hald hald-runner tools \
+SUBDIRS = volume_id libhal libhal-storage hald hald-runner tools \
           fdi doc examples po policy
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = hal.pc hal-storage.pc hal-policy.pc
+pkgconfig_DATA = hal.pc hal-storage.pc
 
 dbusdir = $(DBUS_SYS_DIR)
 dist_dbus_DATA = hal.conf
 
 
-DISTCLEANFILES = hal.pc hal-storage.pc hal-policy.pc intltool-extract intltool-merge intltool-update
+DISTCLEANFILES = hal.pc hal-storage.pc intltool-extract intltool-merge intltool-update
 
-EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal-policy.pc.in hal.conf.in intltool-extract.in intltool-merge.in intltool-update.in mkinstalldirs
+EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in intltool-extract.in intltool-merge.in intltool-update.in mkinstalldirs
 
 clean-local :
 	rm -f *~

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- configure.in	5 Mar 2006 00:41:50 -0000	1.123
+++ configure.in	8 Mar 2006 04:14:09 -0000	1.124
@@ -178,9 +178,20 @@
 
 glib_module="glib-2.0 >= 2.6.0"
 dbus_module="dbus-1 >= 0.33"
-pkg_modules="$glib_module, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module"
+polkit_module="polkit >= 0.1"
+pkg_modules="$glib_module, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module, $polkit_module"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
+POLKIT_USER=`$PKG_CONFIG --variable=user polkit`
+POLKIT_GROUP=`$PKG_CONFIG --variable=group polkit`
+POLKIT_TXTSRC=`$PKG_CONFIG --variable=txtsrc polkit`
+AC_SUBST(POLKIT_USER)
+AC_SUBST(POLKIT_GROUP)
+AC_SUBST(POLKIT_TXTSRC)
+AC_DEFINE_UNQUOTED(POLKIT_USER,"$POLKIT_USER", [User for PolicyKit])
+AC_DEFINE_UNQUOTED(POLKIT_GROUP,"$POLKIT_GROUP", [Group for PolicyKit])
+AC_DEFINE_UNQUOTED(POLKIT_TXTSRC,"$POLKIT_TXTSRC", [Location of text files for PolicyKit])
+
 EXPAT_LIB=""
 AC_ARG_WITH(expat, [  --with-expat=<dir>      ese expat from here],
                       [
@@ -239,10 +250,14 @@
 
 # glib libs
 PKG_CHECK_MODULES(GLIB, [$glib_module])
-
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+# polkit libs
+PKG_CHECK_MODULES(POLKIT, [$polkit_module])
+AC_SUBST(POLKIT_CFLAGS)
+AC_SUBST(POLKIT_LIBS)
+
 # Check for BLKGETSIZE64
 AC_CHECK_TYPE(pgoff_t, ,
               [AC_DEFINE(pgoff_t, unsigned long, [Index into the pagecache])],
@@ -380,7 +395,6 @@
 AC_OUTPUT([
 hal.pc
 hal-storage.pc
-hal-policy.pc
 hal.conf
 Makefile
 hald/Makefile
@@ -393,7 +407,6 @@
 hald-runner/Makefile
 libhal/Makefile
 libhal-storage/Makefile
-libhal-policy/Makefile
 tools/Makefile
 tools/linux/Makefile
 tools/device-manager/hal-device-manager