Get rid of LYX_ERROR in our configure file.

[lyx.git] / config / common.am

diff --git a/config/common.am b/config/common.am
index 9d945984b562b61ba954c3eb9254d7b7c879f497..6f7e31033779a7b6b2eaf9133e8c855abb40dbd9 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign
-
 CLEANFILES = pch.h.gch
 
 DISTCLEANFILES= pch.h.gch.dep *.orig *.rej *~ *.bak core
@@ -22,7 +20,7 @@ $(PCH_FILE): $(PCH_SOURCE)
        $(MAKE) PCH_FLAGS= pch-file
 
 pch-file:
-       $(CXXCOMPILE) -x c++-header $(PCH_SOURCE) -o $(PCH_FILE) \
+       $(CXXCOMPILE) -x c++-header -fPIC -DPIC $(PCH_SOURCE) -o $(PCH_FILE) \
        -MT $(PCH_FILE)  -MD -MP -MF "./$(PCH_FILE).Tdep" \
        && mv "./$(PCH_FILE).Tdep" "./$(PCH_FILE).dep" \
        || rm "./$(PCH_FILE).Tdep"
@@ -32,14 +30,12 @@ SUFFIXES = .gch
 
 if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost
-BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
-BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
-BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
 else
 BOOST_INCLUDES =
-BOOST_FILESYSTEM = -lboost_filesystem
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
+BOOST_REGEX = -lboost_regex$(BOOST_MT)
+BOOST_SIGNALS = -lboost_signals$(BOOST_MT)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
 endif
 
 LIBS =