ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/gdal/0005-Fix-configure.patch

   1 diff --git a/configure.ac b/configure.ac
   2 index bd85e0616..c45b0f74a 100644
   3 --- a/configure.ac
   4 +++ b/configure.ac
   5 @@ -1275,10 +1275,10 @@ AC_MSG_CHECKING([for libtiff])
   6  if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then
   7
   8    dnl Only automatically pick up the external libtiff if it is >= 4.0.
   9 -  AC_CHECK_LIB(tiff,TIFFScanlineSize64,TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,)
  10 +  AC_SEARCH_LIBS(TIFFScanlineSize64,[tiffd tiff],TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,-ljpeg)
  11
  12    if test "$TIFF_SETTING" = "external" ; then
  13 -    LIBS="-ltiff $LIBS"
  14 +    LIBS="-ljpeg $LIBS"
  15      AC_MSG_RESULT([using pre-installed libtiff.])
  16    else
  17      AC_MSG_RESULT([using internal TIFF code.])
  18 @@ -1338,18 +1338,12 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then
  19  elif test "$with_curl" = "no" ; then
  20    LIBCURL_CONFIG=no
  21  else
  22 -  AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no)
  23 +  LIBCURL_CONFIG=yes
  24  fi
  25
  26  if test "$LIBCURL_CONFIG" != "no" ; then
  27
  28 -  CURL_VERNUM=`$LIBCURL_CONFIG --vernum`
  29 -  CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'`
  30 -
  31 -  AC_MSG_RESULT([        found libcurl version $CURL_VER])
  32 -
  33 -  AC_CHECK_LIB(curl,curl_global_init,CURL_SETTING=yes,CURL_SETTING=no,`$LIBCURL_CONFIG --libs`)
  34 -
  35 +  AC_SEARCH_LIBS(curl_global_init,[curl-d curl],CURL_SETTING=yes,CURL_SETTING=no,)
  36  fi
  37
  38  AC_SUBST(CURL_SETTING,$CURL_SETTING)
  39 @@ -1512,12 +1506,12 @@ elif test "$with_spatialite" = "yes"; then
  40      AC_CHECK_HEADERS(sqlite3.h)
  41      if test "$ac_cv_header_sqlite3_h" = "yes"; then
  42          AC_MSG_CHECKING([for spatialite.h in /usr/include or /usr/local/include])
  43 -        if test -f "/usr/include/spatialite.h" -o -f "/usr/local/include/spatialite.h"; then
  44 +        if test -f "$prefix/../include/spatialite.h" -o -f "$prefix/include/spatialite.h" -o -f "/usr/include/spatialite.h" -o -f "/usr/local/include/spatialite.h"; then
  45              AC_MSG_RESULT(found)
  46 -            AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-lsqlite3)
  47 +            AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-lsqlite3 -lrttopo -lfreexl)
  48              if test "$SPATIALITE_INIT_FOUND" = "yes"; then
  49                  HAVE_SPATIALITE=yes
  50 -                SPATIALITE_LIBS="-lspatialite -lsqlite3"
  51 +                SPATIALITE_LIBS="-lspatialite -lsqlite3 -lrttopo -lfreexl"
  52                  LIBS="$LIBS $SPATIALITE_LIBS"
  53                  HAVE_SQLITE3=yes
  54              fi
  55 @@ -1570,11 +1564,15 @@ dnl ---------------------------------------------------------------------------
  56  AC_ARG_WITH(liblzma,[  --with-liblzma[=ARG]       Include liblzma support (ARG=yes/no)],,)
  57
  58  if test "$with_liblzma" = "yes" ; then
  59 -  AC_CHECK_LIB(lzma,lzma_code,LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,)
  60 +  SAVED_LIBS="$LIBS"
  61 +  LIBS=""
  62 +  AC_SEARCH_LIBS(lzma_code,[lzmad lzma],LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,)
  63    AC_CHECK_HEADERS(lzma.h)
  64 +  LZMA_LIBS="$LIBS"
  65 +  LIBS="$SAVED_LIBS"
  66
  67    if test "$LIBLZMA_SETTING" = "yes" -a "$ac_cv_header_lzma_h" = "yes" ; then
  68 -    LIBS="-llzma $LIBS"
  69 +    LIBS="$LZMA_LIBS $LIBS"
  70    else
  71      LIBLZMA_SETTING=no
  72    fi
  73 @@ -1592,11 +1590,9 @@ dnl ---------------------------------------------------------------------------
  74  AC_ARG_WITH(zstd,[  --with-zstd[=ARG]       Include zstd support (ARG=yes/no/installation_prefix)],,)
  75
  76  if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then
  77 -  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,)
  78 +  AC_SEARCH_LIBS(ZSTD_decompressStream,[zstdd zstd],ZSTD_SETTING=yes,ZSTD_SETTING=no,)
  79
  80 -  if test "$ZSTD_SETTING" = "yes" ; then
  81 -    LIBS="-lzstd $LIBS"
  82 -  else
  83 +  if test "$ZSTD_SETTING" != "yes" ; then
  84      if test "$with_zstd" = "yes" ; then
  85        AC_MSG_ERROR([libzstd not found])
  86      else
  87 @@ -1820,8 +1816,6 @@ fi
  88
  89  if test "$CURL_SETTING" = "yes" ; then
  90
  91 -  CURL_INC=`$LIBCURL_CONFIG --cflags`
  92 -  CURL_LIB=`$LIBCURL_CONFIG --libs`
  93  m4_foreach_w([frmt],CURL_FORMATS,[
  94    driver_enabled=m4_join([_],[$INTERNAL_FORMAT],frmt,[ENABLED])
  95    if test "x$driver_enabled" = "xyes"; then
  96 @@ -1888,7 +1882,7 @@ else
  97    PKG_CHECK_MODULES([PQ],[libpq > 9.1], [HAVE_PG=yes], [HAVE_PG=no])
  98
  99    if test "${HAVE_PG}" = "yes" ; then
 100 -    PG_LIB="${PQ_LIBS}"
 101 +    PG_LIB="${PQ_LIBS} -lpgcommon -lpgport"
 102      PG_INC="${PQ_CFLAGS}"
 103      SAVED_LIBS="${LIBS}"
 104      LIBS="${PG_LIB}"
 105 @@ -4287,13 +4281,13 @@ if test "x$with_xml2" = "xyes" -o "x$with_xml2" = "x" ; then
 106    if test "${HAVE_LIBXML2}" = "yes"; then
 107      SAVED_LIBS="${LIBS}"
 108      LIBS="${LIBXML2_LIBS}"
 109 -    AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no)
 110 +    AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no,-lz -lm $LZMA_LIBS)
 111      LIBS="${SAVED_LIBS}"
 112    fi
 113
 114    if test "${HAVE_LIBXML2}" = "yes"; then
 115      LIBXML2_INC="${LIBXML2_CFLAGS}"
 116 -    LIBXML2_LIB="${LIBXML2_LIBS}"
 117 +    LIBXML2_LIB="${LIBXML2_LIBS} -lz -lm $LZMA_LIBS"
 118    else
 119      if test "x$with_xml2" = "xyes"; then
 120        AC_MSG_ERROR([--with-xml2 was requested, but libxml2 is not available])
 121 @@ -4817,8 +4811,7 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs
 122  elif test "$with_libjson_c" = "internal" ; then
 123    LIBJSONC_SETTING=internal
 124  elif test "$with_libjson_c" != "no"; then
 125 -  LIBS="-L$with_libjson_c/lib $LIBS"
 126 -  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib)
 127 +  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,)
 128  else
 129    AC_MSG_ERROR([libjson-c (internal or external) is required])
 130  fi
 131
 132 diff --git a/m4/ax_lib_sqlite3.m4 b/m4/ax_lib_sqlite3.m4
 133 index e53a4a967..440e2c5ed 100644
 134 --- a/m4/ax_lib_sqlite3.m4
 135 +++ b/m4/ax_lib_sqlite3.m4
 136 @@ -76,23 +76,22 @@ AC_DEFUN([AX_LIB_SQLITE3],
 137
 138              unset ac_cv_lib_sqlite3_sqlite3_open
 139              saved_LIBS="$LIBS"
 140 -            LIBS=""
 141              AC_CHECK_LIB(sqlite3,sqlite3_open,LIB_SQLITE3_FOUND=yes,LIB_SQLITE3_FOUND=no,-L$ac_sqlite3_path/lib)
 142              LIBS="$saved_LIBS"
 143              if test "$LIB_SQLITE3_FOUND" = "yes"; then
 144                  ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
 145              fi
 146
 147 +            ac_sqlite3_include_path="$ac_sqlite3_path/include"
 148              ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
 149          else
 150 -            for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
 151 -                if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
 152 -                    && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
 153 +            for ac_sqlite3_path_tmp in $prefix /usr /usr/local /opt; do
 154 +                if (test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
 155 +                    && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header") || (test -f "$ac_sqlite3_path_tmp/../include/$ac_sqlite3_header" && test -r "$ac_sqlite3_path_tmp/../include/$ac_sqlite3_header"); then
 156                      ac_sqlite3_path=$ac_sqlite3_path_tmp
 157
 158                      unset ac_cv_lib_sqlite3_sqlite3_open
 159                      saved_LIBS="$LIBS"
 160 -                    LIBS=""
 161                      AC_CHECK_LIB(sqlite3,sqlite3_open,LIB_SQLITE3_FOUND=yes,LIB_SQLITE3_FOUND=no,)
 162                      LIBS="$saved_LIBS"
 163                      if test "$LIB_SQLITE3_FOUND" = "yes"; then
 164 @@ -100,7 +99,6 @@ AC_DEFUN([AX_LIB_SQLITE3],
 165                      else
 166                          unset ac_cv_lib_sqlite3_sqlite3_open
 167                          saved_LIBS="$LIBS"
 168 -                        LIBS=""
 169                          AC_CHECK_LIB(sqlite3,sqlite3_open,LIB_SQLITE3_FOUND=yes,LIB_SQLITE3_FOUND=no,-L$ac_sqlite3_path_tmp/lib)
 170                          LIBS="$saved_LIBS"
 171                          if test "$LIB_SQLITE3_FOUND" = "yes"; then
 172 @@ -108,7 +106,12 @@ AC_DEFUN([AX_LIB_SQLITE3],
 173                          fi
 174                      fi
 175
 176 -                    ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include"
 177 +                    if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
 178 +                        ac_sqlite3_include_path="$ac_sqlite3_path_tmp/include"
 179 +                    else
 180 +                        ac_sqlite3_include_path="$ac_sqlite3_path_tmp/../include"
 181 +                    fi
 182 +                    ac_sqlite3_cppflags="-I$ac_sqlite3_include_path"
 183                      break;
 184                  fi
 185              done
 186 @@ -122,7 +125,6 @@ AC_DEFUN([AX_LIB_SQLITE3],
 187      AC_MSG_CHECKING([for SQLite3 library >= $sqlite3_version_req])
 188
 189      if test "x$WANT_SQLITE3" = "xyes"; then
 190 -
 191          ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
 192
 193          saved_CPPFLAGS="$CPPFLAGS"
 194 @@ -161,7 +163,7 @@ AC_DEFUN([AX_LIB_SQLITE3],
 195              SQLITE3_CFLAGS="$ac_sqlite3_cppflags"
 196              SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
 197
 198 -            ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
 199 +            ac_sqlite3_header_path="$ac_sqlite3_include_path/$ac_sqlite3_header"
 200
 201              dnl Retrieve SQLite release version
 202              if test "x$ac_sqlite3_header_path" != "x"; then
 203 @@ -184,5 +186,6 @@ AC_DEFUN([AX_LIB_SQLITE3],
 204      else
 205          AC_MSG_RESULT([disabled])
 206      fi
 207 +    unset ac_sqlite3_include_path
 208  ])
 209
 210
 211 diff --git a/m4/geos.m4 b/m4/geos.m4
 212 index a410673b4..c16e1f33a 100644
 213 --- a/m4/geos.m4
 214 +++ b/m4/geos.m4
 215 @@ -60,6 +60,7 @@ AC_DEFUN([GEOS_INIT],[
 216
 217      AC_PATH_PROG(GEOS_CONFIG, geos-config, no)
 218      ac_geos_config_auto=yes
 219 +    HAVE_GEOS="yes"
 220
 221    else
 222