Commit 2e21398e authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Don't check for libjpeg when building without libvlc

Since we don't generate the thumbnails, no need for libjpeg to compress
them
parent 18eecc12
......@@ -206,6 +206,12 @@ libmedialibrary_la_LIBADD += libmedialibrary_macos.la
libmedialibrary_la_LDFLAGS += -Wl,-undefined,dynamic_lookup,-framework,Foundation
endif
lib_LTLIBRARIES = libmedialibrary.la
if HAVE_DARWIN
lib_LTLIBRARIES += libmedialibrary_macos.la
endif
if HAVE_LIBVLC
if HAVE_LIBJPEG
libmedialibrary_la_SOURCES += src/metadata_services/vlc/imagecompressors/JpegCompressor.cpp
......@@ -214,12 +220,6 @@ libmedialibrary_la_CPPFLAGS += $(LIBJPEG_CFLAGS)
libmedialibrary_la_LIBADD += $(LIBJPEG_LIBS)
endif
lib_LTLIBRARIES = libmedialibrary.la
if HAVE_DARWIN
lib_LTLIBRARIES += libmedialibrary_macos.la
endif
if HAVE_LIBVLC
libmedialibrary_la_SOURCES += \
src/metadata_services/vlc/VLCMetadataService.cpp \
src/metadata_services/vlc/VLCThumbnailer.cpp \
......
......@@ -294,23 +294,22 @@ AS_IF([test "${with_libvlc}" != "no"], [
AC_SUBST([VLCPP_CFLAGS],[-I${srcdir}/libvlcpp])
]
)
PKG_CHECK_MODULES(LIBJPEG, libjpeg, [
have_libjpeg="yes"
AC_DEFINE(HAVE_JPEG, 1, [Define to 1 if libjpeg is available])
], [
dnl Falling back to libjpeg.h based detection
AC_CHECK_HEADERS(jpeglib.h, [
have_libjpeg="yes"
AC_SUBST(LIBJPEG_LIBS, "-ljpeg")
])
])
])
AM_CONDITIONAL(HAVE_LIBVLC, [test "${with_libvlc}" != "no"])
AM_CONDITIONAL([HAVE_LIBJPEG], [test "${have_libjpeg}" = "yes"])
PKG_CHECK_MODULES(SQLITE, sqlite3)
PKG_CHECK_MODULES(LIBJPEG, libjpeg, [
have_libjpeg="yes"
AC_DEFINE(HAVE_JPEG, 1, [Define to 1 if libjpeg is available])
], [
dnl Falling back to libjpeg.h based detection
AC_CHECK_HEADERS(jpeglib.h, [
have_libjpeg="yes"
AC_SUBST(LIBJPEG_LIBS, "-ljpeg")
])
])
AM_CONDITIONAL([HAVE_LIBJPEG], [test "${have_libjpeg}" = "yes"])
AC_ARG_ENABLE(tests,AC_HELP_STRING([--disable-tests], [Disable build of automated tests suites]))
AM_CONDITIONAL([HAVE_TESTS], [test "${enable_tests}" = "yes"])
AS_IF([test "${enable_tests}" = "yes"], [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment