Auto-Merge pull request #3138 from mkauf/fix_exec_environment

Automatically merged due to "Automerge" label

diff --combined configure.ac
index 4e585bd,69dc5e5..abca971
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -743,10 -743,10 +743,10 @@@ test_cxx_flags() 
  #
  AC_CHECK_FUNCS_ONCE([ \
      asprintf \
+     execvpe \
      getpwnam \
      getpwnam_r \
      if_indextoname \
-     setenv \
      setgroups \
      setlocale
    ]
@@@ -858,17 -858,6 +858,17 @@@ AC_CHECK_FUNCS([socket]
  AM_CONDITIONAL([BUILD_WITH_LIBSOCKET], [test "x$socket_needs_socket" = "xyes"])
  AM_CONDITIONAL([BUILD_WITH_GNULIB], [test "x$socket_needs_gnulib" = "xyes"])
  
 +AC_CHECK_FUNCS([inet_ntop],
 +  [],
 +  [
 +    AC_CHECK_LIB([nsl], [inet_ntop],
 +      [inet_ntop_needs_nsl="yes"],
 +      [AC_MSG_ERROR([cannot find inet_ntop() in libnsl])]
 +    )
 +  ]
 +)
 +AM_CONDITIONAL([BUILD_WITH_LIBNSL], [test "x$inet_ntop_needs_nsl" = "xyes"])
 +
  clock_gettime_needs_posix4="no"
  AC_CHECK_FUNCS([clock_gettime],
    [have_clock_gettime="yes"],