Add feature to configure building with TIFF support.

.github/workflows/test.yml

@@ -37,6 +37,7 @@ jobs:
           - "--features \"network bundled_proj\""
           - "--features \"network geo-types\""
           - "--features \"bundled_proj geo-types\""
+          - "--features \"bundled_proj tiff\""
           - "--features \"network bundled_proj geo-types\""
     container:
       image: georust/proj-ci:latest

Cargo.toml

@@ -25,6 +25,7 @@ members = ["proj-sys"]
 
 [features]
 bundled_proj = [ "proj-sys/bundled_proj" ]
+tiff = [ "proj-sys/tiff" ]
 pkg_config = [ "proj-sys/pkg_config" ]
 network = ["reqwest"]
 

proj-sys/Cargo.toml

@@ -24,6 +24,7 @@ nobuild = []
 bundled_proj = []
 # `pkg_config` feature is deprecated and does nothing
 pkg_config = []
+tiff = []
 
 [package.metadata.docs.rs]
 features = [ "nobuild" ] # This feature will be enabled during the docs.rs build

proj-sys/README.md

@@ -17,12 +17,15 @@ libproj from source bundled in the crate.
 
 ## Features
 
-`bundled_proj` - forces building libproj from source even if an acceptable
-version could be found on your system.  Note that SQLite3 and `libtiff` must be
-present on your system if you wish to use this feature, and that it builds
-`libproj` **without** its native network functionality; you will have to
-implement your own set of callbacks if you wish to make use of them (see the
+- `bundled_proj` - forces building libproj from source even if an acceptable
+  version could be found on your system.  Note that SQLite3 must be
+  present on your system if you wish to use this feature, and that it builds
+  `libproj` **without** its native network functionality; you will have to
+  implement your own set of callbacks if you wish to make use of them (see the
 [`proj`](https://crates.io/crates/proj) crate for an example).
+- `tiff` - If the `bundled_proj` feature is enabled, adding the `tiff` feature
+  will build PROJ with TIFF support. Note that libtiff must be present on your
+  system if you wish to use this feature.
 
 ## License
 

proj-sys/build.rs

@@ -95,7 +95,8 @@ fn build_from_source() -> Result<std::path::PathBuf, Box<dyn std::error::Error>>
     config.define("BUILD_PROJINFO", "OFF");
     config.define("BUILD_PROJSYNC", "OFF");
     config.define("ENABLE_CURL", "OFF");
-    config.define("ENABLE_TIFF", "ON");
+    let tiff_support = cfg!(feature = "tiff");
+    config.define("ENABLE_TIFF", if tiff_support { "ON" } else { "OFF" });
     let proj = config.build();
     // Tell cargo to tell rustc to link libproj, and where to find it
     // libproj will be built in $OUT_DIR/lib
@@ -114,7 +115,9 @@ fn build_from_source() -> Result<std::path::PathBuf, Box<dyn std::error::Error>>
     );
     // The PROJ library needs SQLite and the C++ standard library.
     println!("cargo:rustc-link-lib=dylib=sqlite3");
-    println!("cargo:rustc-link-lib=dylib=tiff");
+    if tiff_support {
+        println!("cargo:rustc-link-lib=dylib=tiff");
+    }
     if cfg!(target_os = "linux") {
         println!("cargo:rustc-link-lib=dylib=stdc++");
     } else if cfg!(target_os = "macos") {