Making tiny disable libmagic, and documenting the --disable-libmagic flag.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4763 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 2f6d63e8c526a919e2ccf9ac92828833c97fb1c5..c54d243520a5373be463e59a28c1f32cb1251e3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
        * global.c (shortcut_init): Delete a misplaced setting of 'currmenu'.
        * global.c (shortcut_init, strtomenu): Cosmetic tweaks.
        * doc/syntax/{changelog,c,po}.nanorc: Some small extra colourings.
+       * configure.ac, doc/texinfo/nano.texi: Make --enable-tiny disable
+       the use of libmagic, and document the --disable-libmagic flag.
 
 2014-04-10  Benno Schulenberg  <bensberg@justemail.net>
        * doc/syntax/Makefile.am: Add four recent syntaxes to the packlist.

diff --git a/configure.ac b/configure.ac
index 3adf759bfaa0e60026cf565e077861e48563d67d..6fe4f53505861d4d21a5c457bf532a331374e7bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,9 @@ if test "x$enable_tiny" = xyes; then
     if test "x$enable_justify" != xyes; then
        AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
     fi
+    if test "x$enable_libmagic" != xyes; then
+       enable_libmagic=no
+    fi
     if test "x$enable_mouse" != xyes; then
        AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
     fi

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 4ad4505086e39679598c31696d48057fda27fed0..eb7099ede2d02fe6749a3a268a79ff57c77d54a7 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -859,6 +859,11 @@ things about using the editor.
 @item --disable-justify
 Disable the justify and unjustify functions.
 
+@item --disable-libmagic
+Disable the use of the library of magic-number tests (for determining
+the file type and thus which syntax to use for colouring -- often the
+tests on filename extension and header line will be enough).
+
 @item --disable-mouse
 Disable all mouse functionality.  This also eliminates the -m
 command-line option, which enables the mouse functionality.