Use libuv CFLAGS and LIBS when checking for features

When autoconf was checking for libuv features, the LIBUV_CFLAGS was not
added to CFLAGS and LIBUV_LIBS to LIBS which resulted in false
negatives.

Use AX_SAVE_FLAGS and AX_RESTORE_FLAGS to temporarily add LIBUV_CFLAGS
and LIBUV_LIBS to their respective variables.

(cherry picked from commit f063ee276e4a7f6cfccbefa969e8db8df952348b)

diff --git a/configure b/configure
index 1722890d5a139a9ddb6ee245872eaa8dd1ef4585..cca05c2f4cb189620712d9b64ea3a040da7aebea 100755 (executable)
--- a/configure
+++ b/configure
@@ -16214,6 +16214,79 @@ $as_echo "yes" >&6; }
 
 fi
 
+
+
+  CCASFLAGS_libuv_ax_save_flags=$CCASFLAGS
+
+
+
+  CFLAGS_libuv_ax_save_flags=$CFLAGS
+
+
+
+  CPPFLAGS_libuv_ax_save_flags=$CPPFLAGS
+
+
+
+  CXXFLAGS_libuv_ax_save_flags=$CXXFLAGS
+
+
+
+  ERLCFLAGS_libuv_ax_save_flags=$ERLCFLAGS
+
+
+
+  FCFLAGS_libuv_ax_save_flags=$FCFLAGS
+
+
+
+  FCLIBS_libuv_ax_save_flags=$FCLIBS
+
+
+
+  FFLAGS_libuv_ax_save_flags=$FFLAGS
+
+
+
+  FLIBS_libuv_ax_save_flags=$FLIBS
+
+
+
+  GCJFLAGS_libuv_ax_save_flags=$GCJFLAGS
+
+
+
+  JAVACFLAGS_libuv_ax_save_flags=$JAVACFLAGS
+
+
+
+  LDFLAGS_libuv_ax_save_flags=$LDFLAGS
+
+
+
+  LIBS_libuv_ax_save_flags=$LIBS
+
+
+
+  OBJCFLAGS_libuv_ax_save_flags=$OBJCFLAGS
+
+
+
+  OBJCXXFLAGS_libuv_ax_save_flags=$OBJCXXFLAGS
+
+
+
+  UPCFLAGS_libuv_ax_save_flags=$UPCFLAGS
+
+
+
+  VALAFLAGS_libuv_ax_save_flags=$VALAFLAGS
+
+
+
+CFLAGS="$CFLAGS $LIBUV_CFLAGS"
+LIBS="$LIBS $LIBUV_LIBS"
+
 # libuv recvmmsg support
 ac_fn_c_check_decl "$LINENO" "UV_UDP_MMSG_FREE" "ac_cv_have_decl_UV_UDP_MMSG_FREE" "#include <uv.h>
 "
@@ -16275,6 +16348,60 @@ _ACEOF
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+
+  CCASFLAGS=$CCASFLAGS_libuv_ax_save_flags
+
+
+  CFLAGS=$CFLAGS_libuv_ax_save_flags
+
+
+  CPPFLAGS=$CPPFLAGS_libuv_ax_save_flags
+
+
+  CXXFLAGS=$CXXFLAGS_libuv_ax_save_flags
+
+
+  ERLCFLAGS=$ERLCFLAGS_libuv_ax_save_flags
+
+
+  FCFLAGS=$FCFLAGS_libuv_ax_save_flags
+
+
+  FCLIBS=$FCLIBS_libuv_ax_save_flags
+
+
+  FFLAGS=$FFLAGS_libuv_ax_save_flags
+
+
+  FLIBS=$FLIBS_libuv_ax_save_flags
+
+
+  GCJFLAGS=$GCJFLAGS_libuv_ax_save_flags
+
+
+  JAVACFLAGS=$JAVACFLAGS_libuv_ax_save_flags
+
+
+  LDFLAGS=$LDFLAGS_libuv_ax_save_flags
+
+
+  LIBS=$LIBS_libuv_ax_save_flags
+
+
+  OBJCFLAGS=$OBJCFLAGS_libuv_ax_save_flags
+
+
+  OBJCXXFLAGS=$OBJCXXFLAGS_libuv_ax_save_flags
+
+
+  UPCFLAGS=$UPCFLAGS_libuv_ax_save_flags
+
+
+  VALAFLAGS=$VALAFLAGS_libuv_ax_save_flags
+
+
+
+
 #
 # flockfile is usually provided by pthreads
 #

diff --git a/configure.ac b/configure.ac
index cf597c48799da56bbfc2c426fe4b93be3fe67902..acb2642492002fea79d6adb2b0bf559ec77b75ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -711,6 +711,10 @@ AC_MSG_CHECKING(for libuv)
 PKG_CHECK_MODULES([LIBUV], [libuv >= 1.0.0], [],
                  [AC_MSG_ERROR([libuv not found])])
 
+AX_SAVE_FLAGS([libuv])
+CFLAGS="$CFLAGS $LIBUV_CFLAGS"
+LIBS="$LIBS $LIBUV_LIBS"
+
 # libuv recvmmsg support
 AC_CHECK_DECLS([UV_UDP_MMSG_FREE, UV_UDP_MMSG_CHUNK], [], [], [[#include <uv.h>]])
 AC_MSG_CHECKING([whether struct msghdr uses padding for alignment])
@@ -722,6 +726,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/socket.h>],
                  [AC_MSG_RESULT([no])
                   AC_CHECK_DECLS([UV_UDP_RECVMMSG], [], [], [[#include <uv.h>]])])
 
+AX_RESTORE_FLAGS([libuv])
+
 #
 # flockfile is usually provided by pthreads
 #