hal ChangeLog, 1.830, 1.831 Makefile.am, 1.14, 1.15 configure.in, 1.119, 1.120 hal-policy.pc.in, NONE, 1.1

[David Zeuthen]

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

Modified Files:
	ChangeLog Makefile.am configure.in 
Added Files:
	hal-policy.pc.in 
Log Message:
2006-02-25  David Zeuthen  <davidz at redhat.com>

        * hal-policy.pc.in: New file

        * libhal-policy/libhal-policy-test.c: New file

        * libhal-policy/libhal-policy.[ch]: New files

        * libhal-policy/Makefile.am: New file

        * hald/Makefile.am: Uncomment hald-test as this is currently
        somewhat broken

        * doc/api/Doxyfile.in: Add libhal-policy to INPUT

        * configure.in: Add stuff of libhal-policy

        * Makefile.am: Add libhal-policy to SUBDIRS and hal-policy.pc to
        pkgconfig_DATA and hal-policy.pc.in to EXTRA_DIST



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -d -r1.830 -r1.831
--- ChangeLog	24 Feb 2006 16:47:11 -0000	1.830
+++ ChangeLog	25 Feb 2006 16:32:28 -0000	1.831
@@ -1,3 +1,23 @@
+2006-02-25  David Zeuthen  <davidz at redhat.com>
+
+	* hal-policy.pc.in: New file
+
+	* libhal-policy/libhal-policy-test.c: New file
+
+	* libhal-policy/libhal-policy.[ch]: New files
+
+	* libhal-policy/Makefile.am: New file
+
+	* hald/Makefile.am: Uncomment hald-test as this is currently
+	somewhat broken
+
+	* doc/api/Doxyfile.in: Add libhal-policy to INPUT
+
+	* configure.in: Add stuff of libhal-policy
+
+	* Makefile.am: Add libhal-policy to SUBDIRS and hal-policy.pc to
+	pkgconfig_DATA and hal-policy.pc.in to EXTRA_DIST
+
 2006-02-24  David Zeuthen  <davidz at redhat.com>
 
 	* tools/hal-system-power-set-power-save: Fix for

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	23 Jan 2006 12:15:49 -0000	1.14
+++ Makefile.am	25 Feb 2006 16:32:28 -0000	1.15
@@ -1,18 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = volume_id libhal libhal-storage hald hald-runner tools \
+SUBDIRS = volume_id libhal libhal-storage libhal-policy hald hald-runner tools \
           fdi doc examples po
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = hal.pc hal-storage.pc
+pkgconfig_DATA = hal.pc hal-storage.pc hal-policy.pc
 
 dbusdir = $(DBUS_SYS_DIR)
 dist_dbus_DATA = hal.conf
 
 
-DISTCLEANFILES = hal.pc hal-storage.pc intltool-extract intltool-merge intltool-update
+DISTCLEANFILES = hal.pc hal-storage.pc hal-policy.pc intltool-extract intltool-merge intltool-update
 
-EXTRA_DIST = HACKING hal.pc.in hal-storage.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-policy.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.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- configure.in	24 Feb 2006 06:36:11 -0000	1.119
+++ configure.in	25 Feb 2006 16:32:28 -0000	1.120
@@ -12,7 +12,7 @@
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
-# libtool versioning - this applies to libhal and libhal-storage
+# libtool versioning - this applies to libhal, libhal-storage and libhal-policy
 #
 # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
 #
@@ -178,8 +178,9 @@
 
 AM_CONDITIONAL(GCOV, test x$enable_gcov = xyes)
 
+glib_module="glib-2.0 >= 2.6.0"
 dbus_module="dbus-1 >= 0.33"
-pkg_modules="glib-2.0 >= 2.6.0, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module"
+pkg_modules="$glib_module, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
 EXPAT_LIB=""
@@ -238,6 +239,12 @@
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+# glib libs
+PKG_CHECK_MODULES(GLIB, [$glib_module])
+
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 ### All this also from dbus
 
 ### Doxygen Documentation
@@ -404,6 +411,7 @@
 AC_OUTPUT([
 hal.pc
 hal-storage.pc
+hal-policy.pc
 hal.conf
 Makefile
 hald/Makefile
@@ -416,6 +424,7 @@
 hald-runner/Makefile
 libhal/Makefile
 libhal-storage/Makefile
+libhal-policy/Makefile
 tools/Makefile
 tools/linux/Makefile
 tools/device-manager/hal-device-manager

--- NEW FILE: hal-policy.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: hal-policy
Description: library for querying and setting policies related to hal
Version: @VERSION@
Requires: glib-2.0
Libs: -L${libdir} -lhal-policy
Cflags: -I${includedir}/hal