- merged from DEVEL

Changed files:
    hal-parted.patch -> 1.3

diff --git a/hal-parted.patch b/hal-parted.patch
index 03c865031f549f12c8e3f0529ef4f15a2df00555..090e900f6e7b1369b97f87c71d01562a934e6ea9 100644 (file)
--- a/hal-parted.patch
+++ b/hal-parted.patch
@@ -1,23 +1,28 @@
---- hal-0.5.9/configure.in.orig        2007-04-03 06:36:44.000000000 +0200
-+++ hal-0.5.9/configure.in     2007-05-24 19:13:20.983232115 +0200
-@@ -191,8 +191,8 @@
- if test "x$use_parted" = "xyes" ; then
-    USE_PARTED=yes
+--- hal-0.5.10/configure.in~   2007-08-31 19:43:13.000000000 +0200
++++ hal-0.5.10/configure.in    2007-09-08 18:08:44.035708581 +0200
+@@ -244,7 +244,7 @@
     AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used])
--   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_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, 1.8.0, 1.8.1, 1.8.2, 1.8.6])
+    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, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7])
++   AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7, 1.8.8])
     LDFLAGS=-lparted
-    AC_TRY_RUN(
-@@ -211,7 +211,8 @@
-           (major == 1 && minor == 8 && micro == 0) ||
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
+    #include <stdio.h>
+@@ -263,13 +263,14 @@
            (major == 1 && minor == 8 && micro == 1) ||
            (major == 1 && minor == 8 && micro == 2) ||
--          (major == 1 && minor == 8 && micro == 6))
-+          (major == 1 && minor == 8 && micro == 6) ||
-+          (major == 1 && minor == 8 && micro == 7) || (major == 1 && minor == 8 && micro == 8))
+           (major == 1 && minor == 8 && micro == 6) ||
+-          (major == 1 && minor == 8 && micro == 7))
++          (major == 1 && minor == 8 && micro == 7) ||
++          (major == 1 && minor == 8 && micro == 8))
           return 0;
  
        return 1;
+     }
+     ]])], AC_MSG_RESULT([]),
+-       AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7]))
++       AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6/1.8.7 or 1.8.8]))
+     PARTED_LIBS=-lparted
+     AC_SUBST(PARTED_LIBS)
+     LDFLAGS=