ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/elfutils/configure.ac.patch

   1 diff --git a/src/Makefile.am b/src/Makefile.am
   2 index e462e7d7a..7f68d0348 100644
   3 --- a/src/Makefile.am
   4 +++ b/src/Makefile.am
   5 @@ -41,8 +41,8 @@ CLEANFILES += make-debug-archive
   6
   7  if BUILD_STATIC
   8  libasm = ../libasm/libasm.a
   9 -libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
  10 -libelf = ../libelf/libelf.a -lz
  11 +libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) -ldl -lpthread
  12 +libelf = ../libelf/libelf.a $(zip_LIBS)
  13  else
  14  libasm = ../libasm/libasm.so
  15  libdw = ../libdw/libdw.so
  16 diff --git a/configure.ac b/configure.ac
  17 index 5a2dc373e..b1928831e 100644
  18 --- a/configure.ac
  19 +++ b/configure.ac
  20 @@ -383,7 +383,7 @@ AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes)
  21  dnl zlib is mandatory.
  22  save_LIBS="$LIBS"
  23  LIBS=
  24 -eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip)
  25 +eu_ZIPLIB(zlib,ZLIB,[z zlib zlibd],gzdirect,gzip)
  26  AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR([zlib not found but is required])])
  27  LIBS="$save_LIBS"
  28
  29 @@ -391,13 +391,13 @@ dnl Test for bzlib and xz/lzma, gives BZLIB/LZMALIB .am
  30  dnl conditional and config.h USE_BZLIB/USE_LZMALIB/USE_ZSTD #define.
  31  save_LIBS="$LIBS"
  32  LIBS=
  33 -eu_ZIPLIB(bzlib,BZLIB,bz2,BZ2_bzdopen,bzip2)
  34 +eu_ZIPLIB(bzlib,BZLIB,[bz2 bz2d],BZ2_bzdopen,bzip2)
  35  # We need this since bzip2 doesn't have a pkgconfig file.
  36  BZ2_LIB="$LIBS"
  37  AC_SUBST([BZ2_LIB])
  38 -eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)])
  39 +eu_ZIPLIB(lzma,LZMA,[lzma lzmad],lzma_auto_decoder,[LZMA (xz)])
  40  AS_IF([test "x$with_lzma" = xyes], [LIBLZMA="liblzma"], [LIBLZMA=""])
  41  AC_SUBST([LIBLZMA])
  42 -eu_ZIPLIB(zstd,ZSTD,zstd,ZSTD_decompress,[ZSTD (zst)])
  43 +eu_ZIPLIB(zstd,ZSTD,[zstd zstdd zstd_static zstd_staticd],ZSTD_decompress,[ZSTD (zst)])
  44  AS_IF([test "x$with_zstd" = xyes], [LIBZSTD="libzstd"], [LIBLZSTD=""])
  45  AC_SUBST([LIBZSTD])
  46 -zip_LIBS="$LIBS"
  47 +zip_LIBS="$LIBS $ac_cv_search_lzma_auto_decoder $ac_cv_search_BZ2_bzdopen $ac_cv_search_gzdirect $ac_cv_search_ZSTD_decompress"
  48  LIBS="$save_LIBS"
  49  AC_SUBST([zip_LIBS])