Commit 2ed43469 2ed43469bc88f18badd0560f2ba610f5562d2b0c by Sergey Poznyakoff

Check for iconv.h and iconv_t

(MU_COMMON_LIBRARIES): New subst symbol
1 parent 1d375da2
...@@ -38,6 +38,16 @@ dnl Internationalization macros. ...@@ -38,6 +38,16 @@ dnl Internationalization macros.
38 AM_GNU_GETTEXT(no-libtool, need-ngettext) 38 AM_GNU_GETTEXT(no-libtool, need-ngettext)
39 AM_GNU_GETTEXT_VERSION(0.13) 39 AM_GNU_GETTEXT_VERSION(0.13)
40 AM_ICONV 40 AM_ICONV
41 AC_CHECK_HEADERS(iconv.h)
42 AC_CHECK_TYPE(iconv_t,:,
43 AC_DEFINE(iconv_t, int,
44 [Conversion descriptor type]),
45 [
46 #ifdef HAVE_ICONV_H
47 # include <iconv.h>
48 #endif
49 ])
50
41 AC_SUBST(INTLINCS) 51 AC_SUBST(INTLINCS)
42 if test ".$BUILD_INCLUDED_LIBINTL" = ".yes" ; then 52 if test ".$BUILD_INCLUDED_LIBINTL" = ".yes" ; then
43 AC_DEFINE(WITH_INCLUDED_LIBINTL,1, 53 AC_DEFINE(WITH_INCLUDED_LIBINTL,1,
...@@ -716,6 +726,9 @@ AC_SUBST(MU_LTLIBOBJS) ...@@ -716,6 +726,9 @@ AC_SUBST(MU_LTLIBOBJS)
716 AC_SUBST(SIEVE_MODDIR) 726 AC_SUBST(SIEVE_MODDIR)
717 SIEVE_MODDIR='$(libdir)/$(PACKAGE)' 727 SIEVE_MODDIR='$(libdir)/$(PACKAGE)'
718 728
729 AC_SUBST(MU_COMMON_LIBRARIES)
730 MU_COMMON_LIBRARIES='$(LTLIBINTL) $(LTLIBICONV)'
731
719 dnl Output Makefiles 732 dnl Output Makefiles
720 AC_CONFIG_FILES([Makefile 733 AC_CONFIG_FILES([Makefile
721 auth/Makefile 734 auth/Makefile
......