Commit ea8c58d3 ea8c58d335d88bc7c6199a9ad423368e3742e117 by Sergey Poznyakoff

Specify use-libtool to AM_GNU_GETTEXT.

Define WITH_INCLUDED_LIBINTL and INTLINCS if we are using
the included gettext.
1 parent b944f483
...@@ -31,13 +31,19 @@ AC_PROG_CC ...@@ -31,13 +31,19 @@ AC_PROG_CC
31 AC_PROG_INSTALL 31 AC_PROG_INSTALL
32 AC_PROG_LN_S 32 AC_PROG_LN_S
33 AC_LIBTOOL_DLOPEN 33 AC_LIBTOOL_DLOPEN
34 AM_PROG_LIBTOOL 34 AC_PROG_LIBTOOL
35 AC_PROG_YACC 35 AC_PROG_YACC
36 AM_PROG_LEX 36 AM_PROG_LEX
37 37
38 dnl Internationalization macros. 38 dnl Internationalization macros.
39 AM_GNU_GETTEXT 39 AM_GNU_GETTEXT(use-libtool)
40 AM_GNU_GETTEXT_VERSION(0.11.5) 40 AM_GNU_GETTEXT_VERSION(0.11.5)
41 AC_SUBST(INTLINCS)
42 if test ".$BUILD_INCLUDED_LIBINTL" = ".yes" ; then
43 AC_DEFINE(WITH_INCLUDED_LIBINTL,1,
44 [Define if the included libintl is used])
45 INTLINCS='-I${top_srcdir}/intl'
46 fi
41 47
42 dnl Check for libraries 48 dnl Check for libraries
43 AC_CHECK_LIB(resolv, res_query) 49 AC_CHECK_LIB(resolv, res_query)
...@@ -216,7 +222,6 @@ AC_MSG_RESULT($log_facility) ...@@ -216,7 +222,6 @@ AC_MSG_RESULT($log_facility)
216 dnl Check for headers 222 dnl Check for headers
217 AC_HEADER_STDC 223 AC_HEADER_STDC
218 AC_HEADER_DIRENT 224 AC_HEADER_DIRENT
219 AM_C_PROTOTYPES
220 AC_CHECK_HEADERS(argp.h errno.h fcntl.h getopt.h inttypes.h libgen.h limits.h\ 225 AC_CHECK_HEADERS(argp.h errno.h fcntl.h getopt.h inttypes.h libgen.h limits.h\
221 malloc.h obstack.h paths.h shadow.h socket.h sys/socket.h stdarg.h stdio.h\ 226 malloc.h obstack.h paths.h shadow.h socket.h sys/socket.h stdarg.h stdio.h\
222 stdlib.h string.h strings.h sys/file.h sysexits.h syslog.h termcap.h\ 227 stdlib.h string.h strings.h sys/file.h sysexits.h syslog.h termcap.h\
......