diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-10-30 23:18:42 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-10-30 23:18:42 +0000 |
| commit | b7df01bd154af9d4063c290c516e64b29ad5a2fd (patch) | |
| tree | 9c8b66aa85425150c331c7686d0b3c128e3037d6 /sysutils/xcdroast/files/patch-aclocal.m4 | |
| parent | 8b5d2ab75a0ee545a32f951ebd0bf5836001b503 (diff) | |
update xcdroast to 0.98.a.15
Notes
Notes:
svn path=/head/; revision=92661
Diffstat (limited to 'sysutils/xcdroast/files/patch-aclocal.m4')
| -rw-r--r-- | sysutils/xcdroast/files/patch-aclocal.m4 | 57 |
1 files changed, 16 insertions, 41 deletions
diff --git a/sysutils/xcdroast/files/patch-aclocal.m4 b/sysutils/xcdroast/files/patch-aclocal.m4 index 5ead686fcb92..1775aee9a56d 100644 --- a/sysutils/xcdroast/files/patch-aclocal.m4 +++ b/sysutils/xcdroast/files/patch-aclocal.m4 @@ -1,43 +1,18 @@ ---- aclocal.m4.orig Wed Jul 17 20:48:30 2002 -+++ aclocal.m4 Thu Jul 18 16:38:49 2002 -@@ -545,7 +545,7 @@ - rm -f conf.gdk_pixbuftest - ]) - --# gettext.m4 serial 13 (gettext-0.11.1) -+# gettext.m4 serial 14 (gettext-0.11.2) - 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 -@@ -689,14 +689,13 @@ - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include <libintl.h> - extern int _nl_msg_cat_cntr; --extern int *_nl_domain_bindings; - 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_domain_bindings + *_nl_expand_alias (0)], -+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. -@@ -704,14 +703,13 @@ - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <libintl.h> +--- aclocal.m4.orig Sun Oct 26 00:51:41 2003 ++++ aclocal.m4 Thu Oct 30 23:28:02 2003 +@@ -1367,9 +1367,13 @@ + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include <libintl.h> extern int _nl_msg_cat_cntr; --extern int *_nl_domain_bindings; - 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_domain_bindings + *_nl_expand_alias (0)], +-extern int *_nl_domain_bindings;], ++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_domain_bindings], +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 + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + |