apr-util-link.patch

   1 diff -urNp -x '*.orig' apr-util-1.6.1.org/configure.in apr-util-1.6.1/configure.in
   2 --- apr-util-1.6.1.org/configure.in     2017-04-02 19:57:23.000000000 +0200
   3 +++ apr-util-1.6.1/configure.in 2021-10-09 23:46:58.615015473 +0200
   4 @@ -175,14 +175,19 @@ APU_FIND_ICONV
   5  dnl Enable DSO build; must be last:
   6  APU_CHECK_UTIL_DSO
   7
   8 +save_LIBS="$LIBS"
   9 +LIBS=
  10  AC_SEARCH_LIBS(crypt, crypt ufc)
  11  case "$ac_cv_search_crypt" in
  12  "no"|"none required")
  13      ;;
  14  *)
  15 -    APR_ADDTO(APRUTIL_LIBS, [$ac_cv_search_crypt])
  16 +    APR_ADDTO(APRUTIL_EXPORT_LIBS, [$LIBS])
  17 +    APR_ADDTO(APRUTIL_LIBS, [$LIBS])
  18      ;;
  19  esac
  20 +LIBS="$save_LIBS $LIBS"
  21 +
  22  AC_MSG_CHECKING(if system crypt() function is threadsafe)
  23  if test "x$apu_crypt_threadsafe" = "x1"; then
  24    AC_DEFINE(APU_CRYPT_THREADSAFE, 1, [Define if the system crypt() function is threadsafe])
  25 @@ -273,6 +278,11 @@ APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
  26  AC_SUBST(APRUTIL_EXPORT_LIBS)
  27  AC_SUBST(APRUTIL_PRIV_INCLUDES)
  28  AC_SUBST(APRUTIL_INCLUDES)
  29 +
  30 +APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib])
  31 +APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib32])
  32 +APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib64])
  33 +
  34  AC_SUBST(APRUTIL_LDFLAGS)
  35  AC_SUBST(APRUTIL_LIBS)
  36  AC_SUBST(LDFLAGS)