diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-02-20 12:37:37 +1300 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2020-02-21 11:23:15 +0100 |
| commit | 3eac8d5694cfd1049f613cc5c638097976244768 (patch) | |
| tree | 58d7a7e56840d4c90338c58d53d698ec8409a383 /configure.ac | |
| parent | 86530f3146ec091c26652e60067088dc3e067fae (diff) | |
| download | PROJ-3eac8d5694cfd1049f613cc5c638097976244768.tar.gz PROJ-3eac8d5694cfd1049f613cc5c638097976244768.zip | |
Switch build configuration logic from DISABLE_TIFF to ENABLE_TIFF
* Autotools interface should be the same, but different ./configure --help
* For CMake, the option should be -DENABLE_TIFF=NO (default is YES)
* Use TIFF_ENABLED and CURL_ENABLED variables, based on option and outcome
* Reword some messages and add hints
* Move -DTIFF_ENABLED and -DCURL_ENABLED from global add_definitions()
to target_compile_definitions(), which is recommended practice
* Minor spelling and style consistency around SQLITE_VERSION check
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 88a5ba55..1759624c 100644 --- a/configure.ac +++ b/configure.ac @@ -238,7 +238,7 @@ dnl --------------------------------------------------------------------------- if test "x$SQLITE3_CFLAGS$SQLITE3_LIBS" = "x" ; then - dnl Would build and run with older versons, but with horrible performance + dnl Would build and run with older versions, but with horrible performance dnl See https://github.com/OSGeo/PROJ/issues/1718 PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.11]) @@ -256,12 +256,10 @@ dnl Check for libtiff dnl --------------------------------------------------------------------------- AC_ARG_ENABLE([tiff], - AS_HELP_STRING([--disable-tiff], - [Disable TIFF support. Strongly discouraged !]), - [enable_tiff=no], - [enable_tiff=yes]) + AS_HELP_STRING([--enable-tiff], + [Enable TIFF support; strongly encouraged to read some grids [default=yes]])) -if test "x$enable_tiff" = "xyes" -o "x$enable_tiff" = ""; then +if test "x$enable_tiff" != "xno" -o "x$enable_tiff" = ""; then if test "x$TIFF_CFLAGS$TIFF_LIBS" = "x" ; then if $PKG_CONFIG libtiff; then PKG_CHECK_MODULES([TIFF], [libtiff]) |