aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-28 13:40:12 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-28 13:41:07 -0300
commit23d847c1666d66c3a928cb822775ef3dc086cf67 (patch)
tree291253faf185e583172afd70679e06920da32671 /configure.ac
parent272e9db781a8ad702291a77328eadbb7dbdbcbb5 (diff)
configure.ac: make libjpeg optional
Currently, configure requires libjpeg, except if explicitly disabled. That's annoying, specially when we're not working with jpeg webcams (with is the usual usecase - at least for me). So, make it optional. User will notice anyway if this is missing, as configure will display the list of options used on the build. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 520cd204..9d7092bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,13 +181,15 @@ AS_IF([test "x$with_jpeg" != xno],
[AC_CHECK_HEADER([jpeglib.h],
[AC_CHECK_LIB([jpeg],
[jpeg_read_header],
- [have_jpeg=:
+ [have_jpeg=yes
JPEG_LIBS="-ljpeg"
AC_DEFINE([HAVE_JPEG],[1],[whether we use libjpeg])],
- [AC_MSG_ERROR(cannot find libjpeg (v6 or later required))])],
- [AC_MSG_ERROR(cannot find jpeglib.h)])])
+ [have_jpeg=no
+ AC_MSG_WARN(cannot find libjpeg (v6 or later required))])],
+ [have_jpeg=no
+ AC_MSG_WARN(cannot find libjpeg)])])
-AM_CONDITIONAL([HAVE_JPEG], [$have_jpeg])
+AM_CONDITIONAL([HAVE_JPEG], [test x$have_jpeg = xyes])
QT_VERSION="none"
@@ -442,7 +444,7 @@ compile time options summary
X11 : $x11_pkgconfig
GL : $gl_pkgconfig
glu : $glu_pkgconfig
- libjpeg : $with_jpeg
+ libjpeg : $have_jpeg
libudev : $have_libudev
QT version : $QT_VERSION
ALSA support : $USE_ALSA

Privacy Policy