aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-03-09 12:06:58 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-03-09 12:06:58 +0100
commit8c1c41e9131fc80be553990b3bfe0d16a39c5658 (patch)
treed2b11f2da52b0405ea95a40e6da4d19bb2928f63
parent8075b64af4c598d5f6ad3e8e8f2650a4f00ba505 (diff)
v4l-utils: fix autoconf/automake errors
I missed some autoconf/automake errors that I introduced in the previous patch. Hopefully this is now working properly. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--configure.ac5
-rw-r--r--utils/v4l2-compliance/Makefile.am4
-rw-r--r--utils/v4l2-ctl/Makefile.am4
3 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index a9cdfa2c..c49f2c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,13 +347,14 @@ CFLAGS="-m32"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
return 0;
]])], [
- AC_DEFINE([HAVE_M32], [1], [gcc supports -m32])
AC_MSG_RESULT([yes])
+ have_m32=yes
], [
- AC_DEFINE([HAVE_M32], [0], [gcc does not support -m32])
AC_MSG_RESULT([no])
+ have_m32=no
])
CFLAGS=$safe_CFLAGS
+AM_CONDITIONAL([HAVE_M32], [test x$have_m32 = xyes])
# directories
diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am
index 26682352..5c0da68d 100644
--- a/utils/v4l2-compliance/Makefile.am
+++ b/utils/v4l2-compliance/Makefile.am
@@ -2,9 +2,11 @@ bin_PROGRAMS = v4l2-compliance
man_MANS = v4l2-compliance.1
DEFS :=
-if WITH_V4L2_COMPLIANCE_32 && HAVE_M32
+if HAVE_M32
+if WITH_V4L2_COMPLIANCE_32
bin_PROGRAMS += v4l2-compliance-32
endif
+endif
v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-compliance.h \
v4l2-test-debug.cpp v4l2-test-input-output.cpp \
diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am
index 5504efaa..d7066795 100644
--- a/utils/v4l2-ctl/Makefile.am
+++ b/utils/v4l2-ctl/Makefile.am
@@ -2,9 +2,11 @@ bin_PROGRAMS = v4l2-ctl
man_MANS = v4l2-ctl.1
DEFS :=
-if WITH_V4L2_CTL_32 && HAVE_M32
+if HAVE_M32
+if WITH_V4L2_COMPLIANCE_32
bin_PROGRAMS += v4l2-ctl-32
endif
+endif
v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cpp \
v4l2-ctl-io.cpp v4l2-ctl-stds.cpp v4l2-ctl-vidcap.cpp v4l2-ctl-vidout.cpp \

Privacy Policy