X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=3rdparty%2FMakefile.am;h=02dbfef70b787c26b2501eed2804ba745541f23a;hb=9a9a6a8c8f12cb8b0e713a9a1ed3c5763fa25c66;hp=54ab6c4e63eb9031f124a42a8dfeefa22e710aaf;hpb=78e17b1579d4f9282deccd905ad613b3f06abb31;p=lyx.git

diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 54ab6c4e63..02dbfef70b 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -3,11 +3,22 @@ include $(top_srcdir)/config/common.am
 DIST_SUBDIRS = boost hunspell libiconv zlib
 
 if USE_INCLUDED_BOOST
+if LYX_USE_STD_REGEX
+else
 BOOST = boost
 endif
+endif
+
+if USE_INCLUDED_HUNSPELL
+HUNSPELL = hunspell
+endif
+
+if USE_INCLUDED_ICONV
+ICONV = libiconv
+endif
 
 if USE_INCLUDED_ZLIB
 ZLIB = zlib
 endif
 
-SUBDIRS = $(BOOST) $(ZLIB)
+SUBDIRS = $(BOOST) $(HUNSPELL) $(ICONV) $(ZLIB)