components/network/zabbix/patches/012-configure.ac.patch

   1 We have to provide the library path for openssl first! Otherwise other components provide the standard path where the old openssl libs can be found
   2
   3 diff --git a/configure.ac b/configure.ac
   4 index 2ecbb9c..37d8e8c 100644
   5 --- a/configure.ac
   6 +++ b/configure.ac
   7 @@ -1635,25 +1635,25 @@ AC_SUBST(TLS_CFLAGS)
   8  AM_CONDITIONAL(HAVE_OPENSSL, [test "x$have_tls" = "xOpenSSL" || test "x$have_tls" = "xOpenSSL (PSK not supported)"])
   9  AM_CONDITIONAL(HAVE_GNUTLS, [test "x$have_tls" = "xGnuTLS"])
  10
  11 -SERVER_LDFLAGS="$SERVER_LDFLAGS $TLS_LDFLAGS"
  12 +SERVER_LDFLAGS="$TLS_LDFLAGS $SERVER_LDFLAGS"
  13  SERVER_LIBS="$SERVER_LIBS $TLS_LIBS"
  14
  15 -PROXY_LDFLAGS="$PROXY_LDFLAGS $TLS_LDFLAGS"
  16 +PROXY_LDFLAGS="$TLS_LDFLAGS $PROXY_LDFLAGS"
  17  PROXY_LIBS="$PROXY_LIBS $TLS_LIBS"
  18
  19 -AGENT_LDFLAGS="$AGENT_LDFLAGS $TLS_LDFLAGS"
  20 +AGENT_LDFLAGS="$TLS_LDFLAGS $AGENT_LDFLAGS"
  21  AGENT_LIBS="$AGENT_LIBS $TLS_LIBS"
  22
  23 -AGENT2_LDFLAGS="$AGENT2_LDFLAGS $TLS_LDFLAGS"
  24 +AGENT2_LDFLAGS="$TLS_LDFLAGS $AGENT2_LDFLAGS"
  25  AGENT2_LIBS="$AGENT2_LIBS $TLS_LIBS"
  26
  27 -ZBXGET_LDFLAGS="$ZBXGET_LDFLAGS $TLS_LDFLAGS"
  28 +ZBXGET_LDFLAGS="$TLS_LDFLAGS $ZBXGET_LDFLAGS"
  29  ZBXGET_LIBS="$ZBXGET_LIBS $TLS_LIBS"
  30
  31 -SENDER_LDFLAGS="$SENDER_LDFLAGS $TLS_LDFLAGS"
  32 +SENDER_LDFLAGS="$TLS_LDFLAGS $SENDER_LDFLAGS"
  33  SENDER_LIBS="$SENDER_LIBS $TLS_LIBS"
  34
  35 -ZBXJS_LDFLAGS="$ZLIB_LDFLAGS $TLS_LDFLAGS"
  36 +ZBXJS_LDFLAGS="$TLS_LDFLAGS $ZLIB_LDFLAGS"
  37  ZBXJS_LIBS="$ZBXJS_LIBS $TLS_LIBS"
  38
  39  dnl Check for libmodbus [by default - skip]
  40 diff --git a/configure.ac b/configure.ac
  41 index 37d8e8c..e5856b6 100644
  42 --- a/configure.ac
  43 +++ b/configure.ac
  44 @@ -1434,10 +1434,10 @@ if test "x$server" = "xyes" || test "x$proxy" = "xyes"; then
  45                         have_snmp="yes"
  46                 fi
  47         fi
  48 -       SERVER_LDFLAGS="$SNMP_LDFLAGS $SERVER_LDFLAGS"
  49 +       SERVER_LDFLAGS="$SERVER_LDFLAGS $SNMP_LDFLAGS"
  50         SERVER_LIBS="$SERVER_LIBS $SNMP_LIBS"
  51
  52 -       PROXY_LDFLAGS="$SNMP_LDFLAGS $PROXY_LDFLAGS"
  53 +       PROXY_LDFLAGS="$PROXY_LDFLAGS $SNMP_LDFLAGS"
  54         PROXY_LIBS="$PROXY_LIBS $SNMP_LIBS"
  55
  56