ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libpq/patches/mingw/additional-zlib-names.patch

   1 diff --git a/configure b/configure
   2 index c22d3de..75210f0 100755
   3 --- a/configure
   4 +++ b/configure
   5 @@ -11777,13 +11789,13 @@ Use --without-readline to disable readline support." "$LINENO" 5
   6  fi
   7
   8  if test "$with_zlib" = yes; then
   9 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
  10 -$as_echo_n "checking for inflate in -lz... " >&6; }
  11 -if ${ac_cv_lib_z_inflate+:} false; then :
  12 +  if test "$enable_debug" = yes; then
  13 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5
  14 +$as_echo_n "checking for library containing inflate... " >&6; }
  15 +if ${ac_cv_search_inflate+:} false; then :
  16    $as_echo_n "(cached) " >&6
  17  else
  18 -  ac_check_lib_save_LIBS=$LIBS
  19 -LIBS="-lz  $LIBS"
  20 +  ac_func_search_save_LIBS=$LIBS
  21  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  22  /* end confdefs.h.  */
  23
  24 @@ -11802,23 +11814,101 @@ return inflate ();
  25    return 0;
  26  }
  27  _ACEOF
  28 -if ac_fn_c_try_link "$LINENO"; then :
  29 -  ac_cv_lib_z_inflate=yes
  30 -else
  31 -  ac_cv_lib_z_inflate=no
  32 +for ac_lib in '' zd zlibd zlib1d z zlib zlib1; do
  33 +  if test -z "$ac_lib"; then
  34 +    ac_res="none required"
  35 +  else
  36 +    ac_res=-l$ac_lib
  37 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
  38 +  fi
  39 +  if ac_fn_c_try_link "$LINENO"; then :
  40 +  ac_cv_search_inflate=$ac_res
  41  fi
  42  rm -f core conftest.err conftest.$ac_objext \
  43 -    conftest$ac_exeext conftest.$ac_ext
  44 -LIBS=$ac_check_lib_save_LIBS
  45 +    conftest$ac_exeext
  46 +  if ${ac_cv_search_inflate+:} false; then :
  47 +  break
  48  fi
  49 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
  50 -$as_echo "$ac_cv_lib_z_inflate" >&6; }
  51 -if test "x$ac_cv_lib_z_inflate" = xyes; then :
  52 -  cat >>confdefs.h <<_ACEOF
  53 -#define HAVE_LIBZ 1
  54 +done
  55 +if ${ac_cv_search_inflate+:} false; then :
  56 +
  57 +else
  58 +  ac_cv_search_inflate=no
  59 +fi
  60 +rm conftest.$ac_ext
  61 +LIBS=$ac_func_search_save_LIBS
  62 +fi
  63 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5
  64 +$as_echo "$ac_cv_search_inflate" >&6; }
  65 +ac_res=$ac_cv_search_inflate
  66 +if test "$ac_res" != no; then :
  67 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  68 +
  69 +$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
  70 +
  71 +else
  72 +  as_fn_error $? "zlib library not found
  73 +If you have zlib already installed, see config.log for details on the
  74 +failure.  It is possible the compiler isn't looking in the proper directory.
  75 +Use --without-zlib to disable zlib support." "$LINENO" 5
  76 +fi
  77 +
  78 +  else
  79 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5
  80 +$as_echo_n "checking for library containing inflate... " >&6; }
  81 +if ${ac_cv_search_inflate+:} false; then :
  82 +  $as_echo_n "(cached) " >&6
  83 +else
  84 +  ac_func_search_save_LIBS=$LIBS
  85 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  86 +/* end confdefs.h.  */
  87 +
  88 +/* Override any GCC internal prototype to avoid an error.
  89 +   Use char because int might match the return type of a GCC
  90 +   builtin and then its argument prototype would still apply.  */
  91 +#ifdef __cplusplus
  92 +extern "C"
  93 +#endif
  94 +char inflate ();
  95 +int
  96 +main ()
  97 +{
  98 +return inflate ();
  99 +  ;
 100 +  return 0;
 101 +}
 102  _ACEOF
 103 +for ac_lib in '' z zlib zlib1; do
 104 +  if test -z "$ac_lib"; then
 105 +    ac_res="none required"
 106 +  else
 107 +    ac_res=-l$ac_lib
 108 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 109 +  fi
 110 +  if ac_fn_c_try_link "$LINENO"; then :
 111 +  ac_cv_search_inflate=$ac_res
 112 +fi
 113 +rm -f core conftest.err conftest.$ac_objext \
 114 +    conftest$ac_exeext
 115 +  if ${ac_cv_search_inflate+:} false; then :
 116 +  break
 117 +fi
 118 +done
 119 +if ${ac_cv_search_inflate+:} false; then :
 120
 121 -  LIBS="-lz $LIBS"
 122 +else
 123 +  ac_cv_search_inflate=no
 124 +fi
 125 +rm conftest.$ac_ext
 126 +LIBS=$ac_func_search_save_LIBS
 127 +fi
 128 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5
 129 +$as_echo "$ac_cv_search_inflate" >&6; }
 130 +ac_res=$ac_cv_search_inflate
 131 +if test "$ac_res" != no; then :
 132 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 133 +
 134 +$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
 135
 136  else
 137    as_fn_error $? "zlib library not found
 138 @@ -11827,6 +11917,7 @@ failure.  It is possible the compiler isn't looking in the proper directory.
 139  Use --without-zlib to disable zlib support." "$LINENO" 5
 140  fi
 141
 142 +  fi
 143  fi
 144
 145  if test "$enable_spinlocks" = yes; then
 146 diff --git a/configure.in b/configure.in
 147 index 976f90d..e3cd80b 100644
 148 --- a/configure.in
 149 +++ b/configure.in
 150 @@ -1170,11 +1170,21 @@ Use --without-readline to disable readline support.])
 151  fi
 152
 153  if test "$with_zlib" = yes; then
 154 -  AC_CHECK_LIB(z, inflate, [],
 155 -               [AC_MSG_ERROR([zlib library not found
 156 +  if test "$enable_debug" = yes; then
 157 +    AC_SEARCH_LIBS(inflate, [zd zlibd zlib1d z zlib zlib1],
 158 +      [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])],
 159 +      [AC_MSG_ERROR([zlib library not found
 160  If you have zlib already installed, see config.log for details on the
 161  failure.  It is possible the compiler isn't looking in the proper directory.
 162  Use --without-zlib to disable zlib support.])])
 163 +  else
 164 +    AC_SEARCH_LIBS(inflate, [z zlib zlib1],
 165 +      [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])],
 166 +      [AC_MSG_ERROR([zlib library not found
 167 +If you have zlib already installed, see config.log for details on the
 168 +failure.  It is possible the compiler isn't looking in the proper directory.
 169 +Use --without-zlib to disable zlib support.])])
 170 +  fi
 171  fi
 172
 173  if test "$enable_spinlocks" = yes; then
 174 diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
 175 index 244886a..29dd35b 100644
 176 --- a/src/include/pg_config.h.in
 177 +++ b/src/include/pg_config.h.in
 178 @@ -374,7 +374,7 @@
 179  /* Define to 1 if you have the `xslt' library (-lxslt). */
 180  #undef HAVE_LIBXSLT
 181
 182 -/* Define to 1 if you have the `z' library (-lz). */
 183 +/* Define to 1 if you have the `z' library. */
 184  #undef HAVE_LIBZ
 185
 186  /* Define to 1 if the system has the type `locale_t'. */