diff --git a/src/ctpp2/src/Makefile.am.alt b/src/ctpp2/src/Makefile.am.alt
index 8366f4b..8e50449 100644
--- a/src/ctpp2/src/Makefile.am.alt
+++ b/src/ctpp2/src/Makefile.am.alt
@@ -90,6 +90,6 @@ if IS_OSX
 libctpp2_la_CXXFLAGS+= -I/opt/local/include
 endif
 
-libctpp2_la_LDFLAGS=
+libctpp2_la_LDFLAGS=$(CHECK_LDFLAGS)
 
 CLEANFILES=*.obj *.lib *.dll
\ No newline at end of file
diff --git a/src/indexer/Makefile.am.alt b/src/indexer/Makefile.am.alt
index 1a6a6f7..c5c1fd1 100644
--- a/src/indexer/Makefile.am.alt
+++ b/src/indexer/Makefile.am.alt
@@ -20,8 +20,10 @@ include_HEADERS= \
 	../common/kiwix/cluceneIndexer.h 
 kiwix_index_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CFLAGS) -I../common/
 
+kiwix_index_LDFLAGS=$(CHECK_LDFLAGS)
+
 if STATIC_BINS
-kiwix_index_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread $(UUID_STATIC_LDFLAGS) -ldl
+kiwix_index_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread $(UUID_STATIC_LDFLAGS) -ldl
 else
-kiwix_index_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread $(UUID_LDFLAGS) -ldl
+kiwix_index_LDFLAGS+= $(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread $(UUID_LDFLAGS) -ldl
 endif
diff --git a/src/installer/Makefile.am.alt b/src/installer/Makefile.am.alt
index 26a21d5..97fe735 100644
--- a/src/installer/Makefile.am.alt
+++ b/src/installer/Makefile.am.alt
@@ -30,8 +30,10 @@ include_HEADERS= \
 	../common/pathTools.h 
 kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CLAGS) $(UUID_CFLAGS) -I../common/
 
+kiwix_install_LDFLAGS=$(CHECK_LDFLAGS)
+
 if STATIC_BINS
-kiwix_install_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(UUID_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -ldl -lpthread
+kiwix_install_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(UUID_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -ldl -lpthread
 else
-kiwix_install_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(UUID_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -ldl -lpthread
+kiwix_install_LDFLAGS+= $(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(UUID_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) $(ZLIB_LDFLAGS) -ldl -lpthread
 endif
\ No newline at end of file
diff --git a/src/manager/Makefile.am.alt b/src/manager/Makefile.am.alt
index d7e90b4..fe8b273 100644
--- a/src/manager/Makefile.am.alt
+++ b/src/manager/Makefile.am.alt
@@ -19,8 +19,10 @@ include_HEADERS= \
 	../common/pathTools.h 
 kiwix_manage_CXXFLAGS=$(ZIMLIB_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
 
+kiwix_manage_LDFLAGS=$(CHECK_LDFLAGS)
+
 if STATIC_BINS
-kiwix_manage_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) -ldl
+kiwix_manage_LDFLAGS+= $(ZIMLIB_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) -ldl
 else
-kiwix_manage_LDFLAGS=$(ZIMLIB_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) -ldl
+kiwix_manage_LDFLAGS+= $(ZIMLIB_LDFLAGS) $(ICU_LDFLAGS) ../zimlib/src/.libs/libzim.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) -ldl
 endif
diff --git a/src/pugixml/Makefile.am.alt b/src/pugixml/Makefile.am.alt
index 5c749e7..0413e80 100644
--- a/src/pugixml/Makefile.am.alt
+++ b/src/pugixml/Makefile.am.alt
@@ -8,6 +8,6 @@ libpugixml_la_SOURCES = \
 	pugiconfig.hpp
 
 libpugixml_la_CXXFLAGS=-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-libpugixml_la_LDFLAGS=
+libpugixml_la_LDFLAGS=$(CHECK_LDFLAGS)
 
 CLEANFILES=*.obj *.lib *.dll
\ No newline at end of file
diff --git a/src/reader/Makefile.am.alt b/src/reader/Makefile.am.alt
index 8ec516a..53e1153 100644
--- a/src/reader/Makefile.am.alt
+++ b/src/reader/Makefile.am.alt
@@ -7,8 +7,10 @@ include_HEADERS= \
 	../common/kiwix/reader.h
 kiwix_read_CXXFLAGS=$(ZIMLIB_CFLAGS) $(LZMA_CFLAGS) -I../common/
 
+kiwix_read_LDFLAGS=$(CHECK_LDFLAGS)
+
 if STATIC_BINS
-kiwix_read_LDFLAGS=$(ZIMLIB_STATIC_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS)
+kiwix_read_LDFLAGS+= $(ZIMLIB_STATIC_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_STATIC_LDFLAGS)
 else
-kiwix_read_LDFLAGS=$(ZIMLIB_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS)
+kiwix_read_LDFLAGS+= $(ZIMLIB_LDFLAGS) $(top_builddir)/src/zimlib/src/.libs/libzim.a $(LZMA_LDFLAGS)
 endif
diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt
index e60ef12..b09f0de 100644
--- a/src/searcher/Makefile.am.alt
+++ b/src/searcher/Makefile.am.alt
@@ -17,10 +17,12 @@ include_HEADERS= \
 	../common/kiwix/cluceneSearcher.h 
 kiwix_search_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(CTPP2_CFLAGS) $(ZLIB_CFLAGS) $(UUID_CFLAGS) -I../common/
 
+kiwix_search_LDFLAGS=$(CHECK_LDFLAGS)
+
 if STATIC_BINS
-kiwix_search_LDFLAGS=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_STATIC_LDFLAGS) -ldl -lpthread
+kiwix_search_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_STATIC_LDFLAGS) -ldl -lpthread
 else
-kiwix_search_LDFLAGS=$(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(CTPP2_LDFLAGS) $(ZLIB_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_LDFLAGS) -ldl -lpthread
+kiwix_search_LDFLAGS+= $(XAPIAN_LDFLAGS) $(CLUCENE_LDFLAGS) $(ICU_LDFLAGS) $(CTPP2_LDFLAGS) $(ZLIB_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_LDFLAGS) -ldl -lpthread
 endif
 
 if IS_OSX
diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt
index 1f995ed..bb750dc 100644
--- a/src/server/Makefile.am.alt
+++ b/src/server/Makefile.am.alt
@@ -29,10 +29,12 @@ include_HEADERS= \
 	../common/stringTools.h 
 kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $(CLUCENE_CFLAGS) $(XAPIAN_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) -I../common/
 
+kiwix_serve_LDFLAGS=$(CHECK_LDFLAGS)
+
 if STATIC_BINS
-kiwix_serve_LDFLAGS= $(XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) -ldl $(UUID_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread
+kiwix_serve_LDFLAGS+= $(XAPIAN_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(SQLITE_STATIC_LDFLAGS) $(MICROHTTPD_STATIC_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) -ldl $(UUID_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) -lpthread
 else
-kiwix_serve_LDFLAGS= $(XAPIAN_LDFLAGS) $(ICU_LDFLAGS) $(SQLITE_LDFLAGS) $(MICROHTTPD_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) $(CLUCENE_LDFLAGS) -ldl $(UUID_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread
+kiwix_serve_LDFLAGS+= $(XAPIAN_LDFLAGS) $(ICU_LDFLAGS) $(SQLITE_LDFLAGS) $(MICROHTTPD_LDFLAGS) ../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a $(LZMA_LDFLAGS) $(CLUCENE_LDFLAGS) -ldl $(UUID_LDFLAGS) $(ZLIB_LDFLAGS) -lpthread
 endif
 
 if IS_OSX
diff --git a/src/zimlib/src/Makefile.am.alt b/src/zimlib/src/Makefile.am.alt
index 178d430..93340f0 100644
--- a/src/zimlib/src/Makefile.am.alt
+++ b/src/zimlib/src/Makefile.am.alt
@@ -30,6 +30,6 @@ libzim_la_SOURCES = \
 	md5.h
 
 libzim_la_CXXFLAGS=${LZMA_CFLAGS} -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-libzim_la_LDFLAGS=${LZMA_STATIC_LDFLAGS}
+libzim_la_LDFLAGS=$(CHECK_LDFLAGS) ${LZMA_STATIC_LDFLAGS}
 
 CLEANFILES=*.obj *.lib *.dll
\ No newline at end of file