Add GNULIB_DIR to LDFLAGS in configure.ac on Windows

diff --git a/build.sh b/build.sh
index c7d557aad0aff0d35a95deab6e9e9d1d08a929a5..c4eada6ae46c1bff4d691117f2b9f23c4bd9b59a 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -77,7 +77,7 @@ build_cygwin()
     echo "Installing collectd to ${INSTALL_DIR}."
     TOP_SRCDIR=$(pwd)
     MINGW_ROOT="$(x86_64-w64-mingw32-gcc -print-sysroot)/mingw"
-    GNULIB_DIR="${TOP_SRCDIR}/gnulib/build/gllib"
+    export GNULIB_DIR="${TOP_SRCDIR}/gnulib/build/gllib"
 
     export CC="x86_64-w64-mingw32-gcc"
 

diff --git a/configure.ac b/configure.ac
index 36b66e5384020b30c89f208d0be8afbc44c129ab..7bf3718b49a67796b568ee89012dd641d5c8c555 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -779,8 +779,12 @@ AC_FUNC_STRERROR_R
 
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="-Wall -Werror"
-SAVE_LDFAGS="$LDFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
 LDFLAGS=""
+if test "x$ac_system" = "xWindows"; then
+  # This is exported from build.sh
+  LDFLAGS="$LDFLAGS -L${GNULIB_DIR}"
+fi
 
 AC_CACHE_CHECK([for strtok_r],
   [c_cv_have_strtok_r_default],