Require stable libudev version and remove defines used for former unstable versions

PATCH New Peter Rajnoha 2 participants 3 messages Mar 21, 2011

Share & tools

Peter Rajnoha

author

2011-03-21 14:40 UTC #0 lore raw

PATCH 1/3 Require stable libudev version and remove defines used for former unstable versions

Libudev got stabilized in v143. Require that version directly in configure and remove "define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE" that was needed for unstable versions of libudev.

Peter

---
 configure.in         |    5 ++---
 libdm/libdm-common.c |    1 -
 tools/dmsetup.c      |    1 -
 tools/lvmcmdline.c   |    1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

configure.in +2 -3

index c531c8a..cbc839d 100644
@@ -803,9 +803,8 @@ AC_ARG_ENABLE(udev_sync,
 AC_MSG_RESULT($UDEV_SYNC)
 
 if test x$UDEV_SYNC = xyes; then
-	AC_CHECK_LIB(udev, udev_queue_get_udev_is_active,
-		     [UDEV_PC="libudev"; UDEV_LIBS="-ludev"],
-		     [AC_MSG_ERROR([bailing out... libudev library is required])])
+	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"],
+			  [AC_MSG_ERROR([bailing out... libudev library version >= 143 is required])])
 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
 fi

libdm/libdm-common.c +0 -1

index c5780e7..b13b88a 100644
@@ -29,7 +29,6 @@
 #  include <sys/types.h>
 #  include <sys/ipc.h>
 #  include <sys/sem.h>
-#  define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
 #  include <libudev.h>
 #endif

tools/dmsetup.c +0 -1

index fb71350..7c74ab6 100644
@@ -45,7 +45,6 @@
 #  include <sys/types.h>
 #  include <sys/ipc.h>
 #  include <sys/sem.h>
-#  define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
 #  include <libudev.h>
 #endif

tools/lvmcmdline.c +0 -1

index fe5f08e..45c3703 100644
@@ -43,7 +43,6 @@ extern char *optarg;
 #endif
 
 #ifdef UDEV_SYNC_SUPPORT
-#  define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
 #  include <libudev.h>
 #endif

Peter Rajnoha

author

2011-03-21 15:17 UTC #1 lore raw

PATCH 1/3 Require stable libudev version and remove defines used for former unstable versions

configure.in AC_ARG_ENABLE(udev_sync, · line 807

Quoted 2 lines · Peter Rajnoha

configure.in +2 -0

+	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"],
+			  [AC_MSG_ERROR([bailing out... libudev library version >= 143 is required])])

Well, I'd probably even leave the AC_MSG_ERROR out, so nice and detailed pkgconfig errors are printed by default.

Peter

Milan Broz

2011-03-21 15:30 UTC #2 lore raw

PATCH 1/3 Require stable libudev version and remove defines used for former unstable versions

In reply to Peter Rajnoha

Quoted 3 lines · Peter Rajnoha

Libudev got stabilized in v143. Require that version directly in configure and remove "define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE" that was needed for unstable versions of libudev.

ack.

configure.in AC_ARG_ENABLE(udev_sync, · line 807

Quoted 4 lines

configure.in +2 -2

-		     [UDEV_PC="libudev"; UDEV_LIBS="-ludev"],
-		     [AC_MSG_ERROR([bailing out... libudev library is required])])
+	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"],
+			  [AC_MSG_ERROR([bailing out... libudev library version >= 143 is required])])

One day, someone, somewhere, somehow .... could fix static build here.. (UDEV_LIBS)

Milan