X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=2be419db4ef147b6834e91189ad40f5d4c76010e;hb=0b06fd0118ab0e486f1a426740ab3d783f31057d;hp=2cd759669e719b5d094190a58e9c4f203b2bc18d;hpb=a79ebaf570bfc8128d9fa5fffd26a7edc3cbd6a9;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 2cd759669e..2be419db4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.5.0,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
 AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
@@ -77,13 +77,13 @@ AC_LANG(C++)
 dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
-LYX_CXX_EXPLICIT
+dnl LYX_CXX_EXPLICIT
 LYX_CXX_GLOBAL_CSTD
-LYX_STD_COUNT
+dnl LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
-LYX_CXX_STL_MODERN_STREAMS
+dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
+dnl LYX_CXX_STL_MODERN_STREAMS
 
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
@@ -100,7 +100,7 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 ### Library Files
-AC_CHECK_LIB(m, sin)
+dnl AC_CHECK_LIB(m, sin)
 
 ### Add extra directories to check for libraries.
 LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
@@ -153,7 +153,8 @@ 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_SHARED
+AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
 LYX_PROG_LIBTOOL
@@ -226,7 +227,7 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
 fi
 
 ### Setup GNU gettext
-dnl GNU gettext is written in C
+dnl GNU gettext is written in C
 AC_LANG_PUSH(C)
 AM_GNU_GETTEXT
 AC_LANG_POP(C)
@@ -234,7 +235,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 utime.h sys/utime.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)
 
 # some standard structures
 AC_HEADER_STAT
@@ -281,6 +282,13 @@ LIBS="$save_LIBS"
 AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
 AC_LANG_POP(C)
 
+lyx_win_res=false;
+case ${host} in
+    *mingw*|*cygwin*) lyx_win_res=true;;
+esac
+AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
+LYX_SET_VERSION_INFO
+
 AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
@@ -347,15 +355,6 @@ extern "C"
 char * strerror(int n);
 #endif
 
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined(__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
 #  define USE_BOOST_FORMAT 1
 #else
@@ -391,7 +390,7 @@ int mkstemp(char*);
  * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
  * has the needed wchar_t support and uses UCS4. Whether it
  * implements this with the help of libc, or whether it has own code
- * does not matter for us, because we don't use libc directly (Georg)
+ * does not matter for us, because we do not use libc directly (Georg)
 */
 #if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
@@ -400,21 +399,29 @@ int mkstemp(char*);
 #endif
 ])
 
+
+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)
+
+
+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])
+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])
+
 ### Finish the work.
 AC_CONFIG_FILES([Makefile
        boost/Makefile \
-       boost/libs/Makefile \
-       boost/libs/filesystem/Makefile \
-       boost/libs/filesystem/src/Makefile \
-       boost/libs/iostreams/Makefile \
-       boost/libs/iostreams/src/Makefile \
-       boost/libs/regex/Makefile \
-       boost/libs/regex/src/Makefile \
-       boost/libs/signals/Makefile \
-       boost/libs/signals/src/Makefile \
        config/Makefile \
        development/Makefile \
        development/MacOSX/Makefile \
+       development/MacOSX/Info.plist \
+       development/MacOSX/lyxrc.dist \
        development/MacOSX/spotlight/Makefile \
        development/lyx.spec \
        intl/Makefile \
@@ -428,18 +435,11 @@ AC_CONFIG_FILES([Makefile
        sourcedoc/Makefile \
        src/client/Makefile \
        src/Makefile \
-       src/version.cpp-tmp:src/version.cpp.in \
        src/tex2lyx/Makefile \
-       src/mathed/Makefile \
-       src/graphics/Makefile \
-       src/insets/Makefile \
        src/support/Makefile \
-       src/support/tests/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
-       src/frontends/controllers/tests/Makefile \
        src/frontends/qt4/Makefile \
-       src/frontends/qt4/ui/Makefile \
 ])
 
 AC_OUTPUT