X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=86f6e1fa0f9988142334a91fce29b9a81eab6f18;hb=a0ec412cd47f278de0426761abcd0090b74d5179;hp=e1d5ef5f781139b7b3279158f4c3b85a194856e3;hpb=8e988ba702af5562d3b6c06ff6ea49e59eb8e4e2;p=lyx.git

diff --git a/configure.ac b/configure.ac
index e1d5ef5f78..86f6e1fa0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl 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, ["Tue, Apr 22, 2008"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([src/config.h])
@@ -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
@@ -78,13 +81,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]),,
@@ -153,8 +160,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
@@ -235,7 +243,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)
+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
@@ -311,19 +319,12 @@ ${FRONTEND_INFO}\
   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})
-MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_pkgdatadir})
-
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
-AC_SUBST(LYX_ABS_TOP_SRCDIR)
-AC_SUBST(LYX_ABS_INSTALLED_LOCALEDIR)
-AC_SUBST(LYX_ABS_INSTALLED_DATADIR)
 
 ## Some config.h stuff
 
@@ -409,7 +410,56 @@ AC_ARG_ENABLE(monolithic-boost,
   AC_HELP_STRING([--enable-monolithic-boost],
 		[Use monolithic boost compilations]),,
   [enable_monolithic_boost=no])
-AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes)
+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-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")
+
+MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir})
+MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir})
+MSYS_AC_CANONICAL_PATH(lyx_abs_installed_datadir, ${real_pkgdatadir})
+
+AC_DEFINE_UNQUOTED([LYX_ABS_TOP_SRCDIR],
+	"${lyx_abs_top_srcdir}", [Top source directory])
+AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_LOCALEDIR],
+	"${lyx_abs_installed_localedir}",[Hard coded locale directory])
+AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_DATADIR],
+	"${lyx_abs_installed_datadir}",[Hard system support directory])
+AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX],
+	"${version_suffix}",[Program version suffix])
 
 AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
@@ -418,7 +468,6 @@ AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 
-
 AC_CONFIG_FILES([Makefile
       boost/Makefile \
       config/Makefile \
@@ -442,7 +491,6 @@ AC_CONFIG_FILES([Makefile
       src/tex2lyx/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/controllers/Makefile \
       src/frontends/qt4/Makefile
 ])
 
@@ -460,7 +508,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
@@ -468,7 +515,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