From 4036ab03abe11a08b26a0a24a0b9cc2cbe95dd0e Mon Sep 17 00:00:00 2001 From: reg_ Date: Tue, 1 May 2012 14:07:23 +0000 Subject: [PATCH] restored missing pthread link --- src/installer/Makefile.am.alt | 2 +- src/searcher/Makefile.am.alt | 2 +- src/server/Makefile.am.alt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/installer/Makefile.am.alt b/src/installer/Makefile.am.alt index 4928f89..4184a66 100644 --- a/src/installer/Makefile.am.alt +++ b/src/installer/Makefile.am.alt @@ -29,5 +29,5 @@ include_HEADERS= \ ../common/regexTools.h \ ../common/pathTools.h kiwix_install_CXXFLAGS=$(XAPIAN_CFLAGS) $(CLUCENE_CFLAGS) $(ICU_CFLAGS) $(LZMA_CFLAGS) $(ZLIB_CLAGS) $(UUID_CFLAGS) -I../common/ -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 +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_LDADD= \ No newline at end of file diff --git a/src/searcher/Makefile.am.alt b/src/searcher/Makefile.am.alt index d21c370..038d392 100644 --- a/src/searcher/Makefile.am.alt +++ b/src/searcher/Makefile.am.alt @@ -17,7 +17,7 @@ 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=$(XAPIAN_STATIC_LDFLAGS) $(CLUCENE_STATIC_LDFLAGS) $(ICU_STATIC_LDFLAGS) $(CTPP2_STATIC_LDFLAGS) $(ZLIB_STATIC_LDFLAGS) ../ctpp2/src/.libs/libctpp2.a $(UUID_STATIC_LDFLAGS) -ldl +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_LDADD=../ctpp2/src/.libs/libctpp2.a diff --git a/src/server/Makefile.am.alt b/src/server/Makefile.am.alt index e868771..a7c6e38 100644 --- a/src/server/Makefile.am.alt +++ b/src/server/Makefile.am.alt @@ -31,7 +31,7 @@ kiwix_serve_CXXFLAGS=${MICROHTTPD_CFLAGS} -I${CURRENT_PATH}/src/ctpp2/include $( # kiwix_serve_LDADD=../zimlib/src/.libs/libzim.a ../ctpp2/src/.libs/libctpp2.a ../pugixml/.libs/libpugixml.a -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) +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 if IS_OSX kiwix_serve_LDFLAGS+= /opt/local/lib/libiconv.a /opt/local/lib/libintl.a -framework IOKit -framework CoreFoundation