From: Peter Rajnoha <prajnoha@redhat.com>
Date: Tue, 23 Mar 2010 14:44:42 +0000 (+0000)
Subject: Autoreconf.
X-Git-Tag: v2_02_91~2197
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5161ecb98d6e82a36c9d860e406463edb6438f23;p=lvm2.git

Autoreconf.

(Strictly require libudev if udev_sync is used)
---

diff --git a/configure b/configure
index 9b9cea0f5..5f05ea03e 100755
--- a/configure
+++ b/configure
@@ -12208,28 +12208,6 @@ fi
 { $as_echo "$as_me:$LINENO: result: $UDEV_SYNC" >&5
 $as_echo "$UDEV_SYNC" >&6; }
 
-if test x$UDEV_SYNC = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define UDEV_SYNC_SUPPORT 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether to enable installation of udev rules required for synchronisation" >&5
-$as_echo_n "checking whether to enable installation of udev rules required for synchronisation... " >&6; }
-# Check whether --enable-udev_rules was given.
-if test "${enable_udev_rules+set}" = set; then
-  enableval=$enable_udev_rules; UDEV_RULES=$enableval
-else
-  UDEV_RULES=$UDEV_SYNC
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $UDEV_RULES" >&5
-$as_echo "$UDEV_RULES" >&6; }
-
-################################################################################
-
 if test x$UDEV_SYNC = xyes; then
 	{ $as_echo "$as_me:$LINENO: checking for udev_queue_get_udev_is_active in -ludev" >&5
 $as_echo_n "checking for udev_queue_get_udev_is_active in -ludev... " >&6; }
@@ -12297,26 +12275,32 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_udev_udev_queue_get_udev_is_active" >&5
 $as_echo "$ac_cv_lib_udev_udev_queue_get_udev_is_active" >&6; }
 if test "x$ac_cv_lib_udev_udev_queue_get_udev_is_active" = x""yes; then
-  HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE=yes
+  UDEV_LIBS="-ludev"
 else
-  HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE=no
+  { { $as_echo "$as_me:$LINENO: error: bailing out... libudev library is required" >&5
+$as_echo "$as_me: error: bailing out... libudev library is required" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-		if test x$HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE = xyes; then
-
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE 1
+#define UDEV_SYNC_SUPPORT 1
 _ACEOF
 
-			UDEV_LIBS="-ludev"
-		else
-			UDEV_LIBS=
-			{ $as_echo "$as_me:$LINENO: WARNING: It won't be possible to get udev state. We will assume that udev is not running." >&5
-$as_echo "$as_me: WARNING: It won't be possible to get udev state. We will assume that udev is not running." >&2;}
-		fi
 fi
 
+{ $as_echo "$as_me:$LINENO: checking whether to enable installation of udev rules required for synchronisation" >&5
+$as_echo_n "checking whether to enable installation of udev rules required for synchronisation... " >&6; }
+# Check whether --enable-udev_rules was given.
+if test "${enable_udev_rules+set}" = set; then
+  enableval=$enable_udev_rules; UDEV_RULES=$enableval
+else
+  UDEV_RULES=$UDEV_SYNC
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $UDEV_RULES" >&5
+$as_echo "$UDEV_RULES" >&6; }
+
 ################################################################################
 # Check whether --enable-compat was given.
 if test "${enable_compat+set}" = set; then
diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in
index b0af63ffe..7c203ab3e 100644
--- a/lib/misc/configure.h.in
+++ b/lib/misc/configure.h.in
@@ -347,10 +347,6 @@
 /* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define to 1 if libudev's udev_queue_get_udev_is_active function is
-   available. */
-#undef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE
-
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME