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