[poky] [PATCH 5/9] opensp: new recipe v1.5

Joshua Lock josh at openedhand.com
Fri Jan 28 07:27:07 PST 2011


On Thu, 2011-01-27 at 14:42 -0800, Scott Garman wrote:
> From: Scott Garman <scott.a.garman at intel.com>
> 
> Recipe derived from OpenEmbedded. Removed old-style staging
> and converted to BBCLASSEXTEND.
> 
> Signed-off-by: Scott Garman <scott.a.garman at intel.com>
> ---
>  .../opensp/opensp/attributevalue.patch             |   62 +
>  .../opensp/opensp/fix-docdir.patch                 |   14 +
>  meta/recipes-devtools/opensp/opensp/m4.patch       | 1925 ++++++++++++++++++++
>  .../opensp/opensp/rangmap-fix.patch                |   15 +
>  meta/recipes-devtools/opensp/opensp_1.5.bb         |   27 +
>  5 files changed, 2043 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-devtools/opensp/opensp/attributevalue.patch
>  create mode 100644 meta/recipes-devtools/opensp/opensp/fix-docdir.patch
>  create mode 100644 meta/recipes-devtools/opensp/opensp/m4.patch
>  create mode 100644 meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
>  create mode 100644 meta/recipes-devtools/opensp/opensp_1.5.bb
> 
> diff --git a/meta/recipes-devtools/opensp/opensp/attributevalue.patch b/meta/recipes-devtools/opensp/opensp/attributevalue.patch
> new file mode 100644
> index 0000000..4f3507e
> --- /dev/null
> +++ b/meta/recipes-devtools/opensp/opensp/attributevalue.patch
> @@ -0,0 +1,62 @@
> +Patch obtained from OpenEmbedded.
> +
> +Signed-off-by: Scott Garman <scott.a.garman at intel.com>
> +--- OpenSP-1.5/include/Attribute.h~attributevalue	2000-03-09 13:30:56.000000000 -0500
> ++++ OpenSP-1.5/include/Attribute.h	2004-01-20 14:11:36.000000000 -0500
> +@@ -31,6 +31,28 @@
> + class AttributeContext;
> + class Syntax;
> + 
> ++class SP_API AttributeValue : public Resource {
> ++public:
> ++  enum Type {
> ++    implied,
> ++    cdata,
> ++    tokenized
> ++    };
> ++  AttributeValue();
> ++  virtual ~AttributeValue();
> ++  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
> ++					    AttributeContext &,
> ++					    const StringC &,
> ++					    unsigned &,
> ++					    unsigned &) const;
> ++  virtual Type info(const Text *&, const StringC *&) const = 0;
> ++  virtual const Text *text() const;
> ++  virtual Boolean recoverUnquoted(const StringC &, const Location &,
> ++				  AttributeContext &, const StringC &);
> ++  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
> ++};
> ++
> ++
> + class SP_API AttributeDefinitionDesc {
> + public:
> +   AttributeDefinitionDesc() { }
> +@@ -380,27 +402,6 @@
> +   ConstPtr<Notation> notation_;
> + };
> + 
> +-class SP_API AttributeValue : public Resource {
> +-public:
> +-  enum Type {
> +-    implied,
> +-    cdata,
> +-    tokenized
> +-    };
> +-  AttributeValue();
> +-  virtual ~AttributeValue();
> +-  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
> +-					    AttributeContext &,
> +-					    const StringC &,
> +-					    unsigned &,
> +-					    unsigned &) const;
> +-  virtual Type info(const Text *&, const StringC *&) const = 0;
> +-  virtual const Text *text() const;
> +-  virtual Boolean recoverUnquoted(const StringC &, const Location &,
> +-				  AttributeContext &, const StringC &);
> +-  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
> +-};
> +-
> + class SP_API ImpliedAttributeValue : public AttributeValue {
> + public:
> +   ImpliedAttributeValue();
> diff --git a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
> new file mode 100644
> index 0000000..5e2fc8b
> --- /dev/null
> +++ b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch
> @@ -0,0 +1,14 @@
> +Patch obtained from OpenEmbedded.
> +
> +Signed-off-by: Scott Garman <scott.a.garman at intel.com>
> +Index: OpenSP-1.5/doc/Makefile.am
> +===================================================================
> +--- OpenSP-1.5.orig/doc/Makefile.am	2000-05-06 09:10:32.000000000 +1000
> ++++ OpenSP-1.5/doc/Makefile.am	2007-06-02 12:46:50.000000000 +1000
> +@@ -1,6 +1,5 @@
> + ## Process this file with automake to produce Makefile.in
> + 
> +-docdir = $(prefix)/doc
> + pkgdocdir = $(docdir)/@PACKAGE@
> + 
> + MAINTAINERCLEANFILES = Makefile.in
> diff --git a/meta/recipes-devtools/opensp/opensp/m4.patch b/meta/recipes-devtools/opensp/opensp/m4.patch
> new file mode 100644
> index 0000000..a8504c5
> --- /dev/null
> +++ b/meta/recipes-devtools/opensp/opensp/m4.patch
> @@ -0,0 +1,1925 @@
> +Patch obtained from OpenEmbedded.
> +
> +Signed-off-by: Scott Garman <scott.a.garman at intel.com>
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/codeset.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,23 @@
> ++# codeset.m4 serial AM1 (gettext-0.10.40)
> ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Bruno Haible.
> ++
> ++AC_DEFUN([AM_LANGINFO_CODESET],
> ++[
> ++  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
> ++    [AC_TRY_LINK([#include <langinfo.h>],
> ++      [char* cs = nl_langinfo(CODESET);],
> ++      am_cv_langinfo_codeset=yes,
> ++      am_cv_langinfo_codeset=no)
> ++    ])
> ++  if test $am_cv_langinfo_codeset = yes; then
> ++    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
> ++      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/gettext.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,587 @@
> ++# gettext.m4 serial 17 (gettext-0.11.5)
> ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++dnl
> ++dnl This file can can be used in projects which are not available under
> ++dnl the GNU General Public License or the GNU Library General Public
> ++dnl License but which still want to provide support for the GNU gettext
> ++dnl functionality.
> ++dnl Please note that the actual code of the GNU gettext library is covered
> ++dnl by the GNU Library General Public License, and the rest of the GNU
> ++dnl gettext package package is covered by the GNU General Public License.
> ++dnl They are *not* in the public domain.
> ++
> ++dnl Authors:
> ++dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
> ++dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2002.
> ++
> ++dnl Macro to add for using GNU gettext.
> ++
> ++dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
> ++dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
> ++dnl    default (if it is not specified or empty) is 'no-libtool'.
> ++dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
> ++dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
> ++dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
> ++dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
> ++dnl    depending on --{enable,disable}-{shared,static} and on the presence of
> ++dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
> ++dnl    $(top_builddir)/intl/libintl.a will be created.
> ++dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
> ++dnl    implementations (in libc or libintl) without the ngettext() function
> ++dnl    will be ignored.  If NEEDSYMBOL is specified and is
> ++dnl    'need-formatstring-macros', then GNU gettext implementations that don't
> ++dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
> ++dnl INTLDIR is used to find the intl libraries.  If empty,
> ++dnl    the value `$(top_builddir)/intl/' is used.
> ++dnl
> ++dnl The result of the configuration is one of three cases:
> ++dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
> ++dnl    and used.
> ++dnl    Catalog format: GNU --> install in $(datadir)
> ++dnl    Catalog extension: .mo after installation, .gmo in source tree
> ++dnl 2) GNU gettext has been found in the system's C library.
> ++dnl    Catalog format: GNU --> install in $(datadir)
> ++dnl    Catalog extension: .mo after installation, .gmo in source tree
> ++dnl 3) No internationalization, always use English msgid.
> ++dnl    Catalog format: none
> ++dnl    Catalog extension: none
> ++dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
> ++dnl The use of .gmo is historical (it was needed to avoid overwriting the
> ++dnl GNU format catalogs when building on a platform with an X/Open gettext),
> ++dnl but we keep it in order not to force irrelevant filename changes on the
> ++dnl maintainers.
> ++dnl
> ++AC_DEFUN([AM_GNU_GETTEXT],
> ++[
> ++  dnl Argument checking.
> ++  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
> ++    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
> ++])])])])])
> ++  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
> ++    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
> ++])])])])
> ++  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
> ++  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
> ++
> ++  AC_REQUIRE([AM_PO_SUBDIRS])dnl
> ++  ifelse(gt_included_intl, yes, [
> ++    AC_REQUIRE([AM_INTL_SUBDIR])dnl
> ++  ])
> ++
> ++  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
> ++  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> ++  AC_REQUIRE([AC_LIB_RPATH])
> ++
> ++  dnl Sometimes libintl requires libiconv, so first search for libiconv.
> ++  dnl Ideally we would do this search only after the
> ++  dnl      if test "$USE_NLS" = "yes"; then
> ++  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
> ++  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
> ++  dnl the configure script would need to contain the same shell code
> ++  dnl again, outside any 'if'. There are two solutions:
> ++  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
> ++  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
> ++  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
> ++  dnl documented, we avoid it.
> ++  ifelse(gt_included_intl, yes, , [
> ++    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
> ++  ])
> ++
> ++  AC_MSG_CHECKING([whether NLS is requested])
> ++  dnl Default is enabled NLS
> ++  AC_ARG_ENABLE(nls,
> ++    [  --disable-nls           do not use Native Language Support],
> ++    USE_NLS=$enableval, USE_NLS=yes)
> ++  AC_MSG_RESULT($USE_NLS)
> ++  AC_SUBST(USE_NLS)
> ++
> ++  ifelse(gt_included_intl, yes, [
> ++    BUILD_INCLUDED_LIBINTL=no
> ++    USE_INCLUDED_LIBINTL=no
> ++  ])
> ++  LIBINTL=
> ++  LTLIBINTL=
> ++  POSUB=
> ++
> ++  dnl If we use NLS figure out what method
> ++  if test "$USE_NLS" = "yes"; then
> ++    gt_use_preinstalled_gnugettext=no
> ++    ifelse(gt_included_intl, yes, [
> ++      AC_MSG_CHECKING([whether included gettext is requested])
> ++      AC_ARG_WITH(included-gettext,
> ++        [  --with-included-gettext use the GNU gettext library included here],
> ++        nls_cv_force_use_gnu_gettext=$withval,
> ++        nls_cv_force_use_gnu_gettext=no)
> ++      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
> ++
> ++      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
> ++      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
> ++    ])
> ++        dnl User does not insist on using GNU NLS library.  Figure out what
> ++        dnl to use.  If GNU gettext is available we use this.  Else we have
> ++        dnl to fall back to GNU NLS library.
> ++
> ++        dnl Add a version number to the cache macros.
> ++        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
> ++        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
> ++        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
> ++
> ++        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
> ++         [AC_TRY_LINK([#include <libintl.h>
> ++]ifelse([$2], [need-formatstring-macros],
> ++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
> ++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
> ++#endif
> ++changequote(,)dnl
> ++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
> ++changequote([,])dnl
> ++], [])[extern int _nl_msg_cat_cntr;
> ++extern int *_nl_domain_bindings;],
> ++            [bindtextdomain ("", "");
> ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
> ++            gt_cv_func_gnugettext_libc=yes,
> ++            gt_cv_func_gnugettext_libc=no)])
> ++
> ++        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
> ++          dnl Sometimes libintl requires libiconv, so first search for libiconv.
> ++          ifelse(gt_included_intl, yes, , [
> ++            AM_ICONV_LINK
> ++          ])
> ++          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
> ++          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
> ++          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
> ++          dnl even if libiconv doesn't exist.
> ++          AC_LIB_LINKFLAGS_BODY([intl])
> ++          AC_CACHE_CHECK([for GNU gettext in libintl],
> ++            gt_cv_func_gnugettext_libintl,
> ++           [gt_save_CPPFLAGS="$CPPFLAGS"
> ++            CPPFLAGS="$CPPFLAGS $INCINTL"
> ++            gt_save_LIBS="$LIBS"
> ++            LIBS="$LIBS $LIBINTL"
> ++            dnl Now see whether libintl exists and does not depend on libiconv.
> ++            AC_TRY_LINK([#include <libintl.h>
> ++]ifelse([$2], [need-formatstring-macros],
> ++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
> ++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
> ++#endif
> ++changequote(,)dnl
> ++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
> ++changequote([,])dnl
> ++], [])[extern int _nl_msg_cat_cntr;
> ++extern
> ++#ifdef __cplusplus
> ++"C"
> ++#endif
> ++const char *_nl_expand_alias ();],
> ++              [bindtextdomain ("", "");
> ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
> ++              gt_cv_func_gnugettext_libintl=yes,
> ++              gt_cv_func_gnugettext_libintl=no)
> ++            dnl Now see whether libintl exists and depends on libiconv.
> ++            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
> ++              LIBS="$LIBS $LIBICONV"
> ++              AC_TRY_LINK([#include <libintl.h>
> ++]ifelse([$2], [need-formatstring-macros],
> ++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
> ++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
> ++#endif
> ++changequote(,)dnl
> ++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
> ++changequote([,])dnl
> ++], [])[extern int _nl_msg_cat_cntr;
> ++extern
> ++#ifdef __cplusplus
> ++"C"
> ++#endif
> ++const char *_nl_expand_alias ();],
> ++                [bindtextdomain ("", "");
> ++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
> ++               [LIBINTL="$LIBINTL $LIBICONV"
> ++                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
> ++                gt_cv_func_gnugettext_libintl=yes
> ++               ])
> ++            fi
> ++            CPPFLAGS="$gt_save_CPPFLAGS"
> ++            LIBS="$gt_save_LIBS"])
> ++        fi
> ++
> ++        dnl If an already present or preinstalled GNU gettext() is found,
> ++        dnl use it.  But if this macro is used in GNU gettext, and GNU
> ++        dnl gettext is already preinstalled in libintl, we update this
> ++        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
> ++        if test "$gt_cv_func_gnugettext_libc" = "yes" \
> ++           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
> ++                && test "$PACKAGE" != gettext; }; then
> ++          gt_use_preinstalled_gnugettext=yes
> ++        else
> ++          dnl Reset the values set by searching for libintl.
> ++          LIBINTL=
> ++          LTLIBINTL=
> ++          INCINTL=
> ++        fi
> ++
> ++    ifelse(gt_included_intl, yes, [
> ++        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
> ++          dnl GNU gettext is not found in the C library.
> ++          dnl Fall back on included GNU gettext library.
> ++          nls_cv_use_gnu_gettext=yes
> ++        fi
> ++      fi
> ++
> ++      if test "$nls_cv_use_gnu_gettext" = "yes"; then
> ++        dnl Mark actions used to generate GNU NLS library.
> ++        INTLOBJS="\$(GETTOBJS)"
> ++        BUILD_INCLUDED_LIBINTL=yes
> ++        USE_INCLUDED_LIBINTL=yes
> ++        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
> ++        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
> ++        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
> ++      fi
> ++
> ++      if test "$gt_use_preinstalled_gnugettext" = "yes" \
> ++         || test "$nls_cv_use_gnu_gettext" = "yes"; then
> ++        dnl Mark actions to use GNU gettext tools.
> ++        CATOBJEXT=.gmo
> ++      fi
> ++    ])
> ++
> ++    if test "$gt_use_preinstalled_gnugettext" = "yes" \
> ++       || test "$nls_cv_use_gnu_gettext" = "yes"; then
> ++      AC_DEFINE(ENABLE_NLS, 1,
> ++        [Define to 1 if translation of program messages to the user's native language
> ++   is requested.])
> ++    else
> ++      USE_NLS=no
> ++    fi
> ++  fi
> ++
> ++  if test "$USE_NLS" = "yes"; then
> ++
> ++    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
> ++      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
> ++        AC_MSG_CHECKING([how to link with libintl])
> ++        AC_MSG_RESULT([$LIBINTL])
> ++        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
> ++      fi
> ++
> ++      dnl For backward compatibility. Some packages may be using this.
> ++      AC_DEFINE(HAVE_GETTEXT, 1,
> ++       [Define if the GNU gettext() function is already present or preinstalled.])
> ++      AC_DEFINE(HAVE_DCGETTEXT, 1,
> ++       [Define if the GNU dcgettext() function is already present or preinstalled.])
> ++    fi
> ++
> ++    dnl We need to process the po/ directory.
> ++    POSUB=po
> ++  fi
> ++
> ++  ifelse(gt_included_intl, yes, [
> ++    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
> ++    dnl to 'yes' because some of the testsuite requires it.
> ++    if test "$PACKAGE" = gettext; then
> ++      BUILD_INCLUDED_LIBINTL=yes
> ++    fi
> ++
> ++    dnl Make all variables we use known to autoconf.
> ++    AC_SUBST(BUILD_INCLUDED_LIBINTL)
> ++    AC_SUBST(USE_INCLUDED_LIBINTL)
> ++    AC_SUBST(CATOBJEXT)
> ++    AC_SUBST(INTLOBJS)
> ++
> ++    dnl For backward compatibility. Some configure.ins may be using this.
> ++    nls_cv_header_intl=
> ++    nls_cv_header_libgt=
> ++
> ++    dnl For backward compatibility. Some Makefiles may be using this.
> ++    DATADIRNAME=share
> ++    AC_SUBST(DATADIRNAME)
> ++
> ++    dnl For backward compatibility. Some Makefiles may be using this.
> ++    INSTOBJEXT=.mo
> ++    AC_SUBST(INSTOBJEXT)
> ++
> ++    dnl For backward compatibility. Some Makefiles may be using this.
> ++    GENCAT=gencat
> ++    AC_SUBST(GENCAT)
> ++
> ++    dnl Enable libtool support if the surrounding package wishes it.
> ++    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
> ++    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
> ++  ])
> ++
> ++  dnl For backward compatibility. Some Makefiles may be using this.
> ++  INTLLIBS="$LIBINTL"
> ++  AC_SUBST(INTLLIBS)
> ++
> ++  dnl Make all documented variables known to autoconf.
> ++  AC_SUBST(LIBINTL)
> ++  AC_SUBST(LTLIBINTL)
> ++  AC_SUBST(POSUB)
> ++])
> ++
> ++
> ++dnl Checks for all prerequisites of the po subdirectory,
> ++dnl except for USE_NLS.
> ++AC_DEFUN([AM_PO_SUBDIRS],
> ++[
> ++  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
> ++  AC_REQUIRE([AC_PROG_INSTALL])dnl
> ++  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
> ++
> ++  dnl Perform the following tests also if --disable-nls has been given,
> ++  dnl because they are needed for "make dist" to work.
> ++
> ++  dnl Search for GNU msgfmt in the PATH.
> ++  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
> ++  dnl The second test excludes FreeBSD msgfmt.
> ++  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
> ++    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
> ++     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
> ++    :)
> ++  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
> ++
> ++  dnl Search for GNU xgettext 0.11 or newer in the PATH.
> ++  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
> ++  dnl The second test excludes FreeBSD xgettext.
> ++  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
> ++    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
> ++     (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)],
> ++    :)
> ++  dnl Remove leftover from FreeBSD xgettext call.
> ++  rm -f messages.po
> ++
> ++  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
> ++  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
> ++    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
> ++
> ++  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
> ++  dnl Test whether we really found GNU msgfmt.
> ++  if test "$GMSGFMT" != ":"; then
> ++    dnl If it is no GNU msgfmt we define it as : so that the
> ++    dnl Makefiles still can work.
> ++    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
> ++       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
> ++      : ;
> ++    else
> ++      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
> ++      AC_MSG_RESULT(
> ++        [found $GMSGFMT program is not GNU msgfmt; ignore it])
> ++      GMSGFMT=":"
> ++    fi
> ++  fi
> ++
> ++  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
> ++  dnl Test whether we really found GNU xgettext.
> ++  if test "$XGETTEXT" != ":"; then
> ++    dnl If it is no GNU xgettext we define it as : so that the
> ++    dnl Makefiles still can work.
> ++    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
> ++       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
> ++      : ;
> ++    else
> ++      AC_MSG_RESULT(
> ++        [found xgettext program is not GNU xgettext; ignore it])
> ++      XGETTEXT=":"
> ++    fi
> ++    dnl Remove leftover from FreeBSD xgettext call.
> ++    rm -f messages.po
> ++  fi
> ++
> ++  AC_OUTPUT_COMMANDS([
> ++    for ac_file in $CONFIG_FILES; do
> ++      # Support "outfile[:infile[:infile...]]"
> ++      case "$ac_file" in
> ++        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
> ++      esac
> ++      # PO directories have a Makefile.in generated from Makefile.in.in.
> ++      case "$ac_file" in */Makefile.in)
> ++        # Adjust a relative srcdir.
> ++        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
> ++        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
> ++        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
> ++        # In autoconf-2.13 it is called $ac_given_srcdir.
> ++        # In autoconf-2.50 it is called $srcdir.
> ++        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
> ++        case "$ac_given_srcdir" in
> ++          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
> ++          /*) top_srcdir="$ac_given_srcdir" ;;
> ++          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
> ++        esac
> ++        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
> ++          rm -f "$ac_dir/POTFILES"
> ++          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
> ++          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
> ++          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
> ++          # on $ac_dir but don't depend on user-specified configuration
> ++          # parameters.
> ++          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> ++            # The LINGUAS file contains the set of available languages.
> ++            if test -n "$ALL_LINGUAS"; then
> ++              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
> ++            fi
> ++            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> ++            # Hide the ALL_LINGUAS assigment from automake.
> ++            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> ++          fi
> ++          case "$ac_given_srcdir" in
> ++            .) srcdirpre= ;;
> ++            *) srcdirpre='$(srcdir)/' ;;
> ++          esac
> ++          POFILES=
> ++          GMOFILES=
> ++          UPDATEPOFILES=
> ++          DUMMYPOFILES=
> ++          for lang in $ALL_LINGUAS; do
> ++            POFILES="$POFILES $srcdirpre$lang.po"
> ++            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
> ++            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
> ++            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
> ++          done
> ++          # CATALOGS depends on both $ac_dir and the user's LINGUAS
> ++          # environment variable.
> ++          INST_LINGUAS=
> ++          if test -n "$ALL_LINGUAS"; then
> ++            for presentlang in $ALL_LINGUAS; do
> ++              useit=no
> ++              if test "%UNSET%" != "$LINGUAS"; then
> ++                desiredlanguages="$LINGUAS"
> ++              else
> ++                desiredlanguages="$ALL_LINGUAS"
> ++              fi
> ++              for desiredlang in $desiredlanguages; do
> ++                # Use the presentlang catalog if desiredlang is
> ++                #   a. equal to presentlang, or
> ++                #   b. a variant of presentlang (because in this case,
> ++                #      presentlang can be used as a fallback for messages
> ++                #      which are not translated in the desiredlang catalog).
> ++                case "$desiredlang" in
> ++                  "$presentlang"*) useit=yes;;
> ++                esac
> ++              done
> ++              if test $useit = yes; then
> ++                INST_LINGUAS="$INST_LINGUAS $presentlang"
> ++              fi
> ++            done
> ++          fi
> ++          CATALOGS=
> ++          if test -n "$INST_LINGUAS"; then
> ++            for lang in $INST_LINGUAS; do
> ++              CATALOGS="$CATALOGS $lang.gmo"
> ++            done
> ++          fi
> ++          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
> ++          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"
> ++          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
> ++            if test -f "$f"; then
> ++              case "$f" in
> ++                *.orig | *.bak | *~) ;;
> ++                *) cat "$f" >> "$ac_dir/Makefile" ;;
> ++              esac
> ++            fi
> ++          done
> ++        fi
> ++        ;;
> ++      esac
> ++    done],
> ++   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
> ++    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
> ++    # from automake.
> ++    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
> ++    # Capture the value of LINGUAS because we need it to compute CATALOGS.
> ++    LINGUAS="${LINGUAS-%UNSET%}"
> ++   ])
> ++])
> ++
> ++
> ++dnl Checks for all prerequisites of the intl subdirectory,
> ++dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
> ++dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
> ++AC_DEFUN([AM_INTL_SUBDIR],
> ++[
> ++  AC_REQUIRE([AC_PROG_INSTALL])dnl
> ++  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
> ++  AC_REQUIRE([AC_PROG_CC])dnl
> ++  AC_REQUIRE([AC_CANONICAL_HOST])dnl
> ++  AC_REQUIRE([AC_PROG_RANLIB])dnl
> ++  AC_REQUIRE([AC_ISC_POSIX])dnl
> ++  AC_REQUIRE([AC_HEADER_STDC])dnl
> ++  AC_REQUIRE([AC_C_CONST])dnl
> ++  AC_REQUIRE([AC_C_INLINE])dnl
> ++  AC_REQUIRE([AC_TYPE_OFF_T])dnl
> ++  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
> ++  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
> ++  AC_REQUIRE([AC_FUNC_MMAP])dnl
> ++  AC_REQUIRE([jm_GLIBC21])dnl
> ++  AC_REQUIRE([gt_INTDIV0])dnl
> ++  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
> ++  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
> ++  AC_REQUIRE([gt_INTTYPES_PRI])dnl
> ++
> ++  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
> ++stdlib.h string.h unistd.h sys/param.h])
> ++  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
> ++geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
> ++strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
> ++
> ++  AM_ICONV
> ++  AM_LANGINFO_CODESET
> ++  if test $ac_cv_header_locale_h = yes; then
> ++    AM_LC_MESSAGES
> ++  fi
> ++
> ++  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
> ++  dnl because plural.y uses bison specific features. It requires at least
> ++  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
> ++  dnl compile.
> ++  dnl bison is only needed for the maintainer (who touches plural.y). But in
> ++  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
> ++  dnl the rule in general Makefile. Now, some people carelessly touch the
> ++  dnl files or have a broken "make" program, hence the plural.c rule will
> ++  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
> ++  dnl present or too old.
> ++  AC_CHECK_PROGS([INTLBISON], [bison])
> ++  if test -z "$INTLBISON"; then
> ++    ac_verc_fail=yes
> ++  else
> ++    dnl Found it, now check the version.
> ++    AC_MSG_CHECKING([version of bison])
> ++changequote(<<,>>)dnl
> ++    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
> ++    case $ac_prog_version in
> ++      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
> ++      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
> ++changequote([,])dnl
> ++         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
> ++      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
> ++    esac
> ++    AC_MSG_RESULT([$ac_prog_version])
> ++  fi
> ++  if test $ac_verc_fail = yes; then
> ++    INTLBISON=:
> ++  fi
> ++])
> ++
> ++
> ++AC_DEFUN([AM_MKINSTALLDIRS],
> ++[
> ++  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
> ++  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
> ++  dnl Try to locate is.
> ++  MKINSTALLDIRS=
> ++  if test -n "$ac_aux_dir"; then
> ++    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
> ++  fi
> ++  if test -z "$MKINSTALLDIRS"; then
> ++    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
> ++  fi
> ++  AC_SUBST(MKINSTALLDIRS)
> ++])
> ++
> ++
> ++dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
> ++AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/glibc21.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,32 @@
> ++# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
> ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++# Test for the GNU C Library, version 2.1 or newer.
> ++# From Bruno Haible.
> ++
> ++AC_DEFUN([jm_GLIBC21],
> ++  [
> ++    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
> ++      ac_cv_gnu_library_2_1,
> ++      [AC_EGREP_CPP([Lucky GNU user],
> ++	[
> ++#include <features.h>
> ++#ifdef __GNU_LIBRARY__
> ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
> ++  Lucky GNU user
> ++ #endif
> ++#endif
> ++	],
> ++	ac_cv_gnu_library_2_1=yes,
> ++	ac_cv_gnu_library_2_1=no)
> ++      ]
> ++    )
> ++    AC_SUBST(GLIBC21)
> ++    GLIBC21="$ac_cv_gnu_library_2_1"
> ++  ]
> ++)
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/iconv.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,103 @@
> ++# iconv.m4 serial AM4 (gettext-0.11.3)
> ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Bruno Haible.
> ++
> ++AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
> ++[
> ++  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
> ++  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> ++  AC_REQUIRE([AC_LIB_RPATH])
> ++
> ++  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
> ++  dnl accordingly.
> ++  AC_LIB_LINKFLAGS_BODY([iconv])
> ++])
> ++
> ++AC_DEFUN([AM_ICONV_LINK],
> ++[
> ++  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
> ++  dnl those with the standalone portable GNU libiconv installed).
> ++
> ++  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
> ++  dnl accordingly.
> ++  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
> ++
> ++  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
> ++  dnl because if the user has installed libiconv and not disabled its use
> ++  dnl via --without-libiconv-prefix, he wants to use it. The first
> ++  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
> ++  am_save_CPPFLAGS="$CPPFLAGS"
> ++  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
> ++
> ++  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
> ++    am_cv_func_iconv="no, consider installing GNU libiconv"
> ++    am_cv_lib_iconv=no
> ++    AC_TRY_LINK([#include <stdlib.h>
> ++#include <iconv.h>],
> ++      [iconv_t cd = iconv_open("","");
> ++       iconv(cd,NULL,NULL,NULL,NULL);
> ++       iconv_close(cd);],
> ++      am_cv_func_iconv=yes)
> ++    if test "$am_cv_func_iconv" != yes; then
> ++      am_save_LIBS="$LIBS"
> ++      LIBS="$LIBS $LIBICONV"
> ++      AC_TRY_LINK([#include <stdlib.h>
> ++#include <iconv.h>],
> ++        [iconv_t cd = iconv_open("","");
> ++         iconv(cd,NULL,NULL,NULL,NULL);
> ++         iconv_close(cd);],
> ++        am_cv_lib_iconv=yes
> ++        am_cv_func_iconv=yes)
> ++      LIBS="$am_save_LIBS"
> ++    fi
> ++  ])
> ++  if test "$am_cv_func_iconv" = yes; then
> ++    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
> ++  fi
> ++  if test "$am_cv_lib_iconv" = yes; then
> ++    AC_MSG_CHECKING([how to link with libiconv])
> ++    AC_MSG_RESULT([$LIBICONV])
> ++  else
> ++    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
> ++    dnl either.
> ++    CPPFLAGS="$am_save_CPPFLAGS"
> ++    LIBICONV=
> ++    LTLIBICONV=
> ++  fi
> ++  AC_SUBST(LIBICONV)
> ++  AC_SUBST(LTLIBICONV)
> ++])
> ++
> ++AC_DEFUN([AM_ICONV],
> ++[
> ++  AM_ICONV_LINK
> ++  if test "$am_cv_func_iconv" = yes; then
> ++    AC_MSG_CHECKING([for iconv declaration])
> ++    AC_CACHE_VAL(am_cv_proto_iconv, [
> ++      AC_TRY_COMPILE([
> ++#include <stdlib.h>
> ++#include <iconv.h>
> ++extern
> ++#ifdef __cplusplus
> ++"C"
> ++#endif
> ++#if defined(__STDC__) || defined(__cplusplus)
> ++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
> ++#else
> ++size_t iconv();
> ++#endif
> ++], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
> ++      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);"])
> ++    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
> ++    AC_MSG_RESULT([$]{ac_t:-
> ++         }[$]am_cv_proto_iconv)
> ++    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
> ++      [Define as const if the declaration of iconv() needs const.])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/intdiv0.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,72 @@
> ++# intdiv0.m4 serial 1 (gettext-0.11.3)
> ++dnl Copyright (C) 2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Bruno Haible.
> ++
> ++AC_DEFUN([gt_INTDIV0],
> ++[
> ++  AC_REQUIRE([AC_PROG_CC])dnl
> ++  AC_REQUIRE([AC_CANONICAL_HOST])dnl
> ++
> ++  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
> ++    gt_cv_int_divbyzero_sigfpe,
> ++    [
> ++      AC_TRY_RUN([
> ++#include <stdlib.h>
> ++#include <signal.h>
> ++
> ++static void
> ++#ifdef __cplusplus
> ++sigfpe_handler (int sig)
> ++#else
> ++sigfpe_handler (sig) int sig;
> ++#endif
> ++{
> ++  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
> ++  exit (sig != SIGFPE);
> ++}
> ++
> ++int x = 1;
> ++int y = 0;
> ++int z;
> ++int nan;
> ++
> ++int main ()
> ++{
> ++  signal (SIGFPE, sigfpe_handler);
> ++/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
> ++#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
> ++  signal (SIGTRAP, sigfpe_handler);
> ++#endif
> ++/* Linux/SPARC yields signal SIGILL.  */
> ++#if defined (__sparc__) && defined (__linux__)
> ++  signal (SIGILL, sigfpe_handler);
> ++#endif
> ++
> ++  z = x / y;
> ++  nan = y / y;
> ++  exit (1);
> ++}
> ++], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
> ++        [
> ++          # Guess based on the CPU.
> ++          case "$host_cpu" in
> ++            alpha* | i[34567]86 | m68k | s390*)
> ++              gt_cv_int_divbyzero_sigfpe="guessing yes";;
> ++            *)
> ++              gt_cv_int_divbyzero_sigfpe="guessing no";;
> ++          esac
> ++        ])
> ++    ])
> ++  case "$gt_cv_int_divbyzero_sigfpe" in
> ++    *yes) value=1;;
> ++    *) value=0;;
> ++  esac
> ++  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
> ++    [Define if integer division by zero raises signal SIGFPE.])
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/inttypes_h.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,28 @@
> ++# inttypes_h.m4 serial 4 (gettext-0.11.4)
> ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Paul Eggert.
> ++
> ++# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
> ++# doesn't clash with <sys/types.h>, and declares uintmax_t.
> ++
> ++AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
> ++[
> ++  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
> ++  [AC_TRY_COMPILE(
> ++    [#include <sys/types.h>
> ++#include <inttypes.h>],
> ++    [uintmax_t i = (uintmax_t) -1;],
> ++    jm_ac_cv_header_inttypes_h=yes,
> ++    jm_ac_cv_header_inttypes_h=no)])
> ++  if test $jm_ac_cv_header_inttypes_h = yes; then
> ++    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
> ++[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
> ++   and declares uintmax_t. ])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/inttypes.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,27 @@
> ++# inttypes.m4 serial 1 (gettext-0.11.4)
> ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Paul Eggert.
> ++
> ++# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
> ++# <sys/types.h>.
> ++
> ++AC_DEFUN([gt_HEADER_INTTYPES_H],
> ++[
> ++  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
> ++  [
> ++    AC_TRY_COMPILE(
> ++      [#include <sys/types.h>
> ++#include <inttypes.h>],
> ++      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
> ++  ])
> ++  if test $gt_cv_header_inttypes_h = yes; then
> ++    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
> ++      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/inttypes-pri.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,32 @@
> ++# inttypes-pri.m4 serial 1 (gettext-0.11.4)
> ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Bruno Haible.
> ++
> ++# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
> ++# macros to non-string values.  This is the case on AIX 4.3.3.
> ++
> ++AC_DEFUN([gt_INTTYPES_PRI],
> ++[
> ++  AC_REQUIRE([gt_HEADER_INTTYPES_H])
> ++  if test $gt_cv_header_inttypes_h = yes; then
> ++    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
> ++      gt_cv_inttypes_pri_broken,
> ++      [
> ++        AC_TRY_COMPILE([#include <inttypes.h>
> ++#ifdef PRId32
> ++char *p = PRId32;
> ++#endif
> ++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
> ++      ])
> ++  fi
> ++  if test "$gt_cv_inttypes_pri_broken" = yes; then
> ++    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
> ++      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/lcmessage.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,32 @@
> ++# lcmessage.m4 serial 3 (gettext-0.11.3)
> ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++dnl
> ++dnl This file can can be used in projects which are not available under
> ++dnl the GNU General Public License or the GNU Library General Public
> ++dnl License but which still want to provide support for the GNU gettext
> ++dnl functionality.
> ++dnl Please note that the actual code of the GNU gettext library is covered
> ++dnl by the GNU Library General Public License, and the rest of the GNU
> ++dnl gettext package package is covered by the GNU General Public License.
> ++dnl They are *not* in the public domain.
> ++
> ++dnl Authors:
> ++dnl   Ulrich Drepper <drepper at cygnus.com>, 1995.
> ++
> ++# Check whether LC_MESSAGES is available in <locale.h>.
> ++
> ++AC_DEFUN([AM_LC_MESSAGES],
> ++[
> ++  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
> ++    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
> ++       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
> ++  if test $am_cv_val_LC_MESSAGES = yes; then
> ++    AC_DEFINE(HAVE_LC_MESSAGES, 1,
> ++      [Define if your <locale.h> file defines LC_MESSAGES.])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/progtest.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,59 @@
> ++# progtest.m4 serial 2 (gettext-0.10.40)
> ++dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++dnl
> ++dnl This file can can be used in projects which are not available under
> ++dnl the GNU General Public License or the GNU Library General Public
> ++dnl License but which still want to provide support for the GNU gettext
> ++dnl functionality.
> ++dnl Please note that the actual code of the GNU gettext library is covered
> ++dnl by the GNU Library General Public License, and the rest of the GNU
> ++dnl gettext package package is covered by the GNU General Public License.
> ++dnl They are *not* in the public domain.
> ++
> ++dnl Authors:
> ++dnl   Ulrich Drepper <drepper at cygnus.com>, 1996.
> ++
> ++# Search path for a program which passes the given test.
> ++
> ++dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
> ++dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
> ++AC_DEFUN([AM_PATH_PROG_WITH_TEST],
> ++[# Extract the first word of "$2", so it can be a program name with args.
> ++set dummy $2; ac_word=[$]2
> ++AC_MSG_CHECKING([for $ac_word])
> ++AC_CACHE_VAL(ac_cv_path_$1,
> ++[case "[$]$1" in
> ++  /*)
> ++  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
> ++  ;;
> ++  *)
> ++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
> ++  for ac_dir in ifelse([$5], , $PATH, [$5]); do
> ++    test -z "$ac_dir" && ac_dir=.
> ++    if test -f $ac_dir/$ac_word; then
> ++      if [$3]; then
> ++	ac_cv_path_$1="$ac_dir/$ac_word"
> ++	break
> ++      fi
> ++    fi
> ++  done
> ++  IFS="$ac_save_ifs"
> ++dnl If no 4th arg is given, leave the cache variable unset,
> ++dnl so AC_PATH_PROGS will keep looking.
> ++ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
> ++])dnl
> ++  ;;
> ++esac])dnl
> ++$1="$ac_cv_path_$1"
> ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
> ++  AC_MSG_RESULT([$]$1)
> ++else
> ++  AC_MSG_RESULT(no)
> ++fi
> ++AC_SUBST($1)dnl
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/stdint_h.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,28 @@
> ++# stdint_h.m4 serial 2 (gettext-0.11.4)
> ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Paul Eggert.
> ++
> ++# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
> ++# doesn't clash with <sys/types.h>, and declares uintmax_t.
> ++
> ++AC_DEFUN([jm_AC_HEADER_STDINT_H],
> ++[
> ++  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
> ++  [AC_TRY_COMPILE(
> ++    [#include <sys/types.h>
> ++#include <stdint.h>],
> ++    [uintmax_t i = (uintmax_t) -1;],
> ++    jm_ac_cv_header_stdint_h=yes,
> ++    jm_ac_cv_header_stdint_h=no)])
> ++  if test $jm_ac_cv_header_stdint_h = yes; then
> ++    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
> ++[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
> ++   and declares uintmax_t. ])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/uintmax_t.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,29 @@
> ++# uintmax_t.m4 serial 6 (gettext-0.11)
> ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Paul Eggert.
> ++
> ++AC_PREREQ(2.13)
> ++
> ++# Define uintmax_t to `unsigned long' or `unsigned long long'
> ++# if <inttypes.h> does not exist.
> ++
> ++AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
> ++[
> ++  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
> ++  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
> ++  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
> ++    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
> ++    test $ac_cv_type_unsigned_long_long = yes \
> ++      && ac_type='unsigned long long' \
> ++      || ac_type='unsigned long'
> ++    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
> ++  [Define to unsigned long or unsigned long long
> ++   if <inttypes.h> and <stdint.h> don't define.])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/ulonglong.m4	2004-01-20 03:01:28.000000000 -0500
> +@@ -0,0 +1,23 @@
> ++# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
> ++dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Paul Eggert.
> ++
> ++AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
> ++[
> ++  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
> ++  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
> ++    [unsigned long long ullmax = (unsigned long long) -1;
> ++     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
> ++    ac_cv_type_unsigned_long_long=yes,
> ++    ac_cv_type_unsigned_long_long=no)])
> ++  if test $ac_cv_type_unsigned_long_long = yes; then
> ++    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
> ++      [Define if you have the unsigned long long type.])
> ++  fi
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/lib-ld.m4	2004-01-20 03:02:17.000000000 -0500
> +@@ -0,0 +1,97 @@
> ++# lib-ld.m4 serial 1 (gettext-0.11)
> ++dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl Subroutines of libtool.m4,
> ++dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
> ++dnl with libtool.m4.
> ++
> ++dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
> ++AC_DEFUN([AC_LIB_PROG_LD_GNU],
> ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
> ++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
> ++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
> ++  acl_cv_prog_gnu_ld=yes
> ++else
> ++  acl_cv_prog_gnu_ld=no
> ++fi])
> ++with_gnu_ld=$acl_cv_prog_gnu_ld
> ++])
> ++
> ++dnl From libtool-1.4. Sets the variable LD.
> ++AC_DEFUN([AC_LIB_PROG_LD],
> ++[AC_ARG_WITH(gnu-ld,
> ++[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
> ++test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
> ++AC_REQUIRE([AC_PROG_CC])dnl
> ++AC_REQUIRE([AC_CANONICAL_HOST])dnl
> ++ac_prog=ld
> ++if test "$GCC" = yes; then
> ++  # Check if gcc -print-prog-name=ld gives a path.
> ++  AC_MSG_CHECKING([for ld used by GCC])
> ++  case $host in
> ++  *-*-mingw*)
> ++    # gcc leaves a trailing carriage return which upsets mingw
> ++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
> ++  *)
> ++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
> ++  esac
> ++  case $ac_prog in
> ++    # Accept absolute paths.
> ++    [[\\/]* | [A-Za-z]:[\\/]*)]
> ++      [re_direlt='/[^/][^/]*/\.\./']
> ++      # Canonicalize the path of ld
> ++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
> ++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
> ++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
> ++      done
> ++      test -z "$LD" && LD="$ac_prog"
> ++      ;;
> ++  "")
> ++    # If it fails, then pretend we aren't using GCC.
> ++    ac_prog=ld
> ++    ;;
> ++  *)
> ++    # If it is relative, then search for the first ld in PATH.
> ++    with_gnu_ld=unknown
> ++    ;;
> ++  esac
> ++elif test "$with_gnu_ld" = yes; then
> ++  AC_MSG_CHECKING([for GNU ld])
> ++else
> ++  AC_MSG_CHECKING([for non-GNU ld])
> ++fi
> ++AC_CACHE_VAL(acl_cv_path_LD,
> ++[if test -z "$LD"; then
> ++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> ++  for ac_dir in $PATH; do
> ++    test -z "$ac_dir" && ac_dir=.
> ++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
> ++      acl_cv_path_LD="$ac_dir/$ac_prog"
> ++      # Check to see if the program is GNU ld.  I'd rather use --version,
> ++      # but apparently some GNU ld's only accept -v.
> ++      # Break only if it was the GNU/non-GNU ld that we prefer.
> ++      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
> ++	test "$with_gnu_ld" != no && break
> ++      else
> ++	test "$with_gnu_ld" != yes && break
> ++      fi
> ++    fi
> ++  done
> ++  IFS="$ac_save_ifs"
> ++else
> ++  acl_cv_path_LD="$LD" # Let the user override the test with a path.
> ++fi])
> ++LD="$acl_cv_path_LD"
> ++if test -n "$LD"; then
> ++  AC_MSG_RESULT($LD)
> ++else
> ++  AC_MSG_RESULT(no)
> ++fi
> ++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
> ++AC_LIB_PROG_LD_GNU
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/lib-link.m4	2004-01-20 03:02:17.000000000 -0500
> +@@ -0,0 +1,554 @@
> ++# lib-link.m4 serial 3 (gettext-0.11.3)
> ++dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Bruno Haible.
> ++
> ++dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
> ++dnl the libraries corresponding to explicit and implicit dependencies.
> ++dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
> ++dnl augments the CPPFLAGS variable.
> ++AC_DEFUN([AC_LIB_LINKFLAGS],
> ++[
> ++  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> ++  AC_REQUIRE([AC_LIB_RPATH])
> ++  define([Name],[translit([$1],[./-], [___])])
> ++  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
> ++    AC_LIB_LINKFLAGS_BODY([$1], [$2])
> ++    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
> ++    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
> ++    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
> ++  ])
> ++  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
> ++  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
> ++  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
> ++  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
> ++  AC_SUBST([LIB]NAME)
> ++  AC_SUBST([LTLIB]NAME)
> ++  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
> ++  dnl results of this search when this library appears as a dependency.
> ++  HAVE_LIB[]NAME=yes
> ++  undefine([Name])
> ++  undefine([NAME])
> ++])
> ++
> ++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
> ++dnl searches for libname and the libraries corresponding to explicit and
> ++dnl implicit dependencies, together with the specified include files and
> ++dnl the ability to compile and link the specified testcode. If found, it
> ++dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
> ++dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
> ++dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
> ++dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
> ++AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
> ++[
> ++  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> ++  AC_REQUIRE([AC_LIB_RPATH])
> ++  define([Name],[translit([$1],[./-], [___])])
> ++  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++
> ++  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
> ++  dnl accordingly.
> ++  AC_LIB_LINKFLAGS_BODY([$1], [$2])
> ++
> ++  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
> ++  dnl because if the user has installed lib[]Name and not disabled its use
> ++  dnl via --without-lib[]Name-prefix, he wants to use it.
> ++  ac_save_CPPFLAGS="$CPPFLAGS"
> ++  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
> ++
> ++  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
> ++    ac_save_LIBS="$LIBS"
> ++    LIBS="$LIBS $LIB[]NAME"
> ++    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
> ++    LIBS="$ac_save_LIBS"
> ++  ])
> ++  if test "$ac_cv_lib[]Name" = yes; then
> ++    HAVE_LIB[]NAME=yes
> ++    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
> ++    AC_MSG_CHECKING([how to link with lib[]$1])
> ++    AC_MSG_RESULT([$LIB[]NAME])
> ++  else
> ++    HAVE_LIB[]NAME=no
> ++    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
> ++    dnl $INC[]NAME either.
> ++    CPPFLAGS="$ac_save_CPPFLAGS"
> ++    LIB[]NAME=
> ++    LTLIB[]NAME=
> ++  fi
> ++  AC_SUBST([HAVE_LIB]NAME)
> ++  AC_SUBST([LIB]NAME)
> ++  AC_SUBST([LTLIB]NAME)
> ++  undefine([Name])
> ++  undefine([NAME])
> ++])
> ++
> ++dnl Determine the platform dependent parameters needed to use rpath:
> ++dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
> ++dnl hardcode_direct, hardcode_minus_L,
> ++dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
> ++AC_DEFUN([AC_LIB_RPATH],
> ++[
> ++  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
> ++  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
> ++  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
> ++  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
> ++  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
> ++    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
> ++    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
> ++    . ./conftest.sh
> ++    rm -f ./conftest.sh
> ++    acl_cv_rpath=done
> ++  ])
> ++  wl="$acl_cv_wl"
> ++  libext="$acl_cv_libext"
> ++  shlibext="$acl_cv_shlibext"
> ++  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
> ++  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
> ++  hardcode_direct="$acl_cv_hardcode_direct"
> ++  hardcode_minus_L="$acl_cv_hardcode_minus_L"
> ++  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
> ++  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
> ++  dnl Determine whether the user wants rpath handling at all.
> ++  AC_ARG_ENABLE(rpath,
> ++    [  --disable-rpath         do not hardcode runtime library paths],
> ++    :, enable_rpath=yes)
> ++])
> ++
> ++dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
> ++dnl the libraries corresponding to explicit and implicit dependencies.
> ++dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
> ++AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
> ++[
> ++  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
> ++                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
> ++  dnl By default, look in $includedir and $libdir.
> ++  use_additional=yes
> ++  AC_LIB_WITH_FINAL_PREFIX([
> ++    eval additional_includedir=\"$includedir\"
> ++    eval additional_libdir=\"$libdir\"
> ++  ])
> ++  AC_ARG_WITH([lib$1-prefix],
> ++[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
> ++  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
> ++[
> ++    if test "X$withval" = "Xno"; then
> ++      use_additional=no
> ++    else
> ++      if test "X$withval" = "X"; then
> ++        AC_LIB_WITH_FINAL_PREFIX([
> ++          eval additional_includedir=\"$includedir\"
> ++          eval additional_libdir=\"$libdir\"
> ++        ])
> ++      else
> ++        additional_includedir="$withval/include"
> ++        additional_libdir="$withval/lib"
> ++      fi
> ++    fi
> ++])
> ++  dnl Search the library and its dependencies in $additional_libdir and
> ++  dnl $LDFLAGS. Using breadth-first-seach.
> ++  LIB[]NAME=
> ++  LTLIB[]NAME=
> ++  INC[]NAME=
> ++  rpathdirs=
> ++  ltrpathdirs=
> ++  names_already_handled=
> ++  names_next_round='$1 $2'
> ++  while test -n "$names_next_round"; do
> ++    names_this_round="$names_next_round"
> ++    names_next_round=
> ++    for name in $names_this_round; do
> ++      already_handled=
> ++      for n in $names_already_handled; do
> ++        if test "$n" = "$name"; then
> ++          already_handled=yes
> ++          break
> ++        fi
> ++      done
> ++      if test -z "$already_handled"; then
> ++        names_already_handled="$names_already_handled $name"
> ++        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
> ++        dnl or AC_LIB_HAVE_LINKFLAGS call.
> ++        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
> ++        eval value=\"\$HAVE_LIB$uppername\"
> ++        if test -n "$value"; then
> ++          if test "$value" = yes; then
> ++            eval value=\"\$LIB$uppername\"
> ++            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
> ++            eval value=\"\$LTLIB$uppername\"
> ++            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
> ++          else
> ++            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
> ++            dnl that this library doesn't exist. So just drop it.
> ++            :
> ++          fi
> ++        else
> ++          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
> ++          dnl and the already constructed $LIBNAME/$LTLIBNAME.
> ++          found_dir=
> ++          found_la=
> ++          found_so=
> ++          found_a=
> ++          if test $use_additional = yes; then
> ++            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
> ++              found_dir="$additional_libdir"
> ++              found_so="$additional_libdir/lib$name.$shlibext"
> ++              if test -f "$additional_libdir/lib$name.la"; then
> ++                found_la="$additional_libdir/lib$name.la"
> ++              fi
> ++            else
> ++              if test -f "$additional_libdir/lib$name.$libext"; then
> ++                found_dir="$additional_libdir"
> ++                found_a="$additional_libdir/lib$name.$libext"
> ++                if test -f "$additional_libdir/lib$name.la"; then
> ++                  found_la="$additional_libdir/lib$name.la"
> ++                fi
> ++              fi
> ++            fi
> ++          fi
> ++          if test "X$found_dir" = "X"; then
> ++            for x in $LDFLAGS $LTLIB[]NAME; do
> ++              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++              case "$x" in
> ++                -L*)
> ++                  dir=`echo "X$x" | sed -e 's/^X-L//'`
> ++                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
> ++                    found_dir="$dir"
> ++                    found_so="$dir/lib$name.$shlibext"
> ++                    if test -f "$dir/lib$name.la"; then
> ++                      found_la="$dir/lib$name.la"
> ++                    fi
> ++                  else
> ++                    if test -f "$dir/lib$name.$libext"; then
> ++                      found_dir="$dir"
> ++                      found_a="$dir/lib$name.$libext"
> ++                      if test -f "$dir/lib$name.la"; then
> ++                        found_la="$dir/lib$name.la"
> ++                      fi
> ++                    fi
> ++                  fi
> ++                  ;;
> ++              esac
> ++              if test "X$found_dir" != "X"; then
> ++                break
> ++              fi
> ++            done
> ++          fi
> ++          if test "X$found_dir" != "X"; then
> ++            dnl Found the library.
> ++            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
> ++            if test "X$found_so" != "X"; then
> ++              dnl Linking with a shared library. We attempt to hardcode its
> ++              dnl directory into the executable's runpath, unless it's the
> ++              dnl standard /usr/lib.
> ++              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
> ++                dnl No hardcoding is needed.
> ++                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> ++              else
> ++                dnl Use an explicit option to hardcode DIR into the resulting
> ++                dnl binary.
> ++                dnl Potentially add DIR to ltrpathdirs.
> ++                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
> ++                haveit=
> ++                for x in $ltrpathdirs; do
> ++                  if test "X$x" = "X$found_dir"; then
> ++                    haveit=yes
> ++                    break
> ++                  fi
> ++                done
> ++                if test -z "$haveit"; then
> ++                  ltrpathdirs="$ltrpathdirs $found_dir"
> ++                fi
> ++                dnl The hardcoding into $LIBNAME is system dependent.
> ++                if test "$hardcode_direct" = yes; then
> ++                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
> ++                  dnl resulting binary.
> ++                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> ++                else
> ++                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
> ++                    dnl Use an explicit option to hardcode DIR into the resulting
> ++                    dnl binary.
> ++                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> ++                    dnl Potentially add DIR to rpathdirs.
> ++                    dnl The rpathdirs will be appended to $LIBNAME at the end.
> ++                    haveit=
> ++                    for x in $rpathdirs; do
> ++                      if test "X$x" = "X$found_dir"; then
> ++                        haveit=yes
> ++                        break
> ++                      fi
> ++                    done
> ++                    if test -z "$haveit"; then
> ++                      rpathdirs="$rpathdirs $found_dir"
> ++                    fi
> ++                  else
> ++                    dnl Rely on "-L$found_dir".
> ++                    dnl But don't add it if it's already contained in the LDFLAGS
> ++                    dnl or the already constructed $LIBNAME
> ++                    haveit=
> ++                    for x in $LDFLAGS $LIB[]NAME; do
> ++                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++                      if test "X$x" = "X-L$found_dir"; then
> ++                        haveit=yes
> ++                        break
> ++                      fi
> ++                    done
> ++                    if test -z "$haveit"; then
> ++                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
> ++                    fi
> ++                    if test "$hardcode_minus_L" != no; then
> ++                      dnl FIXME: Not sure whether we should use
> ++                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
> ++                      dnl here.
> ++                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
> ++                    else
> ++                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
> ++                      dnl here, because this doesn't fit in flags passed to the
> ++                      dnl compiler. So give up. No hardcoding. This affects only
> ++                      dnl very old systems.
> ++                      dnl FIXME: Not sure whether we should use
> ++                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
> ++                      dnl here.
> ++                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
> ++                    fi
> ++                  fi
> ++                fi
> ++              fi
> ++            else
> ++              if test "X$found_a" != "X"; then
> ++                dnl Linking with a static library.
> ++                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
> ++              else
> ++                dnl We shouldn't come here, but anyway it's good to have a
> ++                dnl fallback.
> ++                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
> ++              fi
> ++            fi
> ++            dnl Assume the include files are nearby.
> ++            additional_includedir=
> ++            case "$found_dir" in
> ++              */lib | */lib/)
> ++                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
> ++                additional_includedir="$basedir/include"
> ++                ;;
> ++            esac
> ++            if test "X$additional_includedir" != "X"; then
> ++              dnl Potentially add $additional_includedir to $INCNAME.
> ++              dnl But don't add it
> ++              dnl   1. if it's the standard /usr/include,
> ++              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
> ++              dnl   3. if it's already present in $CPPFLAGS or the already
> ++              dnl      constructed $INCNAME,
> ++              dnl   4. if it doesn't exist as a directory.
> ++              if test "X$additional_includedir" != "X/usr/include"; then
> ++                haveit=
> ++                if test "X$additional_includedir" = "X/usr/local/include"; then
> ++                  if test -n "$GCC"; then
> ++                    case $host_os in
> ++                      linux*) haveit=yes;;
> ++                    esac
> ++                  fi
> ++                fi
> ++                if test -z "$haveit"; then
> ++                  for x in $CPPFLAGS $INC[]NAME; do
> ++                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++                    if test "X$x" = "X-I$additional_includedir"; then
> ++                      haveit=yes
> ++                      break
> ++                    fi
> ++                  done
> ++                  if test -z "$haveit"; then
> ++                    if test -d "$additional_includedir"; then
> ++                      dnl Really add $additional_includedir to $INCNAME.
> ++                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
> ++                    fi
> ++                  fi
> ++                fi
> ++              fi
> ++            fi
> ++            dnl Look for dependencies.
> ++            if test -n "$found_la"; then
> ++              dnl Read the .la file. It defines the variables
> ++              dnl dlname, library_names, old_library, dependency_libs, current,
> ++              dnl age, revision, installed, dlopen, dlpreopen, libdir.
> ++              save_libdir="$libdir"
> ++              case "$found_la" in
> ++                */* | *\\*) . "$found_la" ;;
> ++                *) . "./$found_la" ;;
> ++              esac
> ++              libdir="$save_libdir"
> ++              dnl We use only dependency_libs.
> ++              for dep in $dependency_libs; do
> ++                case "$dep" in
> ++                  -L*)
> ++                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
> ++                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
> ++                    dnl But don't add it
> ++                    dnl   1. if it's the standard /usr/lib,
> ++                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
> ++                    dnl   3. if it's already present in $LDFLAGS or the already
> ++                    dnl      constructed $LIBNAME,
> ++                    dnl   4. if it doesn't exist as a directory.
> ++                    if test "X$additional_libdir" != "X/usr/lib"; then
> ++                      haveit=
> ++                      if test "X$additional_libdir" = "X/usr/local/lib"; then
> ++                        if test -n "$GCC"; then
> ++                          case $host_os in
> ++                            linux*) haveit=yes;;
> ++                          esac
> ++                        fi
> ++                      fi
> ++                      if test -z "$haveit"; then
> ++                        haveit=
> ++                        for x in $LDFLAGS $LIB[]NAME; do
> ++                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++                          if test "X$x" = "X-L$additional_libdir"; then
> ++                            haveit=yes
> ++                            break
> ++                          fi
> ++                        done
> ++                        if test -z "$haveit"; then
> ++                          if test -d "$additional_libdir"; then
> ++                            dnl Really add $additional_libdir to $LIBNAME.
> ++                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
> ++                          fi
> ++                        fi
> ++                        haveit=
> ++                        for x in $LDFLAGS $LTLIB[]NAME; do
> ++                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++                          if test "X$x" = "X-L$additional_libdir"; then
> ++                            haveit=yes
> ++                            break
> ++                          fi
> ++                        done
> ++                        if test -z "$haveit"; then
> ++                          if test -d "$additional_libdir"; then
> ++                            dnl Really add $additional_libdir to $LTLIBNAME.
> ++                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
> ++                          fi
> ++                        fi
> ++                      fi
> ++                    fi
> ++                    ;;
> ++                  -R*)
> ++                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
> ++                    if test "$enable_rpath" != no; then
> ++                      dnl Potentially add DIR to rpathdirs.
> ++                      dnl The rpathdirs will be appended to $LIBNAME at the end.
> ++                      haveit=
> ++                      for x in $rpathdirs; do
> ++                        if test "X$x" = "X$dir"; then
> ++                          haveit=yes
> ++                          break
> ++                        fi
> ++                      done
> ++                      if test -z "$haveit"; then
> ++                        rpathdirs="$rpathdirs $dir"
> ++                      fi
> ++                      dnl Potentially add DIR to ltrpathdirs.
> ++                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
> ++                      haveit=
> ++                      for x in $ltrpathdirs; do
> ++                        if test "X$x" = "X$dir"; then
> ++                          haveit=yes
> ++                          break
> ++                        fi
> ++                      done
> ++                      if test -z "$haveit"; then
> ++                        ltrpathdirs="$ltrpathdirs $dir"
> ++                      fi
> ++                    fi
> ++                    ;;
> ++                  -l*)
> ++                    dnl Handle this in the next round.
> ++                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
> ++                    ;;
> ++                  *.la)
> ++                    dnl Handle this in the next round. Throw away the .la's
> ++                    dnl directory; it is already contained in a preceding -L
> ++                    dnl option.
> ++                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
> ++                    ;;
> ++                  *)
> ++                    dnl Most likely an immediate library name.
> ++                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
> ++                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
> ++                    ;;
> ++                esac
> ++              done
> ++            fi
> ++          else
> ++            dnl Didn't find the library; assume it is in the system directories
> ++            dnl known to the linker and runtime loader. (All the system
> ++            dnl directories known to the linker should also be known to the
> ++            dnl runtime loader, otherwise the system is severely misconfigured.)
> ++            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
> ++            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
> ++          fi
> ++        fi
> ++      fi
> ++    done
> ++  done
> ++  if test "X$rpathdirs" != "X"; then
> ++    if test -n "$hardcode_libdir_separator"; then
> ++      dnl Weird platform: only the last -rpath option counts, the user must
> ++      dnl pass all path elements in one option. We can arrange that for a
> ++      dnl single library, but not when more than one $LIBNAMEs are used.
> ++      alldirs=
> ++      for found_dir in $rpathdirs; do
> ++        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
> ++      done
> ++      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
> ++      acl_save_libdir="$libdir"
> ++      libdir="$alldirs"
> ++      eval flag=\"$hardcode_libdir_flag_spec\"
> ++      libdir="$acl_save_libdir"
> ++      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
> ++    else
> ++      dnl The -rpath options are cumulative.
> ++      for found_dir in $rpathdirs; do
> ++        acl_save_libdir="$libdir"
> ++        libdir="$found_dir"
> ++        eval flag=\"$hardcode_libdir_flag_spec\"
> ++        libdir="$acl_save_libdir"
> ++        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
> ++      done
> ++    fi
> ++  fi
> ++  if test "X$ltrpathdirs" != "X"; then
> ++    dnl When using libtool, the option that works for both libraries and
> ++    dnl executables is -R. The -R options are cumulative.
> ++    for found_dir in $ltrpathdirs; do
> ++      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
> ++    done
> ++  fi
> ++])
> ++
> ++dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
> ++dnl unless already present in VAR.
> ++dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
> ++dnl contains two or three consecutive elements that belong together.
> ++AC_DEFUN([AC_LIB_APPENDTOVAR],
> ++[
> ++  for element in [$2]; do
> ++    haveit=
> ++    for x in $[$1]; do
> ++      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++      if test "X$x" = "X$element"; then
> ++        haveit=yes
> ++        break
> ++      fi
> ++    done
> ++    if test -z "$haveit"; then
> ++      [$1]="${[$1]}${[$1]:+ }$element"
> ++    fi
> ++  done
> ++])
> +--- /dev/null	2003-09-23 18:19:32.000000000 -0400
> ++++ OpenSP-1.5/m4/lib-prefix.m4	2004-01-20 03:02:17.000000000 -0500
> +@@ -0,0 +1,148 @@
> ++# lib-prefix.m4 serial 1 (gettext-0.11)
> ++dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
> ++dnl This file is free software, distributed under the terms of the GNU
> ++dnl General Public License.  As a special exception to the GNU General
> ++dnl Public License, this file may be distributed as part of a program
> ++dnl that contains a configuration script generated by Autoconf, under
> ++dnl the same distribution terms as the rest of that program.
> ++
> ++dnl From Bruno Haible.
> ++
> ++dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
> ++dnl to access previously installed libraries. The basic assumption is that
> ++dnl a user will want packages to use other packages he previously installed
> ++dnl with the same --prefix option.
> ++dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
> ++dnl libraries, but is otherwise very convenient.
> ++AC_DEFUN([AC_LIB_PREFIX],
> ++[
> ++  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
> ++  AC_REQUIRE([AC_PROG_CC])
> ++  AC_REQUIRE([AC_CANONICAL_HOST])
> ++  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
> ++  dnl By default, look in $includedir and $libdir.
> ++  use_additional=yes
> ++  AC_LIB_WITH_FINAL_PREFIX([
> ++    eval additional_includedir=\"$includedir\"
> ++    eval additional_libdir=\"$libdir\"
> ++  ])
> ++  AC_ARG_WITH([lib-prefix],
> ++[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
> ++  --without-lib-prefix    don't search for libraries in includedir and libdir],
> ++[
> ++    if test "X$withval" = "Xno"; then
> ++      use_additional=no
> ++    else
> ++      if test "X$withval" = "X"; then
> ++        AC_LIB_WITH_FINAL_PREFIX([
> ++          eval additional_includedir=\"$includedir\"
> ++          eval additional_libdir=\"$libdir\"
> ++        ])
> ++      else
> ++        additional_includedir="$withval/include"
> ++        additional_libdir="$withval/lib"
> ++      fi
> ++    fi
> ++])
> ++  if test $use_additional = yes; then
> ++    dnl Potentially add $additional_includedir to $CPPFLAGS.
> ++    dnl But don't add it
> ++    dnl   1. if it's the standard /usr/include,
> ++    dnl   2. if it's already present in $CPPFLAGS,
> ++    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
> ++    dnl   4. if it doesn't exist as a directory.
> ++    if test "X$additional_includedir" != "X/usr/include"; then
> ++      haveit=
> ++      for x in $CPPFLAGS; do
> ++        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++        if test "X$x" = "X-I$additional_includedir"; then
> ++          haveit=yes
> ++          break
> ++        fi
> ++      done
> ++      if test -z "$haveit"; then
> ++        if test "X$additional_includedir" = "X/usr/local/include"; then
> ++          if test -n "$GCC"; then
> ++            case $host_os in
> ++              linux*) haveit=yes;;
> ++            esac
> ++          fi
> ++        fi
> ++        if test -z "$haveit"; then
> ++          if test -d "$additional_includedir"; then
> ++            dnl Really add $additional_includedir to $CPPFLAGS.
> ++            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
> ++          fi
> ++        fi
> ++      fi
> ++    fi
> ++    dnl Potentially add $additional_libdir to $LDFLAGS.
> ++    dnl But don't add it
> ++    dnl   1. if it's the standard /usr/lib,
> ++    dnl   2. if it's already present in $LDFLAGS,
> ++    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
> ++    dnl   4. if it doesn't exist as a directory.
> ++    if test "X$additional_libdir" != "X/usr/lib"; then
> ++      haveit=
> ++      for x in $LDFLAGS; do
> ++        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
> ++        if test "X$x" = "X-L$additional_libdir"; then
> ++          haveit=yes
> ++          break
> ++        fi
> ++      done
> ++      if test -z "$haveit"; then
> ++        if test "X$additional_libdir" = "X/usr/local/lib"; then
> ++          if test -n "$GCC"; then
> ++            case $host_os in
> ++              linux*) haveit=yes;;
> ++            esac
> ++          fi
> ++        fi
> ++        if test -z "$haveit"; then
> ++          if test -d "$additional_libdir"; then
> ++            dnl Really add $additional_libdir to $LDFLAGS.
> ++            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
> ++          fi
> ++        fi
> ++      fi
> ++    fi
> ++  fi
> ++])
> ++
> ++dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
> ++dnl acl_final_exec_prefix, containing the values to which $prefix and
> ++dnl $exec_prefix will expand at the end of the configure script.
> ++AC_DEFUN([AC_LIB_PREPARE_PREFIX],
> ++[
> ++  dnl Unfortunately, prefix and exec_prefix get only finally determined
> ++  dnl at the end of configure.
> ++  if test "X$prefix" = "XNONE"; then
> ++    acl_final_prefix="$ac_default_prefix"
> ++  else
> ++    acl_final_prefix="$prefix"
> ++  fi
> ++  if test "X$exec_prefix" = "XNONE"; then
> ++    acl_final_exec_prefix='${prefix}'
> ++  else
> ++    acl_final_exec_prefix="$exec_prefix"
> ++  fi
> ++  acl_save_prefix="$prefix"
> ++  prefix="$acl_final_prefix"
> ++  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
> ++  prefix="$acl_save_prefix"
> ++])
> ++
> ++dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
> ++dnl variables prefix and exec_prefix bound to the values they will have
> ++dnl at the end of the configure script.
> ++AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
> ++[
> ++  acl_save_prefix="$prefix"
> ++  prefix="$acl_final_prefix"
> ++  acl_save_exec_prefix="$exec_prefix"
> ++  exec_prefix="$acl_final_exec_prefix"
> ++  $1
> ++  exec_prefix="$acl_save_exec_prefix"
> ++  prefix="$acl_save_prefix"
> ++])
> diff --git a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
> new file mode 100644
> index 0000000..cc849ca
> --- /dev/null
> +++ b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
> @@ -0,0 +1,15 @@
> +Patch obtained from OpenEmbedded.
> +
> +Signed-off-by: Scott Garman <scott.a.garman at intel.com>
> +Index: OpenSP-1.5/include/RangeMap.cxx
> +===================================================================
> +--- OpenSP-1.5.orig/include/RangeMap.cxx	2000-02-26 03:55:21.000000000 +1100
> ++++ OpenSP-1.5/include/RangeMap.cxx	2007-06-02 11:48:17.000000000 +1000
> +@@ -7,6 +7,7 @@
> + #include "RangeMap.h"
> + #include "ISet.h"
> + #include "types.h"
> ++#include "constant.h"
> + 
> + #ifdef SP_NAMESPACE
> + namespace SP_NAMESPACE {
> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
> new file mode 100644
> index 0000000..bda87cb
> --- /dev/null
> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
> @@ -0,0 +1,27 @@
> +SUMMARY = "An SGML parser"
> +DESCRIPTION = "An SGML parser used by the OpenJade suite of utilities."
> +HOMEPAGE = "http://openjade.sourceforge.net"
> +SECTION = "libs"
> +LICENSE = "BSD"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
> +
> +PR = "r0"
> +
> +# At -Os it encounters calls to some inline functions which are then
> +# not found in any other objects with gcc 4.5
> +FULL_OPTIMIZATION += "-O2"

Not directly related to your patch, but is anyone keeping a list of
recipes which gcc 4.5 smashes with -Os

> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
> +           file://m4.patch \
> +           file://attributevalue.patch \
> +           file://rangmap-fix.patch \
> +           file://fix-docdir.patch"
> +
> +SRC_URI[md5sum] = "87f56e79ae0c20397f4207d61d154303"
> +SRC_URI[sha256sum] = "987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704"
> +
> +S = "${WORKDIR}/OpenSP-${PV}"
> +
> +inherit autotools gettext
> +
> +BBCLASSEXTEND = "native"

-- 
Joshua Lock
        Intel Open Source Technology Centre




More information about the poky mailing list