X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=c72fa3962eedcb51e3680b352ed14667d091e5fc;hb=5296e9e9952cf6e2f306077c62a1caeaf8479eed;hp=6292c85ec6fc7634f7a5277faf8da1de19ec9bc7;hpb=a81d9e53d955f60473e22462e73b7a72cd5e4819;p=lyx.git

diff --git a/configure.in b/configure.in
index 6292c85ec6..c72fa3962e 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl AM_CONFIG_HEADER(src/config.h)
 AC_CONFIG_AUX_DIR(config)
 
 PACKAGE=lyx${program_suffix}
-VERSION="1.2.0cvs"
+VERSION="1.3.0cvs"
 LYX_CHECK_VERSION
 
 AC_CANONICAL_SYSTEM
@@ -40,6 +40,7 @@ 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)
 
 # Work around a problem in automake 1.4: when invoking install-strip,
 # INSTALL_PROGRAM is changed to 'install -s', and since
@@ -224,7 +225,7 @@ dnl Ensure gnome-config is available...
 	LYX_PATH_XFORMS
     QT2_DO_IT_ALL
     FRONTEND="qt2"
-    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
+    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
     FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;
@@ -312,8 +313,15 @@ LYX_CHECK_DECL(snprintf, stdio.h)
 LYX_CHECK_DECL(vsnprintf, stdio.h)
 LYX_CHECK_DECL(istreambuf_iterator, iterator)
 
-AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo \
-  mkstemp mktemp)
+dnl This is a slight hack: the tests generated by autoconf 2.52 do not
+dnl work correctly because of some conflict with stdlib.h with g++ 2.96
+dnl We aim to remove this eventually, since we should test as much as
+dnl possible with the compiler which will use the functions (JMarc)
+AC_LANG_C
+AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
+# SunOS 4.1.3 does not have strerror and atexit
+AC_REPLACE_FUNCS(strerror atexit)
+AC_LANG_CPLUSPLUS
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
@@ -321,8 +329,6 @@ LYX_FUNC_SELECT_ARGTYPES
 dnl check whether we have to work around solaris broken putenv()
 LYX_FUNC_PUTENV_ARGTYPE
 
-# SunOS 4.1.3 does not have strerror and atexit
-AC_REPLACE_FUNCS(strerror atexit)
 
 LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])