diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:04:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-26 17:04:53 -0800 |
| commit | 8f2c0995b611ef2f53fc29dc5ea3721a803ec1c2 (patch) | |
| tree | 42c636d0c8b7ac941355541451dc75ca72b3281e | |
| parent | 4d06691eeca5712319a7e8cf2085d081dca9ea47 (diff) | |
| parent | a8356d43e3602fb65a9ae57a5cf1ca98a75f5cc3 (diff) | |
| download | git-8f2c0995b611ef2f53fc29dc5ea3721a803ec1c2.tar.gz | |
Merge branch 'js/configure-libintl' into maint
* js/configure-libintl:
configure: don't use -lintl when there is no gettext support
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 24190de616..8bb0f44b48 100644 --- a/configure.ac +++ b/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], |