undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dp/i18n-libcharset' into maint

Browse Source 
* dp/i18n-libcharset:
  Makefile: introduce CHARSET_LIB to link with -lcharset
This commit is contained in:
Junio C Hamano 2012-02-21 14:57:14 -08:00
commit ef55bd78e7
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -53,6 +53,10 @@ all::
# FreeBSD can use either, but MinGW and some others need to use # FreeBSD can use either, but MinGW and some others need to use
# libcharset.h's locale_charset() instead. # libcharset.h's locale_charset() instead.
# #
# Define CHARSET_LIB to you need to link with library other than -liconv to
# use locale_charset() function. On some platforms this needs to set to
# -lcharset
#
# Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't # Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't
# need -lintl when linking. # need -lintl when linking.
# #
@ -1695,6 +1699,7 @@ endif
ifdef HAVE_LIBCHARSET_H ifdef HAVE_LIBCHARSET_H
BASIC_CFLAGS += -DHAVE_LIBCHARSET_H BASIC_CFLAGS += -DHAVE_LIBCHARSET_H
EXTLIBS += $(CHARSET_LIB)
endif endif
ifdef HAVE_DEV_TTY ifdef HAVE_DEV_TTY

1
config.mak.in
View File

@ -74,3 +74,4 @@ SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
NO_PTHREADS=@NO_PTHREADS@ NO_PTHREADS=@NO_PTHREADS@
PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
PTHREAD_LIBS=@PTHREAD_LIBS@ PTHREAD_LIBS=@PTHREAD_LIBS@
CHARSET_LIB=@CHARSET_LIB@

10
configure.ac
View File

@ -836,6 +836,16 @@ AC_CHECK_HEADER([libcharset.h],
[HAVE_LIBCHARSET_H=YesPlease], [HAVE_LIBCHARSET_H=YesPlease],
[HAVE_LIBCHARSET_H=]) [HAVE_LIBCHARSET_H=])
AC_SUBST(HAVE_LIBCHARSET_H) AC_SUBST(HAVE_LIBCHARSET_H)
# Define CHARSET_LIB if libiconv does not export the locale_charset symbol
# and libcharset does
CHARSET_LIB=
AC_CHECK_LIB([iconv], [locale_charset],
[],
[AC_CHECK_LIB([charset], [locale_charset],
[CHARSET_LIB=-lcharset])
]
)
AC_SUBST(CHARSET_LIB)
# #
# Define NO_STRCASESTR if you don't have strcasestr. # Define NO_STRCASESTR if you don't have strcasestr.
GIT_CHECK_FUNC(strcasestr, GIT_CHECK_FUNC(strcasestr,