summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2006-09-11 19:32:41 -0400
committerDavid Zeuthen <davidz@redhat.com>2006-09-11 19:32:41 -0400
commitf920a972a83bc7f74b182a29d1704a498632577b (patch)
tree7428d9fb3be13e9f65655eadd213b6c1b285ffe5
parent64cc367c425c6af0b85b8b34bd31e2a56b119d98 (diff)
fixup libparted detection
-rw-r--r--configure.in24
-rw-r--r--doc/api/tmpl/device.sgml36
-rw-r--r--doc/api/tmpl/hald_runner.sgml8
-rw-r--r--doc/api/tmpl/libhal-storage.sgml54
-rw-r--r--doc/api/tmpl/libhal.sgml18
5 files changed, 138 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 6425dfcf..79313332 100644
--- a/configure.in
+++ b/configure.in
@@ -106,8 +106,28 @@ AC_ARG_ENABLE([parted], AC_HELP_STRING([--enable-parted], [Use libparted]), [use
if test "x$use_parted" = "xyes" ; then
USE_PARTED=yes
AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used])
- PARTED_CHECK_LIBPARTED(1.7.1, ,
- [AC_MSG_ERROR([*** libparted >= 1.7.1 not installed - please install first ***])])
+ AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
+ AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found]))
+ AC_MSG_CHECKING(for libparted == 1.7.1)
+ LDFLAGS=-lparted
+ AC_TRY_RUN(
+ #include <stdio.h>
+ #include <parted/parted.h>
+ int main ()
+ {
+ int major ;
+ int minor ;
+ int micro ;
+
+ if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, &micro ) == 3 )
+ printf( "Found libparted %s", ped_get_version() ) ;
+
+ return ! ( major == 1 && minor == 7 && micro == 1 ) ;
+ }
+ ,AC_MSG_RESULT( ),AC_MSG_ERROR(*** Requires libparted == 1.7.1) )
+ PARTED_LIBS=-lparted
+ AC_SUBST(PARTED_LIBS)
+ LDFLAGS=
else
USE_PARTED=no
fi
diff --git a/doc/api/tmpl/device.sgml b/doc/api/tmpl/device.sgml
index d5a02b64..c28adf92 100644
--- a/doc/api/tmpl/device.sgml
+++ b/doc/api/tmpl/device.sgml
@@ -387,6 +387,16 @@ HalDevice
@Returns:
+<!-- ##### FUNCTION hal_device_property_strlist_is_empty ##### -->
+<para>
+
+</para>
+
+@device:
+@key:
+@Returns:
+
+
<!-- ##### FUNCTION hal_device_property_remove ##### -->
<para>
@@ -457,3 +467,29 @@ HalDevice
@Returns:
+<!-- ##### FUNCTION hal_device_inc_num_addons ##### -->
+<para>
+
+</para>
+
+@device:
+
+
+<!-- ##### FUNCTION hal_device_inc_num_ready_addons ##### -->
+<para>
+
+</para>
+
+@device:
+@Returns:
+
+
+<!-- ##### FUNCTION hal_device_are_all_addons_ready ##### -->
+<para>
+
+</para>
+
+@device:
+@Returns:
+
+
diff --git a/doc/api/tmpl/hald_runner.sgml b/doc/api/tmpl/hald_runner.sgml
index 9537d0a0..048cfcf1 100644
--- a/doc/api/tmpl/hald_runner.sgml
+++ b/doc/api/tmpl/hald_runner.sgml
@@ -132,3 +132,11 @@ hald_runner
+<!-- ##### FUNCTION runner_device_finalized ##### -->
+<para>
+
+</para>
+
+@device:
+
+
diff --git a/doc/api/tmpl/libhal-storage.sgml b/doc/api/tmpl/libhal-storage.sgml
index deb2bf82..1d7eae01 100644
--- a/doc/api/tmpl/libhal-storage.sgml
+++ b/doc/api/tmpl/libhal-storage.sgml
@@ -214,6 +214,15 @@ libhal-storage
@Returns:
+<!-- ##### FUNCTION libhal_drive_get_partition_scheme ##### -->
+<para>
+
+</para>
+
+@drive:
+@Returns:
+
+
<!-- ##### FUNCTION libhal_drive_no_partitions_hint ##### -->
<para>
@@ -520,6 +529,51 @@ libhal-storage
@Returns:
+<!-- ##### FUNCTION libhal_volume_get_partition_scheme ##### -->
+<para>
+
+</para>
+
+@volume:
+@Returns:
+
+
+<!-- ##### FUNCTION libhal_volume_get_partition_type ##### -->
+<para>
+
+</para>
+
+@volume:
+@Returns:
+
+
+<!-- ##### FUNCTION libhal_volume_get_partition_label ##### -->
+<para>
+
+</para>
+
+@volume:
+@Returns:
+
+
+<!-- ##### FUNCTION libhal_volume_get_partition_uuid ##### -->
+<para>
+
+</para>
+
+@volume:
+@Returns:
+
+
+<!-- ##### FUNCTION libhal_volume_get_partition_flags ##### -->
+<para>
+
+</para>
+
+@volume:
+@Returns:
+
+
<!-- ##### FUNCTION libhal_volume_get_partition_number ##### -->
<para>
diff --git a/doc/api/tmpl/libhal.sgml b/doc/api/tmpl/libhal.sgml
index 116a16b5..9b0b4a2e 100644
--- a/doc/api/tmpl/libhal.sgml
+++ b/doc/api/tmpl/libhal.sgml
@@ -17,6 +17,13 @@ libhal
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO LIBHAL_DEPRECATED ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### MACRO LIBHAL_FREE_DBUS_ERROR ##### -->
<para>
@@ -1044,3 +1051,14 @@ libhal
@Returns:
+<!-- ##### FUNCTION libhal_device_addon_is_ready ##### -->
+<para>
+
+</para>
+
+@ctx:
+@udi:
+@error:
+@Returns:
+
+