I'll find a solution for the 'dirList problem', Abdel.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bd6b955b89c8163dded55182c24ea632db256b32..f082e225e0adf332c85cb88b714933c98c2c7531 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,9 @@ for file in config/install-sh config/mkinstalldirs ; do
   chmod 755 ${srcdir}/${file}
 done
 
+### Provide a dummy POTFILES.in in po in order to mark it as a PO directory
+test -f ${srcdir}/po/POTFILES.in || touch ${srcdir}/po/POTFILES.in
+
 ### Check for programs
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -236,7 +239,7 @@ AC_LANG_POP(C)
 # some standard header files
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h utime.h sys/utime.h fontconfig/fontconfig.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h utime.h sys/utime.h)
 
 # some standard structures
 AC_HEADER_STAT
@@ -411,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]),,
@@ -477,7 +474,7 @@ AC_CONFIG_FILES([Makefile
       development/MacOSX/spotlight/Makefile \
       development/lyx.spec \
       intl/Makefile \
-     lib/Makefile \
+      lib/Makefile \
       lib/doc/Makefile \
       lib/lyx2lyx/lyx2lyx_version.py \
       lib/lyx2lyx/Makefile \
@@ -490,7 +487,6 @@ AC_CONFIG_FILES([Makefile
       src/tex2lyx/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/controllers/Makefile \
       src/frontends/qt4/Makefile
 ])
 
@@ -508,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
@@ -516,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