Index: ChangeLog from Akim Demaille * configure.ac: Use AC_CHECK_DECLS, not txi_CHECK_DECLS. * acinclude.m4: Remove. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/texinfo/texinfo/acinclude.m4,v retrieving revision 1.2 diff -u -u -r1.2 acinclude.m4 --- acinclude.m4 29 Sep 2002 16:18:36 -0000 1.2 +++ acinclude.m4 12 Nov 2003 17:09:27 -0000 @@ -1,89 +0,0 @@ -# Source file used by aclocal in generating aclocal.m4. - -#serial 3 - -AC_DEFUN(jm_CHECK_DECLARATION, -[ - AC_REQUIRE([AC_HEADER_STDC])dnl - test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h) - test -z "$ac_cv_header_string_h" && AC_CHECK_HEADERS(string.h) - test -z "$ac_cv_header_strings_h" && AC_CHECK_HEADERS(strings.h) - test -z "$ac_cv_header_stdlib_h" && AC_CHECK_HEADERS(stdlib.h) - test -z "$ac_cv_header_unistd_h" && AC_CHECK_HEADERS(unistd.h) - AC_MSG_CHECKING([whether $1 is declared]) - AC_CACHE_VAL(jm_cv_func_decl_$1, - [AC_TRY_COMPILE($2, - [ -#ifndef $1 -char *(*pfn) = (char *(*)) $1 -#endif - ], - eval "jm_cv_func_decl_$1=yes", - eval "jm_cv_func_decl_$1=no")]) - - if eval "test \"`echo '$jm_cv_func_decl_'$1`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$3], , :, [$3]) - else - AC_MSG_RESULT(no) - ifelse([$4], , , [$4 -])dnl - fi -])dnl - -dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED -dnl [, ACTION-IF-NOT-DECLARED]]) -AC_DEFUN(jm_CHECK_DECLARATIONS, -[ - for jm_func in $2 - do - jm_CHECK_DECLARATION($jm_func, $1, - [ - jm_tr_func=HAVE_DECL_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` - AC_DEFINE_UNQUOTED($jm_tr_func) $3], $4)dnl - done -]) - -#serial 1 -# this is check-decl.m4 in sh-utils 1.16k/m4/check-decl.m4 -# with a different function list. - -dnl This is just a wrapper function to encapsulate this kludge. -dnl Putting it in a separate file like this helps share it between -dnl different packages. -AC_DEFUN(txi_CHECK_DECLS, -[ - headers=' -#include -#ifdef HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#else -# ifdef HAVE_STRINGS_H -# include -# endif -#endif -#ifdef HAVE_STDLIB_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif -' - - if test x = y; then - dnl This code is deliberately never run via ./configure. - dnl FIXME: this is a gross hack to make autoheader put entries - dnl for each of these symbols in the config.h.in. - dnl Otherwise, I'd have to update acconfig.h every time I change - dnl this list of functions. - AC_DEFINE(HAVE_DECL_STRERROR, 1, [Define if this function is declared.]) - AC_DEFINE(HAVE_DECL_STRCASECMP, 1, [Define if this function is declared.]) - AC_DEFINE(HAVE_DECL_STRNCASECMP, 1, [Define if this function is declared.]) - AC_DEFINE(HAVE_DECL_STRCOLL, 1, [Define if this function is declared.]) - fi - - jm_CHECK_DECLARATIONS($headers, strerror strcasecmp strncasecmp strcoll) -]) Index: configure.ac =================================================================== RCS file: /cvsroot/texinfo/texinfo/configure.ac,v retrieving revision 1.34 diff -u -u -r1.34 configure.ac --- configure.ac 8 Nov 2003 14:37:33 -0000 1.34 +++ configure.ac 12 Nov 2003 17:09:27 -0000 @@ -1,28 +1,28 @@ -dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.ac,v 1.34 2003/11/08 14:37:33 karl Exp $ -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -dnl -AC_PREREQ(2.58)dnl Minimum Autoconf version required. -dnl +# Process this file with autoconf to produce a configure script. +# $Id: configure.ac,v 1.34 2003/11/08 14:37:33 karl Exp $ +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +AC_PREREQ(2.58)# Minimum Autoconf version required. +# AC_INIT([GNU Texinfo], [4.6]) -AC_CONFIG_HEADERS(config.h:config.in)dnl Keep filename to 8.3 for MS-DOS. +AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS. AC_CONFIG_SRCDIR([makeinfo/makeinfo.c]) AM_INIT_AUTOMAKE([dist-bzip2]) -dnl When the Texinfo source is imported into other repositories -dnl (NetBSD and TeX Live), timestamps are generally not preserved. This -dnl causes lots of annoyance, so --enable-maintainer-mode. Sorry. +# When the Texinfo source is imported into other repositories +# (NetBSD and TeX Live), timestamps are generally not preserved. This +# causes lots of annoyance, so --enable-maintainer-mode. Sorry. AM_MAINTAINER_MODE -dnl -dnl Checks for programs. +# +# Checks for programs. AC_PROG_CC AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL @@ -35,14 +35,14 @@ # Needed on sysV68 for sigblock, sigsetmask. But check for it in libc first. AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock)) -dnl Checks for header files. +# Checks for header files. AC_HEADER_STAT AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h io.h limits.h pwd.h string.h strings.h \ termcap.h termio.h termios.h unistd.h \ sys/fcntl.h sys/file.h sys/stream.h sys/time.h sys/ttold.h sys/wait.h) -dnl sys/ptem.h requires sys/stream.h for mblk_t on Solaris. +# sys/ptem.h requires sys/stream.h for mblk_t on Solaris. AC_CHECK_HEADERS([sys/ptem.h],,, [#if HAVE_SYS_STREAM_H #include @@ -52,29 +52,29 @@ AC_SYS_POSIX_TERMIOS AC_HEADER_TIOCGWINSZ -dnl Checks for typedefs, structures, and compiler characteristics. +# Checks for typedefs, structures, and compiler characteristics. AC_TYPE_OFF_T AC_TYPE_SIGNAL AC_C_CONST AC_STRUCT_TM -dnl Checks for function declarations. -txi_CHECK_DECLS +# Checks for function declarations. +AC_CHECK_DECLS([strerror, strcasecmp, strncasecmp, strcoll]) -dnl Checks for library functions. +# Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_STRCOLL AC_FUNC_VPRINTF -dnl in theory only pre-sysvr3 systems needed this and it's not likely -dnl that anyone compiling new texinfo still has such a thing? we'll see. -dnl AC_FUNC_SETVBUF_REVERSED +# in theory only pre-sysvr3 systems needed this and it's not likely +# that anyone compiling new texinfo still has such a thing? we'll see. +# AC_FUNC_SETVBUF_REVERSED AC_CHECK_FUNCS(bzero getcwd memset setvbuf sigaction sigprocmask \ sigsetmask strchr) -dnl strerror, xmalloc, xrealloc, probably others should be added. +# strerror, xmalloc, xrealloc, probably others should be added. AC_REPLACE_FUNCS(memcpy memmove strdup strcasecmp strerror strncasecmp) -dnl We want to recognize djgpp to avoid the useless warning about no -dnl term library. +# We want to recognize djgpp to avoid the useless warning about no +# term library. AC_CANONICAL_BUILD # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but @@ -92,7 +92,7 @@ AC_MSG_WARN([probably need a terminal library, one of: ${TERMLIB_VARIANTS}]) fi -dnl Checks for variables. +# Checks for variables. # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc. AC_MSG_CHECKING(for library with termcap variables) AC_CACHE_VAL(ac_cv_var_ospeed, @@ -132,16 +132,16 @@ && test "x$termlib" != "x$ac_cv_var_ospeed"; then TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}" fi -AC_SUBST(TERMLIBS)dnl +AC_SUBST(TERMLIBS)# -dnl Do not use unless we're linking with ncurses. -dnl Must come after the termlib tests. +# Do not use unless we're linking with ncurses. +# Must come after the termlib tests. if test "x$termlib" = xncurses; then - dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined. + # Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined. AC_CHECK_HEADERS(ncurses/termcap.h) fi -dnl gnulib. +# gnulib. UTILS_FUNC_MKSTEMP # For teTeX and TeX Live. @@ -152,21 +152,21 @@ && test "x$bindir" = 'x${exec_prefix}/bin' \ && bindir="$bindir/$host" -dnl i18n support. To update to a new version of gettext, run: -dnl gettextize -f -c --intl +# i18n support. To update to a new version of gettext, run: +# gettextize -f -c --intl AM_GNU_GETTEXT_VERSION(0.12.1) AM_GNU_GETTEXT() AC_CONFIG_FILES([ - Makefile \ - doc/Makefile \ - info/Makefile \ - intl/Makefile \ - lib/Makefile \ - m4/Makefile \ - makeinfo/Makefile \ - makeinfo/tests/Makefile \ - po/Makefile.in \ - util/Makefile \ + Makefile + doc/Makefile + info/Makefile + intl/Makefile + lib/Makefile + m4/Makefile + makeinfo/Makefile + makeinfo/tests/Makefile + po/Makefile.in + util/Makefile ]) AC_OUTPUT