Add UseModule tag for layout files. This allows the AMS files, in particular, to...

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bd6b955b89c8163dded55182c24ea632db256b32..988e51094ae0427529ec66240747a4d43539fe30 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-dnl Process with autoconf to generate configure script   -*- sh -*-
+vdnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"])
+AC_SUBST(LYX_DATE, ["Fri, Jul 11, 2008"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -37,17 +37,6 @@ done
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-AC_PROG_AWK
-test "$AWK" = gawk && AWK="gawk --posix"
-
-#AC_PROG_RANLIB
-AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
-if test "x$KPSEWHICH" = xkpsewhich ; then
-    AC_DEFINE(HAVE_KPSEWHICH, 1,
-    [Define this if you have the kpsewhich program working on your system.])
-fi
-AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
-
 # Check for installed python
 AM_PATH_PYTHON(2.3,, :)
 
@@ -59,6 +48,7 @@ INSTALL_SCRIPT='${INSTALL}'
 
 ### we will also need a C compiler to compile GNU gettext
 AC_PROG_CC
+AC_GNU_SOURCE
 
 ### check for special systems
 AC_ISC_POSIX
@@ -78,13 +68,17 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 dnl LYX_CXX_EXPLICIT
-LYX_CXX_GLOBAL_CSTD
+dnl LYX_CXX_GLOBAL_CSTD
 dnl LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
 dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 dnl LYX_CXX_STL_MODERN_STREAMS
 
+### Objective-C compiler
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
@@ -231,12 +225,13 @@ fi
 dnl GNU gettext is written in C
 AC_LANG_PUSH(C)
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.16.1])
 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 +406,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 +466,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 +479,6 @@ AC_CONFIG_FILES([Makefile
       src/tex2lyx/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/controllers/Makefile \
       src/frontends/qt4/Makefile
 ])
 
@@ -508,7 +496,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 +503,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