configure.ac: Add --without-libudev option to avoid automagic dep

Message ID 20200823164744.6191-1-chewi@gentoo.org (mailing list archive)
State Changes Requested, archived
Headers
Series configure.ac: Add --without-libudev option to avoid automagic dep |

Commit Message

James Le Cuirot Aug. 23, 2020, 4:47 p.m. UTC
  Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 configure.ac | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)
  

Comments

Hans Verkuil Aug. 24, 2020, 8:51 a.m. UTC | #1
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

On 23/08/2020 18:47, James Le Cuirot wrote:
> Signed-off-by: James Le Cuirot <chewi@gentoo.org>
> ---
>  configure.ac | 27 +++++++++++++++++----------
>  1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d9f43ab5..e6134d08 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -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])
>  
>
  
Rosen Penev Aug. 24, 2020, 10:28 p.m. UTC | #2
On Mon, Aug 24, 2020 at 2:29 AM Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> 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
>
> Regards,
>
>         Hans
>
> On 23/08/2020 18:47, James Le Cuirot wrote:
> > Signed-off-by: James Le Cuirot <chewi@gentoo.org>
> > ---
> >  configure.ac | 27 +++++++++++++++++----------
> >  1 file changed, 17 insertions(+), 10 deletions(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index d9f43ab5..e6134d08 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -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

diff --git a/configure.ac b/configure.ac
index d9f43ab5..e6134d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])