[v4l-utils PATCH 0/2] automake fixes

[v4l-utils PATCH 0/2] automake fixes

[Sakari Ailus]

Hi,

This set fixes deprecated use of $(MKDIR_P) in Makefile.am and a configure
script error if libqt isn't available.

-- 
Kind regards,
Sakari 

[v4l-utils PATCH 1/2] v4l: libv4l1, libv4l2: Use $(mkdir_p) instead of deprecated $(MKDIR_P)

[Sakari Ailus]

autoconf thinks $(MKDIR_P) is deprecated. Use $(mkdir_p) instead.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 lib/libv4l1/Makefile.am | 2 +-
 lib/libv4l2/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libv4l1/Makefile.am b/lib/libv4l1/Makefile.am
index 005ae10..f768eaa 100644
--- a/lib/libv4l1/Makefile.am
+++ b/lib/libv4l1/Makefile.am
@@ -7,7 +7,7 @@ if WITH_V4L_WRAPPERS
 libv4l1priv_LTLIBRARIES = v4l1compat.la
 
 install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)/$(libdir)
+	$(mkdir_p) $(DESTDIR)/$(libdir)
 	(cd $(DESTDIR)/$(libdir) && rm -f v4l1compat.so && $(LN_S) $(libv4l1subdir)/v4l1compat.so v4l1compat.so)
 
 endif
diff --git a/lib/libv4l2/Makefile.am b/lib/libv4l2/Makefile.am
index b6f4d3b..1314a99 100644
--- a/lib/libv4l2/Makefile.am
+++ b/lib/libv4l2/Makefile.am
@@ -7,7 +7,7 @@ if WITH_V4L_WRAPPERS
 libv4l2priv_LTLIBRARIES = v4l2convert.la
 
 install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)/$(libdir)
+	$(mkdir_p) $(DESTDIR)/$(libdir)
 	(cd $(DESTDIR)/$(libdir) && rm -f v4l2convert.so && $(LN_S) $(libv4l2subdir)/v4l2convert.so v4l2convert.so)
 
 endif
-- 
2.1.0.231.g7484e3b

[v4l-utils PATCH 2/2] Fix configure script errors

[Sakari Ailus]

If the the QT library is disabled, $qt_pkgconfig_gl will not be set,
leading to an error in the configure script:

./configure: line 21721: test: =: unary operator expected

Fix this. Also do the same for $qt_pkgconfig.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8bfe83d..0fbf981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,10 +394,10 @@ AC_ARG_ENABLE(gconv,
 AM_CONDITIONAL([WITH_LIBDVBV5],     [test x$enable_libdvbv5  != xno])
 AM_CONDITIONAL([WITH_LIBV4L],       [test x$enable_libv4l    != xno])
 AM_CONDITIONAL([WITH_V4LUTILS],	    [test x$enable_v4l_utils != xno -a x$linux_os = xyes])
-AM_CONDITIONAL([WITH_QV4L2],	    [test ${qt_pkgconfig}  = true -a x$enable_qv4l2 != xno])
+AM_CONDITIONAL([WITH_QV4L2],	    [test x${qt_pkgconfig} = xtrue -a x$enable_qv4l2 != xno])
 AM_CONDITIONAL([WITH_V4L_PLUGINS],  [test x$enable_libv4l != xno -a x$enable_shared != xno])
 AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_libv4l != xno -a x$enable_shared != xno])
-AM_CONDITIONAL([WITH_QTGL],	    [test ${qt_pkgconfig_gl} = true])
+AM_CONDITIONAL([WITH_QTGL],	    [test x${qt_pkgconfig_gl} = xtrue])
 AM_CONDITIONAL([WITH_GCONV],        [test x${enable_gconv} = xyes])
 AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno])
 AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x${enable_v4l2_compliance_libv4l} != xno])
-- 
2.1.0.231.g7484e3b

Re: [v4l-utils PATCH 1/2] v4l: libv4l1, libv4l2: Use $(mkdir_p) instead of deprecated $(MKDIR_P)

[Mauro Carvalho Chehab]

Em Mon, 25 Jan 2016 14:41:23 +0200
Sakari Ailus <sakari.ailus@linux.intel.com> escreveu:

> autoconf thinks $(MKDIR_P) is deprecated. Use $(mkdir_p) instead.

Did you get any troubles with the deprecated macro?

At least here (version 2.69), I don't see any error by using $(MKDIR_P).

Regards,
Mauro

> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  lib/libv4l1/Makefile.am | 2 +-
>  lib/libv4l2/Makefile.am | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/libv4l1/Makefile.am b/lib/libv4l1/Makefile.am
> index 005ae10..f768eaa 100644
> --- a/lib/libv4l1/Makefile.am
> +++ b/lib/libv4l1/Makefile.am
> @@ -7,7 +7,7 @@ if WITH_V4L_WRAPPERS
>  libv4l1priv_LTLIBRARIES = v4l1compat.la
>  
>  install-exec-hook:
> -	$(MKDIR_P) $(DESTDIR)/$(libdir)
> +	$(mkdir_p) $(DESTDIR)/$(libdir)
>  	(cd $(DESTDIR)/$(libdir) && rm -f v4l1compat.so && $(LN_S) $(libv4l1subdir)/v4l1compat.so v4l1compat.so)
>  
>  endif
> diff --git a/lib/libv4l2/Makefile.am b/lib/libv4l2/Makefile.am
> index b6f4d3b..1314a99 100644
> --- a/lib/libv4l2/Makefile.am
> +++ b/lib/libv4l2/Makefile.am
> @@ -7,7 +7,7 @@ if WITH_V4L_WRAPPERS
>  libv4l2priv_LTLIBRARIES = v4l2convert.la
>  
>  install-exec-hook:
> -	$(MKDIR_P) $(DESTDIR)/$(libdir)
> +	$(mkdir_p) $(DESTDIR)/$(libdir)
>  	(cd $(DESTDIR)/$(libdir) && rm -f v4l2convert.so && $(LN_S) $(libv4l2subdir)/v4l2convert.so v4l2convert.so)
>  
>  endif

Re: [v4l-utils PATCH 1/2] v4l: libv4l1, libv4l2: Use $(mkdir_p) instead of deprecated $(MKDIR_P)

[Sakari Ailus]

Hi Mauro,

Mauro Carvalho Chehab wrote:
> Em Mon, 25 Jan 2016 14:41:23 +0200
> Sakari Ailus <sakari.ailus@linux.intel.com> escreveu:
> 
>> autoconf thinks $(MKDIR_P) is deprecated. Use $(mkdir_p) instead.
> 
> Did you get any troubles with the deprecated macro?
> 
> At least here (version 2.69), I don't see any error by using $(MKDIR_P).

I have the same version.

-----8<------
$ autoreconf -vfi
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force -I m4
autoreconf: configure.ac: tracing
autoreconf: configure.ac: AM_GNU_GETTEXT is used, but not
AM_GNU_GETTEXT_VERSION
autoreconf: running: libtoolize --copy --force
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
autoreconf: running: /usr/bin/autoconf --force
autoreconf: running: /usr/bin/autoheader --force
autoreconf: running: automake --add-missing --copy --force-missing
configure.ac:85: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and
its use is discouraged.
configure.ac:85: You should use the Autoconf-provided 'AC_PROG_MKDIR_P'
macro instead,
configure.ac:85: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your
Makefile.am files.
autoreconf: Leaving directory `.'
-----8<------

Perhaps automake version makes a difference. I have 1.14.1 here (Ubuntu
package 1:1.14.1-2ubuntu1 from Ubuntu 14.10).

There are no errors due to this, just a warning.

-- 
Kind regards,

Sakari Ailus
sakari.ailus@linux.intel.com