Move TexRow stuff near where it is used.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 700f6ff712b8739b01dafed560b47e8f2aedeb7b..acfa66338eff9d3da42f789ba704311c9ce4a6d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
 
@@ -361,6 +371,7 @@ AC_CONFIG_FILES([Makefile \
       development/cygwin/lyxrc.dist \
       development/lyx.spec \
       intl/Makefile \
+      lib/lyx.desktop-temp:lib/lyx.desktop.in
       lib/Makefile \
       lib/doc/Makefile \
       lib/lyx2lyx/lyx2lyx_version.py \