diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:29 +0900 |
| commit | f832bccd85234ad4b3d0cd2973889fb2cb6be41e (patch) | |
| tree | a911ebdbbf54a2bc22533cac5c46cf95f6789066 | |
| parent | 1ff440fb41c65c34ea9a5b727ec2befda12dc34b (diff) | |
| parent | b71e56a68384748f2dc712471957b719513508fb (diff) | |
| download | git-f832bccd85234ad4b3d0cd2973889fb2cb6be41e.tar.gz | |
Merge branch 'vk/autoconf-gettext'
The autoconf generated configure script failed to use the right
gettext() implementations from -libintl by ignoring useless stub
implementations shipped in some C library, which has been
corrected.
* vk/autoconf-gettext:
autoconf: #include <libintl.h> when checking for gettext()
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e0d0da3c0c..be3b55f1cc 100644 --- a/configure.ac +++ b/configure.ac @@ -763,9 +763,19 @@ AC_CHECK_LIB([c], [basename], GIT_CONF_SUBST([NEEDS_LIBGEN]) test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" -AC_CHECK_LIB([c], [gettext], -[LIBC_CONTAINS_LIBINTL=YesPlease], -[LIBC_CONTAINS_LIBINTL=]) +AC_DEFUN([LIBINTL_SRC], [ +AC_LANG_PROGRAM([[ +#include <libintl.h> +]],[[ +char *msg = gettext("test"); +]])]) + +AC_MSG_CHECKING([if libc contains libintl]) +AC_LINK_IFELSE([LIBINTL_SRC], + [AC_MSG_RESULT([yes]) + LIBC_CONTAINS_LIBINTL=YesPlease], + [AC_MSG_RESULT([no]) + LIBC_CONTAINS_LIBINTL=]) GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL]) # |