3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- tetex-src-2.0.2/libs/xpdf/configure.in~configure 2002-12-05 18:44:31.000000000 -0500
7 +++ tetex-src-2.0.2/libs/xpdf/configure.in 2004-01-26 20:17:53.000000000 -0500
9 dnl Process this file with autoconf to produce a configure script.
10 dnl Copyright 1998-2002 Glyph & Cog, LLC
12 -AC_INIT(xpdf/xpdf.cc)
14 +AC_CONFIG_SRCDIR([xpdf/xpdf.cc])
15 AC_CONFIG_HEADER(aconf.h)
17 dnl ##### Optional features.
18 AC_ARG_ENABLE(a4-paper,
19 [ --enable-a4-paper use A4 paper size instead of Letter for
21 +AH_TEMPLATE([A4_PAPER], [Define if using A4 paper size instead of Letter for PS output])
24 AC_ARG_ENABLE(no-text-select,
25 [ --enable-no-text-select do not allow text selection],
26 +AH_TEMPLATE([NO_TEXT_SELECT], [Define if not allowing text selection])
27 AC_DEFINE(NO_TEXT_SELECT))
30 [ --enable-opi include support for OPI comments],
31 +AH_TEMPLATE([OPI_SUPPORT], [Define if including support for OPI comments])
32 AC_DEFINE(OPI_SUPPORT))
34 AC_ARG_ENABLE(multithreaded,
35 [ --enable-multithreaded include support for multithreading],
36 +AH_TEMPLATE([MULTITHREADED], [Define if including support for multithreading])
37 AC_DEFINE(MULTITHREADED))
39 AC_ARG_WITH(appdef-dir,
40 [ --with-appdef-dir set app-defaults directory],
41 +AH_TEMPLATE([APPDEFDIR], [Set to app-defaults directory])
42 AC_DEFINE_UNQUOTED(APPDEFDIR, "$with_appdef_dir"))
44 dnl ##### Path to xpdfrc.
47 system_xpdfrc="$sysconfdir/xpdfrc"
49 +AH_TEMPLATE([SYSTEM_XPDFRC], [Set to path to the xpdfrc])
50 AC_DEFINE_UNQUOTED(SYSTEM_XPDFRC, "$system_xpdfrc")
52 dnl ##### Checks for programs.
57 #if test -z "$CXX" -a "$CC" = "gcc"; then
61 dnl ##### Check for OS/2.
62 AC_CACHE_CHECK([for OS/2 (with EMX)],
66 -xpdf_cv_sys_os2=yes, xpdf_cv_sys_os2=no)])
67 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__EMX__]])],[xpdf_cv_sys_os2=yes],[xpdf_cv_sys_os2=no])])
68 if test "$xpdf_cv_sys_os2" = yes; then
72 dnl ##### Check for DOS (with DJGPP).
73 AC_CACHE_CHECK([for DOS (with DJGPP)],
77 -xpdf_cv_sys_dos=yes, xpdf_cv_sys_dos=no)])
78 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__DJGPP__]])],[xpdf_cv_sys_dos=yes],[xpdf_cv_sys_dos=no])])
79 if test "$xpdf_cv_sys_dos" = yes; then
83 dnl ##### Switch over to C++. This will make the checks below a little
84 dnl ##### bit stricter (requiring function prototypes in include files).
85 dnl ##### (99% of xpdf is written in C++.)
89 dnl ##### Check for extra libraries needed by X. (LynxOS needs this.)
90 AC_CHECK_FUNC(gethostbyname)
94 dnl ##### Look for header that defines select() and fd_set.
95 +AH_TEMPLATE([HAVE_SYS_SELECT_H], [Define if you have sys/select.h])
96 +AH_TEMPLATE([HAVE_SYS_BSDTYPES_H], [Define if you have sys/bsdtypes.h])
97 AC_MSG_CHECKING([select() and fd_set in sys/select.h and sys/bsdtypes.h])
98 -AC_TRY_COMPILE([#include <stdlib.h>
99 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
102 -#include <sys/types.h>],
104 -select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
105 +#include <sys/types.h>]], [[fd_set fds;
106 +select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
107 if test $xpdf_ok = yes; then
108 AC_MSG_RESULT([not needed])
110 - AC_TRY_COMPILE([#include <stdlib.h>
111 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
114 #include <sys/types.h>
115 -#include <sys/select.h>],
117 -select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
118 +#include <sys/select.h>]], [[fd_set fds;
119 +select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
120 if test $xpdf_ok = yes; then
121 AC_DEFINE(HAVE_SYS_SELECT_H)
122 AC_MSG_RESULT([need sys/select.h])
124 - AC_TRY_COMPILE([#include <stdlib.h>
125 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
128 #include <sys/types.h>
129 -#include <sys/bsdtypes.h>],
131 -select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
132 +#include <sys/bsdtypes.h>]], [[fd_set fds;
133 +select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
134 if test $xpdf_ok = yes; then
135 AC_DEFINE(HAVE_SYS_BSDTYPES_H)
136 AC_MSG_RESULT([need sys/bsdtypes.h])
137 @@ -138,34 +144,33 @@
140 dnl ##### Look for header that defines FD_ZERO.
141 +AH_TEMPLATE([HAVE_STRINGS_H], [Define if you need to include strings.h.])
142 +AH_TEMPLATE([HAVE_BSTRING_H], [Define if you need to include bstring.h.])
143 AC_MSG_CHECKING([FD_ZERO and strings.h or bstring.h])
144 -AC_TRY_COMPILE([#include <stdlib.h>
145 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
146 #include <sys/types.h>
147 #ifdef HAVE_SYS_SELECT_H
148 #include <sys/select.h>
150 -[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
151 +#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
152 if test $xpdf_ok = yes; then
153 AC_MSG_RESULT([not needed])
155 - AC_TRY_COMPILE([#include <stdlib.h>
156 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
157 #include <sys/types.h>
159 #ifdef HAVE_SYS_SELECT_H
160 #include <sys/select.h>
162 - [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
163 +#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
164 if test $xpdf_ok = yes; then
165 AC_DEFINE(HAVE_STRINGS_H)
166 AC_MSG_RESULT([need strings.h])
168 - AC_TRY_COMPILE([#include <stdlib.h>
169 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
170 #include <sys/types.h>
172 #ifdef HAVE_SYS_SELECT_H
173 #include <sys/select.h>
175 - [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
176 +#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
177 if test $xpdf_ok = yes; then
178 AC_DEFINE(HAVE_BSTRING_H)
179 AC_MSG_RESULT([need bstring.h])
180 @@ -186,46 +191,44 @@
181 dnl # This should use 'AC_CHECK_FUNCS(mkstemp)' but that fails if
182 dnl # the mkstemp exists in the library but isn't declared in the
183 dnl # include file (e.g., in cygwin 1.1.2).
184 +AH_TEMPLATE([HAVE_MKSTEMP], [Define if we have mkstemp])
185 AC_CACHE_CHECK([for mkstemp],
186 xpdf_cv_func_mkstemp,
187 -[AC_TRY_LINK([#include <stdlib.h>
188 -#include <unistd.h>],
190 -xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)])
191 +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
192 +#include <unistd.h>]], [[mkstemp("foo");]])],[xpdf_cv_func_mkstemp=yes],[xpdf_cv_func_mkstemp=no])])
193 if test "$xpdf_cv_func_mkstemp" = yes; then
194 AC_DEFINE(HAVE_MKSTEMP)
196 +AH_TEMPLATE([HAVE_MKSTEMPS], [Define if we have mkstemps])
197 dnl # Check for mkstemps, just like mkstemp.
198 AC_CACHE_CHECK([for mkstemps],
199 xpdf_cv_func_mkstemps,
200 -[AC_TRY_LINK([#include <stdlib.h>
201 -#include <unistd.h>],
202 -[mkstemps("foo", 0);],
203 -xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)])
204 +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
205 +#include <unistd.h>]], [[mkstemps("foo", 0);]])],[xpdf_cv_func_mkstemps=yes],[xpdf_cv_func_mkstemps=no])])
206 if test "$xpdf_cv_func_mkstemps" = yes; then
207 AC_DEFINE(HAVE_MKSTEMPS)
210 +AH_TEMPLATE([SELECT_TAKES_INT], [Define if select takes an int * argument instead of fd_set *])
211 dnl ##### Check select argument type: on HP-UX before version 10, select
212 dnl ##### takes (int *) instead of (fd_set *).
213 AC_CACHE_CHECK([whether select takes fd_set arguments],
214 xpdf_cv_func_select_arg,
215 -[AC_TRY_COMPILE([#include <sys/types.h>
216 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
217 #include <sys/time.h>
219 #ifdef HAVE_SYS_SELECT_H
220 #include <sys/select.h>
223 -select(1, &fds, &fds, &fds, 0);],
224 -xpdf_cv_func_select_arg=yes, xpdf_cv_func_select_arg=no)])
225 +#endif]], [[fd_set fds;
226 +select(1, &fds, &fds, &fds, 0);]])],[xpdf_cv_func_select_arg=yes],[xpdf_cv_func_select_arg=no])])
227 if test "$xpdf_cv_func_select_arg" != yes; then
228 AC_DEFINE(SELECT_TAKES_INT)
231 dnl ##### Back to C for the library tests.
235 +AH_TEMPLATE([HAVE_FSEEK64], [Define if we have fseek64/ftell64])
236 dnl ##### Check for fseeko/ftello or fseek64/ftell64
237 dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode.
240 dnl ##### Look for FreeType 2.0.5+ first, and then FreeType 1.x.
241 dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
242 dnl ##### the reason that Xpdf requires 2.0.5+.)
243 +AH_TEMPLATE([FREETYPE2], [Define if using freetype2])
244 if test -z "$no_x"; then
245 smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
246 FT_Get_Name_Index, freetype/freetype.h,
248 AC_SUBST(XPDF_TARGET)
250 dnl ##### Write the makefiles.
251 -AC_OUTPUT(Makefile xpdf/Makefile goo/Makefile)
252 +AC_CONFIG_FILES([Makefile xpdf/Makefile goo/Makefile])
255 dnl ##### Warn user if X is missing.
256 if test -n "$no_x"; then
257 --- tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4~configure 2003-02-18 01:46:57.000000000 -0500
258 +++ tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4 2004-01-26 20:17:53.000000000 -0500
260 dnl checking messages from result messages.
261 dnl Idea borrowed from dist 3.0.
262 dnl Internal use only.
263 -AC_DEFUN(AC_PROG_ECHO_N,
264 +AC_DEFUN([AC_PROG_ECHO_N],
265 [if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
266 # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
267 if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
272 -AC_DEFUN(AC_PROG_CC,
273 +AC_DEFUN([AC_PROG_CC],
274 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
275 AC_CHECK_PROG(CC, gcc, gcc)
276 if test -z "$CC"; then
281 -AC_DEFUN(AC_PROG_CXX,
282 +AC_DEFUN([AC_PROG_CXX],
283 [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
284 AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc)
290 -AC_DEFUN(AC_PROG_F77,
291 +AC_DEFUN([AC_PROG_F77],
292 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
293 if test -z "$F77"; then
294 AC_CHECK_PROGS(F77, g77 f77 f2c)
299 -AC_DEFUN(AC_PROG_CC_WORKS,
300 +AC_DEFUN([AC_PROG_CC_WORKS],
301 [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
305 cross_compiling=$ac_cv_prog_cc_cross
308 -AC_DEFUN(AC_PROG_CXX_WORKS,
309 +AC_DEFUN([AC_PROG_CXX_WORKS],
310 [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
314 dnl compiler is `g77').
316 dnl AC_PROG_F77_WORKS()
317 -AC_DEFUN(AC_PROG_F77_WORKS,
318 +AC_DEFUN([AC_PROG_F77_WORKS],
319 [AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works])
323 cross_compiling=$ac_cv_prog_f77_cross
326 -AC_DEFUN(AC_PROG_CC_GNU,
327 +AC_DEFUN([AC_PROG_CC_GNU],
328 [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc,
329 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
330 cat > conftest.c <<EOF
335 -AC_DEFUN(AC_PROG_CXX_GNU,
336 +AC_DEFUN([AC_PROG_CXX_GNU],
337 [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
338 [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
339 cat > conftest.C <<EOF
341 dnl do CPP pre-processing.
343 dnl AC_PROG_F77_GNU()
344 -AC_DEFUN(AC_PROG_F77_GNU,
345 +AC_DEFUN([AC_PROG_F77_GNU],
346 [AC_CACHE_CHECK(whether we are using GNU Fortran 77, ac_cv_prog_g77,
347 [cat > conftest.fpp <<EOF
353 -AC_DEFUN(AC_PROG_CC_G,
354 +AC_DEFUN([AC_PROG_CC_G],
355 [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
356 [echo 'void f(){}' > conftest.c
357 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
362 -AC_DEFUN(AC_PROG_CXX_G,
363 +AC_DEFUN([AC_PROG_CXX_G],
364 [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
365 [echo 'void f(){}' > conftest.cc
366 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
368 dnl enable debugging.
371 -AC_DEFUN(AC_PROG_F77_G,
372 +AC_DEFUN([AC_PROG_F77_G],
373 [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
374 [cat > conftest.f << EOF
380 -AC_DEFUN(AC_PROG_GCC_TRADITIONAL,
381 +AC_DEFUN([AC_PROG_GCC_TRADITIONAL],
382 [AC_REQUIRE([AC_PROG_CC])dnl
383 AC_REQUIRE([AC_PROG_CPP])dnl
384 if test $ac_cv_prog_gcc = yes; then
389 -AC_DEFUN(AC_PROG_CC_C_O,
390 +AC_DEFUN([AC_PROG_CC_C_O],
391 [if test "x$CC" != xcc; then
392 AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
395 dnl completeness, since a similar test exists for the C compiler.
398 -AC_DEFUN(AC_PROG_F77_C_O,
399 +AC_DEFUN([AC_PROG_F77_C_O],
400 [AC_BEFORE([$0], [AC_PROG_F77])dnl
401 AC_MSG_CHECKING(whether $F77 understand -c and -o together)
402 set dummy $F77; ac_f77="`echo [$]2 |
406 dnl Define SET_MAKE to set ${MAKE} if make doesn't.
407 -AC_DEFUN(AC_PROG_MAKE_SET,
408 +AC_DEFUN([AC_PROG_MAKE_SET],
409 [AC_MSG_CHECKING(whether ${MAKE-make} sets \${MAKE})
410 set dummy ${MAKE-make}; ac_make=`echo "[$]2" | sed 'y%./+-%__p_%'`
411 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
412 @@ -476,17 +476,17 @@
413 AC_SUBST([SET_MAKE])dnl
416 -AC_DEFUN(AC_PROG_RANLIB,
417 +AC_DEFUN([AC_PROG_RANLIB],
418 [AC_CHECK_PROG(RANLIB, ranlib, ranlib, :)])
420 dnl Check for mawk first since it's generally faster.
421 -AC_DEFUN(AC_PROG_AWK,
422 +AC_DEFUN([AC_PROG_AWK],
423 [AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
425 -AC_DEFUN(AC_PROG_YACC,
426 +AC_DEFUN([AC_PROG_YACC],
427 [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)])
429 -AC_DEFUN(AC_PROG_CPP,
430 +AC_DEFUN([AC_PROG_CPP],
431 [AC_MSG_CHECKING(how to run the C preprocessor)
432 # On Suns, sometimes $CPP names a directory.
433 if test -n "$CPP" && test -d "$CPP"; then
438 -AC_DEFUN(AC_PROG_CXXCPP,
439 +AC_DEFUN([AC_PROG_CXXCPP],
440 [AC_MSG_CHECKING(how to run the C++ preprocessor)
441 if test -z "$CXXCPP"; then
442 AC_CACHE_VAL(ac_cv_prog_CXXCPP,
443 @@ -537,10 +537,10 @@
445 dnl Require finding the C or C++ preprocessor, whichever is the
446 dnl current language.
447 -AC_DEFUN(AC_REQUIRE_CPP,
448 +AC_DEFUN([AC_REQUIRE_CPP],
449 [ifelse(AC_LANG, C, [AC_REQUIRE([AC_PROG_CPP])], [AC_REQUIRE([AC_PROG_CXXCPP])])])
451 -AC_DEFUN(AC_PROG_LEX,
452 +AC_DEFUN([AC_PROG_LEX],
453 [AC_CHECK_PROG(LEX, flex, flex, lex)
458 dnl Check if lex declares yytext as a char * by default, not a char[].
459 undefine([AC_DECL_YYTEXT])
460 -AC_DEFUN(AC_DECL_YYTEXT,
461 +AC_DEFUN([AC_DECL_YYTEXT],
463 AC_REQUIRE([AC_PROG_LEX])dnl
464 AC_CACHE_CHECK(lex output file root, ac_cv_prog_lex_root,
469 -AC_DEFUN(AC_PROG_INSTALL,
470 +AC_DEFUN([AC_PROG_INSTALL],
471 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
472 # Find a good install program. We prefer a C program (faster),
473 # so one script is as good as another. But avoid the broken or
475 AC_SUBST(INSTALL_DATA)dnl
478 -AC_DEFUN(AC_PROG_LN_S,
479 +AC_DEFUN([AC_PROG_LN_S],
480 [AC_MSG_CHECKING(whether ln -s works)
481 AC_CACHE_VAL(ac_cv_prog_LN_S,
489 [errprint(__file__:__line__: [$0] has been removed; replace it with equivalent code
493 dnl ### Checks for header files
496 -AC_DEFUN(AC_HEADER_STDC,
497 +AC_DEFUN([AC_HEADER_STDC],
499 AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc,
500 [AC_TRY_CPP([#include <stdlib.h>
501 @@ -794,11 +794,11 @@
505 -AC_DEFUN(AC_UNISTD_H,
506 +AC_DEFUN([AC_UNISTD_H],
507 [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(unistd.h)])dnl
508 AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))])
513 [; instead use AC_CHECK_HEADERS(string.h) and HAVE_STRING_H])dnl
514 AC_MSG_CHECKING([for BSD string and memory functions])
517 dnl If memchr and the like aren't declared in <string.h>, include <memory.h>.
518 dnl To avoid problems, don't check for gcc2 built-ins.
519 -AC_DEFUN(AC_MEMORY_H,
520 +AC_DEFUN([AC_MEMORY_H],
521 [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(memory.h) and HAVE_MEMORY_H])dnl
522 AC_MSG_CHECKING(whether string.h declares mem functions)
523 AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no)
528 -AC_DEFUN(AC_HEADER_MAJOR,
529 +AC_DEFUN([AC_HEADER_MAJOR],
530 [AC_CACHE_CHECK(whether sys/types.h defines makedev,
531 ac_cv_header_sys_types_h_makedev,
532 [AC_TRY_LINK([#include <sys/types.h>], [return makedev(0, 0);],
537 -AC_DEFUN(AC_HEADER_DIRENT,
538 +AC_DEFUN([AC_HEADER_DIRENT],
540 AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
541 [ac_header_dirent=$ac_hdr; break])
543 dnl Like AC_CHECK_HEADER, except also make sure that HEADER-FILE
544 dnl defines the type `DIR'. dirent.h on NextStep 3.2 doesn't.
545 dnl AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
546 -AC_DEFUN(AC_CHECK_HEADER_DIRENT,
547 +AC_DEFUN([AC_CHECK_HEADER_DIRENT],
548 [ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
549 AC_MSG_CHECKING([for $1 that defines DIR])
550 AC_CACHE_VAL(ac_cv_header_dirent_$ac_safe,
552 dnl Like AC_CHECK_HEADERS, except succeed only for a HEADER-FILE that
554 dnl AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
555 -define(AC_CHECK_HEADERS_DIRENT,
556 +define([AC_CHECK_HEADERS_DIRENT],
559 AC_CHECK_HEADER_DIRENT($ac_hdr,
561 AC_DEFINE_UNQUOTED($ac_tr_hdr) $2])dnl
564 -AC_DEFUN(AC_DIR_HEADER,
565 +AC_DEFUN([AC_DIR_HEADER],
566 [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl
568 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
573 -AC_DEFUN(AC_HEADER_STAT,
574 +AC_DEFUN([AC_HEADER_STAT],
575 [AC_CACHE_CHECK(whether stat file-mode macros are broken,
576 ac_cv_header_stat_broken,
577 [AC_EGREP_CPP([You lose], [#include <sys/types.h>
582 -AC_DEFUN(AC_DECL_SYS_SIGLIST,
583 +AC_DEFUN([AC_DECL_SYS_SIGLIST],
584 [AC_CACHE_CHECK([for sys_siglist declaration in signal.h or unistd.h],
585 ac_cv_decl_sys_siglist,
586 [AC_TRY_COMPILE([#include <sys/types.h>
591 -AC_DEFUN(AC_HEADER_SYS_WAIT,
592 +AC_DEFUN([AC_HEADER_SYS_WAIT],
593 [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible],
594 ac_cv_header_sys_wait_h,
595 [AC_TRY_COMPILE([#include <sys/types.h>
597 dnl ### Checks for typedefs
600 -AC_DEFUN(AC_TYPE_GETGROUPS,
601 +AC_DEFUN([AC_TYPE_GETGROUPS],
602 [AC_REQUIRE([AC_TYPE_UID_T])dnl
603 AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
605 @@ -1015,7 +1015,7 @@
606 AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups)
609 -AC_DEFUN(AC_TYPE_UID_T,
610 +AC_DEFUN([AC_TYPE_UID_T],
611 [AC_CACHE_CHECK(for uid_t in sys/types.h, ac_cv_type_uid_t,
612 [AC_EGREP_HEADER(uid_t, sys/types.h,
613 ac_cv_type_uid_t=yes, ac_cv_type_uid_t=no)])
614 @@ -1025,20 +1025,20 @@
618 -AC_DEFUN(AC_TYPE_SIZE_T,
619 +AC_DEFUN([AC_TYPE_SIZE_T],
620 [AC_CHECK_TYPE(size_t, unsigned)])
622 -AC_DEFUN(AC_TYPE_PID_T,
623 +AC_DEFUN([AC_TYPE_PID_T],
624 [AC_CHECK_TYPE(pid_t, int)])
626 -AC_DEFUN(AC_TYPE_OFF_T,
627 +AC_DEFUN([AC_TYPE_OFF_T],
628 [AC_CHECK_TYPE(off_t, long)])
630 -AC_DEFUN(AC_TYPE_MODE_T,
631 +AC_DEFUN([AC_TYPE_MODE_T],
632 [AC_CHECK_TYPE(mode_t, int)])
634 dnl Note that identifiers starting with SIG are reserved by ANSI C.
635 -AC_DEFUN(AC_TYPE_SIGNAL,
636 +AC_DEFUN([AC_TYPE_SIGNAL],
637 [AC_CACHE_CHECK([return type of signal handlers], ac_cv_type_signal,
638 [AC_TRY_COMPILE([#include <sys/types.h>
640 @@ -1059,7 +1059,7 @@
641 dnl ### Checks for functions
644 -AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
645 +AC_DEFUN([AC_FUNC_CLOSEDIR_VOID],
646 [AC_REQUIRE([AC_HEADER_DIRENT])dnl
647 AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
648 [AC_TRY_RUN([#include <sys/types.h>
649 @@ -1071,7 +1071,7 @@
653 -AC_DEFUN(AC_FUNC_FNMATCH,
654 +AC_DEFUN([AC_FUNC_FNMATCH],
655 [AC_CACHE_CHECK(for working fnmatch, ac_cv_func_fnmatch_works,
656 # Some versions of Solaris or SCO have a broken fnmatch function.
657 # So we run a test program. If we are cross-compiling, take no chance.
658 @@ -1084,7 +1084,7 @@
662 -AC_DEFUN(AC_FUNC_MMAP,
663 +AC_DEFUN([AC_FUNC_MMAP],
664 [AC_CHECK_HEADERS(unistd.h)
665 AC_CHECK_FUNCS(getpagesize)
666 AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
667 @@ -1231,7 +1231,7 @@
671 -AC_DEFUN(AC_FUNC_GETPGRP,
672 +AC_DEFUN([AC_FUNC_GETPGRP],
673 [AC_CACHE_CHECK(whether getpgrp takes no argument, ac_cv_func_getpgrp_void,
676 @@ -1292,7 +1292,7 @@
680 -AC_DEFUN(AC_FUNC_SETPGRP,
681 +AC_DEFUN([AC_FUNC_SETPGRP],
682 [AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void,
685 @@ -1318,14 +1318,14 @@
689 -AC_DEFUN(AC_FUNC_VPRINTF,
690 +AC_DEFUN([AC_FUNC_VPRINTF],
691 [AC_CHECK_FUNC(vprintf, AC_DEFINE(HAVE_VPRINTF))
692 if test "$ac_cv_func_vprintf" != yes; then
693 AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT))
697 -AC_DEFUN(AC_FUNC_VFORK,
698 +AC_DEFUN([AC_FUNC_VFORK],
699 [AC_REQUIRE([AC_TYPE_PID_T])dnl
700 AC_CHECK_HEADER(vfork.h, AC_DEFINE(HAVE_VFORK_H))
701 AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
702 @@ -1428,7 +1428,7 @@
706 -AC_DEFUN(AC_FUNC_WAIT3,
707 +AC_DEFUN([AC_FUNC_WAIT3],
708 [AC_CACHE_CHECK(for wait3 that fills in rusage, ac_cv_func_wait3_rusage,
709 [AC_TRY_RUN([#include <sys/types.h>
710 #include <sys/time.h>
711 @@ -1464,7 +1464,7 @@
715 -AC_DEFUN(AC_FUNC_ALLOCA,
716 +AC_DEFUN([AC_FUNC_ALLOCA],
717 [AC_REQUIRE_CPP()dnl Set CPP; we run AC_EGREP_CPP conditionally.
718 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
719 # for constant arguments. Useless!
720 @@ -1549,7 +1549,7 @@
724 -AC_DEFUN(AC_FUNC_GETLOADAVG,
725 +AC_DEFUN([AC_FUNC_GETLOADAVG],
726 [ac_have_func=no # yes means we've found a way to get the load average.
728 # Some systems with -lutil have (and need) -lkvm as well, some do not.
729 @@ -1651,7 +1651,7 @@
730 AC_SUBST(KMEM_GROUP)dnl
733 -AC_DEFUN(AC_FUNC_UTIME_NULL,
734 +AC_DEFUN([AC_FUNC_UTIME_NULL],
735 [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null,
736 [rm -f conftestdata; > conftestdata
737 # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong.
738 @@ -1670,7 +1670,7 @@
742 -AC_DEFUN(AC_FUNC_STRCOLL,
743 +AC_DEFUN([AC_FUNC_STRCOLL],
744 [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
745 [AC_TRY_RUN([#include <string.h>
747 @@ -1685,7 +1685,7 @@
751 -AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
752 +AC_DEFUN([AC_FUNC_SETVBUF_REVERSED],
753 [AC_CACHE_CHECK(whether setvbuf arguments are reversed,
754 ac_cv_func_setvbuf_reversed,
755 [AC_TRY_RUN([#include <stdio.h>
756 @@ -1705,21 +1705,21 @@
760 -AC_DEFUN(AC_FUNC_GETMNTENT,
761 +AC_DEFUN([AC_FUNC_GETMNTENT],
762 [# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
763 AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS",
764 [AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS",
765 [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])])
766 AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])])
768 -AC_DEFUN(AC_FUNC_STRFTIME,
769 +AC_DEFUN([AC_FUNC_STRFTIME],
770 [AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)],
771 [# strftime is in -lintl on SCO UNIX.
772 AC_CHECK_LIB(intl, strftime,
773 [AC_DEFINE(HAVE_STRFTIME)
774 LIBS="-lintl $LIBS"])])])
776 -AC_DEFUN(AC_FUNC_MEMCMP,
777 +AC_DEFUN([AC_FUNC_MEMCMP],
778 [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
781 @@ -1733,7 +1733,7 @@
785 -AC_DEFUN(AC_FUNC_SELECT_ARGTYPES,
786 +AC_DEFUN([AC_FUNC_SELECT_ARGTYPES],
787 [AC_MSG_CHECKING([types of arguments for select()])
788 AC_CACHE_VAL(ac_cv_func_select_arg234,dnl
789 [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl
790 @@ -1777,7 +1777,7 @@
791 dnl ### Checks for structure members
794 -AC_DEFUN(AC_HEADER_TIME,
795 +AC_DEFUN([AC_HEADER_TIME],
796 [AC_CACHE_CHECK([whether time.h and sys/time.h may both be included],
798 [AC_TRY_COMPILE([#include <sys/types.h>
799 @@ -1789,7 +1789,7 @@
803 -AC_DEFUN(AC_STRUCT_TM,
804 +AC_DEFUN([AC_STRUCT_TM],
805 [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h],
807 [AC_TRY_COMPILE([#include <sys/types.h>
808 @@ -1801,7 +1801,7 @@
812 -AC_DEFUN(AC_STRUCT_TIMEZONE,
813 +AC_DEFUN([AC_STRUCT_TIMEZONE],
814 [AC_REQUIRE([AC_STRUCT_TM])dnl
815 AC_CACHE_CHECK([for tm_zone in struct tm], ac_cv_struct_tm_zone,
816 [AC_TRY_COMPILE([#include <sys/types.h>
817 @@ -1825,7 +1825,7 @@
821 -AC_DEFUN(AC_STRUCT_ST_BLOCKS,
822 +AC_DEFUN([AC_STRUCT_ST_BLOCKS],
823 [AC_CACHE_CHECK([for st_blocks in struct stat], ac_cv_struct_st_blocks,
824 [AC_TRY_COMPILE([#include <sys/types.h>
825 #include <sys/stat.h>], [struct stat s; s.st_blocks;],
826 @@ -1838,7 +1838,7 @@
830 -AC_DEFUN(AC_STRUCT_ST_BLKSIZE,
831 +AC_DEFUN([AC_STRUCT_ST_BLKSIZE],
832 [AC_CACHE_CHECK([for st_blksize in struct stat], ac_cv_struct_st_blksize,
833 [AC_TRY_COMPILE([#include <sys/types.h>
834 #include <sys/stat.h>], [struct stat s; s.st_blksize;],
835 @@ -1848,7 +1848,7 @@
839 -AC_DEFUN(AC_STRUCT_ST_RDEV,
840 +AC_DEFUN([AC_STRUCT_ST_RDEV],
841 [AC_CACHE_CHECK([for st_rdev in struct stat], ac_cv_struct_st_rdev,
842 [AC_TRY_COMPILE([#include <sys/types.h>
843 #include <sys/stat.h>], [struct stat s; s.st_rdev;],
844 @@ -1862,10 +1862,10 @@
845 dnl ### Checks for compiler characteristics
848 -AC_DEFUN(AC_C_CROSS,
849 +AC_DEFUN([AC_C_CROSS],
850 [AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
852 -AC_DEFUN(AC_C_CHAR_UNSIGNED,
853 +AC_DEFUN([AC_C_CHAR_UNSIGNED],
854 [AC_CACHE_CHECK(whether char is unsigned, ac_cv_c_char_unsigned,
855 [if test "$GCC" = yes; then
856 # GCC predefines this symbol on systems where it applies.
857 @@ -1889,7 +1889,7 @@
861 -AC_DEFUN(AC_C_LONG_DOUBLE,
862 +AC_DEFUN([AC_C_LONG_DOUBLE],
863 [AC_CACHE_CHECK(for long double, ac_cv_c_long_double,
864 [if test "$GCC" = yes; then
865 ac_cv_c_long_double=yes
866 @@ -1906,7 +1906,7 @@
870 -AC_DEFUN(AC_INT_16_BITS,
871 +AC_DEFUN([AC_INT_16_BITS],
872 [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
873 AC_MSG_CHECKING(whether int is 16 bits)
874 AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
875 @@ -1914,7 +1914,7 @@
876 AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
879 -AC_DEFUN(AC_LONG_64_BITS,
880 +AC_DEFUN([AC_LONG_64_BITS],
881 [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
882 AC_MSG_CHECKING(whether long int is 64 bits)
883 AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
884 @@ -1922,7 +1922,7 @@
885 AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
888 -AC_DEFUN(AC_C_BIGENDIAN,
889 +AC_DEFUN([AC_C_BIGENDIAN],
890 [AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
891 [ac_cv_c_bigendian=unknown
892 # See if sys/param.h defines the BYTE_ORDER macro.
893 @@ -1956,7 +1956,7 @@
894 dnl Do nothing if the compiler accepts the inline keyword.
895 dnl Otherwise define inline to __inline__ or __inline if one of those work,
896 dnl otherwise define inline to be empty.
897 -AC_DEFUN(AC_C_INLINE,
898 +AC_DEFUN([AC_C_INLINE],
899 [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
901 for ac_kw in inline __inline__ __inline; do
902 @@ -1970,7 +1970,7 @@
906 -AC_DEFUN(AC_C_CONST,
907 +AC_DEFUN([AC_C_CONST],
908 [dnl This message is consistent in form with the other checking messages,
909 dnl and with the result message.
910 AC_CACHE_CHECK([for working const], ac_cv_c_const,
911 @@ -2026,7 +2026,7 @@
915 -AC_DEFUN(AC_C_STRINGIZE, [
916 +AC_DEFUN([AC_C_STRINGIZE], [
917 AC_REQUIRE([AC_PROG_CPP])
918 AC_MSG_CHECKING([for preprocessor stringizing operator])
919 AC_CACHE_VAL(ac_cv_c_stringize,
920 @@ -2042,14 +2042,14 @@
921 AC_MSG_RESULT([${ac_cv_c_stringize}])
924 -define(AC_ARG_ARRAY,
925 +define([AC_ARG_ARRAY],
926 [errprint(__file__:__line__: [$0] has been removed; don't do unportable things with arguments
929 dnl Check the object extension used by the compiler: typically .o or
930 dnl .obj. If this is called, some other behaviour will change,
931 dnl determined by ac_objext.
933 +AC_DEFUN([AC_OBJEXT],
934 [AC_MSG_CHECKING([for object suffix])
935 AC_CACHE_VAL(ac_cv_objext,
937 @@ -2098,7 +2098,7 @@
938 dnl extremely useful macro. Thank you John.
940 dnl AC_F77_LIBRARY_LDFLAGS()
941 -AC_DEFUN(AC_F77_LIBRARY_LDFLAGS,
942 +AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
943 [AC_MSG_CHECKING([for Fortran 77 libraries])
944 AC_REQUIRE([AC_PROG_F77])
945 AC_REQUIRE([AC_CANONICAL_HOST])
946 @@ -2285,7 +2285,7 @@
947 dnl ### Checks for operating system services
950 -AC_DEFUN(AC_SYS_INTERPRETER,
951 +AC_DEFUN([AC_SYS_INTERPRETER],
952 [# Pull the hash mark out of the macro call to avoid m4 problems.
953 ac_msg="whether #! works in shell scripts"
954 AC_CACHE_CHECK($ac_msg, ac_cv_sys_interpreter,
955 @@ -2303,11 +2303,11 @@
956 interpval="$ac_cv_sys_interpreter"
959 -define(AC_HAVE_POUNDBANG,
960 +define([AC_HAVE_POUNDBANG],
961 [errprint(__file__:__line__: [$0 has been replaced by AC_SYS_INTERPRETER, taking no arguments
964 -AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
965 +AC_DEFUN([AC_SYS_LONG_FILE_NAMES],
966 [AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names,
967 [ac_cv_sys_long_file_names=yes
968 # Test for long file names in all the places we know might matter:
969 @@ -2343,7 +2343,7 @@
973 -AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
974 +AC_DEFUN([AC_SYS_RESTARTABLE_SYSCALLS],
975 [AC_CACHE_CHECK(for restartable system calls, ac_cv_sys_restartable_syscalls,
977 [/* Exit 0 (true) if wait returns something other than -1,
978 @@ -2366,7 +2366,7 @@
983 +AC_DEFUN([AC_PATH_X],
984 [AC_REQUIRE_CPP()dnl Set CPP; we run AC_PATH_X_DIRECT conditionally.
985 # If we find X, set shell vars x_includes and x_libraries to the
986 # paths, otherwise set no_x=yes.
987 @@ -2417,7 +2417,7 @@
989 dnl Internal subroutine of AC_PATH_X.
990 dnl Set ac_x_includes and/or ac_x_libraries.
991 -AC_DEFUN(AC_PATH_X_XMKMF,
992 +AC_DEFUN([AC_PATH_X_XMKMF],
994 if mkdir conftestdir; then
996 @@ -2455,7 +2455,7 @@
998 dnl Internal subroutine of AC_PATH_X.
999 dnl Set ac_x_includes and/or ac_x_libraries.
1000 -AC_DEFUN(AC_PATH_X_DIRECT,
1001 +AC_DEFUN([AC_PATH_X_DIRECT],
1002 [if test "$ac_x_includes" = NO; then
1003 # Guess where to find include files, by looking for this one X11 .h file.
1004 test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
1005 @@ -2577,7 +2577,7 @@
1008 dnl Find additional X libraries, magic flags, etc.
1009 -AC_DEFUN(AC_PATH_XTRA,
1010 +AC_DEFUN([AC_PATH_XTRA],
1011 [AC_REQUIRE([AC_PATH_X])dnl
1012 if test "$no_x" = yes; then
1013 # Not all programs may use this symbol, but it does not hurt to define it.
1014 @@ -2690,13 +2690,13 @@
1017 dnl The old Cygwin32 macro is deprecated.
1018 -AC_DEFUN(AC_CYGWIN32,
1019 +AC_DEFUN([AC_CYGWIN32],
1020 [AC_OBSOLETE([$0], [; instead use AC_CYGWIN])dnl
1023 dnl Check for Cygwin. This is a way to set the right value for
1025 -AC_DEFUN(AC_CYGWIN,
1026 +AC_DEFUN([AC_CYGWIN],
1027 [AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin,
1030 @@ -2710,7 +2710,7 @@
1032 dnl Check for mingw32. This is another way to set the right value for
1034 -AC_DEFUN(AC_MINGW32,
1035 +AC_DEFUN([AC_MINGW32],
1036 [AC_CACHE_CHECK(for mingw32 environment, ac_cv_mingw32,
1037 [AC_TRY_COMPILE(,[return __MINGW32__;],
1038 ac_cv_mingw32=yes, ac_cv_mingw32=no)
1039 @@ -2719,7 +2719,7 @@
1040 test "$ac_cv_mingw32" = yes && MINGW32=yes])
1042 dnl Check for djgpp.
1044 +AC_DEFUN([AC_DJGPP],
1045 [AC_CACHE_CHECK(for djgpp environment, ac_cv_djgpp,
1047 #if defined (DJGPP) || defined (__DJGPP__)
1048 @@ -2732,7 +2732,7 @@
1049 test "$ac_cv_djgpp" = yes && HAVE_DJGPP=yes])
1051 dnl Check for win32.
1053 +AC_DEFUN([AC_WIN32],
1054 [AC_CACHE_CHECK(for win32 environment, ac_cv_win32,
1056 #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32)
1057 @@ -2748,7 +2748,7 @@
1058 dnl add .exe for Cygwin or mingw32. Otherwise, it compiles a test
1059 dnl executable. If this is called, the executable extensions will be
1060 dnl automatically used by link commands run by the configure script.
1061 -AC_DEFUN(AC_EXEEXT,
1062 +AC_DEFUN([AC_EXEEXT],
1063 [AC_REQUIRE([AC_CYGWIN])
1064 AC_REQUIRE([AC_MINGW32])
1065 AC_MSG_CHECKING([for executable suffix])
1066 @@ -2780,7 +2780,7 @@
1069 dnl Unset CC to run configure with cross compiler.
1070 -AC_DEFUN(AC_UNSET_CC, [
1071 +AC_DEFUN([AC_UNSET_CC], [
1073 if test "$cross_compiling" = yes &&
1074 (test "x$CC" = "xdos-gcc" || test "x$CC" = "xi386-mingw32-gcc" || test "x$CC" = "xgnuwin32gcc") ; then
1075 @@ -2791,7 +2791,7 @@
1078 dnl Restore CC that has been unset by AC_UNSET_CC
1079 -AC_DEFUN(AC_RESET_CC, [
1080 +AC_DEFUN([AC_RESET_CC], [
1081 if test "x$ZZ" = "xdos-gcc" || test "x$ZZ" = "xi386-mingw32-gcc" || test "x$ZZ" = "xgnuwin32gcc" ; then
1084 @@ -2804,7 +2804,7 @@
1085 dnl They aren't cached, to discourage their use.
1090 [AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
1091 AC_BEFORE([$0], [AC_TRY_RUN])dnl
1092 AC_MSG_CHECKING(for AIX)
1093 @@ -2815,7 +2815,7 @@
1094 ], [AC_MSG_RESULT(yes); AC_DEFINE(_ALL_SOURCE)], AC_MSG_RESULT(no))
1098 +AC_DEFUN([AC_MINIX],
1099 [AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
1100 AC_BEFORE([$0], [AC_TRY_RUN])dnl
1101 AC_CHECK_HEADER(minix/config.h, MINIX=yes, MINIX=)
1102 @@ -2826,7 +2826,7 @@
1106 -AC_DEFUN(AC_ISC_POSIX,
1107 +AC_DEFUN([AC_ISC_POSIX],
1108 [AC_REQUIRE([AC_PROG_CC])dnl
1109 AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
1110 AC_BEFORE([$0], [AC_TRY_RUN])dnl
1111 @@ -2848,7 +2848,7 @@
1115 -AC_DEFUN(AC_XENIX_DIR,
1116 +AC_DEFUN([AC_XENIX_DIR],
1117 [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl
1118 AC_REQUIRE([AC_DIR_HEADER])dnl
1119 AC_MSG_CHECKING(for Xenix)
1120 @@ -2864,17 +2864,17 @@
1124 -AC_DEFUN(AC_DYNIX_SEQ,
1125 +AC_DEFUN([AC_DYNIX_SEQ],
1126 [AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT])dnl
1127 AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")
1130 -AC_DEFUN(AC_IRIX_SUN,
1131 +AC_DEFUN([AC_IRIX_SUN],
1132 [AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT or AC_CHECK_LIB(sun, getpwnam)])dnl
1133 AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS")
1136 -AC_DEFUN(AC_SCO_INTL,
1137 +AC_DEFUN([AC_SCO_INTL],
1138 [AC_OBSOLETE([$0], [; instead use AC_FUNC_STRFTIME])dnl
1139 AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
1141 --- tetex-src-2.0.2/./texk/etc/autoconf/acoldnames.m4~configure 1999-01-05 08:27:38.000000000 -0500
1142 +++ tetex-src-2.0.2/./texk/etc/autoconf/acoldnames.m4 2004-01-26 20:17:53.000000000 -0500
1147 -define(AC_WARN, [indir([AC_MSG_WARN], $@)])dnl
1148 -define(AC_ERROR, [indir([AC_MSG_ERROR], $@)])dnl
1149 -AC_DEFUN(AC_PROGRAM_CHECK, [indir([AC_CHECK_PROG], $@)])dnl
1150 -AC_DEFUN(AC_PROGRAM_PATH, [indir([AC_PATH_PROG], $@)])dnl
1151 -AC_DEFUN(AC_PROGRAMS_CHECK, [indir([AC_CHECK_PROGS], $@)])dnl
1152 -AC_DEFUN(AC_PROGRAMS_PATH, [indir([AC_PATH_PROGS], $@)])dnl
1153 -AC_DEFUN(AC_PREFIX, [indir([AC_PREFIX_PROGRAM], $@)])dnl
1154 -AC_DEFUN(AC_HEADER_EGREP, [indir([AC_EGREP_HEADER], $@)])dnl
1155 -AC_DEFUN(AC_PROGRAM_EGREP, [indir([AC_EGREP_CPP], $@)])dnl
1156 -AC_DEFUN(AC_TEST_PROGRAM, [indir([AC_TRY_RUN], $@)])dnl
1157 -AC_DEFUN(AC_TEST_CPP, [indir([AC_TRY_CPP], $@)])dnl
1158 -AC_DEFUN(AC_HEADER_CHECK, [indir([AC_CHECK_HEADER], $@)])dnl
1159 -AC_DEFUN(AC_FUNC_CHECK, [indir([AC_CHECK_FUNC], $@)])dnl
1160 -AC_DEFUN(AC_HAVE_FUNCS, [indir([AC_CHECK_FUNCS], $@)])dnl
1161 -AC_DEFUN(AC_HAVE_HEADERS, [indir([AC_CHECK_HEADERS], $@)])dnl
1162 -AC_DEFUN(AC_SIZEOF_TYPE, [indir([AC_CHECK_SIZEOF], $@)])dnl
1163 +define([AC_WARN], [indir([AC_MSG_WARN], $@)])dnl
1164 +define([AC_ERROR], [indir([AC_MSG_ERROR], $@)])dnl
1165 +AC_DEFUN([AC_PROGRAM_CHECK], [indir([AC_CHECK_PROG], $@)])dnl
1166 +AC_DEFUN([AC_PROGRAM_PATH], [indir([AC_PATH_PROG], $@)])dnl
1167 +AC_DEFUN([AC_PROGRAMS_CHECK], [indir([AC_CHECK_PROGS], $@)])dnl
1168 +AC_DEFUN([AC_PROGRAMS_PATH], [indir([AC_PATH_PROGS], $@)])dnl
1169 +AC_DEFUN([AC_PREFIX], [indir([AC_PREFIX_PROGRAM], $@)])dnl
1170 +AC_DEFUN([AC_HEADER_EGREP], [indir([AC_EGREP_HEADER], $@)])dnl
1171 +AC_DEFUN([AC_PROGRAM_EGREP], [indir([AC_EGREP_CPP], $@)])dnl
1172 +AC_DEFUN([AC_TEST_PROGRAM], [indir([AC_TRY_RUN], $@)])dnl
1173 +AC_DEFUN([AC_TEST_CPP], [indir([AC_TRY_CPP], $@)])dnl
1174 +AC_DEFUN([AC_HEADER_CHECK], [indir([AC_CHECK_HEADER], $@)])dnl
1175 +AC_DEFUN([AC_FUNC_CHECK], [indir([AC_CHECK_FUNC], $@)])dnl
1176 +AC_DEFUN([AC_HAVE_FUNCS], [indir([AC_CHECK_FUNCS], $@)])dnl
1177 +AC_DEFUN([AC_HAVE_HEADERS], [indir([AC_CHECK_HEADERS], $@)])dnl
1178 +AC_DEFUN([AC_SIZEOF_TYPE], [indir([AC_CHECK_SIZEOF], $@)])dnl
1180 dnl Specific macros.
1182 -AC_DEFUN(AC_GCC_TRADITIONAL, [indir([AC_PROG_GCC_TRADITIONAL])])dnl
1183 -AC_DEFUN(AC_MINUS_C_MINUS_O, [indir([AC_PROG_CC_C_O])])dnl
1184 -AC_DEFUN(AC_SET_MAKE, [indir([AC_PROG_MAKE_SET])])dnl
1185 -AC_DEFUN(AC_YYTEXT_POINTER, [indir([AC_DECL_YYTEXT])])dnl
1186 -AC_DEFUN(AC_LN_S, [indir([AC_PROG_LN_S])])dnl
1187 -AC_DEFUN(AC_STDC_HEADERS, [indir([AC_HEADER_STDC])])dnl
1188 -AC_DEFUN(AC_MAJOR_HEADER, [indir([AC_HEADER_MAJOR])])dnl
1189 -AC_DEFUN(AC_STAT_MACROS_BROKEN, [indir([AC_HEADER_STAT])])dnl
1190 -AC_DEFUN(AC_SYS_SIGLIST_DECLARED, [indir([AC_DECL_SYS_SIGLIST])])dnl
1191 -AC_DEFUN(AC_GETGROUPS_T, [indir([AC_TYPE_GETGROUPS])])dnl
1192 -AC_DEFUN(AC_UID_T, [indir([AC_TYPE_UID_T])])dnl
1193 -AC_DEFUN(AC_SIZE_T, [indir([AC_TYPE_SIZE_T])])dnl
1194 -AC_DEFUN(AC_PID_T, [indir([AC_TYPE_PID_T])])dnl
1195 -AC_DEFUN(AC_OFF_T, [indir([AC_TYPE_OFF_T])])dnl
1196 -AC_DEFUN(AC_MODE_T, [indir([AC_TYPE_MODE_T])])dnl
1197 -AC_DEFUN(AC_RETSIGTYPE, [indir([AC_TYPE_SIGNAL])])dnl
1198 -AC_DEFUN(AC_MMAP, [indir([AC_FUNC_MMAP])])dnl
1199 -AC_DEFUN(AC_VPRINTF, [indir([AC_FUNC_VPRINTF])])dnl
1200 -AC_DEFUN(AC_VFORK, [indir([AC_FUNC_VFORK])])dnl
1201 -AC_DEFUN(AC_WAIT3, [indir([AC_FUNC_WAIT3])])dnl
1202 -AC_DEFUN(AC_ALLOCA, [indir([AC_FUNC_ALLOCA])])dnl
1203 -AC_DEFUN(AC_GETLOADAVG, [indir([AC_FUNC_GETLOADAVG])])dnl
1204 -AC_DEFUN(AC_UTIME_NULL, [indir([AC_FUNC_UTIME_NULL])])dnl
1205 -AC_DEFUN(AC_STRCOLL, [indir([AC_FUNC_STRCOLL])])dnl
1206 -AC_DEFUN(AC_SETVBUF_REVERSED, [indir([AC_FUNC_SETVBUF_REVERSED])])dnl
1207 -AC_DEFUN(AC_TIME_WITH_SYS_TIME, [indir([AC_HEADER_TIME])])dnl
1208 -AC_DEFUN(AC_TIMEZONE, [indir([AC_STRUCT_TIMEZONE])])dnl
1209 -AC_DEFUN(AC_ST_BLOCKS, [indir([AC_STRUCT_ST_BLOCKS])])dnl
1210 -AC_DEFUN(AC_ST_BLKSIZE, [indir([AC_STRUCT_ST_BLKSIZE])])dnl
1211 -AC_DEFUN(AC_ST_RDEV, [indir([AC_STRUCT_ST_RDEV])])dnl
1212 -AC_DEFUN(AC_CROSS_CHECK, [indir([AC_C_CROSS])])dnl
1213 -AC_DEFUN(AC_CHAR_UNSIGNED, [indir([AC_C_CHAR_UNSIGNED])])dnl
1214 -AC_DEFUN(AC_LONG_DOUBLE, [indir([AC_C_LONG_DOUBLE])])dnl
1215 -AC_DEFUN(AC_WORDS_BIGENDIAN, [indir([AC_C_BIGENDIAN])])dnl
1216 -AC_DEFUN(AC_INLINE, [indir([AC_C_INLINE])])dnl
1217 -AC_DEFUN(AC_CONST, [indir([AC_C_CONST])])dnl
1218 -AC_DEFUN(AC_LONG_FILE_NAMES, [indir([AC_SYS_LONG_FILE_NAMES])])dnl
1219 -AC_DEFUN(AC_RESTARTABLE_SYSCALLS, [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl
1220 -AC_DEFUN(AC_FIND_X, [indir([AC_PATH_X])])dnl
1221 -AC_DEFUN(AC_FIND_XTRA, [indir([AC_PATH_XTRA])])dnl
1222 +AC_DEFUN([AC_GCC_TRADITIONAL], [indir([AC_PROG_GCC_TRADITIONAL])])dnl
1223 +AC_DEFUN([AC_MINUS_C_MINUS_O], [indir([AC_PROG_CC_C_O])])dnl
1224 +AC_DEFUN([AC_SET_MAKE], [indir([AC_PROG_MAKE_SET])])dnl
1225 +AC_DEFUN([AC_YYTEXT_POINTER], [indir([AC_DECL_YYTEXT])])dnl
1226 +AC_DEFUN([AC_LN_S], [indir([AC_PROG_LN_S])])dnl
1227 +AC_DEFUN([AC_STDC_HEADERS], [indir([AC_HEADER_STDC])])dnl
1228 +AC_DEFUN([AC_MAJOR_HEADER], [indir([AC_HEADER_MAJOR])])dnl
1229 +AC_DEFUN([AC_STAT_MACROS_BROKEN], [indir([AC_HEADER_STAT])])dnl
1230 +AC_DEFUN([AC_SYS_SIGLIST_DECLARED], [indir([AC_DECL_SYS_SIGLIST])])dnl
1231 +AC_DEFUN([AC_GETGROUPS_T], [indir([AC_TYPE_GETGROUPS])])dnl
1232 +AC_DEFUN([AC_UID_T], [indir([AC_TYPE_UID_T])])dnl
1233 +AC_DEFUN([AC_SIZE_T], [indir([AC_TYPE_SIZE_T])])dnl
1234 +AC_DEFUN([AC_PID_T], [indir([AC_TYPE_PID_T])])dnl
1235 +AC_DEFUN([AC_OFF_T], [indir([AC_TYPE_OFF_T])])dnl
1236 +AC_DEFUN([AC_MODE_T], [indir([AC_TYPE_MODE_T])])dnl
1237 +AC_DEFUN([AC_RETSIGTYPE], [indir([AC_TYPE_SIGNAL])])dnl
1238 +AC_DEFUN([AC_MMAP], [indir([AC_FUNC_MMAP])])dnl
1239 +AC_DEFUN([AC_VPRINTF], [indir([AC_FUNC_VPRINTF])])dnl
1240 +AC_DEFUN([AC_VFORK], [indir([AC_FUNC_VFORK])])dnl
1241 +AC_DEFUN([AC_WAIT3], [indir([AC_FUNC_WAIT3])])dnl
1242 +AC_DEFUN([AC_ALLOCA], [indir([AC_FUNC_ALLOCA])])dnl
1243 +AC_DEFUN([AC_GETLOADAVG], [indir([AC_FUNC_GETLOADAVG])])dnl
1244 +AC_DEFUN([AC_UTIME_NULL], [indir([AC_FUNC_UTIME_NULL])])dnl
1245 +AC_DEFUN([AC_STRCOLL], [indir([AC_FUNC_STRCOLL])])dnl
1246 +AC_DEFUN([AC_SETVBUF_REVERSED], [indir([AC_FUNC_SETVBUF_REVERSED])])dnl
1247 +AC_DEFUN([AC_TIME_WITH_SYS_TIME], [indir([AC_HEADER_TIME])])dnl
1248 +AC_DEFUN([AC_TIMEZONE], [indir([AC_STRUCT_TIMEZONE])])dnl
1249 +AC_DEFUN([AC_ST_BLOCKS], [indir([AC_STRUCT_ST_BLOCKS])])dnl
1250 +AC_DEFUN([AC_ST_BLKSIZE], [indir([AC_STRUCT_ST_BLKSIZE])])dnl
1251 +AC_DEFUN([AC_ST_RDEV], [indir([AC_STRUCT_ST_RDEV])])dnl
1252 +AC_DEFUN([AC_CROSS_CHECK], [indir([AC_C_CROSS])])dnl
1253 +AC_DEFUN([AC_CHAR_UNSIGNED], [indir([AC_C_CHAR_UNSIGNED])])dnl
1254 +AC_DEFUN([AC_LONG_DOUBLE], [indir([AC_C_LONG_DOUBLE])])dnl
1255 +AC_DEFUN([AC_WORDS_BIGENDIAN], [indir([AC_C_BIGENDIAN])])dnl
1256 +AC_DEFUN([AC_INLINE], [indir([AC_C_INLINE])])dnl
1257 +AC_DEFUN([AC_CONST], [indir([AC_C_CONST])])dnl
1258 +AC_DEFUN([AC_LONG_FILE_NAMES], [indir([AC_SYS_LONG_FILE_NAMES])])dnl
1259 +AC_DEFUN([AC_RESTARTABLE_SYSCALLS], [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl
1260 +AC_DEFUN([AC_FIND_X], [indir([AC_PATH_X])])dnl
1261 +AC_DEFUN([AC_FIND_XTRA], [indir([AC_PATH_XTRA])])dnl
1262 --- tetex-src-2.0.2/./texk/etc/autoconf/acgeneral.m4~configure 1999-01-07 13:53:31.000000000 -0500
1263 +++ tetex-src-2.0.2/./texk/etc/autoconf/acgeneral.m4 2004-01-26 20:17:53.000000000 -0500
1265 divert(-1)dnl Throw away output until AC_INIT is called.
1268 -define(AC_ACVERSION, 2.13)
1269 +define([AC_ACVERSION], 2.13)
1271 dnl Some old m4's don't support m4exit. But they provide
1272 dnl equivalent functionality by core dumping because of the
1274 dnl and AC_DIVERSION_ICMDS.
1276 dnl AC_DIVERSION_NOTICE - 1 (= 0) AC_REQUIRE'd #! /bin/sh line
1277 -define(AC_DIVERSION_NOTICE, 1)dnl copyright notice & option help strings
1278 -define(AC_DIVERSION_INIT, 2)dnl initialization code
1279 -define(AC_DIVERSION_NORMAL_4, 3)dnl AC_REQUIRE'd code, 4 level deep
1280 -define(AC_DIVERSION_NORMAL_3, 4)dnl AC_REQUIRE'd code, 3 level deep
1281 -define(AC_DIVERSION_NORMAL_2, 5)dnl AC_REQUIRE'd code, 2 level deep
1282 -define(AC_DIVERSION_NORMAL_1, 6)dnl AC_REQUIRE'd code, 1 level deep
1283 -define(AC_DIVERSION_NORMAL, 7)dnl the tests and output code
1284 -define(AC_DIVERSION_SED, 8)dnl variable substitutions in config.status
1285 -define(AC_DIVERSION_CMDS, 9)dnl extra shell commands in config.status
1286 -define(AC_DIVERSION_ICMDS, 10)dnl extra initialization in config.status
1287 +define([AC_DIVERSION_NOTICE], 1)dnl copyright notice & option help strings
1288 +define([AC_DIVERSION_INIT], 2)dnl initialization code
1289 +define([AC_DIVERSION_NORMAL_4], 3)dnl AC_REQUIRE'd code, 4 level deep
1290 +define([AC_DIVERSION_NORMAL_3], 4)dnl AC_REQUIRE'd code, 3 level deep
1291 +define([AC_DIVERSION_NORMAL_2], 5)dnl AC_REQUIRE'd code, 2 level deep
1292 +define([AC_DIVERSION_NORMAL_1], 6)dnl AC_REQUIRE'd code, 1 level deep
1293 +define([AC_DIVERSION_NORMAL], 7)dnl the tests and output code
1294 +define([AC_DIVERSION_SED], 8)dnl variable substitutions in config.status
1295 +define([AC_DIVERSION_CMDS], 9)dnl extra shell commands in config.status
1296 +define([AC_DIVERSION_ICMDS], 10)dnl extra initialization in config.status
1298 dnl Change the diversion stream to STREAM, while stacking old values.
1299 dnl AC_DIVERT_PUSH(STREAM)
1300 -define(AC_DIVERT_PUSH,
1301 +define([AC_DIVERT_PUSH],
1302 [pushdef([AC_DIVERSION_CURRENT], $1)dnl
1303 divert(AC_DIVERSION_CURRENT)dnl
1306 dnl Change the diversion stream to its previous value, unstacking it.
1308 -define(AC_DIVERT_POP,
1309 +define([AC_DIVERT_POP],
1310 [popdef([AC_DIVERSION_CURRENT])dnl
1311 divert(AC_DIVERSION_CURRENT)dnl
1315 dnl The prologue for Autoconf macros.
1316 dnl AC_PRO(MACRO-NAME)
1319 [define([AC_PROVIDE_$1], )dnl
1320 ifelse(AC_DIVERSION_CURRENT, AC_DIVERSION_NORMAL,
1321 [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))],
1324 dnl The Epilogue for Autoconf macros.
1329 ifelse(AC_DIVERSION_CURRENT, AC_DIVERSION_NORMAL,
1330 [undivert(AC_DIVERSION_NORMAL_4)dnl
1331 @@ -135,16 +135,16 @@
1332 dnl macros. We don't use this macro to define some frequently called
1333 dnl macros that are not involved in ordering constraints, to save m4
1335 -dnl AC_DEFUN(NAME, EXPANSION)
1336 +dnl AC_DEFUN([NAME], EXPANSION)
1338 -[define($1, [AC_PRO([$1])$2[]AC_EPI()])])
1339 +[define([$1], [AC_PRO([$1])$2[]AC_EPI()])])
1342 dnl ### Initialization
1345 dnl AC_INIT_NOTICE()
1346 -AC_DEFUN(AC_INIT_NOTICE,
1347 +AC_DEFUN([AC_INIT_NOTICE],
1348 [# Guess values for system-dependent variables and create Makefiles.
1349 # Generated automatically using autoconf version] AC_ACVERSION [
1350 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
1351 @@ -158,13 +158,13 @@
1352 [#] Any additions from configure.in:])
1354 dnl AC_PREFIX_DEFAULT(PREFIX)
1355 -AC_DEFUN(AC_PREFIX_DEFAULT,
1356 +AC_DEFUN([AC_PREFIX_DEFAULT],
1357 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
1358 ac_default_prefix=$1
1361 dnl AC_INIT_PARSE_ARGS()
1362 -AC_DEFUN(AC_INIT_PARSE_ARGS,
1363 +AC_DEFUN([AC_INIT_PARSE_ARGS],
1365 # Initialize some variables set by options.
1366 # The variables have the same names as the options, with
1367 @@ -573,12 +573,12 @@
1368 dnl Try to have only one #! line, so the script doesn't look funny
1369 dnl for users of AC_REVISION.
1371 -AC_DEFUN(AC_INIT_BINSH,
1372 +AC_DEFUN([AC_INIT_BINSH],
1376 dnl AC_INIT(UNIQUE-FILE-IN-SOURCE-DIR)
1378 +AC_DEFUN([AC_INIT],
1379 [sinclude(acsite.m4)dnl
1380 sinclude(./aclocal.m4)dnl
1381 AC_REQUIRE([AC_INIT_BINSH])dnl
1385 dnl AC_INIT_PREPARE(UNIQUE-FILE-IN-SOURCE-DIR)
1386 -AC_DEFUN(AC_INIT_PREPARE,
1387 +AC_DEFUN([AC_INIT_PREPARE],
1388 [trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
1390 # File descriptor usage:
1392 # 2 errors and warnings
1393 # 3 some systems may open it to /dev/tty
1394 # 4 used on the Kubota Titan
1395 -define(AC_FD_MSG, 6)dnl
1396 +define([AC_FD_MSG], 6)dnl
1397 [#] AC_FD_MSG checking for... messages and results
1398 -define(AC_FD_CC, 5)dnl
1399 +define([AC_FD_CC], 5)dnl
1400 [#] AC_FD_CC compiler messages saved in config.log
1401 if test "$silent" = yes; then
1402 exec AC_FD_MSG>/dev/null
1406 dnl AC_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
1407 -AC_DEFUN(AC_ARG_ENABLE,
1408 +AC_DEFUN([AC_ARG_ENABLE],
1409 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
1416 -AC_DEFUN(AC_ENABLE,
1417 +AC_DEFUN([AC_ENABLE],
1418 [AC_OBSOLETE([$0], [; instead use AC_ARG_ENABLE])dnl
1419 AC_ARG_ENABLE([$1], [ --enable-$1], [$2], [$3])dnl
1424 dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
1425 -AC_DEFUN(AC_ARG_WITH,
1426 +AC_DEFUN([AC_ARG_WITH],
1427 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
1435 +AC_DEFUN([AC_WITH],
1436 [AC_OBSOLETE([$0], [; instead use AC_ARG_WITH])dnl
1437 AC_ARG_WITH([$1], [ --with-$1], [$2], [$3])dnl
1442 dnl AC_ARG_PROGRAM()
1443 -AC_DEFUN(AC_ARG_PROGRAM,
1444 +AC_DEFUN([AC_ARG_PROGRAM],
1445 [if test "$program_transform_name" = s,x,x,; then
1446 program_transform_name=
1451 dnl AC_REVISION(REVISION-INFO)
1452 -AC_DEFUN(AC_REVISION,
1453 +AC_DEFUN([AC_REVISION],
1454 [AC_REQUIRE([AC_INIT_BINSH])dnl
1455 [# From configure.in] translit([$1], $")])
1457 @@ -811,19 +811,19 @@
1459 dnl Change the dots in NUMBER into commas.
1460 dnl AC_PREREQ_SPLIT(NUMBER)
1461 -define(AC_PREREQ_SPLIT,
1462 +define([AC_PREREQ_SPLIT],
1463 [translit($1, ., [, ])])
1465 dnl Default the ternary version number to 0 (e.g., 1, 7 -> 1, 7, 0).
1466 dnl AC_PREREQ_CANON(MAJOR, MINOR [,TERNARY])
1467 -define(AC_PREREQ_CANON,
1468 +define([AC_PREREQ_CANON],
1469 [$1, $2, ifelse([$3], , 0, [$3])])
1471 dnl Complain and exit if version number 1 is less than version number 2.
1472 dnl PRINTABLE2 is the printable version of version number 2.
1473 dnl AC_PREREQ_COMPARE(MAJOR1, MINOR1, TERNARY1, MAJOR2, MINOR2, TERNARY2,
1475 -define(AC_PREREQ_COMPARE,
1476 +define([AC_PREREQ_COMPARE],
1477 [ifelse(builtin([eval],
1478 [$3 + $2 * 1000 + $1 * 1000000 < $6 + $5 * 1000 + $4 * 1000000]), 1,
1482 dnl Complain and exit if the Autoconf version is less than VERSION.
1483 dnl AC_PREREQ(VERSION)
1485 +define([AC_PREREQ],
1486 [AC_PREREQ_COMPARE(AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)),
1487 AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1])])
1489 @@ -844,12 +844,12 @@
1490 dnl in directory DIR. These are auxiliary files used in configuration.
1491 dnl DIR can be either absolute or relative to $srcdir.
1492 dnl AC_CONFIG_AUX_DIR(DIR)
1493 -AC_DEFUN(AC_CONFIG_AUX_DIR,
1494 +AC_DEFUN([AC_CONFIG_AUX_DIR],
1495 [AC_CONFIG_AUX_DIRS($1 $srcdir/$1)])
1497 dnl The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'.
1498 dnl There's no need to call this macro explicitly; just AC_REQUIRE it.
1499 -AC_DEFUN(AC_CONFIG_AUX_DIR_DEFAULT,
1500 +AC_DEFUN([AC_CONFIG_AUX_DIR_DEFAULT],
1501 [AC_CONFIG_AUX_DIRS($srcdir $srcdir/.. $srcdir/../..)])
1503 dnl Internal subroutine.
1505 dnl We look only for install-sh, so users of AC_PROG_INSTALL
1506 dnl do not automatically need to distribute the other auxiliary files.
1507 dnl AC_CONFIG_AUX_DIRS(DIR ...)
1508 -AC_DEFUN(AC_CONFIG_AUX_DIRS,
1509 +AC_DEFUN([AC_CONFIG_AUX_DIRS],
1511 for ac_dir in $1; do
1512 if test -f $ac_dir/install-sh; then
1516 dnl Canonicalize the host, target, and build system types.
1517 -AC_DEFUN(AC_CANONICAL_SYSTEM,
1518 +AC_DEFUN([AC_CANONICAL_SYSTEM],
1519 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1520 AC_BEFORE([$0], [AC_ARG_PROGRAM])
1521 # Do some error checking and defaulting for the host and target type.
1524 dnl Subroutines of AC_CANONICAL_SYSTEM.
1526 -AC_DEFUN(AC_CANONICAL_HOST,
1527 +AC_DEFUN([AC_CANONICAL_HOST],
1528 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1530 # Make sure we can run config.sub.
1534 dnl Internal use only.
1535 -AC_DEFUN(AC_CANONICAL_TARGET,
1536 +AC_DEFUN([AC_CANONICAL_TARGET],
1537 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1538 AC_MSG_CHECKING(target system type)
1543 dnl Internal use only.
1544 -AC_DEFUN(AC_CANONICAL_BUILD,
1545 +AC_DEFUN([AC_CANONICAL_BUILD],
1546 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1547 AC_MSG_CHECKING(build system type)
1549 @@ -1027,7 +1027,7 @@
1550 dnl if the cache file is inconsistent with the current host,
1551 dnl target and build system types, execute CMD or print a default
1553 -AC_DEFUN(AC_VALIDATE_CACHED_SYSTEM_TUPLE, [
1554 +AC_DEFUN([AC_VALIDATE_CACHED_SYSTEM_TUPLE], [
1555 AC_REQUIRE([AC_CANONICAL_SYSTEM])
1556 AC_MSG_CHECKING([cached system tuple])
1557 if { test x"${ac_cv_host_system_type+set}" = x"set" &&
1558 @@ -1053,7 +1053,7 @@
1560 dnl Look for site or system specific initialization scripts.
1562 -define(AC_SITE_LOAD,
1563 +define([AC_SITE_LOAD],
1564 [# Prefer explicitly selected file to automatically selected ones.
1565 if test -z "$CONFIG_SITE"; then
1566 if test "x$prefix" != xNONE; then
1567 @@ -1071,7 +1071,7 @@
1571 -define(AC_CACHE_LOAD,
1572 +define([AC_CACHE_LOAD],
1573 [if test -r "$cache_file"; then
1574 echo "loading cache $cache_file"
1576 @@ -1082,7 +1082,7 @@
1580 -define(AC_CACHE_SAVE,
1581 +define([AC_CACHE_SAVE],
1582 [cat > confcache <<\EOF
1583 # This file is a shell script that caches the results of configure
1584 # tests run on this system so they can be shared between configure
1585 @@ -1136,7 +1136,7 @@
1587 dnl The name of shell var CACHE-ID must contain `_cv_' in order to get saved.
1588 dnl AC_CACHE_VAL(CACHE-ID, COMMANDS-TO-SET-IT)
1589 -define(AC_CACHE_VAL,
1590 +define([AC_CACHE_VAL],
1591 [dnl We used to use the below line, but it fails if the 1st arg is a
1592 dnl shell variable, so we need the eval.
1593 dnl if test "${$1+set}" = set; then
1594 @@ -1149,7 +1149,7 @@
1597 dnl AC_CACHE_CHECK(MESSAGE, CACHE-ID, COMMANDS)
1598 -define(AC_CACHE_CHECK,
1599 +define([AC_CACHE_CHECK],
1600 [AC_MSG_CHECKING([$1])
1601 AC_CACHE_VAL([$2], [$3])
1602 AC_MSG_RESULT([$]$2)])
1603 @@ -1160,14 +1160,14 @@
1605 dnl Set VARIABLE to VALUE, verbatim, or 1.
1606 dnl AC_DEFINE(VARIABLE [, VALUE])
1608 +define([AC_DEFINE],
1609 [cat >> confdefs.h <<\EOF
1610 [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
1614 dnl Similar, but perform shell substitutions $ ` \ once on VALUE.
1615 -define(AC_DEFINE_UNQUOTED,
1616 +define([AC_DEFINE_UNQUOTED],
1617 [cat >> confdefs.h <<EOF
1618 [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
1620 @@ -1180,7 +1180,7 @@
1621 dnl This macro protects VARIABLE from being diverted twice
1622 dnl if this macro is called twice for it.
1623 dnl AC_SUBST(VARIABLE)
1626 [ifdef([AC_SUBST_$1], ,
1627 [define([AC_SUBST_$1], )dnl
1628 AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
1629 @@ -1189,7 +1189,7 @@
1632 dnl AC_SUBST_FILE(VARIABLE)
1633 -define(AC_SUBST_FILE,
1634 +define([AC_SUBST_FILE],
1635 [ifdef([AC_SUBST_$1], ,
1636 [define([AC_SUBST_$1], )dnl
1637 AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
1638 @@ -1203,30 +1203,30 @@
1641 dnl AC_MSG_CHECKING(FEATURE-DESCRIPTION)
1642 -define(AC_MSG_CHECKING,
1643 +define([AC_MSG_CHECKING],
1644 [echo $ac_n "checking $1""... $ac_c" 1>&AC_FD_MSG
1645 echo "configure:__oline__: checking $1" >&AC_FD_CC])
1647 dnl AC_CHECKING(FEATURE-DESCRIPTION)
1648 -define(AC_CHECKING,
1649 +define([AC_CHECKING],
1650 [echo "checking $1" 1>&AC_FD_MSG
1651 echo "configure:__oline__: checking $1" >&AC_FD_CC])
1653 dnl AC_MSG_RESULT(RESULT-DESCRIPTION)
1654 -define(AC_MSG_RESULT,
1655 +define([AC_MSG_RESULT],
1656 [echo "$ac_t""$1" 1>&AC_FD_MSG])
1658 dnl AC_VERBOSE(RESULT-DESCRIPTION)
1660 +define([AC_VERBOSE],
1661 [AC_OBSOLETE([$0], [; instead use AC_MSG_RESULT])dnl
1662 echo " $1" 1>&AC_FD_MSG])
1664 dnl AC_MSG_WARN(PROBLEM-DESCRIPTION)
1665 -define(AC_MSG_WARN,
1666 +define([AC_MSG_WARN],
1667 [echo "configure: warning: $1" 1>&2])
1669 dnl AC_MSG_ERROR(ERROR-DESCRIPTION)
1670 -define(AC_MSG_ERROR,
1671 +define([AC_MSG_ERROR],
1672 [{ echo "configure: error: $1" 1>&2; exit 1; }])
1675 @@ -1234,7 +1234,7 @@
1679 -AC_DEFUN(AC_LANG_C,
1680 +AC_DEFUN([AC_LANG_C],
1681 [define([AC_LANG], [C])dnl
1683 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
1684 @@ -1245,7 +1245,7 @@
1687 dnl AC_LANG_CPLUSPLUS()
1688 -AC_DEFUN(AC_LANG_CPLUSPLUS,
1689 +AC_DEFUN([AC_LANG_CPLUSPLUS],
1690 [define([AC_LANG], [CPLUSPLUS])dnl
1692 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
1693 @@ -1256,7 +1256,7 @@
1696 dnl AC_LANG_FORTRAN77()
1697 -AC_DEFUN(AC_LANG_FORTRAN77,
1698 +AC_DEFUN([AC_LANG_FORTRAN77],
1699 [define([AC_LANG], [FORTRAN77])dnl
1701 ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&AC_FD_CC'
1702 @@ -1266,7 +1266,7 @@
1704 dnl Push the current language on a stack.
1706 -define(AC_LANG_SAVE,
1707 +define([AC_LANG_SAVE],
1708 [pushdef([AC_LANG_STACK], AC_LANG)])
1710 dnl Restore the current language from the stack.
1711 @@ -1283,12 +1283,12 @@
1712 dnl The purpose of this macro is to "configure:123: command line"
1713 dnl written into config.log for every test run.
1714 dnl AC_TRY_EVAL(VARIABLE)
1715 -AC_DEFUN(AC_TRY_EVAL,
1716 +AC_DEFUN([AC_TRY_EVAL],
1717 [{ (eval echo configure:__oline__: \"[$]$1\") 1>&AC_FD_CC; dnl
1718 (eval [$]$1) 2>&AC_FD_CC; }])
1720 dnl AC_TRY_COMMAND(COMMAND)
1721 -AC_DEFUN(AC_TRY_COMMAND,
1722 +AC_DEFUN([AC_TRY_COMMAND],
1723 [{ ac_try='$1'; AC_TRY_EVAL(ac_try); }])
1726 @@ -1296,12 +1296,12 @@
1729 dnl AC_BEFORE(THIS-MACRO-NAME, CALLED-MACRO-NAME)
1731 +define([AC_BEFORE],
1732 [ifdef([AC_PROVIDE_$2], [errprint(__file__:__line__: [$2 was called before $1
1735 dnl AC_REQUIRE(MACRO-NAME)
1737 +define([AC_REQUIRE],
1738 [ifdef([AC_PROVIDE_$1], ,
1739 [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl
1741 @@ -1309,11 +1309,11 @@
1744 dnl AC_PROVIDE(MACRO-NAME)
1746 +define([AC_PROVIDE],
1747 [define([AC_PROVIDE_$1], )])
1749 dnl AC_OBSOLETE(THIS-MACRO-NAME [, SUGGESTION])
1750 -define(AC_OBSOLETE,
1751 +define([AC_OBSOLETE],
1752 [errprint(__file__:__line__: warning: [$1] is obsolete[$2]
1755 @@ -1323,7 +1323,7 @@
1757 dnl AC_CHECK_PROG(VARIABLE, PROG-TO-CHECK-FOR, VALUE-IF-FOUND
1758 dnl [, [VALUE-IF-NOT-FOUND] [, [PATH] [, [REJECT]]]])
1759 -AC_DEFUN(AC_CHECK_PROG,
1760 +AC_DEFUN([AC_CHECK_PROG],
1761 [# Extract the first word of "$2", so it can be a program name with args.
1762 set dummy $2; ac_word=[$]2
1763 AC_MSG_CHECKING([for $ac_word])
1764 @@ -1391,7 +1391,7 @@
1767 dnl AC_PATH_PROG(VARIABLE, PROG-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
1768 -AC_DEFUN(AC_PATH_PROG,
1769 +AC_DEFUN([AC_PATH_PROG],
1770 [# Extract the first word of "$2", so it can be a program name with args.
1771 set dummy $2; ac_word=[$]2
1772 AC_MSG_CHECKING([for $ac_word])
1773 @@ -1439,7 +1439,7 @@
1775 dnl AC_CHECK_PROGS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
1777 -AC_DEFUN(AC_CHECK_PROGS,
1778 +AC_DEFUN([AC_CHECK_PROGS],
1781 AC_CHECK_PROG($1, [$]ac_prog, [$]ac_prog, , $4)
1782 @@ -1450,7 +1450,7 @@
1784 dnl AC_PATH_PROGS(VARIABLE, PROGS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
1786 -AC_DEFUN(AC_PATH_PROGS,
1787 +AC_DEFUN([AC_PATH_PROGS],
1790 AC_PATH_PROG($1, [$]ac_prog, , $4)
1791 @@ -1460,7 +1460,7 @@
1794 dnl Internal subroutine.
1795 -AC_DEFUN(AC_CHECK_TOOL_PREFIX,
1796 +AC_DEFUN([AC_CHECK_TOOL_PREFIX],
1797 [AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1798 if test $host != $build; then
1799 ac_tool_prefix=${host_alias}-
1800 @@ -1470,7 +1470,7 @@
1803 dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]])
1804 -AC_DEFUN(AC_CHECK_TOOL,
1805 +AC_DEFUN([AC_CHECK_TOOL],
1806 [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
1807 AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
1808 ifelse([$3], , [$2], ), $4)
1809 @@ -1492,10 +1492,10 @@
1810 dnl and it might use a cached value for the path.
1811 dnl No big loss, I think, since most configures don't use this macro anyway.
1812 dnl AC_PREFIX_PROGRAM(PROGRAM)
1813 -AC_DEFUN(AC_PREFIX_PROGRAM,
1814 +AC_DEFUN([AC_PREFIX_PROGRAM],
1815 [if test "x$prefix" = xNONE; then
1816 changequote(<<, >>)dnl
1817 -define(<<AC_VAR_NAME>>, translit($1, [a-z], [A-Z]))dnl
1818 +define([<<AC_VAR_NAME>>], translit($1, [a-z], [A-Z]))dnl
1819 changequote([, ])dnl
1820 dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle.
1821 echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG
1822 @@ -1517,7 +1517,7 @@
1825 dnl AC_TRY_COMPILER(TEST-PROGRAM, WORKING-VAR, CROSS-VAR)
1826 -AC_DEFUN(AC_TRY_COMPILER,
1827 +AC_DEFUN([AC_TRY_COMPILER],
1828 [cat > conftest.$ac_ext << EOF
1829 ifelse(AC_LANG, [FORTRAN77], ,
1831 @@ -1550,7 +1550,7 @@
1832 dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
1833 dnl ACTION-IF-NOT-FOUND.
1835 -AC_DEFUN(AC_TRY_LINK_FUNC,
1836 +AC_DEFUN([AC_TRY_LINK_FUNC],
1838 ifelse([$1], [main], , dnl Avoid conflicting decl of main.
1839 [/* Override any gcc2 internal prototype to avoid an error. */
1840 @@ -1571,7 +1571,7 @@
1841 dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
1842 dnl Search for a library defining FUNC, if it's not already available.
1844 -AC_DEFUN(AC_SEARCH_LIBS,
1845 +AC_DEFUN([AC_SEARCH_LIBS],
1847 AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
1848 [ac_func_search_save_LIBS="$LIBS"
1849 @@ -1595,7 +1595,7 @@
1851 dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
1852 dnl [, OTHER-LIBRARIES]]])
1853 -AC_DEFUN(AC_CHECK_LIB,
1854 +AC_DEFUN([AC_CHECK_LIB],
1855 [AC_MSG_CHECKING([for $2 in -l$1])
1856 dnl Use a cache variable name containing both the library and function name,
1857 dnl because the test really is for library $1 defining function $2, not
1858 @@ -1641,12 +1641,12 @@
1860 dnl AC_HAVE_LIBRARY(LIBRARY, [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
1861 dnl [, OTHER-LIBRARIES]]])
1862 -AC_DEFUN(AC_HAVE_LIBRARY,
1863 +AC_DEFUN([AC_HAVE_LIBRARY],
1864 [AC_OBSOLETE([$0], [; instead use AC_CHECK_LIB])dnl
1865 changequote(<<, >>)dnl
1866 -define(<<AC_LIB_NAME>>, dnl
1867 +define([<<AC_LIB_NAME>>], dnl
1868 patsubst(patsubst($1, <<lib\([^\.]*\)\.a>>, <<\1>>), <<-l>>, <<>>))dnl
1869 -define(<<AC_CV_NAME>>, ac_cv_lib_<<>>AC_LIB_NAME)dnl
1870 +define([<<AC_CV_NAME>>], ac_cv_lib_<<>>AC_LIB_NAME)dnl
1871 changequote([, ])dnl
1872 AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
1873 AC_CACHE_VAL(AC_CV_NAME,
1874 @@ -1674,7 +1674,7 @@
1877 dnl AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
1878 -AC_DEFUN(AC_TRY_CPP,
1879 +AC_DEFUN([AC_TRY_CPP],
1880 [AC_REQUIRE_CPP()dnl
1881 cat > conftest.$ac_ext <<EOF
1882 [#]line __oline__ "configure"
1883 @@ -1703,14 +1703,14 @@
1885 dnl AC_EGREP_HEADER(PATTERN, HEADER-FILE, ACTION-IF-FOUND [,
1886 dnl ACTION-IF-NOT-FOUND])
1887 -AC_DEFUN(AC_EGREP_HEADER,
1888 +AC_DEFUN([AC_EGREP_HEADER],
1889 [AC_EGREP_CPP([$1], [#include <$2>], [$3], [$4])])
1891 dnl Because this macro is used by AC_PROG_GCC_TRADITIONAL, which must
1892 dnl come early, it is not included in AC_BEFORE checks.
1893 dnl AC_EGREP_CPP(PATTERN, PROGRAM, [ACTION-IF-FOUND [,
1894 dnl ACTION-IF-NOT-FOUND]])
1895 -AC_DEFUN(AC_EGREP_CPP,
1896 +AC_DEFUN([AC_EGREP_CPP],
1897 [AC_REQUIRE_CPP()dnl
1898 cat > conftest.$ac_ext <<EOF
1899 [#]line __oline__ "configure"
1900 @@ -1740,7 +1740,7 @@
1902 dnl AC_TRY_COMPILE(INCLUDES, FUNCTION-BODY,
1903 dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1904 -AC_DEFUN(AC_TRY_COMPILE,
1905 +AC_DEFUN([AC_TRY_COMPILE],
1906 [cat > conftest.$ac_ext <<EOF
1907 ifelse(AC_LANG, [FORTRAN77],
1909 @@ -1773,7 +1773,7 @@
1911 dnl AC_COMPILE_CHECK(ECHO-TEXT, INCLUDES, FUNCTION-BODY,
1912 dnl ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
1913 -AC_DEFUN(AC_COMPILE_CHECK,
1914 +AC_DEFUN([AC_COMPILE_CHECK],
1915 [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl
1916 ifelse([$1], , , [AC_CHECKING([for $1])
1918 @@ -1782,7 +1782,7 @@
1920 dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
1921 dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1922 -AC_DEFUN(AC_TRY_LINK,
1923 +AC_DEFUN([AC_TRY_LINK],
1924 [cat > conftest.$ac_ext <<EOF
1925 ifelse(AC_LANG, [FORTRAN77],
1927 @@ -1817,7 +1817,7 @@
1929 dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE
1930 dnl [, ACTION-IF-CROSS-COMPILING]]])
1931 -AC_DEFUN(AC_TRY_RUN,
1932 +AC_DEFUN([AC_TRY_RUN],
1933 [if test "$cross_compiling" = yes; then
1935 [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling
1936 @@ -1831,7 +1831,7 @@
1938 dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
1939 dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
1940 -AC_DEFUN(AC_TRY_RUN_NATIVE,
1941 +AC_DEFUN([AC_TRY_RUN_NATIVE],
1942 [cat > conftest.$ac_ext <<EOF
1943 [#]line __oline__ "configure"
1944 #include "confdefs.h"
1945 @@ -1859,7 +1859,7 @@
1948 dnl AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1949 -AC_DEFUN(AC_CHECK_HEADER,
1950 +AC_DEFUN([AC_CHECK_HEADER],
1951 [dnl Do the transliteration at runtime so arg 1 can be a shell variable.
1952 ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
1953 AC_MSG_CHECKING([for $1])
1954 @@ -1877,7 +1877,7 @@
1957 dnl AC_CHECK_HEADERS(HEADER-FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1958 -AC_DEFUN(AC_CHECK_HEADERS,
1959 +AC_DEFUN([AC_CHECK_HEADERS],
1962 AC_CHECK_HEADER($ac_hdr,
1963 @@ -1892,7 +1892,7 @@
1964 dnl ### Checking for the existence of files
1966 dnl AC_CHECK_FILE(FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1967 -AC_DEFUN(AC_CHECK_FILE,
1968 +AC_DEFUN([AC_CHECK_FILE],
1969 [AC_REQUIRE([AC_PROG_CC])
1970 dnl Do the transliteration at runtime so arg 1 can be a shell variable.
1971 ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
1972 @@ -1919,7 +1919,7 @@
1975 dnl AC_CHECK_FILES(FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1976 -AC_DEFUN(AC_CHECK_FILES,
1977 +AC_DEFUN([AC_CHECK_FILES],
1980 AC_CHECK_FILE($ac_file,
1981 @@ -1935,7 +1935,7 @@
1984 dnl AC_CHECK_FUNC(FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1985 -AC_DEFUN(AC_CHECK_FUNC,
1986 +AC_DEFUN([AC_CHECK_FUNC],
1987 [AC_MSG_CHECKING([for $1])
1988 AC_CACHE_VAL(ac_cv_func_$1,
1990 @@ -1974,7 +1974,7 @@
1993 dnl AC_CHECK_FUNCS(FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
1994 -AC_DEFUN(AC_CHECK_FUNCS,
1995 +AC_DEFUN([AC_CHECK_FUNCS],
1998 AC_CHECK_FUNC($ac_func,
1999 @@ -1986,7 +1986,7 @@
2002 dnl AC_REPLACE_FUNCS(FUNCTION...)
2003 -AC_DEFUN(AC_REPLACE_FUNCS,
2004 +AC_DEFUN([AC_REPLACE_FUNCS],
2005 [AC_CHECK_FUNCS([$1], , [LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"])
2006 AC_SUBST(LIBOBJS)dnl
2008 @@ -1996,12 +1996,12 @@
2011 dnl AC_CHECK_SIZEOF(TYPE [, CROSS-SIZE])
2012 -AC_DEFUN(AC_CHECK_SIZEOF,
2013 +AC_DEFUN([AC_CHECK_SIZEOF],
2014 [changequote(<<, >>)dnl
2015 dnl The name to #define.
2016 -define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
2017 +define([<<AC_TYPE_NAME>>], translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
2018 dnl The cache variable name.
2019 -define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
2020 +define([<<AC_CV_NAME>>], translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
2021 changequote([, ])dnl
2022 AC_MSG_CHECKING(size of $1)
2023 AC_CACHE_VAL(AC_CV_NAME,
2024 @@ -2024,7 +2024,7 @@
2027 dnl AC_CHECK_TYPE(TYPE, DEFAULT)
2028 -AC_DEFUN(AC_CHECK_TYPE,
2029 +AC_DEFUN([AC_CHECK_TYPE],
2030 [AC_REQUIRE([AC_HEADER_STDC])dnl
2031 AC_MSG_CHECKING(for $1)
2032 AC_CACHE_VAL(ac_cv_type_$1,
2033 @@ -2047,13 +2047,13 @@
2036 dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
2037 -AC_DEFUN(AC_CONFIG_HEADER,
2038 +AC_DEFUN([AC_CONFIG_HEADER],
2039 [define([AC_LIST_HEADER], $1)])
2041 dnl Link each of the existing files SOURCE... to the corresponding
2042 dnl link name in DEST...
2043 dnl AC_LINK_FILES(SOURCE..., DEST...)
2044 -AC_DEFUN(AC_LINK_FILES,
2045 +AC_DEFUN([AC_LINK_FILES],
2047 define([AC_LIST_FILES], ifdef([AC_LIST_FILES], [AC_LIST_FILES ],)[$1])dnl
2048 define([AC_LIST_LINKS], ifdef([AC_LIST_LINKS], [AC_LIST_LINKS ],)[$2])])
2049 @@ -2062,7 +2062,7 @@
2050 dnl Use diversions instead of macros so we can be robust in the
2051 dnl presence of commas in $1 and/or $2.
2052 dnl AC_OUTPUT_COMMANDS(EXTRA-CMDS, INIT-CMDS)
2053 -AC_DEFUN(AC_OUTPUT_COMMANDS,
2054 +AC_DEFUN([AC_OUTPUT_COMMANDS],
2055 [AC_DIVERT_PUSH(AC_DIVERSION_CMDS)dnl
2058 @@ -2071,7 +2071,7 @@
2061 dnl AC_CONFIG_SUBDIRS(DIR ...)
2062 -AC_DEFUN(AC_CONFIG_SUBDIRS,
2063 +AC_DEFUN([AC_CONFIG_SUBDIRS],
2064 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
2065 define([AC_LIST_SUBDIRS], ifdef([AC_LIST_SUBDIRS], [AC_LIST_SUBDIRS ],)[$1])dnl
2066 subdirs="AC_LIST_SUBDIRS"
2067 @@ -2081,7 +2081,7 @@
2069 dnl Produce config.status, config.h, and links; and configure subdirs.
2070 dnl AC_OUTPUT([FILE...] [, EXTRA-CMDS] [, INIT-CMDS])
2072 +define([AC_OUTPUT],
2075 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
2076 @@ -2176,7 +2176,7 @@
2077 dnl This is a subroutine of AC_OUTPUT.
2078 dnl It is called inside configure, outside of config.status.
2079 dnl AC_OUTPUT_MAKE_DEFS()
2080 -define(AC_OUTPUT_MAKE_DEFS,
2081 +define([AC_OUTPUT_MAKE_DEFS],
2082 [# Transform confdefs.h into DEFS.
2083 dnl Using a here document instead of a string reduces the quoting nightmare.
2084 # Protect against shell expansion while executing Makefile rules.
2085 @@ -2199,7 +2199,7 @@
2086 dnl here document whose contents are going into config.status, but
2087 dnl upon returning, the here document is being quoted.
2088 dnl AC_OUTPUT_FILES(FILE...)
2089 -define(AC_OUTPUT_FILES,
2090 +define([AC_OUTPUT_FILES],
2091 [# Protect against being on the right side of a sed subst in config.status.
2093 sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
2094 @@ -2380,7 +2380,7 @@
2095 dnl This is a subroutine of AC_OUTPUT. It is called inside a quoted
2096 dnl here document whose contents are going into config.status.
2097 dnl AC_OUTPUT_HEADER(HEADER-FILE...)
2098 -define(AC_OUTPUT_HEADER,
2099 +define([AC_OUTPUT_HEADER],
2100 [changequote(<<, >>)dnl
2101 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
2102 # NAME is the cpp macro being defined and VALUE is the value it is being given.
2103 @@ -2507,7 +2507,7 @@
2104 dnl This is a subroutine of AC_OUTPUT. It is called inside a quoted
2105 dnl here document whose contents are going into config.status.
2106 dnl AC_OUTPUT_LINKS(SOURCE..., DEST...)
2107 -define(AC_OUTPUT_LINKS,
2108 +define([AC_OUTPUT_LINKS],
2111 cat >> $CONFIG_STATUS <<EOF
2112 @@ -2564,7 +2564,7 @@
2113 dnl This is a subroutine of AC_OUTPUT.
2114 dnl It is called after running config.status.
2115 dnl AC_OUTPUT_SUBDIRS(DIRECTORY...)
2116 -define(AC_OUTPUT_SUBDIRS,
2117 +define([AC_OUTPUT_SUBDIRS],
2119 if test "$no_recursion" != yes; then
2121 --- tetex-src-2.0.2/./texk/etc/autoconf/acsite.m4~configure 1998-03-04 08:19:45.000000000 -0500
2122 +++ tetex-src-2.0.2/./texk/etc/autoconf/acsite.m4 2004-01-26 20:17:53.000000000 -0500
2126 dnl kb_AC_LIBTOOL_REPLACE_FUNCS(FUNCTION-NAME...)
2127 -AC_DEFUN(kb_AC_LIBTOOL_REPLACE_FUNCS,
2128 +AC_DEFUN([kb_AC_LIBTOOL_REPLACE_FUNCS],
2131 AC_CHECK_FUNC($ac_func, , [LIBTOOL_LIBOBJS="$LIBTOOL_LIBOBJS ${ac_func}.lo"])
2133 dnl Check if gcc asm for i386 needs external symbols with an underscore.
2134 dnl Peter Breitenlohner, April 15, 1996.
2135 undefine([pb_AC_ASM_UNDERSCORE])
2136 -AC_DEFUN(pb_AC_ASM_UNDERSCORE,
2137 +AC_DEFUN([pb_AC_ASM_UNDERSCORE],
2138 [AC_REQUIRE_CPP()dnl
2139 AC_CACHE_CHECK(whether gcc asm needs underscore, pb_cv_asm_underscore,
2142 dnl From automake distribution, by Jim Meyering:
2143 dnl Add --enable-maintainer-mode option to configure.
2145 -AC_DEFUN(AM_MAINTAINER_MODE,
2146 +AC_DEFUN([AM_MAINTAINER_MODE],
2147 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
2148 dnl maintainer-mode is disabled by default
2149 AC_ARG_ENABLE(maintainer-mode,
2150 --- tetex-src-2.0.2/./texk/etc/autoconf/autoheader.m4~configure 1999-01-05 08:28:37.000000000 -0500
2151 +++ tetex-src-2.0.2/./texk/etc/autoconf/autoheader.m4 2004-01-26 20:17:53.000000000 -0500
2154 define([AC_HAVE_LIBRARY], [#
2155 changequote(<<, >>)dnl
2156 -define(<<AC_LIB_NAME>>, dnl
2157 +define([<<AC_LIB_NAME>>], dnl
2158 patsubst(patsubst($1, <<lib\([^\.]*\)\.a>>, <<\1>>), <<-l>>, <<>>))dnl
2159 changequote([, ])dnl
2161 --- tetex-src-2.0.2/./texk/acklibtool.m4~configure 1997-10-03 07:38:16.000000000 -0400
2162 +++ tetex-src-2.0.2/./texk/acklibtool.m4 2004-01-26 20:17:53.000000000 -0500
2166 dnl Find the script, check for subprogs, etc.
2167 -AC_DEFUN(kb_AC_PROG_LIBTOOL,
2168 +AC_DEFUN([kb_AC_PROG_LIBTOOL],
2169 [AC_REQUIRE([AC_PROG_RANLIB])
2170 AC_REQUIRE([AC_CANONICAL_HOST])
2175 dnl Like AC_REPLACE_FUNCS, but add to LTLIBOBJS instead of LIBOBJS.
2176 -AC_DEFUN(kb_AC_KLIBTOOL_REPLACE_FUNCS,
2177 +AC_DEFUN([kb_AC_KLIBTOOL_REPLACE_FUNCS],
2178 [ dnl cannot require this function, since it doesn't have a provide call.
2179 AC_CHECK_FUNCS($1,, LTLIBOBJS="$LTLIBOBJS $ac_func.lo")
2180 AC_SUBST(LTLIBOBJS)dnl
2181 --- tetex-src-2.0.2/./utils/texinfo/m4/gettext.m4~configure 2002-09-20 16:30:58.000000000 -0400
2182 +++ tetex-src-2.0.2/./utils/texinfo/m4/gettext.m4 2004-01-26 20:17:53.000000000 -0500
2184 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
2185 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
2187 - define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
2188 - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
2189 + define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
2190 + define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
2192 AC_REQUIRE([AM_PO_SUBDIRS])dnl
2193 ifelse(gt_included_intl, yes, [
2194 --- tetex-src-2.0.2/./utils/texinfo/acinclude.m4~configure 2002-09-29 12:18:16.000000000 -0400
2195 +++ tetex-src-2.0.2/./utils/texinfo/acinclude.m4 2004-01-26 20:17:53.000000000 -0500
2200 -AC_DEFUN(jm_CHECK_DECLARATION,
2201 +AC_DEFUN([jm_CHECK_DECLARATION],
2203 AC_REQUIRE([AC_HEADER_STDC])dnl
2204 test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h)
2207 dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
2208 dnl [, ACTION-IF-NOT-DECLARED]])
2209 -AC_DEFUN(jm_CHECK_DECLARATIONS,
2210 +AC_DEFUN([jm_CHECK_DECLARATIONS],
2215 dnl This is just a wrapper function to encapsulate this kludge.
2216 dnl Putting it in a separate file like this helps share it between
2217 dnl different packages.
2218 -AC_DEFUN(txi_CHECK_DECLS,
2219 +AC_DEFUN([txi_CHECK_DECLS],