mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3629_external_gettext'

Browse Source 
* 3629_external_gettext:
  Ticket #3629: configure.ac: drop bundled gettext
This commit is contained in:
Andrew Borodin 2019-09-22 13:20:39 +03:00
commit b633256c76
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -20,7 +20,6 @@ config.sub
configure configure
configure.mc configure.mc
gettext.m4 gettext.m4
intl
install-sh install-sh
m4 m4
mc.qpg mc.qpg

2
Makefile.am
View File

@ -1,7 +1,7 @@
## Process this file with automake to create Makefile.in. ## Process this file with automake to create Makefile.in.
AUTOMAKE_OPTIONS = 1.5 AUTOMAKE_OPTIONS = 1.5
SUBDIRS = intl po lib src doc contrib misc SUBDIRS = po lib src doc contrib misc
if HAVE_TESTS if HAVE_TESTS
SUBDIRS += tests SUBDIRS += tests

5
configure.ac
View File

@ -272,7 +272,9 @@ dnl ############################################################################
dnl Internationalization dnl Internationalization
dnl ############################################################################ dnl ############################################################################
AM_GNU_GETTEXT([no-libtool], [need-ngettext]) AC_CHECK_FUNCS([setlocale])
AM_GNU_GETTEXT([external], [need-ngettext])
AM_GNU_GETTEXT_VERSION([0.18.1]) AM_GNU_GETTEXT_VERSION([0.18.1])
mc_I18N mc_I18N
@ -674,7 +676,6 @@ doc/hlp/pl/Makefile
doc/hlp/ru/Makefile doc/hlp/ru/Makefile
doc/hlp/sr/Makefile doc/hlp/sr/Makefile
intl/Makefile
po/Makefile.in po/Makefile.in
]) ])

2
doc/doxygen.cfg
View File

@ -91,7 +91,7 @@ FILE_PATTERNS = *.c \
RECURSIVE = YES RECURSIVE = YES
EXCLUDE = EXCLUDE =
EXCLUDE_SYMLINKS = NO EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = */intl/* */tests/* */.git/* EXCLUDE_PATTERNS = */tests/* */.git/*
EXCLUDE_SYMBOLS = EXCLUDE_SYMBOLS =
EXAMPLE_PATH = $(SRCDIR) EXAMPLE_PATH = $(SRCDIR)
EXAMPLE_PATTERNS = EXAMPLE_PATTERNS =

2
lib/Makefile.am
View File

@ -74,4 +74,4 @@ else
libmc_la_LIBADD += $(GLIB_LIBS) libmc_la_LIBADD += $(GLIB_LIBS)
endif endif
libmc_la_LIBADD += $(PCRE_LIBS) $(LIBICONV) $(LIBINTL) libmc_la_LIBADD += $(PCRE_LIBS)

5
m4.include/mc-i18n.m4
View File

@ -8,11 +8,6 @@ dnl @license GPL
dnl @copyright Free Software Foundation, Inc. dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([mc_I18N],[ AC_DEFUN([mc_I18N],[
if test "x$USE_INCLUDED_LIBINTL" = xyes; then
CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"
fi
dnl User visible support for charset conversion. dnl User visible support for charset conversion.
AC_ARG_ENABLE([charset], AC_ARG_ENABLE([charset],
AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@])) AS_HELP_STRING([--enable-charset], [Support for charset selection and conversion @<:@yes@:>@]))