X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=f082e225e0adf332c85cb88b714933c98c2c7531;hb=5c4a20fe0406ca60a084f733b5fc4324ab1a0933;hp=0653730f7bd3738f1e830a3943cd142d416cc586;hpb=581b67b26e0cac98f2c83c035b483768875c5adc;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 0653730f7b..f082e225e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,8 +157,8 @@ 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
@@ -414,12 +414,6 @@ AC_ARG_ENABLE(monolithic-client,
   [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]),,
@@ -493,7 +487,6 @@ AC_CONFIG_FILES([Makefile
       src/tex2lyx/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/controllers/Makefile \
       src/frontends/qt4/Makefile
 ])
 
@@ -511,7 +504,6 @@ if test x$with_qmake = xyes ; then
 		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
@@ -519,7 +511,6 @@ if test x$with_qmake = xyes ; then
 		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