Set conditional HTTP depending on EXIV2_ENABLE_WEBREADY

(cherry picked from commit 9f90144)

# Conflicts:
#	src/CMakeLists.txt

include/exiv2/exiv2.hpp

@@ -19,7 +19,9 @@
 #include "exiv2/exif.hpp"
 #include "exiv2/futils.hpp"
 #include "exiv2/gifimage.hpp"
+#ifdef EXV_ENABLE_WEBREADY
 #include "exiv2/http.hpp"
+#endif
 #include "exiv2/image.hpp"
 #include "exiv2/iptc.hpp"
 #include "exiv2/jp2image.hpp"

include/meson.build

@@ -14,7 +14,6 @@ headers = files(
   'exiv2/exiv2.hpp',
   'exiv2/futils.hpp',
   'exiv2/gifimage.hpp',
-  'exiv2/http.hpp',
   'exiv2/image.hpp',
   'exiv2/image_types.hpp',
   'exiv2/iptc.hpp',
@@ -47,6 +46,10 @@ if get_option('video')
   headers += files('exiv2/asfvideo.hpp', 'exiv2/matroskavideo.hpp', 'exiv2/quicktimevideo.hpp', 'exiv2/riffvideo.hpp')
 endif
 
+if get_option('webready')
+  headers += files('exiv2/http.hpp')
+endif
+
 if zlib_dep.found()
   headers += files('exiv2/pngimage.hpp')
 endif

meson.build

@@ -67,7 +67,12 @@ if brotli_dep.found()
   deps += brotli_dep
 endif
 
-curl_dep = dependency('libcurl', disabler: true, required: get_option('curl'))
+if get_option('webready')
+  curl_dep = dependency('libcurl', disabler: true, required: get_option('curl'))
+else
+  curl_dep = dependency('', disabler: true, required: false)
+endif
+
 if curl_dep.found()
   deps += curl_dep
 endif
@@ -113,9 +118,9 @@ cdata.set('EXV_HAVE_XMP_TOOLKIT', expat_dep.found())
 cdata.set('EXV_HAVE_BROTLI', brotli_dep.found())
 cdata.set('EXV_HAVE_ICONV', iconv_dep.found())
 cdata.set('EXV_HAVE_LIBZ', zlib_dep.found())
+cdata.set('EXV_ENABLE_WEBREADY', get_option('webready'))
 cdata.set('EXV_USE_CURL', curl_dep.found())
 cdata.set('EXV_ENABLE_NLS', intl_dep.found())
-cdata.set('EXV_ENABLE_WEBREADY', curl_dep.found())
 
 cfile = configure_file(
   input: 'cmake/config.h.cmake',

meson_options.txt

@@ -44,3 +44,8 @@ option('xmp', type : 'feature',
 option('unitTests', type : 'feature',
   description : 'Build and run unit tests',
 )
+
+option('webready', type : 'boolean',
+  value: true,
+  description : 'Build with support for webready',
+)

src/CMakeLists.txt

@@ -48,7 +48,6 @@ set(PUBLIC_HEADERS
     ../include/exiv2/exiv2.hpp
     ../include/exiv2/futils.hpp
     ../include/exiv2/gifimage.hpp
-    ../include/exiv2/http.hpp
     ../include/exiv2/image.hpp
     ../include/exiv2/image_types.hpp
     ../include/exiv2/iptc.hpp
@@ -76,6 +75,7 @@ set(PUBLIC_HEADERS
     ../include/exiv2/xmpsidecar.hpp
 )
 
+<<<<<<< HEAD
 add_library( exiv2lib
     asfvideo.cpp
     basicio.cpp
@@ -118,6 +118,50 @@ add_library( exiv2lib
     xmpsidecar.cpp
     ${PUBLIC_HEADERS}
     $<TARGET_OBJECTS:exiv2lib_int>
+=======
+add_library(
+  exiv2lib
+  asfvideo.cpp
+  basicio.cpp
+  bmffimage.cpp
+  bmpimage.cpp
+  convert.cpp
+  cr2image.cpp
+  crwimage.cpp
+  datasets.cpp
+  easyaccess.cpp
+  epsimage.cpp
+  error.cpp
+  exif.cpp
+  futils.cpp
+  fff.h
+  gifimage.cpp
+  image.cpp
+  iptc.cpp
+  jp2image.cpp
+  jpgimage.cpp
+  metadatum.cpp
+  mrwimage.cpp
+  orfimage.cpp
+  pgfimage.cpp
+  photoshop.cpp
+  preview.cpp
+  properties.cpp
+  psdimage.cpp
+  rafimage.cpp
+  rw2image.cpp
+  tags.cpp
+  tgaimage.cpp
+  tiffimage.cpp
+  types.cpp
+  value.cpp
+  version.cpp
+  webpimage.cpp
+  xmp.cpp
+  xmpsidecar.cpp
+  ${PUBLIC_HEADERS}
+  $<TARGET_OBJECTS:exiv2lib_int>
+>>>>>>> 9f90144e8 (Set conditional HTTP depending on EXIV2_ENABLE_WEBREADY)
 )
 add_library(Exiv2::exiv2lib ALIAS exiv2lib)
 
@@ -129,6 +173,10 @@ generate_export_header(exiv2lib
 
 # Conditional addition of sources to library targets
 # ---------------------------------------------------------
+if(EXIV2_ENABLE_WEBREADY)
+  set(PUBLIC_HEADERS ${PUBLIC_HEADERS} ../include/exiv2/http.hpp)
+  target_sources(exiv2lib PRIVATE http.cpp ../include/exiv2/http.hpp)
+endif()
 
 if( EXIV2_ENABLE_PNG )
     set(PUBLIC_HEADERS ${PUBLIC_HEADERS} ../include/exiv2/pngimage.hpp)

src/basicio.cpp

@@ -1385,6 +1385,7 @@ void RemoteIo::populateFakeData() {
   }
 }
 
+#ifdef EXV_ENABLE_WEBREADY
 //! Internal Pimpl structure of class HttpIo.
 class HttpIo::HttpImpl : public Impl {
  public:
@@ -1524,6 +1525,7 @@ void HttpIo::HttpImpl::writeRemote(const byte* data, size_t size, size_t from, s
 HttpIo::HttpIo(const std::string& url, size_t blockSize) {
   p_ = std::make_unique<HttpImpl>(url, blockSize);
 }
+#endif
 
 #ifdef EXV_USE_CURL
 //! Internal Pimpl structure of class RemoteIo.

src/image.cpp

@@ -779,8 +779,10 @@ BasicIo::UniquePtr ImageFactory::createIo(const std::string& path, bool useCurl)
   }
 #endif
 
+#ifdef EXV_ENABLE_WEBREADY
   if (fProt == pHttp)
     return std::make_unique<HttpIo>(path);  // may throw
+#endif
   if (fProt == pFileUri)
     return std::make_unique<FileIo>(pathOfFileUrl(path));
   if (fProt == pStdin || fProt == pDataUri)