change call to shared_ptr::reset, move some using declarations around

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index bfc3491a863948677ed95bdaad0c3c91d2d0ad2e..c72fa3962eedcb51e3680b352ed14667d091e5fc 100644 (file)
--- 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
@@ -314,7 +315,7 @@ LYX_CHECK_DECL(istreambuf_iterator, iterator)
 
 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 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)