configure.ac: Add --without-libudev option to avoid automagic dep
PATCH 1/1 configure.ac: Add --without-libudev option to avoid automagic dep
--- configure.ac | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
configure.ac +17 -10
@@ -291,16 +291,23 @@ else AC_MSG_WARN(ALSA library not available) fi -PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no) -if test "x$have_libudev" = "xyes"; then - AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) - LIBUDEV_CFLAGS="$libudev_CFLAGS" - LIBUDEV_LIBS="$libudev_LIBS" - AC_SUBST(LIBUDEV_CFLAGS) - AC_SUBST(LIBUDEV_LIBS) -else - AC_MSG_WARN(udev library not available) -fi +AC_ARG_WITH([libudev], + AS_HELP_STRING([--without-libudev], [Do not use udev library]), + [], + [with_libudev=yes]) + +have_libudev=no + +AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno], + [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, []) + AS_IF([test "x$have_libudev" = xyes], + [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) + LIBUDEV_CFLAGS="$libudev_CFLAGS" + LIBUDEV_LIBS="$libudev_LIBS" + AC_SUBST(LIBUDEV_CFLAGS) + AC_SUBST(LIBUDEV_LIBS)], + AC_MSG_WARN(udev library not available) + )]) AC_SUBST([JPEG_LIBS])
Signature · 1 line
2.26.2
Hi James,
Can you elaborate a bit more in the commit log text? It's not clear to me what you mean with 'avoid automagic dep' or why you want to avoid it.
Regards,
Hans
Quoted 44 lines · James Le Cuirot
Signed-off-by James Le Cuirot <[email protected]>--- configure.ac | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)configure.ac +17
-10@@ -291,16 +291,23 @@ else AC_MSG_WARN(ALSA library not available) fi -PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no) -if test "x$have_libudev" = "xyes"; then - AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) - LIBUDEV_CFLAGS="$libudev_CFLAGS" - LIBUDEV_LIBS="$libudev_LIBS" - AC_SUBST(LIBUDEV_CFLAGS) - AC_SUBST(LIBUDEV_LIBS) -else - AC_MSG_WARN(udev library not available) -fi +AC_ARG_WITH([libudev], + AS_HELP_STRING([--without-libudev], [Do not use udev library]), + [], + [with_libudev=yes]) + +have_libudev=no + +AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno], + [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, []) + AS_IF([test "x$have_libudev" = xyes], + [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) + LIBUDEV_CFLAGS="$libudev_CFLAGS" + LIBUDEV_LIBS="$libudev_LIBS" + AC_SUBST(LIBUDEV_CFLAGS) + AC_SUBST(LIBUDEV_LIBS)], + AC_MSG_WARN(udev library not available) + )]) AC_SUBST([JPEG_LIBS])
PATCH v2 1/1 configure.ac: Add --without-libudev option to avoid automagic dep
configure currently checks for and links against libudev unconditionally, If this was unwanted and the library is removed then this can leave v4l-utils broken. This is a problem for distributions, especially Gentoo Linux where it affects end users. libudev is unlikely to be removed entirely but the 32-bit library may be removed from a 64-bit system, breaking a 32-bit build of v4l-utils.
--- configure.ac | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
configure.ac +17 -10
@@ -291,16 +291,23 @@ else AC_MSG_WARN(ALSA library not available) fi -PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no) -if test "x$have_libudev" = "xyes"; then - AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) - LIBUDEV_CFLAGS="$libudev_CFLAGS" - LIBUDEV_LIBS="$libudev_LIBS" - AC_SUBST(LIBUDEV_CFLAGS) - AC_SUBST(LIBUDEV_LIBS) -else - AC_MSG_WARN(udev library not available) -fi +AC_ARG_WITH([libudev], + AS_HELP_STRING([--without-libudev], [Do not use udev library]), + [], + [with_libudev=yes]) + +have_libudev=no + +AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno], + [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, []) + AS_IF([test "x$have_libudev" = xyes], + [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) + LIBUDEV_CFLAGS="$libudev_CFLAGS" + LIBUDEV_LIBS="$libudev_LIBS" + AC_SUBST(LIBUDEV_CFLAGS) + AC_SUBST(LIBUDEV_LIBS)], + AC_MSG_WARN(udev library not available) + )]) AC_SUBST([JPEG_LIBS])
Signature · 1 line
2.26.2
Quoted 5 lines · Hans Verkuil
Hi James,
Can you elaborate a bit more in the commit log text? It's not clear to me what you mean with 'avoid automagic dep' or why you want to avoid it.
Something similar is done with OpenWrt to avoid picking up the host
libudev: https://github.com/openwrt/packages/blob/master/libs/libv4l/patches/010-remove-libudev-check.patch
Quoted 51 lines
Regards,
Hans
Quoted 44 lines · James Le Cuirot
Signed-off-by James Le Cuirot <[email protected]>--- configure.ac | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)configure.ac +17
-10@@ -291,16 +291,23 @@ else AC_MSG_WARN(ALSA library not available) fi -PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no) -if test "x$have_libudev" = "xyes"; then - AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) - LIBUDEV_CFLAGS="$libudev_CFLAGS" - LIBUDEV_LIBS="$libudev_LIBS" - AC_SUBST(LIBUDEV_CFLAGS) - AC_SUBST(LIBUDEV_LIBS) -else - AC_MSG_WARN(udev library not available) -fi +AC_ARG_WITH([libudev], + AS_HELP_STRING([--without-libudev], [Do not use udev library]), + [], + [with_libudev=yes]) + +have_libudev=no + +AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno], + [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, []) + AS_IF([test "x$have_libudev" = xyes], + [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev]) + LIBUDEV_CFLAGS="$libudev_CFLAGS" + LIBUDEV_LIBS="$libudev_LIBS" + AC_SUBST(LIBUDEV_CFLAGS) + AC_SUBST(LIBUDEV_LIBS)], + AC_MSG_WARN(udev library not available) + )]) AC_SUBST([JPEG_LIBS])