X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=83f4c99da2595ab2bd535761203c163afaf8a99c;hb=87fe26e5ebc3325767c44c8ed9865fd40f563330;hp=c4f1ebeb31236375e0739418e45b5f7b73804ef4;hpb=2bf021ee739fbf3859dc9044a80a0de01ea90bc1;p=lyx.git

diff --git a/configure.ac b/configure.ac
index c4f1ebeb31..83f4c99da2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.1.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.1.0dev,[lyx-devel@lists.lyx.org],[lyx])
 # Use ISO format only. The frontend needs to parse this
 AC_SUBST(LYX_DATE, ["2011-04-29"])
 AC_PREREQ(2.52)
@@ -115,6 +115,16 @@ AC_CHECK_HEADERS(zlib.h,
  [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
  [LYX_LIB_ERROR(zlib.h,zlib)])
 
+### check for file magic support (currently optional)
+AC_CHECK_HEADERS(magic.h,
+ [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"],
+  LYX_WARNING([Cannot find limagic. Please check that the libmagic library
+   is correctly installed on your system.
+   Falling back to builtin file format detection.]))],
+ [LYX_WARNING([Cannot find magic.h. Please check that the libmagic library
+   is correctly installed on your system.
+   Falling back to builtin file format detection.])])
+
 
 ### check which frontend we want to use
 
@@ -227,9 +237,6 @@ real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                    ${host}\n\
   Special build flags:         ${lyx_flags}\n\
-  C   Compiler:                 ${CC} ${CC_VERSION}\n\
-  C   Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
-  C   Compiler flags:           ${CPPFLAGS} ${CFLAGS}\n\
   C++ Compiler:                 ${CXX} ${CXX_VERSION}\n\
   C++ Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
   C++ Compiler flags:           ${CPPFLAGS} ${CXXFLAGS}\n\