mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'js/configure-libintl'
* js/configure-libintl: configure: don't use -lintl when there is no gettext support
This commit is contained in:
commit
ef8adcadfe
20
configure.ac
20
configure.ac
|
@ -640,7 +640,18 @@ AC_CHECK_LIB([c], [gettext],
|
|||
[LIBC_CONTAINS_LIBINTL=YesPlease],
|
||||
[LIBC_CONTAINS_LIBINTL=])
|
||||
AC_SUBST(LIBC_CONTAINS_LIBINTL)
|
||||
test -n "$LIBC_CONTAINS_LIBINTL" || LIBS="$LIBS -lintl"
|
||||
|
||||
#
|
||||
# Define NO_GETTEXT if you don't want Git output to be translated.
|
||||
# A translated Git requires GNU libintl or another gettext implementation
|
||||
AC_CHECK_HEADER([libintl.h],
|
||||
[NO_GETTEXT=],
|
||||
[NO_GETTEXT=YesPlease])
|
||||
AC_SUBST(NO_GETTEXT)
|
||||
|
||||
if test -z "$NO_GETTEXT"; then
|
||||
test -n "$LIBC_CONTAINS_LIBINTL" || LIBS="$LIBS -lintl"
|
||||
fi
|
||||
|
||||
## Checks for header files.
|
||||
AC_MSG_NOTICE([CHECKS for header files])
|
||||
|
@ -824,13 +835,6 @@ AC_CHECK_HEADER([paths.h],
|
|||
[HAVE_PATHS_H=])
|
||||
AC_SUBST(HAVE_PATHS_H)
|
||||
#
|
||||
# Define NO_GETTEXT if you don't want Git output to be translated.
|
||||
# A translated Git requires GNU libintl or another gettext implementation
|
||||
AC_CHECK_HEADER([libintl.h],
|
||||
[NO_GETTEXT=],
|
||||
[NO_GETTEXT=YesPlease])
|
||||
AC_SUBST(NO_GETTEXT)
|
||||
#
|
||||
# Define HAVE_LIBCHARSET_H if have libcharset.h
|
||||
AC_CHECK_HEADER([libcharset.h],
|
||||
[HAVE_LIBCHARSET_H=YesPlease],
|
||||
|
|
Loading…
Reference in a new issue