ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libwandio/configure.lib.patch

   1 diff --git a/configure.ac b/configure.ac
   2 index 4579fbb3d..f6be008c8 100644
   3 --- a/configure.ac
   4 +++ b/configure.ac
   5 @@ -112,10 +112,11 @@ AC_HEADER_STDC
   6  AC_CHECK_HEADERS(stddef.h inttypes.h sys/prctl.h)
   7
   8  # Checks for various "optional" libraries
   9 -AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
  10 +# AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
  11 +AC_SEARCH_LIBS(pthread_create, [pthreadGC pthreadVC pthread], have_pthread=1, have_pthread=0)
  12
  13  if test "$have_pthread" = 1; then
  14 -       LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
  15 +       LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_pthread_create"
  16         AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
  17  fi
  18
  19 @@ -128,12 +129,13 @@ AC_ARG_WITH([bzip2],
  20
  21  AS_IF([test "x$with_bzip2" != "xno"],
  22         [
  23 -       AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
  24 +       AC_SEARCH_LIBS(BZ2_bzDecompressInit, [bz2 bz2d bzip2 bzip2d], have_bzip=yes, have_bzip=no)
  25 +       # AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
  26         ], [have_bzip=no])
  27
  28  AS_IF([test "x$have_bzip" = "xyes"], [
  29 -       if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
  30 -               LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
  31 +       if test "$ac_cv_search_BZ2_bzDecompressInit" != "none required"; then
  32 +               LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_BZ2_bzDecompressInit"
  33         fi
  34         with_bzip2=yes
  35         AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")],
  36 @@ -149,12 +151,13 @@ AC_ARG_WITH([zlib],
  37
  38  AS_IF([test "x$with_zlib" != "xno"],
  39         [
  40 -       AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
  41 +       AC_SEARCH_LIBS(deflate, [z zlib zlibd zd], have_zlib=yes, have_zlib=no)
  42 +       # AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
  43         ], [have_zlib=no])
  44
  45  AS_IF([test "x$have_zlib" = "xyes"], [
  46 -       if test "$ac_cv_lib_z_deflate" != "none required"; then
  47 -               LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
  48 +       if test "$ac_cv_search_deflate" != "none required"; then
  49 +               LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_deflate"
  50         fi
  51         AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
  52         with_zlib=yes],
  53 @@ -193,12 +196,13 @@ AC_ARG_WITH([lzma],
  54
  55  AS_IF([test "x$with_lzma" != "xno"],
  56         [
  57 -       AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
  58 +       # AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
  59 +    AC_SEARCH_LIBS(lzma_free, [lzma lzmad], have_lzma=yes, have_lzma=no)
  60         ], [have_lzma=no])
  61
  62  AS_IF([test "x$have_lzma" = "xyes"], [
  63 -       if test "$ac_cv_lib_lzma_code" != "none required"; then
  64 -               LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma"
  65 +       if test "$ac_cv_search_lzma_free" != "none required"; then
  66 +               LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_lzma_free"
  67         fi
  68         AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
  69         with_lzma=yes],
  70 @@ -215,12 +219,13 @@ AC_ARG_WITH([zstd],
  71
  72  AS_IF([test "x$with_zstd" != "xno"],
  73         [
  74 -       AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no)
  75 +    AC_SEARCH_LIBS(ZSTD_createDStream, [zstd zstdd], have_zstd=yes, have_zstd=no)
  76 +       # AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no)
  77         ], [have_zstd=no])
  78
  79  AS_IF([test "x$have_zstd" = "xyes"], [
  80 -       if test "$ac_cv_lib_zstd_code" != "none required"; then
  81 -               LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lzstd"
  82 +       if test "$ac_cv_search_ZSTD_createDStream" != "none required"; then
  83 +               LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_ZSTD_createDStream"
  84         fi
  85         AC_DEFINE(HAVE_LIBZSTD, 1, "Compiled with zstd support")
  86         with_zstd=yes],
  87 @@ -259,25 +264,28 @@ AC_ARG_WITH([lz4],
  88
  89  AS_IF([test "x$with_lz4" != "xno"],
  90          [
  91 -        AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
  92 +        AC_SEARCH_LIBS(LZ4F_createDecompressionContext, [lz4 lz4d], have_lz4f=yes, have_lz4f=no)
  93 +        # AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
  94          ], [have_zstd=no])
  95
  96  AS_IF([test "x$have_lz4f" = "xyes"], [
  97 -        if test "$ac_cv_lib_lz4_code" != "none required"; then
  98 -                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4"
  99 +        if test "$ac_cv_search_LZ4F_createDecompressionContext" != "none required"; then
 100 +                LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_LZ4F_createDecompressionContext"
 101          fi
 102          AC_DEFINE(HAVE_LIBLZ4F, 1, "Compiled with lz4 frame support")
 103 -        AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no)
 104 +        AC_SEARCH_LIBS(LZ4F_getVersion, [lz4 lz4d], have_lz4_173=yes, have_lz4_173=no)
 105 +        # AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no)
 106          if test "x$have_lz4_173" = "xyes"; then
 107                  AC_DEFINE(HAVE_LIBLZ4_MOVABLE, 1, "If defined then liblz4 does NOT have the ERROR_srcPtr_wrong bug")
 108          fi
 109          with_lz4=frameapi],
 110          [
 111              AC_DEFINE(HAVE_LIBLZ4F, 0, "Compiled with lz4 frame support")
 112 -            AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no)
 113 +            AC_SEARCH_LIBS(LZ4_decompress_safe_continue, [lz4 lz4d],  have_lz4s=yes, have_lz4s=no)
 114 +            # AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no)
 115              AS_IF([test "x$have_lz4s" = "xyes"], [
 116 -                if test "$ac_cv_lib_lz4_code" != "none required"; then
 117 -                    LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4"
 118 +                if test "$ac_cv_search_LZ4_decompress_safe_continue" != "none required"; then
 119 +                    LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_LZ4_decompress_safe_continue"
 120                  fi
 121                  AC_DEFINE(HAVE_LIBLZ4S, 1, "Compiled with lz4 stream support")
 122                  with_lz4=streamapi