| blob | d6ca75f9cf9279351914e6cdd1b8e28c03145f42 |
1 diff -urNd -urNd orpheus-1.5/m4/codeset.m4 orpheus-1.5/m4/codeset.m4
2 --- orpheus-1.5/m4/codeset.m4 1969-12-31 19:00:00.000000000 -0500
3 +++ orpheus-1.5/m4/codeset.m4 2004-03-12 23:18:57.000000000 -0500
4 @@ -0,0 +1,23 @@
5 +# codeset.m4 serial AM1 (gettext-0.10.40)
6 +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
7 +dnl This file is free software, distributed under the terms of the GNU
8 +dnl General Public License. As a special exception to the GNU General
9 +dnl Public License, this file may be distributed as part of a program
10 +dnl that contains a configuration script generated by Autoconf, under
11 +dnl the same distribution terms as the rest of that program.
12 +
13 +dnl From Bruno Haible.
14 +
15 +AC_DEFUN([AM_LANGINFO_CODESET],
16 +[
17 + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
18 + [AC_TRY_LINK([#include <langinfo.h>],
19 + [char* cs = nl_langinfo(CODESET);],
20 + am_cv_langinfo_codeset=yes,
21 + am_cv_langinfo_codeset=no)
22 + ])
23 + if test $am_cv_langinfo_codeset = yes; then
24 + AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
25 + [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
26 + fi
27 +])
28 diff -urNd -urNd orpheus-1.5/m4/gettext.m4 orpheus-1.5/m4/gettext.m4
29 --- orpheus-1.5/m4/gettext.m4 1969-12-31 19:00:00.000000000 -0500
30 +++ orpheus-1.5/m4/gettext.m4 2004-03-12 23:18:57.000000000 -0500
31 @@ -0,0 +1,587 @@
32 +# gettext.m4 serial 17 (gettext-0.11.5)
33 +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
34 +dnl This file is free software, distributed under the terms of the GNU
35 +dnl General Public License. As a special exception to the GNU General
36 +dnl Public License, this file may be distributed as part of a program
37 +dnl that contains a configuration script generated by Autoconf, under
38 +dnl the same distribution terms as the rest of that program.
39 +dnl
40 +dnl This file can can be used in projects which are not available under
41 +dnl the GNU General Public License or the GNU Library General Public
42 +dnl License but which still want to provide support for the GNU gettext
43 +dnl functionality.
44 +dnl Please note that the actual code of the GNU gettext library is covered
45 +dnl by the GNU Library General Public License, and the rest of the GNU
46 +dnl gettext package package is covered by the GNU General Public License.
47 +dnl They are *not* in the public domain.
48 +
49 +dnl Authors:
50 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
51 +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
52 +
53 +dnl Macro to add for using GNU gettext.
54 +
55 +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
56 +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
57 +dnl default (if it is not specified or empty) is 'no-libtool'.
58 +dnl INTLSYMBOL should be 'external' for packages with no intl directory,
59 +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
60 +dnl If INTLSYMBOL is 'use-libtool', then a libtool library
61 +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
62 +dnl depending on --{enable,disable}-{shared,static} and on the presence of
63 +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
64 +dnl $(top_builddir)/intl/libintl.a will be created.
65 +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
66 +dnl implementations (in libc or libintl) without the ngettext() function
67 +dnl will be ignored. If NEEDSYMBOL is specified and is
68 +dnl 'need-formatstring-macros', then GNU gettext implementations that don't
69 +dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
70 +dnl INTLDIR is used to find the intl libraries. If empty,
71 +dnl the value `$(top_builddir)/intl/' is used.
72 +dnl
73 +dnl The result of the configuration is one of three cases:
74 +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
75 +dnl and used.
76 +dnl Catalog format: GNU --> install in $(datadir)
77 +dnl Catalog extension: .mo after installation, .gmo in source tree
78 +dnl 2) GNU gettext has been found in the system's C library.
79 +dnl Catalog format: GNU --> install in $(datadir)
80 +dnl Catalog extension: .mo after installation, .gmo in source tree
81 +dnl 3) No internationalization, always use English msgid.
82 +dnl Catalog format: none
83 +dnl Catalog extension: none
84 +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
85 +dnl The use of .gmo is historical (it was needed to avoid overwriting the
86 +dnl GNU format catalogs when building on a platform with an X/Open gettext),
87 +dnl but we keep it in order not to force irrelevant filename changes on the
88 +dnl maintainers.
89 +dnl
90 +AC_DEFUN([AM_GNU_GETTEXT],
91 +[
92 + dnl Argument checking.
93 + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
94 + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
95 +])])])])])
96 + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
97 + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
98 +])])])])
99 + define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
100 + define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
101 +
102 + AC_REQUIRE([AM_PO_SUBDIRS])dnl
103 + ifelse(gt_included_intl, yes, [
104 + AC_REQUIRE([AM_INTL_SUBDIR])dnl
105 + ])
106 +
107 + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
108 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
109 + AC_REQUIRE([AC_LIB_RPATH])
110 +
111 + dnl Sometimes libintl requires libiconv, so first search for libiconv.
112 + dnl Ideally we would do this search only after the
113 + dnl if test "$USE_NLS" = "yes"; then
114 + dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
115 + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
116 + dnl the configure script would need to contain the same shell code
117 + dnl again, outside any 'if'. There are two solutions:
118 + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
119 + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
120 + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
121 + dnl documented, we avoid it.
122 + ifelse(gt_included_intl, yes, , [
123 + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
124 + ])
125 +
126 + AC_MSG_CHECKING([whether NLS is requested])
127 + dnl Default is enabled NLS
128 + AC_ARG_ENABLE(nls,
129 + [ --disable-nls do not use Native Language Support],
130 + USE_NLS=$enableval, USE_NLS=yes)
131 + AC_MSG_RESULT($USE_NLS)
132 + AC_SUBST(USE_NLS)
133 +
134 + ifelse(gt_included_intl, yes, [
135 + BUILD_INCLUDED_LIBINTL=no
136 + USE_INCLUDED_LIBINTL=no
137 + ])
138 + LIBINTL=
139 + LTLIBINTL=
140 + POSUB=
141 +
142 + dnl If we use NLS figure out what method
143 + if test "$USE_NLS" = "yes"; then
144 + gt_use_preinstalled_gnugettext=no
145 + ifelse(gt_included_intl, yes, [
146 + AC_MSG_CHECKING([whether included gettext is requested])
147 + AC_ARG_WITH(included-gettext,
148 + [ --with-included-gettext use the GNU gettext library included here],
149 + nls_cv_force_use_gnu_gettext=$withval,
150 + nls_cv_force_use_gnu_gettext=no)
151 + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
152 +
153 + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
154 + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
155 + ])
156 + dnl User does not insist on using GNU NLS library. Figure out what
157 + dnl to use. If GNU gettext is available we use this. Else we have
158 + dnl to fall back to GNU NLS library.
159 +
160 + dnl Add a version number to the cache macros.
161 + define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
162 + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
163 + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
164 +
165 + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
166 + [AC_TRY_LINK([#include <libintl.h>
167 +]ifelse([$2], [need-formatstring-macros],
168 +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
169 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
170 +#endif
171 +changequote(,)dnl
172 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
173 +changequote([,])dnl
174 +], [])[extern int _nl_msg_cat_cntr;
175 +extern int *_nl_domain_bindings;],
176 + [bindtextdomain ("", "");
177 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
178 + gt_cv_func_gnugettext_libc=yes,
179 + gt_cv_func_gnugettext_libc=no)])
180 +
181 + if test "$gt_cv_func_gnugettext_libc" != "yes"; then
182 + dnl Sometimes libintl requires libiconv, so first search for libiconv.
183 + ifelse(gt_included_intl, yes, , [
184 + AM_ICONV_LINK
185 + ])
186 + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
187 + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
188 + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
189 + dnl even if libiconv doesn't exist.
190 + AC_LIB_LINKFLAGS_BODY([intl])
191 + AC_CACHE_CHECK([for GNU gettext in libintl],
192 + gt_cv_func_gnugettext_libintl,
193 + [gt_save_CPPFLAGS="$CPPFLAGS"
194 + CPPFLAGS="$CPPFLAGS $INCINTL"
195 + gt_save_LIBS="$LIBS"
196 + LIBS="$LIBS $LIBINTL"
197 + dnl Now see whether libintl exists and does not depend on libiconv.
198 + AC_TRY_LINK([#include <libintl.h>
199 +]ifelse([$2], [need-formatstring-macros],
200 +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
201 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
202 +#endif
203 +changequote(,)dnl
204 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
205 +changequote([,])dnl
206 +], [])[extern int _nl_msg_cat_cntr;
207 +extern
208 +#ifdef __cplusplus
209 +"C"
210 +#endif
211 +const char *_nl_expand_alias ();],
212 + [bindtextdomain ("", "");
213 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
214 + gt_cv_func_gnugettext_libintl=yes,
215 + gt_cv_func_gnugettext_libintl=no)
216 + dnl Now see whether libintl exists and depends on libiconv.
217 + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
218 + LIBS="$LIBS $LIBICONV"
219 + AC_TRY_LINK([#include <libintl.h>
220 +]ifelse([$2], [need-formatstring-macros],
221 +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
222 +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
223 +#endif
224 +changequote(,)dnl
225 +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
226 +changequote([,])dnl
227 +], [])[extern int _nl_msg_cat_cntr;
228 +extern
229 +#ifdef __cplusplus
230 +"C"
231 +#endif
232 +const char *_nl_expand_alias ();],
233 + [bindtextdomain ("", "");
234 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
235 + [LIBINTL="$LIBINTL $LIBICONV"
236 + LTLIBINTL="$LTLIBINTL $LTLIBICONV"
237 + gt_cv_func_gnugettext_libintl=yes
238 + ])
239 + fi
240 + CPPFLAGS="$gt_save_CPPFLAGS"
241 + LIBS="$gt_save_LIBS"])
242 + fi
243 +
244 + dnl If an already present or preinstalled GNU gettext() is found,
245 + dnl use it. But if this macro is used in GNU gettext, and GNU
246 + dnl gettext is already preinstalled in libintl, we update this
247 + dnl libintl. (Cf. the install rule in intl/Makefile.in.)
248 + if test "$gt_cv_func_gnugettext_libc" = "yes" \
249 + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
250 + && test "$PACKAGE" != gettext; }; then
251 + gt_use_preinstalled_gnugettext=yes
252 + else
253 + dnl Reset the values set by searching for libintl.
254 + LIBINTL=
255 + LTLIBINTL=
256 + INCINTL=
257 + fi
258 +
259 + ifelse(gt_included_intl, yes, [
260 + if test "$gt_use_preinstalled_gnugettext" != "yes"; then
261 + dnl GNU gettext is not found in the C library.
262 + dnl Fall back on included GNU gettext library.
263 + nls_cv_use_gnu_gettext=yes
264 + fi
265 + fi
266 +
267 + if test "$nls_cv_use_gnu_gettext" = "yes"; then
268 + dnl Mark actions used to generate GNU NLS library.
269 + INTLOBJS="\$(GETTOBJS)"
270 + BUILD_INCLUDED_LIBINTL=yes
271 + USE_INCLUDED_LIBINTL=yes
272 + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
273 + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
274 + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
275 + fi
276 +
277 + if test "$gt_use_preinstalled_gnugettext" = "yes" \
278 + || test "$nls_cv_use_gnu_gettext" = "yes"; then
279 + dnl Mark actions to use GNU gettext tools.
280 + CATOBJEXT=.gmo
281 + fi
282 + ])
283 +
284 + if test "$gt_use_preinstalled_gnugettext" = "yes" \
285 + || test "$nls_cv_use_gnu_gettext" = "yes"; then
286 + AC_DEFINE(ENABLE_NLS, 1,
287 + [Define to 1 if translation of program messages to the user's native language
288 + is requested.])
289 + else
290 + USE_NLS=no
291 + fi
292 + fi
293 +
294 + if test "$USE_NLS" = "yes"; then
295 +
296 + if test "$gt_use_preinstalled_gnugettext" = "yes"; then
297 + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
298 + AC_MSG_CHECKING([how to link with libintl])
299 + AC_MSG_RESULT([$LIBINTL])
300 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
301 + fi
302 +
303 + dnl For backward compatibility. Some packages may be using this.
304 + AC_DEFINE(HAVE_GETTEXT, 1,
305 + [Define if the GNU gettext() function is already present or preinstalled.])
306 + AC_DEFINE(HAVE_DCGETTEXT, 1,
307 + [Define if the GNU dcgettext() function is already present or preinstalled.])
308 + fi
309 +
310 + dnl We need to process the po/ directory.
311 + POSUB=po
312 + fi
313 +
314 + ifelse(gt_included_intl, yes, [
315 + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
316 + dnl to 'yes' because some of the testsuite requires it.
317 + if test "$PACKAGE" = gettext; then
318 + BUILD_INCLUDED_LIBINTL=yes
319 + fi
320 +
321 + dnl Make all variables we use known to autoconf.
322 + AC_SUBST(BUILD_INCLUDED_LIBINTL)
323 + AC_SUBST(USE_INCLUDED_LIBINTL)
324 + AC_SUBST(CATOBJEXT)
325 + AC_SUBST(INTLOBJS)
326 +
327 + dnl For backward compatibility. Some configure.ins may be using this.
328 + nls_cv_header_intl=
329 + nls_cv_header_libgt=
330 +
331 + dnl For backward compatibility. Some Makefiles may be using this.
332 + DATADIRNAME=share
333 + AC_SUBST(DATADIRNAME)
334 +
335 + dnl For backward compatibility. Some Makefiles may be using this.
336 + INSTOBJEXT=.mo
337 + AC_SUBST(INSTOBJEXT)
338 +
339 + dnl For backward compatibility. Some Makefiles may be using this.
340 + GENCAT=gencat
341 + AC_SUBST(GENCAT)
342 +
343 + dnl Enable libtool support if the surrounding package wishes it.
344 + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
345 + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
346 + ])
347 +
348 + dnl For backward compatibility. Some Makefiles may be using this.
349 + INTLLIBS="$LIBINTL"
350 + AC_SUBST(INTLLIBS)
351 +
352 + dnl Make all documented variables known to autoconf.
353 + AC_SUBST(LIBINTL)
354 + AC_SUBST(LTLIBINTL)
355 + AC_SUBST(POSUB)
356 +])
357 +
358 +
359 +dnl Checks for all prerequisites of the po subdirectory,
360 +dnl except for USE_NLS.
361 +AC_DEFUN([AM_PO_SUBDIRS],
362 +[
363 + AC_REQUIRE([AC_PROG_MAKE_SET])dnl
364 + AC_REQUIRE([AC_PROG_INSTALL])dnl
365 + AC_REQUIRE([AM_MKINSTALLDIRS])dnl
366 +
367 + dnl Perform the following tests also if --disable-nls has been given,
368 + dnl because they are needed for "make dist" to work.
369 +
370 + dnl Search for GNU msgfmt in the PATH.
371 + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
372 + dnl The second test excludes FreeBSD msgfmt.
373 + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
374 + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
375 + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
376 + :)
377 + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
378 +
379 + dnl Search for GNU xgettext 0.11 or newer in the PATH.
380 + dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
381 + dnl The second test excludes FreeBSD xgettext.
382 + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
383 + [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
384 + (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
385 + :)
386 + dnl Remove leftover from FreeBSD xgettext call.
387 + rm -f messages.po
388 +
389 + dnl Search for GNU msgmerge 0.11 or newer in the PATH.
390 + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
391 + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
392 +
393 + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
394 + dnl Test whether we really found GNU msgfmt.
395 + if test "$GMSGFMT" != ":"; then
396 + dnl If it is no GNU msgfmt we define it as : so that the
397 + dnl Makefiles still can work.
398 + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
399 + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
400 + : ;
401 + else
402 + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
403 + AC_MSG_RESULT(
404 + [found $GMSGFMT program is not GNU msgfmt; ignore it])
405 + GMSGFMT=":"
406 + fi
407 + fi
408 +
409 + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
410 + dnl Test whether we really found GNU xgettext.
411 + if test "$XGETTEXT" != ":"; then
412 + dnl If it is no GNU xgettext we define it as : so that the
413 + dnl Makefiles still can work.
414 + if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
415 + (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
416 + : ;
417 + else
418 + AC_MSG_RESULT(
419 + [found xgettext program is not GNU xgettext; ignore it])
420 + XGETTEXT=":"
421 + fi
422 + dnl Remove leftover from FreeBSD xgettext call.
423 + rm -f messages.po
424 + fi
425 +
426 + AC_OUTPUT_COMMANDS([
427 + for ac_file in $CONFIG_FILES; do
428 + # Support "outfile[:infile[:infile...]]"
429 + case "$ac_file" in
430 + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
431 + esac
432 + # PO directories have a Makefile.in generated from Makefile.in.in.
433 + case "$ac_file" in */Makefile.in)
434 + # Adjust a relative srcdir.
435 + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
436 + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
437 + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
438 + # In autoconf-2.13 it is called $ac_given_srcdir.
439 + # In autoconf-2.50 it is called $srcdir.
440 + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
441 + case "$ac_given_srcdir" in
442 + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
443 + /*) top_srcdir="$ac_given_srcdir" ;;
444 + *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
445 + esac
446 + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
447 + rm -f "$ac_dir/POTFILES"
448 + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
449 + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
450 + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
451 + # on $ac_dir but don't depend on user-specified configuration
452 + # parameters.
453 + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
454 + # The LINGUAS file contains the set of available languages.
455 + if test -n "$ALL_LINGUAS"; then
456 + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
457 + fi
458 + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
459 + # Hide the ALL_LINGUAS assigment from automake.
460 + eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
461 + fi
462 + case "$ac_given_srcdir" in
463 + .) srcdirpre= ;;
464 + *) srcdirpre='$(srcdir)/' ;;
465 + esac
466 + POFILES=
467 + GMOFILES=
468 + UPDATEPOFILES=
469 + DUMMYPOFILES=
470 + for lang in $ALL_LINGUAS; do
471 + POFILES="$POFILES $srcdirpre$lang.po"
472 + GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
473 + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
474 + DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
475 + done
476 + # CATALOGS depends on both $ac_dir and the user's LINGUAS
477 + # environment variable.
478 + INST_LINGUAS=
479 + if test -n "$ALL_LINGUAS"; then
480 + for presentlang in $ALL_LINGUAS; do
481 + useit=no
482 + if test "%UNSET%" != "$LINGUAS"; then
483 + desiredlanguages="$LINGUAS"
484 + else
485 + desiredlanguages="$ALL_LINGUAS"
486 + fi
487 + for desiredlang in $desiredlanguages; do
488 + # Use the presentlang catalog if desiredlang is
489 + # a. equal to presentlang, or
490 + # b. a variant of presentlang (because in this case,
491 + # presentlang can be used as a fallback for messages
492 + # which are not translated in the desiredlang catalog).
493 + case "$desiredlang" in
494 + "$presentlang"*) useit=yes;;
495 + esac
496 + done
497 + if test $useit = yes; then
498 + INST_LINGUAS="$INST_LINGUAS $presentlang"
499 + fi
500 + done
501 + fi
502 + CATALOGS=
503 + if test -n "$INST_LINGUAS"; then
504 + for lang in $INST_LINGUAS; do
505 + CATALOGS="$CATALOGS $lang.gmo"
506 + done
507 + fi
508 + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
509 + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
510 + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
511 + if test -f "$f"; then
512 + case "$f" in
513 + *.orig | *.bak | *~) ;;
514 + *) cat "$f" >> "$ac_dir/Makefile" ;;
515 + esac
516 + fi
517 + done
518 + fi
519 + ;;
520 + esac
521 + done],
522 + [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
523 + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
524 + # from automake.
525 + eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
526 + # Capture the value of LINGUAS because we need it to compute CATALOGS.
527 + LINGUAS="${LINGUAS-%UNSET%}"
528 + ])
529 +])
530 +
531 +
532 +dnl Checks for all prerequisites of the intl subdirectory,
533 +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
534 +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
535 +AC_DEFUN([AM_INTL_SUBDIR],
536 +[
537 + AC_REQUIRE([AC_PROG_INSTALL])dnl
538 + AC_REQUIRE([AM_MKINSTALLDIRS])dnl
539 + AC_REQUIRE([AC_PROG_CC])dnl
540 + AC_REQUIRE([AC_CANONICAL_HOST])dnl
541 + AC_REQUIRE([AC_PROG_RANLIB])dnl
542 + AC_REQUIRE([AC_ISC_POSIX])dnl
543 + AC_REQUIRE([AC_HEADER_STDC])dnl
544 + AC_REQUIRE([AC_C_CONST])dnl
545 + AC_REQUIRE([AC_C_INLINE])dnl
546 + AC_REQUIRE([AC_TYPE_OFF_T])dnl
547 + AC_REQUIRE([AC_TYPE_SIZE_T])dnl
548 + AC_REQUIRE([AC_FUNC_ALLOCA])dnl
549 + AC_REQUIRE([AC_FUNC_MMAP])dnl
550 + AC_REQUIRE([jm_GLIBC21])dnl
551 + AC_REQUIRE([gt_INTDIV0])dnl
552 + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
553 + AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
554 + AC_REQUIRE([gt_INTTYPES_PRI])dnl
555 +
556 + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
557 +stdlib.h string.h unistd.h sys/param.h])
558 + AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
559 +geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
560 +strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
561 +
562 + AM_ICONV
563 + AM_LANGINFO_CODESET
564 + if test $ac_cv_header_locale_h = yes; then
565 + AM_LC_MESSAGES
566 + fi
567 +
568 + dnl intl/plural.c is generated from intl/plural.y. It requires bison,
569 + dnl because plural.y uses bison specific features. It requires at least
570 + dnl bison-1.26 because earlier versions generate a plural.c that doesn't
571 + dnl compile.
572 + dnl bison is only needed for the maintainer (who touches plural.y). But in
573 + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
574 + dnl the rule in general Makefile. Now, some people carelessly touch the
575 + dnl files or have a broken "make" program, hence the plural.c rule will
576 + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
577 + dnl present or too old.
578 + AC_CHECK_PROGS([INTLBISON], [bison])
579 + if test -z "$INTLBISON"; then
580 + ac_verc_fail=yes
581 + else
582 + dnl Found it, now check the version.
583 + AC_MSG_CHECKING([version of bison])
584 +changequote(<<,>>)dnl
585 + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
586 + case $ac_prog_version in
587 + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
588 + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
589 +changequote([,])dnl
590 + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
591 + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
592 + esac
593 + AC_MSG_RESULT([$ac_prog_version])
594 + fi
595 + if test $ac_verc_fail = yes; then
596 + INTLBISON=:
597 + fi
598 +])
599 +
600 +
601 +AC_DEFUN([AM_MKINSTALLDIRS],
602 +[
603 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
604 + dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
605 + dnl Try to locate is.
606 + MKINSTALLDIRS=
607 + if test -n "$ac_aux_dir"; then
608 + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
609 + fi
610 + if test -z "$MKINSTALLDIRS"; then
611 + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
612 + fi
613 + AC_SUBST(MKINSTALLDIRS)
614 +])
615 +
616 +
617 +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
618 +AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
619 diff -urNd -urNd orpheus-1.5/m4/glibc21.m4 orpheus-1.5/m4/glibc21.m4
620 --- orpheus-1.5/m4/glibc21.m4 1969-12-31 19:00:00.000000000 -0500
621 +++ orpheus-1.5/m4/glibc21.m4 2004-03-12 23:19:14.000000000 -0500
622 @@ -0,0 +1,32 @@
623 +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
624 +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
625 +dnl This file is free software, distributed under the terms of the GNU
626 +dnl General Public License. As a special exception to the GNU General
627 +dnl Public License, this file may be distributed as part of a program
628 +dnl that contains a configuration script generated by Autoconf, under
629 +dnl the same distribution terms as the rest of that program.
630 +
631 +# Test for the GNU C Library, version 2.1 or newer.
632 +# From Bruno Haible.
633 +
634 +AC_DEFUN([jm_GLIBC21],
635 + [
636 + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
637 + ac_cv_gnu_library_2_1,
638 + [AC_EGREP_CPP([Lucky GNU user],
639 + [
640 +#include <features.h>
641 +#ifdef __GNU_LIBRARY__
642 + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
643 + Lucky GNU user
644 + #endif
645 +#endif
646 + ],
647 + ac_cv_gnu_library_2_1=yes,
648 + ac_cv_gnu_library_2_1=no)
649 + ]
650 + )
651 + AC_SUBST(GLIBC21)
652 + GLIBC21="$ac_cv_gnu_library_2_1"
653 + ]
654 +)
655 diff -urNd -urNd orpheus-1.5/m4/iconv.m4 orpheus-1.5/m4/iconv.m4
656 --- orpheus-1.5/m4/iconv.m4 1969-12-31 19:00:00.000000000 -0500
657 +++ orpheus-1.5/m4/iconv.m4 2004-03-12 23:18:57.000000000 -0500
658 @@ -0,0 +1,103 @@
659 +# iconv.m4 serial AM4 (gettext-0.11.3)
660 +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
661 +dnl This file is free software, distributed under the terms of the GNU
662 +dnl General Public License. As a special exception to the GNU General
663 +dnl Public License, this file may be distributed as part of a program
664 +dnl that contains a configuration script generated by Autoconf, under
665 +dnl the same distribution terms as the rest of that program.
666 +
667 +dnl From Bruno Haible.
668 +
669 +AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
670 +[
671 + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
672 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
673 + AC_REQUIRE([AC_LIB_RPATH])
674 +
675 + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
676 + dnl accordingly.
677 + AC_LIB_LINKFLAGS_BODY([iconv])
678 +])
679 +
680 +AC_DEFUN([AM_ICONV_LINK],
681 +[
682 + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
683 + dnl those with the standalone portable GNU libiconv installed).
684 +
685 + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
686 + dnl accordingly.
687 + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
688 +
689 + dnl Add $INCICONV to CPPFLAGS before performing the following checks,
690 + dnl because if the user has installed libiconv and not disabled its use
691 + dnl via --without-libiconv-prefix, he wants to use it. The first
692 + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
693 + am_save_CPPFLAGS="$CPPFLAGS"
694 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
695 +
696 + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
697 + am_cv_func_iconv="no, consider installing GNU libiconv"
698 + am_cv_lib_iconv=no
699 + AC_TRY_LINK([#include <stdlib.h>
700 +#include <iconv.h>],
701 + [iconv_t cd = iconv_open("","");
702 + iconv(cd,NULL,NULL,NULL,NULL);
703 + iconv_close(cd);],
704 + am_cv_func_iconv=yes)
705 + if test "$am_cv_func_iconv" != yes; then
706 + am_save_LIBS="$LIBS"
707 + LIBS="$LIBS $LIBICONV"
708 + AC_TRY_LINK([#include <stdlib.h>
709 +#include <iconv.h>],
710 + [iconv_t cd = iconv_open("","");
711 + iconv(cd,NULL,NULL,NULL,NULL);
712 + iconv_close(cd);],
713 + am_cv_lib_iconv=yes
714 + am_cv_func_iconv=yes)
715 + LIBS="$am_save_LIBS"
716 + fi
717 + ])
718 + if test "$am_cv_func_iconv" = yes; then
719 + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
720 + fi
721 + if test "$am_cv_lib_iconv" = yes; then
722 + AC_MSG_CHECKING([how to link with libiconv])
723 + AC_MSG_RESULT([$LIBICONV])
724 + else
725 + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
726 + dnl either.
727 + CPPFLAGS="$am_save_CPPFLAGS"
728 + LIBICONV=
729 + LTLIBICONV=
730 + fi
731 + AC_SUBST(LIBICONV)
732 + AC_SUBST(LTLIBICONV)
733 +])
734 +
735 +AC_DEFUN([AM_ICONV],
736 +[
737 + AM_ICONV_LINK
738 + if test "$am_cv_func_iconv" = yes; then
739 + AC_MSG_CHECKING([for iconv declaration])
740 + AC_CACHE_VAL(am_cv_proto_iconv, [
741 + AC_TRY_COMPILE([
742 +#include <stdlib.h>
743 +#include <iconv.h>
744 +extern
745 +#ifdef __cplusplus
746 +"C"
747 +#endif
748 +#if defined(__STDC__) || defined(__cplusplus)
749 +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
750 +#else
751 +size_t iconv();
752 +#endif
753 +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
754 + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
755 + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
756 + AC_MSG_RESULT([$]{ac_t:-
757 + }[$]am_cv_proto_iconv)
758 + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
759 + [Define as const if the declaration of iconv() needs const.])
760 + fi
761 +])
762 diff -urNd -urNd orpheus-1.5/m4/intdiv0.m4 orpheus-1.5/m4/intdiv0.m4
763 --- orpheus-1.5/m4/intdiv0.m4 1969-12-31 19:00:00.000000000 -0500
764 +++ orpheus-1.5/m4/intdiv0.m4 2004-03-12 23:18:57.000000000 -0500
765 @@ -0,0 +1,72 @@
766 +# intdiv0.m4 serial 1 (gettext-0.11.3)
767 +dnl Copyright (C) 2002 Free Software Foundation, Inc.
768 +dnl This file is free software, distributed under the terms of the GNU
769 +dnl General Public License. As a special exception to the GNU General
770 +dnl Public License, this file may be distributed as part of a program
771 +dnl that contains a configuration script generated by Autoconf, under
772 +dnl the same distribution terms as the rest of that program.
773 +
774 +dnl From Bruno Haible.
775 +
776 +AC_DEFUN([gt_INTDIV0],
777 +[
778 + AC_REQUIRE([AC_PROG_CC])dnl
779 + AC_REQUIRE([AC_CANONICAL_HOST])dnl
780 +
781 + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
782 + gt_cv_int_divbyzero_sigfpe,
783 + [
784 + AC_TRY_RUN([
785 +#include <stdlib.h>
786 +#include <signal.h>
787 +
788 +static void
789 +#ifdef __cplusplus
790 +sigfpe_handler (int sig)
791 +#else
792 +sigfpe_handler (sig) int sig;
793 +#endif
794 +{
795 + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
796 + exit (sig != SIGFPE);
797 +}
798 +
799 +int x = 1;
800 +int y = 0;
801 +int z;
802 +int nan;
803 +
804 +int main ()
805 +{
806 + signal (SIGFPE, sigfpe_handler);
807 +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
808 +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
809 + signal (SIGTRAP, sigfpe_handler);
810 +#endif
811 +/* Linux/SPARC yields signal SIGILL. */
812 +#if defined (__sparc__) && defined (__linux__)
813 + signal (SIGILL, sigfpe_handler);
814 +#endif
815 +
816 + z = x / y;
817 + nan = y / y;
818 + exit (1);
819 +}
820 +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
821 + [
822 + # Guess based on the CPU.
823 + case "$host_cpu" in
824 + alpha* | i[34567]86 | m68k | s390*)
825 + gt_cv_int_divbyzero_sigfpe="guessing yes";;
826 + *)
827 + gt_cv_int_divbyzero_sigfpe="guessing no";;
828 + esac
829 + ])
830 + ])
831 + case "$gt_cv_int_divbyzero_sigfpe" in
832 + *yes) value=1;;
833 + *) value=0;;
834 + esac
835 + AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
836 + [Define if integer division by zero raises signal SIGFPE.])
837 +])
838 diff -urNd -urNd orpheus-1.5/m4/inttypes_h.m4 orpheus-1.5/m4/inttypes_h.m4
839 --- orpheus-1.5/m4/inttypes_h.m4 1969-12-31 19:00:00.000000000 -0500
840 +++ orpheus-1.5/m4/inttypes_h.m4 2004-03-12 23:18:57.000000000 -0500
841 @@ -0,0 +1,28 @@
842 +# inttypes_h.m4 serial 4 (gettext-0.11.4)
843 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
844 +dnl This file is free software, distributed under the terms of the GNU
845 +dnl General Public License. As a special exception to the GNU General
846 +dnl Public License, this file may be distributed as part of a program
847 +dnl that contains a configuration script generated by Autoconf, under
848 +dnl the same distribution terms as the rest of that program.
849 +
850 +dnl From Paul Eggert.
851 +
852 +# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
853 +# doesn't clash with <sys/types.h>, and declares uintmax_t.
854 +
855 +AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
856 +[
857 + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
858 + [AC_TRY_COMPILE(
859 + [#include <sys/types.h>
860 +#include <inttypes.h>],
861 + [uintmax_t i = (uintmax_t) -1;],
862 + jm_ac_cv_header_inttypes_h=yes,
863 + jm_ac_cv_header_inttypes_h=no)])
864 + if test $jm_ac_cv_header_inttypes_h = yes; then
865 + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
866 +[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
867 + and declares uintmax_t. ])
868 + fi
869 +])
870 diff -urNd -urNd orpheus-1.5/m4/inttypes.m4 orpheus-1.5/m4/inttypes.m4
871 --- orpheus-1.5/m4/inttypes.m4 1969-12-31 19:00:00.000000000 -0500
872 +++ orpheus-1.5/m4/inttypes.m4 2004-03-12 23:18:57.000000000 -0500
873 @@ -0,0 +1,27 @@
874 +# inttypes.m4 serial 1 (gettext-0.11.4)
875 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
876 +dnl This file is free software, distributed under the terms of the GNU
877 +dnl General Public License. As a special exception to the GNU General
878 +dnl Public License, this file may be distributed as part of a program
879 +dnl that contains a configuration script generated by Autoconf, under
880 +dnl the same distribution terms as the rest of that program.
881 +
882 +dnl From Paul Eggert.
883 +
884 +# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
885 +# <sys/types.h>.
886 +
887 +AC_DEFUN([gt_HEADER_INTTYPES_H],
888 +[
889 + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
890 + [
891 + AC_TRY_COMPILE(
892 + [#include <sys/types.h>
893 +#include <inttypes.h>],
894 + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
895 + ])
896 + if test $gt_cv_header_inttypes_h = yes; then
897 + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
898 + [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
899 + fi
900 +])
901 diff -urNd -urNd orpheus-1.5/m4/inttypes-pri.m4 orpheus-1.5/m4/inttypes-pri.m4
902 --- orpheus-1.5/m4/inttypes-pri.m4 1969-12-31 19:00:00.000000000 -0500
903 +++ orpheus-1.5/m4/inttypes-pri.m4 2004-03-12 23:18:57.000000000 -0500
904 @@ -0,0 +1,32 @@
905 +# inttypes-pri.m4 serial 1 (gettext-0.11.4)
906 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
907 +dnl This file is free software, distributed under the terms of the GNU
908 +dnl General Public License. As a special exception to the GNU General
909 +dnl Public License, this file may be distributed as part of a program
910 +dnl that contains a configuration script generated by Autoconf, under
911 +dnl the same distribution terms as the rest of that program.
912 +
913 +dnl From Bruno Haible.
914 +
915 +# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
916 +# macros to non-string values. This is the case on AIX 4.3.3.
917 +
918 +AC_DEFUN([gt_INTTYPES_PRI],
919 +[
920 + AC_REQUIRE([gt_HEADER_INTTYPES_H])
921 + if test $gt_cv_header_inttypes_h = yes; then
922 + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
923 + gt_cv_inttypes_pri_broken,
924 + [
925 + AC_TRY_COMPILE([#include <inttypes.h>
926 +#ifdef PRId32
927 +char *p = PRId32;
928 +#endif
929 +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
930 + ])
931 + fi
932 + if test "$gt_cv_inttypes_pri_broken" = yes; then
933 + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
934 + [Define if <inttypes.h> exists and defines unusable PRI* macros.])
935 + fi
936 +])
937 diff -urNd -urNd orpheus-1.5/m4/isc-posix.m4 orpheus-1.5/m4/isc-posix.m4
938 --- orpheus-1.5/m4/isc-posix.m4 1969-12-31 19:00:00.000000000 -0500
939 +++ orpheus-1.5/m4/isc-posix.m4 2004-03-12 23:18:57.000000000 -0500
940 @@ -0,0 +1,26 @@
941 +# isc-posix.m4 serial 2 (gettext-0.11.2)
942 +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
943 +dnl This file is free software, distributed under the terms of the GNU
944 +dnl General Public License. As a special exception to the GNU General
945 +dnl Public License, this file may be distributed as part of a program
946 +dnl that contains a configuration script generated by Autoconf, under
947 +dnl the same distribution terms as the rest of that program.
948 +
949 +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
950 +
951 +# This test replaces the one in autoconf.
952 +# Currently this macro should have the same name as the autoconf macro
953 +# because gettext's gettext.m4 (distributed in the automake package)
954 +# still uses it. Otherwise, the use in gettext.m4 makes autoheader
955 +# give these diagnostics:
956 +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
957 +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
958 +
959 +undefine([AC_ISC_POSIX])
960 +
961 +AC_DEFUN([AC_ISC_POSIX],
962 + [
963 + dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
964 + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
965 + ]
966 +)
967 diff -urNd -urNd orpheus-1.5/m4/lcmessage.m4 orpheus-1.5/m4/lcmessage.m4
968 --- orpheus-1.5/m4/lcmessage.m4 1969-12-31 19:00:00.000000000 -0500
969 +++ orpheus-1.5/m4/lcmessage.m4 2004-03-12 23:18:57.000000000 -0500
970 @@ -0,0 +1,32 @@
971 +# lcmessage.m4 serial 3 (gettext-0.11.3)
972 +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
973 +dnl This file is free software, distributed under the terms of the GNU
974 +dnl General Public License. As a special exception to the GNU General
975 +dnl Public License, this file may be distributed as part of a program
976 +dnl that contains a configuration script generated by Autoconf, under
977 +dnl the same distribution terms as the rest of that program.
978 +dnl
979 +dnl This file can can be used in projects which are not available under
980 +dnl the GNU General Public License or the GNU Library General Public
981 +dnl License but which still want to provide support for the GNU gettext
982 +dnl functionality.
983 +dnl Please note that the actual code of the GNU gettext library is covered
984 +dnl by the GNU Library General Public License, and the rest of the GNU
985 +dnl gettext package package is covered by the GNU General Public License.
986 +dnl They are *not* in the public domain.
987 +
988 +dnl Authors:
989 +dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
990 +
991 +# Check whether LC_MESSAGES is available in <locale.h>.
992 +
993 +AC_DEFUN([AM_LC_MESSAGES],
994 +[
995 + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
996 + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
997 + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
998 + if test $am_cv_val_LC_MESSAGES = yes; then
999 + AC_DEFINE(HAVE_LC_MESSAGES, 1,
1000 + [Define if your <locale.h> file defines LC_MESSAGES.])
1001 + fi
1002 +])
1003 diff -urNd -urNd orpheus-1.5/m4/lib-ld.m4 orpheus-1.5/m4/lib-ld.m4
1004 --- orpheus-1.5/m4/lib-ld.m4 1969-12-31 19:00:00.000000000 -0500
1005 +++ orpheus-1.5/m4/lib-ld.m4 2004-03-12 23:18:57.000000000 -0500
1006 @@ -0,0 +1,97 @@
1007 +# lib-ld.m4 serial 1 (gettext-0.11)
1008 +dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
1009 +dnl This file is free software, distributed under the terms of the GNU
1010 +dnl General Public License. As a special exception to the GNU General
1011 +dnl Public License, this file may be distributed as part of a program
1012 +dnl that contains a configuration script generated by Autoconf, under
1013 +dnl the same distribution terms as the rest of that program.
1014 +
1015 +dnl Subroutines of libtool.m4,
1016 +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
1017 +dnl with libtool.m4.
1018 +
1019 +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
1020 +AC_DEFUN([AC_LIB_PROG_LD_GNU],
1021 +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
1022 +[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
1023 +if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
1024 + acl_cv_prog_gnu_ld=yes
1025 +else
1026 + acl_cv_prog_gnu_ld=no
1027 +fi])
1028 +with_gnu_ld=$acl_cv_prog_gnu_ld
1029 +])
1030 +
1031 +dnl From libtool-1.4. Sets the variable LD.
1032 +AC_DEFUN([AC_LIB_PROG_LD],
1033 +[AC_ARG_WITH(gnu-ld,
1034 +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
1035 +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
1036 +AC_REQUIRE([AC_PROG_CC])dnl
1037 +AC_REQUIRE([AC_CANONICAL_HOST])dnl
1038 +ac_prog=ld
1039 +if test "$GCC" = yes; then
1040 + # Check if gcc -print-prog-name=ld gives a path.
1041 + AC_MSG_CHECKING([for ld used by GCC])
1042 + case $host in
1043 + *-*-mingw*)
1044 + # gcc leaves a trailing carriage return which upsets mingw
1045 + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
1046 + *)
1047 + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
1048 + esac
1049 + case $ac_prog in
1050 + # Accept absolute paths.
1051 + [[\\/]* | [A-Za-z]:[\\/]*)]
1052 + [re_direlt='/[^/][^/]*/\.\./']
1053 + # Canonicalize the path of ld
1054 + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
1055 + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
1056 + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
1057 + done
1058 + test -z "$LD" && LD="$ac_prog"
1059 + ;;
1060 + "")
1061 + # If it fails, then pretend we aren't using GCC.
1062 + ac_prog=ld
1063 + ;;
1064 + *)
1065 + # If it is relative, then search for the first ld in PATH.
1066 + with_gnu_ld=unknown
1067 + ;;
1068 + esac
1069 +elif test "$with_gnu_ld" = yes; then
1070 + AC_MSG_CHECKING([for GNU ld])
1071 +else
1072 + AC_MSG_CHECKING([for non-GNU ld])
1073 +fi
1074 +AC_CACHE_VAL(acl_cv_path_LD,
1075 +[if test -z "$LD"; then
1076 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
1077 + for ac_dir in $PATH; do
1078 + test -z "$ac_dir" && ac_dir=.
1079 + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
1080 + acl_cv_path_LD="$ac_dir/$ac_prog"
1081 + # Check to see if the program is GNU ld. I'd rather use --version,
1082 + # but apparently some GNU ld's only accept -v.
1083 + # Break only if it was the GNU/non-GNU ld that we prefer.
1084 + if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
1085 + test "$with_gnu_ld" != no && break
1086 + else
1087 + test "$with_gnu_ld" != yes && break
1088 + fi
1089 + fi
1090 + done
1091 + IFS="$ac_save_ifs"
1092 +else
1093 + acl_cv_path_LD="$LD" # Let the user override the test with a path.
1094 +fi])
1095 +LD="$acl_cv_path_LD"
1096 +if test -n "$LD"; then
1097 + AC_MSG_RESULT($LD)
1098 +else
1099 + AC_MSG_RESULT(no)
1100 +fi
1101 +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
1102 +AC_LIB_PROG_LD_GNU
1103 +])
1104 diff -urNd -urNd orpheus-1.5/m4/lib-link.m4 orpheus-1.5/m4/lib-link.m4
1105 --- orpheus-1.5/m4/lib-link.m4 1969-12-31 19:00:00.000000000 -0500
1106 +++ orpheus-1.5/m4/lib-link.m4 2004-03-12 23:18:57.000000000 -0500
1107 @@ -0,0 +1,554 @@
1108 +# lib-link.m4 serial 3 (gettext-0.11.3)
1109 +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
1110 +dnl This file is free software, distributed under the terms of the GNU
1111 +dnl General Public License. As a special exception to the GNU General
1112 +dnl Public License, this file may be distributed as part of a program
1113 +dnl that contains a configuration script generated by Autoconf, under
1114 +dnl the same distribution terms as the rest of that program.
1115 +
1116 +dnl From Bruno Haible.
1117 +
1118 +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
1119 +dnl the libraries corresponding to explicit and implicit dependencies.
1120 +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
1121 +dnl augments the CPPFLAGS variable.
1122 +AC_DEFUN([AC_LIB_LINKFLAGS],
1123 +[
1124 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
1125 + AC_REQUIRE([AC_LIB_RPATH])
1126 + define([Name],[translit([$1],[./-], [___])])
1127 + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
1128 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
1129 + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
1130 + AC_LIB_LINKFLAGS_BODY([$1], [$2])
1131 + ac_cv_lib[]Name[]_libs="$LIB[]NAME"
1132 + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
1133 + ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
1134 + ])
1135 + LIB[]NAME="$ac_cv_lib[]Name[]_libs"
1136 + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
1137 + INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
1138 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
1139 + AC_SUBST([LIB]NAME)
1140 + AC_SUBST([LTLIB]NAME)
1141 + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
1142 + dnl results of this search when this library appears as a dependency.
1143 + HAVE_LIB[]NAME=yes
1144 + undefine([Name])
1145 + undefine([NAME])
1146 +])
1147 +
1148 +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
1149 +dnl searches for libname and the libraries corresponding to explicit and
1150 +dnl implicit dependencies, together with the specified include files and
1151 +dnl the ability to compile and link the specified testcode. If found, it
1152 +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
1153 +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
1154 +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
1155 +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
1156 +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
1157 +[
1158 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
1159 + AC_REQUIRE([AC_LIB_RPATH])
1160 + define([Name],[translit([$1],[./-], [___])])
1161 + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
1162 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
1163 +
1164 + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
1165 + dnl accordingly.
1166 + AC_LIB_LINKFLAGS_BODY([$1], [$2])
1167 +
1168 + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
1169 + dnl because if the user has installed lib[]Name and not disabled its use
1170 + dnl via --without-lib[]Name-prefix, he wants to use it.
1171 + ac_save_CPPFLAGS="$CPPFLAGS"
1172 + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
1173 +
1174 + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
1175 + ac_save_LIBS="$LIBS"
1176 + LIBS="$LIBS $LIB[]NAME"
1177 + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
1178 + LIBS="$ac_save_LIBS"
1179 + ])
1180 + if test "$ac_cv_lib[]Name" = yes; then
1181 + HAVE_LIB[]NAME=yes
1182 + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
1183 + AC_MSG_CHECKING([how to link with lib[]$1])
1184 + AC_MSG_RESULT([$LIB[]NAME])
1185 + else
1186 + HAVE_LIB[]NAME=no
1187 + dnl If $LIB[]NAME didn't lead to a usable library, we don't need
1188 + dnl $INC[]NAME either.
1189 + CPPFLAGS="$ac_save_CPPFLAGS"
1190 + LIB[]NAME=
1191 + LTLIB[]NAME=
1192 + fi
1193 + AC_SUBST([HAVE_LIB]NAME)
1194 + AC_SUBST([LIB]NAME)
1195 + AC_SUBST([LTLIB]NAME)
1196 + undefine([Name])
1197 + undefine([NAME])
1198 +])
1199 +
1200 +dnl Determine the platform dependent parameters needed to use rpath:
1201 +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
1202 +dnl hardcode_direct, hardcode_minus_L,
1203 +dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
1204 +AC_DEFUN([AC_LIB_RPATH],
1205 +[
1206 + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
1207 + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
1208 + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
1209 + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
1210 + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
1211 + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
1212 + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
1213 + . ./conftest.sh
1214 + rm -f ./conftest.sh
1215 + acl_cv_rpath=done
1216 + ])
1217 + wl="$acl_cv_wl"
1218 + libext="$acl_cv_libext"
1219 + shlibext="$acl_cv_shlibext"
1220 + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
1221 + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
1222 + hardcode_direct="$acl_cv_hardcode_direct"
1223 + hardcode_minus_L="$acl_cv_hardcode_minus_L"
1224 + sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
1225 + sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
1226 + dnl Determine whether the user wants rpath handling at all.
1227 + AC_ARG_ENABLE(rpath,
1228 + [ --disable-rpath do not hardcode runtime library paths],
1229 + :, enable_rpath=yes)
1230 +])
1231 +
1232 +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
1233 +dnl the libraries corresponding to explicit and implicit dependencies.
1234 +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
1235 +AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
1236 +[
1237 + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
1238 + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
1239 + dnl By default, look in $includedir and $libdir.
1240 + use_additional=yes
1241 + AC_LIB_WITH_FINAL_PREFIX([
1242 + eval additional_includedir=\"$includedir\"
1243 + eval additional_libdir=\"$libdir\"
1244 + ])
1245 + AC_ARG_WITH([lib$1-prefix],
1246 +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
1247 + --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
1248 +[
1249 + if test "X$withval" = "Xno"; then
1250 + use_additional=no
1251 + else
1252 + if test "X$withval" = "X"; then
1253 + AC_LIB_WITH_FINAL_PREFIX([
1254 + eval additional_includedir=\"$includedir\"
1255 + eval additional_libdir=\"$libdir\"
1256 + ])
1257 + else
1258 + additional_includedir="$withval/include"
1259 + additional_libdir="$withval/lib"
1260 + fi
1261 + fi
1262 +])
1263 + dnl Search the library and its dependencies in $additional_libdir and
1264 + dnl $LDFLAGS. Using breadth-first-seach.
1265 + LIB[]NAME=
1266 + LTLIB[]NAME=
1267 + INC[]NAME=
1268 + rpathdirs=
1269 + ltrpathdirs=
1270 + names_already_handled=
1271 + names_next_round='$1 $2'
1272 + while test -n "$names_next_round"; do
1273 + names_this_round="$names_next_round"
1274 + names_next_round=
1275 + for name in $names_this_round; do
1276 + already_handled=
1277 + for n in $names_already_handled; do
1278 + if test "$n" = "$name"; then
1279 + already_handled=yes
1280 + break
1281 + fi
1282 + done
1283 + if test -z "$already_handled"; then
1284 + names_already_handled="$names_already_handled $name"
1285 + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
1286 + dnl or AC_LIB_HAVE_LINKFLAGS call.
1287 + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
1288 + eval value=\"\$HAVE_LIB$uppername\"
1289 + if test -n "$value"; then
1290 + if test "$value" = yes; then
1291 + eval value=\"\$LIB$uppername\"
1292 + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
1293 + eval value=\"\$LTLIB$uppername\"
1294 + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
1295 + else
1296 + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
1297 + dnl that this library doesn't exist. So just drop it.
1298 + :
1299 + fi
1300 + else
1301 + dnl Search the library lib$name in $additional_libdir and $LDFLAGS
1302 + dnl and the already constructed $LIBNAME/$LTLIBNAME.
1303 + found_dir=
1304 + found_la=
1305 + found_so=
1306 + found_a=
1307 + if test $use_additional = yes; then
1308 + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
1309 + found_dir="$additional_libdir"
1310 + found_so="$additional_libdir/lib$name.$shlibext"
1311 + if test -f "$additional_libdir/lib$name.la"; then
1312 + found_la="$additional_libdir/lib$name.la"
1313 + fi
1314 + else
1315 + if test -f "$additional_libdir/lib$name.$libext"; then
1316 + found_dir="$additional_libdir"
1317 + found_a="$additional_libdir/lib$name.$libext"
1318 + if test -f "$additional_libdir/lib$name.la"; then
1319 + found_la="$additional_libdir/lib$name.la"
1320 + fi
1321 + fi
1322 + fi
1323 + fi
1324 + if test "X$found_dir" = "X"; then
1325 + for x in $LDFLAGS $LTLIB[]NAME; do
1326 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1327 + case "$x" in
1328 + -L*)
1329 + dir=`echo "X$x" | sed -e 's/^X-L//'`
1330 + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
1331 + found_dir="$dir"
1332 + found_so="$dir/lib$name.$shlibext"
1333 + if test -f "$dir/lib$name.la"; then
1334 + found_la="$dir/lib$name.la"
1335 + fi
1336 + else
1337 + if test -f "$dir/lib$name.$libext"; then
1338 + found_dir="$dir"
1339 + found_a="$dir/lib$name.$libext"
1340 + if test -f "$dir/lib$name.la"; then
1341 + found_la="$dir/lib$name.la"
1342 + fi
1343 + fi
1344 + fi
1345 + ;;
1346 + esac
1347 + if test "X$found_dir" != "X"; then
1348 + break
1349 + fi
1350 + done
1351 + fi
1352 + if test "X$found_dir" != "X"; then
1353 + dnl Found the library.
1354 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
1355 + if test "X$found_so" != "X"; then
1356 + dnl Linking with a shared library. We attempt to hardcode its
1357 + dnl directory into the executable's runpath, unless it's the
1358 + dnl standard /usr/lib.
1359 + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
1360 + dnl No hardcoding is needed.
1361 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1362 + else
1363 + dnl Use an explicit option to hardcode DIR into the resulting
1364 + dnl binary.
1365 + dnl Potentially add DIR to ltrpathdirs.
1366 + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
1367 + haveit=
1368 + for x in $ltrpathdirs; do
1369 + if test "X$x" = "X$found_dir"; then
1370 + haveit=yes
1371 + break
1372 + fi
1373 + done
1374 + if test -z "$haveit"; then
1375 + ltrpathdirs="$ltrpathdirs $found_dir"
1376 + fi
1377 + dnl The hardcoding into $LIBNAME is system dependent.
1378 + if test "$hardcode_direct" = yes; then
1379 + dnl Using DIR/libNAME.so during linking hardcodes DIR into the
1380 + dnl resulting binary.
1381 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1382 + else
1383 + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
1384 + dnl Use an explicit option to hardcode DIR into the resulting
1385 + dnl binary.
1386 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1387 + dnl Potentially add DIR to rpathdirs.
1388 + dnl The rpathdirs will be appended to $LIBNAME at the end.
1389 + haveit=
1390 + for x in $rpathdirs; do
1391 + if test "X$x" = "X$found_dir"; then
1392 + haveit=yes
1393 + break
1394 + fi
1395 + done
1396 + if test -z "$haveit"; then
1397 + rpathdirs="$rpathdirs $found_dir"
1398 + fi
1399 + else
1400 + dnl Rely on "-L$found_dir".
1401 + dnl But don't add it if it's already contained in the LDFLAGS
1402 + dnl or the already constructed $LIBNAME
1403 + haveit=
1404 + for x in $LDFLAGS $LIB[]NAME; do
1405 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1406 + if test "X$x" = "X-L$found_dir"; then
1407 + haveit=yes
1408 + break
1409 + fi
1410 + done
1411 + if test -z "$haveit"; then
1412 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
1413 + fi
1414 + if test "$hardcode_minus_L" != no; then
1415 + dnl FIXME: Not sure whether we should use
1416 + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
1417 + dnl here.
1418 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
1419 + else
1420 + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
1421 + dnl here, because this doesn't fit in flags passed to the
1422 + dnl compiler. So give up. No hardcoding. This affects only
1423 + dnl very old systems.
1424 + dnl FIXME: Not sure whether we should use
1425 + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
1426 + dnl here.
1427 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
1428 + fi
1429 + fi
1430 + fi
1431 + fi
1432 + else
1433 + if test "X$found_a" != "X"; then
1434 + dnl Linking with a static library.
1435 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
1436 + else
1437 + dnl We shouldn't come here, but anyway it's good to have a
1438 + dnl fallback.
1439 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
1440 + fi
1441 + fi
1442 + dnl Assume the include files are nearby.
1443 + additional_includedir=
1444 + case "$found_dir" in
1445 + */lib | */lib/)
1446 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
1447 + additional_includedir="$basedir/include"
1448 + ;;
1449 + esac
1450 + if test "X$additional_includedir" != "X"; then
1451 + dnl Potentially add $additional_includedir to $INCNAME.
1452 + dnl But don't add it
1453 + dnl 1. if it's the standard /usr/include,
1454 + dnl 2. if it's /usr/local/include and we are using GCC on Linux,
1455 + dnl 3. if it's already present in $CPPFLAGS or the already
1456 + dnl constructed $INCNAME,
1457 + dnl 4. if it doesn't exist as a directory.
1458 + if test "X$additional_includedir" != "X/usr/include"; then
1459 + haveit=
1460 + if test "X$additional_includedir" = "X/usr/local/include"; then
1461 + if test -n "$GCC"; then
1462 + case $host_os in
1463 + linux*) haveit=yes;;
1464 + esac
1465 + fi
1466 + fi
1467 + if test -z "$haveit"; then
1468 + for x in $CPPFLAGS $INC[]NAME; do
1469 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1470 + if test "X$x" = "X-I$additional_includedir"; then
1471 + haveit=yes
1472 + break
1473 + fi
1474 + done
1475 + if test -z "$haveit"; then
1476 + if test -d "$additional_includedir"; then
1477 + dnl Really add $additional_includedir to $INCNAME.
1478 + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
1479 + fi
1480 + fi
1481 + fi
1482 + fi
1483 + fi
1484 + dnl Look for dependencies.
1485 + if test -n "$found_la"; then
1486 + dnl Read the .la file. It defines the variables
1487 + dnl dlname, library_names, old_library, dependency_libs, current,
1488 + dnl age, revision, installed, dlopen, dlpreopen, libdir.
1489 + save_libdir="$libdir"
1490 + case "$found_la" in
1491 + */* | *\\*) . "$found_la" ;;
1492 + *) . "./$found_la" ;;
1493 + esac
1494 + libdir="$save_libdir"
1495 + dnl We use only dependency_libs.
1496 + for dep in $dependency_libs; do
1497 + case "$dep" in
1498 + -L*)
1499 + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
1500 + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
1501 + dnl But don't add it
1502 + dnl 1. if it's the standard /usr/lib,
1503 + dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
1504 + dnl 3. if it's already present in $LDFLAGS or the already
1505 + dnl constructed $LIBNAME,
1506 + dnl 4. if it doesn't exist as a directory.
1507 + if test "X$additional_libdir" != "X/usr/lib"; then
1508 + haveit=
1509 + if test "X$additional_libdir" = "X/usr/local/lib"; then
1510 + if test -n "$GCC"; then
1511 + case $host_os in
1512 + linux*) haveit=yes;;
1513 + esac
1514 + fi
1515 + fi
1516 + if test -z "$haveit"; then
1517 + haveit=
1518 + for x in $LDFLAGS $LIB[]NAME; do
1519 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1520 + if test "X$x" = "X-L$additional_libdir"; then
1521 + haveit=yes
1522 + break
1523 + fi
1524 + done
1525 + if test -z "$haveit"; then
1526 + if test -d "$additional_libdir"; then
1527 + dnl Really add $additional_libdir to $LIBNAME.
1528 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
1529 + fi
1530 + fi
1531 + haveit=
1532 + for x in $LDFLAGS $LTLIB[]NAME; do
1533 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1534 + if test "X$x" = "X-L$additional_libdir"; then
1535 + haveit=yes
1536 + break
1537 + fi
1538 + done
1539 + if test -z "$haveit"; then
1540 + if test -d "$additional_libdir"; then
1541 + dnl Really add $additional_libdir to $LTLIBNAME.
1542 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
1543 + fi
1544 + fi
1545 + fi
1546 + fi
1547 + ;;
1548 + -R*)
1549 + dir=`echo "X$dep" | sed -e 's/^X-R//'`
1550 + if test "$enable_rpath" != no; then
1551 + dnl Potentially add DIR to rpathdirs.
1552 + dnl The rpathdirs will be appended to $LIBNAME at the end.
1553 + haveit=
1554 + for x in $rpathdirs; do
1555 + if test "X$x" = "X$dir"; then
1556 + haveit=yes
1557 + break
1558 + fi
1559 + done
1560 + if test -z "$haveit"; then
1561 + rpathdirs="$rpathdirs $dir"
1562 + fi
1563 + dnl Potentially add DIR to ltrpathdirs.
1564 + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
1565 + haveit=
1566 + for x in $ltrpathdirs; do
1567 + if test "X$x" = "X$dir"; then
1568 + haveit=yes
1569 + break
1570 + fi
1571 + done
1572 + if test -z "$haveit"; then
1573 + ltrpathdirs="$ltrpathdirs $dir"
1574 + fi
1575 + fi
1576 + ;;
1577 + -l*)
1578 + dnl Handle this in the next round.
1579 + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
1580 + ;;
1581 + *.la)
1582 + dnl Handle this in the next round. Throw away the .la's
1583 + dnl directory; it is already contained in a preceding -L
1584 + dnl option.
1585 + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
1586 + ;;
1587 + *)
1588 + dnl Most likely an immediate library name.
1589 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
1590 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
1591 + ;;
1592 + esac
1593 + done
1594 + fi
1595 + else
1596 + dnl Didn't find the library; assume it is in the system directories
1597 + dnl known to the linker and runtime loader. (All the system
1598 + dnl directories known to the linker should also be known to the
1599 + dnl runtime loader, otherwise the system is severely misconfigured.)
1600 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
1601 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
1602 + fi
1603 + fi
1604 + fi
1605 + done
1606 + done
1607 + if test "X$rpathdirs" != "X"; then
1608 + if test -n "$hardcode_libdir_separator"; then
1609 + dnl Weird platform: only the last -rpath option counts, the user must
1610 + dnl pass all path elements in one option. We can arrange that for a
1611 + dnl single library, but not when more than one $LIBNAMEs are used.
1612 + alldirs=
1613 + for found_dir in $rpathdirs; do
1614 + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
1615 + done
1616 + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
1617 + acl_save_libdir="$libdir"
1618 + libdir="$alldirs"
1619 + eval flag=\"$hardcode_libdir_flag_spec\"
1620 + libdir="$acl_save_libdir"
1621 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
1622 + else
1623 + dnl The -rpath options are cumulative.
1624 + for found_dir in $rpathdirs; do
1625 + acl_save_libdir="$libdir"
1626 + libdir="$found_dir"
1627 + eval flag=\"$hardcode_libdir_flag_spec\"
1628 + libdir="$acl_save_libdir"
1629 + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
1630 + done
1631 + fi
1632 + fi
1633 + if test "X$ltrpathdirs" != "X"; then
1634 + dnl When using libtool, the option that works for both libraries and
1635 + dnl executables is -R. The -R options are cumulative.
1636 + for found_dir in $ltrpathdirs; do
1637 + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
1638 + done
1639 + fi
1640 +])
1641 +
1642 +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
1643 +dnl unless already present in VAR.
1644 +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
1645 +dnl contains two or three consecutive elements that belong together.
1646 +AC_DEFUN([AC_LIB_APPENDTOVAR],
1647 +[
1648 + for element in [$2]; do
1649 + haveit=
1650 + for x in $[$1]; do
1651 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1652 + if test "X$x" = "X$element"; then
1653 + haveit=yes
1654 + break
1655 + fi
1656 + done
1657 + if test -z "$haveit"; then
1658 + [$1]="${[$1]}${[$1]:+ }$element"
1659 + fi
1660 + done
1661 +])
1662 diff -urNd -urNd orpheus-1.5/m4/lib-prefix.m4 orpheus-1.5/m4/lib-prefix.m4
1663 --- orpheus-1.5/m4/lib-prefix.m4 1969-12-31 19:00:00.000000000 -0500
1664 +++ orpheus-1.5/m4/lib-prefix.m4 2004-03-12 23:18:57.000000000 -0500
1665 @@ -0,0 +1,148 @@
1666 +# lib-prefix.m4 serial 1 (gettext-0.11)
1667 +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
1668 +dnl This file is free software, distributed under the terms of the GNU
1669 +dnl General Public License. As a special exception to the GNU General
1670 +dnl Public License, this file may be distributed as part of a program
1671 +dnl that contains a configuration script generated by Autoconf, under
1672 +dnl the same distribution terms as the rest of that program.
1673 +
1674 +dnl From Bruno Haible.
1675 +
1676 +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
1677 +dnl to access previously installed libraries. The basic assumption is that
1678 +dnl a user will want packages to use other packages he previously installed
1679 +dnl with the same --prefix option.
1680 +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
1681 +dnl libraries, but is otherwise very convenient.
1682 +AC_DEFUN([AC_LIB_PREFIX],
1683 +[
1684 + AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
1685 + AC_REQUIRE([AC_PROG_CC])
1686 + AC_REQUIRE([AC_CANONICAL_HOST])
1687 + AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
1688 + dnl By default, look in $includedir and $libdir.
1689 + use_additional=yes
1690 + AC_LIB_WITH_FINAL_PREFIX([
1691 + eval additional_includedir=\"$includedir\"
1692 + eval additional_libdir=\"$libdir\"
1693 + ])
1694 + AC_ARG_WITH([lib-prefix],
1695 +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
1696 + --without-lib-prefix don't search for libraries in includedir and libdir],
1697 +[
1698 + if test "X$withval" = "Xno"; then
1699 + use_additional=no
1700 + else
1701 + if test "X$withval" = "X"; then
1702 + AC_LIB_WITH_FINAL_PREFIX([
1703 + eval additional_includedir=\"$includedir\"
1704 + eval additional_libdir=\"$libdir\"
1705 + ])
1706 + else
1707 + additional_includedir="$withval/include"
1708 + additional_libdir="$withval/lib"
1709 + fi
1710 + fi
1711 +])
1712 + if test $use_additional = yes; then
1713 + dnl Potentially add $additional_includedir to $CPPFLAGS.
1714 + dnl But don't add it
1715 + dnl 1. if it's the standard /usr/include,
1716 + dnl 2. if it's already present in $CPPFLAGS,
1717 + dnl 3. if it's /usr/local/include and we are using GCC on Linux,
1718 + dnl 4. if it doesn't exist as a directory.
1719 + if test "X$additional_includedir" != "X/usr/include"; then
1720 + haveit=
1721 + for x in $CPPFLAGS; do
1722 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1723 + if test "X$x" = "X-I$additional_includedir"; then
1724 + haveit=yes
1725 + break
1726 + fi
1727 + done
1728 + if test -z "$haveit"; then
1729 + if test "X$additional_includedir" = "X/usr/local/include"; then
1730 + if test -n "$GCC"; then
1731 + case $host_os in
1732 + linux*) haveit=yes;;
1733 + esac
1734 + fi
1735 + fi
1736 + if test -z "$haveit"; then
1737 + if test -d "$additional_includedir"; then
1738 + dnl Really add $additional_includedir to $CPPFLAGS.
1739 + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
1740 + fi
1741 + fi
1742 + fi
1743 + fi
1744 + dnl Potentially add $additional_libdir to $LDFLAGS.
1745 + dnl But don't add it
1746 + dnl 1. if it's the standard /usr/lib,
1747 + dnl 2. if it's already present in $LDFLAGS,
1748 + dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
1749 + dnl 4. if it doesn't exist as a directory.
1750 + if test "X$additional_libdir" != "X/usr/lib"; then
1751 + haveit=
1752 + for x in $LDFLAGS; do
1753 + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1754 + if test "X$x" = "X-L$additional_libdir"; then
1755 + haveit=yes
1756 + break
1757 + fi
1758 + done
1759 + if test -z "$haveit"; then
1760 + if test "X$additional_libdir" = "X/usr/local/lib"; then
1761 + if test -n "$GCC"; then
1762 + case $host_os in
1763 + linux*) haveit=yes;;
1764 + esac
1765 + fi
1766 + fi
1767 + if test -z "$haveit"; then
1768 + if test -d "$additional_libdir"; then
1769 + dnl Really add $additional_libdir to $LDFLAGS.
1770 + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
1771 + fi
1772 + fi
1773 + fi
1774 + fi
1775 + fi
1776 +])
1777 +
1778 +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
1779 +dnl acl_final_exec_prefix, containing the values to which $prefix and
1780 +dnl $exec_prefix will expand at the end of the configure script.
1781 +AC_DEFUN([AC_LIB_PREPARE_PREFIX],
1782 +[
1783 + dnl Unfortunately, prefix and exec_prefix get only finally determined
1784 + dnl at the end of configure.
1785 + if test "X$prefix" = "XNONE"; then
1786 + acl_final_prefix="$ac_default_prefix"
1787 + else
1788 + acl_final_prefix="$prefix"
1789 + fi
1790 + if test "X$exec_prefix" = "XNONE"; then
1791 + acl_final_exec_prefix='${prefix}'
1792 + else
1793 + acl_final_exec_prefix="$exec_prefix"
1794 + fi
1795 + acl_save_prefix="$prefix"
1796 + prefix="$acl_final_prefix"
1797 + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
1798 + prefix="$acl_save_prefix"
1799 +])
1800 +
1801 +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
1802 +dnl variables prefix and exec_prefix bound to the values they will have
1803 +dnl at the end of the configure script.
1804 +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
1805 +[
1806 + acl_save_prefix="$prefix"
1807 + prefix="$acl_final_prefix"
1808 + acl_save_exec_prefix="$exec_prefix"
1809 + exec_prefix="$acl_final_exec_prefix"
1810 + $1
1811 + exec_prefix="$acl_save_exec_prefix"
1812 + prefix="$acl_save_prefix"
1813 +])
1814 diff -urNd -urNd orpheus-1.5/m4/progtest.m4 orpheus-1.5/m4/progtest.m4
1815 --- orpheus-1.5/m4/progtest.m4 1969-12-31 19:00:00.000000000 -0500
1816 +++ orpheus-1.5/m4/progtest.m4 2004-03-12 23:18:57.000000000 -0500
1817 @@ -0,0 +1,59 @@
1818 +# progtest.m4 serial 2 (gettext-0.10.40)
1819 +dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
1820 +dnl This file is free software, distributed under the terms of the GNU
1821 +dnl General Public License. As a special exception to the GNU General
1822 +dnl Public License, this file may be distributed as part of a program
1823 +dnl that contains a configuration script generated by Autoconf, under
1824 +dnl the same distribution terms as the rest of that program.
1825 +dnl
1826 +dnl This file can can be used in projects which are not available under
1827 +dnl the GNU General Public License or the GNU Library General Public
1828 +dnl License but which still want to provide support for the GNU gettext
1829 +dnl functionality.
1830 +dnl Please note that the actual code of the GNU gettext library is covered
1831 +dnl by the GNU Library General Public License, and the rest of the GNU
1832 +dnl gettext package package is covered by the GNU General Public License.
1833 +dnl They are *not* in the public domain.
1834 +
1835 +dnl Authors:
1836 +dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
1837 +
1838 +# Search path for a program which passes the given test.
1839 +
1840 +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
1841 +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
1842 +AC_DEFUN([AM_PATH_PROG_WITH_TEST],
1843 +[# Extract the first word of "$2", so it can be a program name with args.
1844 +set dummy $2; ac_word=[$]2
1845 +AC_MSG_CHECKING([for $ac_word])
1846 +AC_CACHE_VAL(ac_cv_path_$1,
1847 +[case "[$]$1" in
1848 + /*)
1849 + ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1850 + ;;
1851 + *)
1852 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1853 + for ac_dir in ifelse([$5], , $PATH, [$5]); do
1854 + test -z "$ac_dir" && ac_dir=.
1855 + if test -f $ac_dir/$ac_word; then
1856 + if [$3]; then
1857 + ac_cv_path_$1="$ac_dir/$ac_word"
1858 + break
1859 + fi
1860 + fi
1861 + done
1862 + IFS="$ac_save_ifs"
1863 +dnl If no 4th arg is given, leave the cache variable unset,
1864 +dnl so AC_PATH_PROGS will keep looking.
1865 +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1866 +])dnl
1867 + ;;
1868 +esac])dnl
1869 +$1="$ac_cv_path_$1"
1870 +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
1871 + AC_MSG_RESULT([$]$1)
1872 +else
1873 + AC_MSG_RESULT(no)
1874 +fi
1875 +AC_SUBST($1)dnl
1876 +])
1877 diff -urNd -urNd orpheus-1.5/m4/stdint_h.m4 orpheus-1.5/m4/stdint_h.m4
1878 --- orpheus-1.5/m4/stdint_h.m4 1969-12-31 19:00:00.000000000 -0500
1879 +++ orpheus-1.5/m4/stdint_h.m4 2004-03-12 23:18:57.000000000 -0500
1880 @@ -0,0 +1,28 @@
1881 +# stdint_h.m4 serial 2 (gettext-0.11.4)
1882 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
1883 +dnl This file is free software, distributed under the terms of the GNU
1884 +dnl General Public License. As a special exception to the GNU General
1885 +dnl Public License, this file may be distributed as part of a program
1886 +dnl that contains a configuration script generated by Autoconf, under
1887 +dnl the same distribution terms as the rest of that program.
1888 +
1889 +dnl From Paul Eggert.
1890 +
1891 +# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
1892 +# doesn't clash with <sys/types.h>, and declares uintmax_t.
1893 +
1894 +AC_DEFUN([jm_AC_HEADER_STDINT_H],
1895 +[
1896 + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
1897 + [AC_TRY_COMPILE(
1898 + [#include <sys/types.h>
1899 +#include <stdint.h>],
1900 + [uintmax_t i = (uintmax_t) -1;],
1901 + jm_ac_cv_header_stdint_h=yes,
1902 + jm_ac_cv_header_stdint_h=no)])
1903 + if test $jm_ac_cv_header_stdint_h = yes; then
1904 + AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
1905 +[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
1906 + and declares uintmax_t. ])
1907 + fi
1908 +])
1909 diff -urNd -urNd orpheus-1.5/m4/uintmax_t.m4 orpheus-1.5/m4/uintmax_t.m4
1910 --- orpheus-1.5/m4/uintmax_t.m4 1969-12-31 19:00:00.000000000 -0500
1911 +++ orpheus-1.5/m4/uintmax_t.m4 2004-03-12 23:18:57.000000000 -0500
1912 @@ -0,0 +1,29 @@
1913 +# uintmax_t.m4 serial 6 (gettext-0.11)
1914 +dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
1915 +dnl This file is free software, distributed under the terms of the GNU
1916 +dnl General Public License. As a special exception to the GNU General
1917 +dnl Public License, this file may be distributed as part of a program
1918 +dnl that contains a configuration script generated by Autoconf, under
1919 +dnl the same distribution terms as the rest of that program.
1920 +
1921 +dnl From Paul Eggert.
1922 +
1923 +AC_PREREQ(2.13)
1924 +
1925 +# Define uintmax_t to `unsigned long' or `unsigned long long'
1926 +# if <inttypes.h> does not exist.
1927 +
1928 +AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
1929 +[
1930 + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
1931 + AC_REQUIRE([jm_AC_HEADER_STDINT_H])
1932 + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
1933 + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
1934 + test $ac_cv_type_unsigned_long_long = yes \
1935 + && ac_type='unsigned long long' \
1936 + || ac_type='unsigned long'
1937 + AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
1938 + [Define to unsigned long or unsigned long long
1939 + if <inttypes.h> and <stdint.h> don't define.])
1940 + fi
1941 +])
1942 diff -urNd -urNd orpheus-1.5/m4/ulonglong.m4 orpheus-1.5/m4/ulonglong.m4
1943 --- orpheus-1.5/m4/ulonglong.m4 1969-12-31 19:00:00.000000000 -0500
1944 +++ orpheus-1.5/m4/ulonglong.m4 2004-03-12 23:18:57.000000000 -0500
1945 @@ -0,0 +1,23 @@
1946 +# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
1947 +dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
1948 +dnl This file is free software, distributed under the terms of the GNU
1949 +dnl General Public License. As a special exception to the GNU General
1950 +dnl Public License, this file may be distributed as part of a program
1951 +dnl that contains a configuration script generated by Autoconf, under
1952 +dnl the same distribution terms as the rest of that program.
1953 +
1954 +dnl From Paul Eggert.
1955 +
1956 +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
1957 +[
1958 + AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
1959 + [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
1960 + [unsigned long long ullmax = (unsigned long long) -1;
1961 + return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
1962 + ac_cv_type_unsigned_long_long=yes,
1963 + ac_cv_type_unsigned_long_long=no)])
1964 + if test $ac_cv_type_unsigned_long_long = yes; then
1965 + AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
1966 + [Define if you have the unsigned long long type.])
1967 + fi
1968 +])