SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a0353474772b3b7ed2cb8c84ce7895a844f2b5ec..b23313e2ed6125d4da9fe5f37b2fcbca9ed0e0b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -153,8 +153,9 @@ dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699
 dnl Note that this will reportedly not be needed with libtool 2.0
 m4_undefine([AC_PROG_F77])
 m4_defun([AC_PROG_F77],[])
-#AC_DISABLE_SHARED
-AC_DISABLE_STATIC
+
+AC_DISABLE_SHARED
+#AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
 LYX_PROG_LIBTOOL
@@ -296,20 +297,20 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
-  Host type:                      ${host}\n\
-  Special build flags:            ${lyx_flags}\n\
-  C   Compiler:                   ${CC} ${CC_VERSION}\n\
-  C   Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
-  C   Compiler flags:             ${CPPFLAGS} ${CFLAGS}\n\
-  C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
-  C++ Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
-  C++ Compiler flags:             ${CPPFLAGS} ${CXXFLAGS}\n\
-  Linker flags:                   ${AM_LDFLAGS}\n\
-  Linker user flags:              ${LDFLAGS}\n\
+  Host type:                    ${host}\n\
+  Special build flags:          ${lyx_flags}\n\
+  C   Compiler:                 ${CC} ${CC_VERSION}\n\
+  C   Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
+  C   Compiler flags:           ${CPPFLAGS} ${CFLAGS}\n\
+  C++ Compiler:                 ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+  C++ Compiler flags:           ${CPPFLAGS} ${CXXFLAGS}\n\
+  Linker flags:                 ${AM_LDFLAGS}\n\
+  Linker user flags:            ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
-  Packaging:                      ${lyx_use_packaging}\n\
-  LyX binary dir:                 ${real_bindir}\n\
-  LyX files dir:                  ${real_pkgdatadir}\n"
+  Packaging:                    ${lyx_use_packaging}\n\
+  LyX binary dir:               ${real_bindir}\n\
+  LyX files dir:                ${real_pkgdatadir}\n"
 
 MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir})
 MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir})
@@ -411,6 +412,48 @@ AC_ARG_ENABLE(monolithic-boost,
   [enable_monolithic_boost=no])
 AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes)
 
+AC_ARG_ENABLE(monolithic-client,
+  AC_HELP_STRING([--enable-monolithic-client],
+               [Use monolithic client compilations]),,
+  [enable_monolithic_client=no])
+AM_CONDITIONAL(MONOLITHIC_CLIENT, test $enable_monolithic_client = yes)
+
+AC_ARG_ENABLE(monolithic-controllers,
+  AC_HELP_STRING([--enable-monolithic-controllers],
+               [Use monolithic controllers compilations]),,
+  [enable_monolithic_controllers=no])
+AM_CONDITIONAL(MONOLITHIC_CONTROLLERS, test $enable_monolithic_controllers = yes)
+
+AC_ARG_ENABLE(monolithic-insets,
+  AC_HELP_STRING([--enable-monolithic-insets],
+               [Use monolithic insets compilations]),,
+  [enable_monolithic_insets=no])
+AM_CONDITIONAL(MONOLITHIC_INSETS, test $enable_monolithic_insets = yes)
+
+AC_ARG_ENABLE(monolithic-mathed,
+  AC_HELP_STRING([--enable-monolithic-mathed],
+               [Use monolithic mathed compilations]),,
+  [enable_monolithic_mathed=no])
+AM_CONDITIONAL(MONOLITHIC_MATHED, test $enable_monolithic_mathed = yes)
+
+AC_ARG_ENABLE(monolithic-core,
+  AC_HELP_STRING([--enable-monolithic-core],
+               [Use monolithic core files compilations]),,
+  [enable_monolithic_core=no])
+AM_CONDITIONAL(MONOLITHIC_CORE, test $enable_monolithic_core = yes)
+
+AC_ARG_ENABLE(monolithic-tex2lyx,
+  AC_HELP_STRING([--enable-monolithic-tex2lyx],
+               [Use monolithic tex2lyx compilations]),,
+  [enable_monolithic_tex2lyx=no])
+AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test $enable_monolithic_tex2lyx = yes)
+
+AC_ARG_ENABLE(monolithic-frontend-qt4,
+  AC_HELP_STRING([--enable-monolithic-frontend-qt4],
+               [Use monolithic compilation of the Qt 4 frontend. Only recommended with > 512 MB of RAM]),,
+  [enable_monolithic_frontend_qt4=no])
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test $enable_monolithic_frontend_qt4 = yes)
+
 AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
 AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
@@ -447,10 +490,34 @@ AC_CONFIG_FILES([Makefile
 ])
 
 
-test x$with_qmake = xyes && ${srcdir}/development/qmake/doit
+AC_OUTPUT
+
+if test x$with_qmake = xyes ; then
+       echo "CONFIGURE WITH QMAKE ONLY"
+       if test x$srcdir = x ; then
+               echo "ONLY FOR OUT-OF-TREE-BUILDS POSSIBLE"
+       else
+               rm boost/Makefile
+               rm src/client/Makefile
+               rm src/Makefile
+               rm src/tex2lyx/Makefile
+               rm src/support/Makefile
+               rm src/frontends/Makefile
+               rm src/frontends/controllers/Makefile
+               rm src/frontends/qt4/Makefile
+               rm -rf boost/.deps
+               rm -rf src/client/.deps
+               rm -rf src/.deps
+               rm -rf src/tex2lyx/.deps
+               rm -rf src/support/.deps
+               rm -rf src/frontends/.deps
+               rm -rf src/frontends/controllers/.deps
+               rm -rf src/frontends/qt4/.deps
+               ${srcdir}/development/qmake/doit
+       fi
+fi
 
 
-AC_OUTPUT
 # show version information
 echo
 printf "$VERSION_INFO"