zbar: Always require jpeg

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Dec 2 11:26:35 2019 +0100
Changeset:	6c970c0c17771c8b1dde27e9d6c67feab7d99a28

Modified Files:
	zbar/Makefile
	zbar/buildlink3.mk
	zbar/options.mk

Log Message:
zbar: Always require jpeg

jpeg was picked up accidentally and indirectly when the `imagemagick'
option was selected but was actually unrelated to neither `imagemagick'
nor `x11' option.

Always pass `--with-jpeg' and build with jpeg support enabled.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6c970c0c17771c8b1dde27e9d6c67feab7d99a28

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zbar/Makefile      | 3 +++
 zbar/buildlink3.mk | 3 ++-
 zbar/options.mk    | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diffs:
diff --git a/zbar/Makefile b/zbar/Makefile
index 20882cfab7..525c9838bc 100644
--- a/zbar/Makefile
+++ b/zbar/Makefile
@@ -17,6 +17,7 @@ USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++	# c++ needed only for test
 
 # XXX: should we move some of them to options.mk?
+CONFIGURE_ARGS+=	--with-jpeg
 CONFIGURE_ARGS+=	--disable-video
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-python
@@ -38,4 +39,6 @@ PYTHON_VERSIONS_ACCEPTED=	27
 .include "../../lang/python/application.mk"
 
 .include "options.mk"
+
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/zbar/buildlink3.mk b/zbar/buildlink3.mk
index 5b3e705630..eea5584927 100644
--- a/zbar/buildlink3.mk
+++ b/zbar/buildlink3.mk
@@ -12,13 +12,14 @@ pkgbase:=	zbar
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.zbar:Mx11)
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .endif
 
+.include "../../mk/jpeg.buildlink3.mk"
+
 .endif # ZBAR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-zbar
diff --git a/zbar/options.mk b/zbar/options.mk
index 7d5bcd0a83..16e709403d 100644
--- a/zbar/options.mk
+++ b/zbar/options.mk
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=	--without-imagemagick
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-xshm
 CONFIGURE_ARGS+=	--with-xv
-.  include "../../mk/jpeg.buildlink3.mk"
 .  include "../../x11/libX11/buildlink3.mk"
 .  include "../../x11/libXext/buildlink3.mk"
 .  include "../../x11/libXv/buildlink3.mk"