|
@@ -11,13 +11,11 @@
|
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
# PARTICULAR PURPOSE.
|
|
|
|
|
|
-# gettext.m4 serial 28 (gettext-0.13)
|
|
|
-dnl Copyright (C) 1995-2003 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.
|
|
|
+# gettext.m4 serial 34 (gettext-0.14.2)
|
|
|
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
|
|
|
+dnl This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
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
|
|
@@ -105,6 +103,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
|
|
|
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
|
])
|
|
|
|
|
|
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
|
|
|
+ gt_INTL_MACOSX
|
|
|
+
|
|
|
dnl Set USE_NLS.
|
|
|
AM_NLS
|
|
|
|
|
@@ -185,9 +186,9 @@ extern
|
|
|
#ifdef __cplusplus
|
|
|
"C"
|
|
|
#endif
|
|
|
-const char *_nl_expand_alias ();],
|
|
|
+const char *_nl_expand_alias (const char *);],
|
|
|
[bindtextdomain ("", "");
|
|
|
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
|
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
|
|
gt_cv_func_gnugettext_libintl=yes,
|
|
|
gt_cv_func_gnugettext_libintl=no)
|
|
|
dnl Now see whether libintl exists and depends on libiconv.
|
|
@@ -206,9 +207,9 @@ extern
|
|
|
#ifdef __cplusplus
|
|
|
"C"
|
|
|
#endif
|
|
|
-const char *_nl_expand_alias ();],
|
|
|
+const char *_nl_expand_alias (const char *);],
|
|
|
[bindtextdomain ("", "");
|
|
|
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
|
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
|
|
[LIBINTL="$LIBINTL $LIBICONV"
|
|
|
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
|
|
gt_cv_func_gnugettext_libintl=yes
|
|
@@ -258,6 +259,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
+ if test -n "$INTL_MACOSX_LIBS"; then
|
|
|
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
|
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
+ dnl Some extra flags are needed during linking.
|
|
|
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
|
|
|
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
AC_DEFINE(ENABLE_NLS, 1,
|
|
@@ -363,6 +373,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
|
AC_REQUIRE([AC_PROG_CC])dnl
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
+ AC_REQUIRE([gt_GLIBC2])dnl
|
|
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
|
AC_REQUIRE([AC_ISC_POSIX])dnl
|
|
|
AC_REQUIRE([AC_HEADER_STDC])dnl
|
|
@@ -371,22 +382,23 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
AC_REQUIRE([AC_C_INLINE])dnl
|
|
|
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
|
|
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
|
|
- AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
|
|
|
+ AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
|
|
|
AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
|
|
|
AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
|
|
|
AC_REQUIRE([gt_TYPE_WINT_T])dnl
|
|
|
- AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
|
|
|
- AC_REQUIRE([jm_AC_HEADER_STDINT_H])
|
|
|
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
|
|
|
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
|
|
|
AC_REQUIRE([gt_TYPE_INTMAX_T])
|
|
|
AC_REQUIRE([gt_PRINTF_POSIX])
|
|
|
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
|
|
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
|
|
- AC_REQUIRE([jm_GLIBC21])dnl
|
|
|
+ AC_REQUIRE([gl_GLIBC21])dnl
|
|
|
AC_REQUIRE([gt_INTDIV0])dnl
|
|
|
- AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
|
|
|
+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
|
|
|
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
|
|
|
AC_REQUIRE([gt_INTTYPES_PRI])dnl
|
|
|
AC_REQUIRE([gl_XSIZE])dnl
|
|
|
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
|
|
|
|
|
|
AC_CHECK_TYPE([ptrdiff_t], ,
|
|
|
[AC_DEFINE([ptrdiff_t], [long],
|
|
@@ -440,7 +452,11 @@ __fsetlocking])
|
|
|
AM_ICONV
|
|
|
AM_LANGINFO_CODESET
|
|
|
if test $ac_cv_header_locale_h = yes; then
|
|
|
- AM_LC_MESSAGES
|
|
|
+ gt_LC_MESSAGES
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -n "$INTL_MACOSX_LIBS"; then
|
|
|
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
|
fi
|
|
|
|
|
|
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
|
@@ -476,6 +492,50 @@ changequote([,])dnl
|
|
|
])
|
|
|
|
|
|
|
|
|
+dnl Checks for special options needed on MacOS X.
|
|
|
+dnl Defines INTL_MACOSX_LIBS.
|
|
|
+AC_DEFUN([gt_INTL_MACOSX],
|
|
|
+[
|
|
|
+ dnl Check for API introduced in MacOS X 10.2.
|
|
|
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
|
|
|
+ gt_cv_func_CFPreferencesCopyAppValue,
|
|
|
+ [gt_save_CPPFLAGS="$CPPFLAGS"
|
|
|
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
|
+ gt_save_LIBS="$LIBS"
|
|
|
+ LIBS="$LIBS -framework CoreFoundation"
|
|
|
+ AC_TRY_LINK([#include <CFPreferences.h>],
|
|
|
+ [CFPreferencesCopyAppValue(NULL, NULL)],
|
|
|
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
|
|
|
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
|
|
|
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
|
+ LIBS="$gt_save_LIBS"])
|
|
|
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
|
|
|
+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
|
|
|
+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
|
|
|
+ fi
|
|
|
+ dnl Check for API introduced in MacOS X 10.3.
|
|
|
+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
|
|
|
+ [gt_save_CPPFLAGS="$CPPFLAGS"
|
|
|
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
|
+ gt_save_LIBS="$LIBS"
|
|
|
+ LIBS="$LIBS -framework CoreFoundation"
|
|
|
+ AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
|
|
|
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
|
|
|
+ [gt_cv_func_CFLocaleCopyCurrent=no])
|
|
|
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
|
+ LIBS="$gt_save_LIBS"])
|
|
|
+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
|
|
+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
|
|
|
+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
|
|
|
+ fi
|
|
|
+ INTL_MACOSX_LIBS=
|
|
|
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
|
|
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
|
|
|
+ fi
|
|
|
+ AC_SUBST([INTL_MACOSX_LIBS])
|
|
|
+])
|
|
|
+
|
|
|
+
|
|
|
dnl gt_CHECK_DECL(FUNC, INCLUDES)
|
|
|
dnl Check whether a function is declared.
|
|
|
AC_DEFUN([gt_CHECK_DECL],
|
|
@@ -501,11 +561,9 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
|
|
|
|
|
|
# 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 This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
|
@@ -605,11 +663,9 @@ size_t iconv();
|
|
|
|
|
|
# lib-ld.m4 serial 3 (gettext-0.13)
|
|
|
dnl Copyright (C) 1996-2003 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 This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
dnl Subroutines of libtool.m4,
|
|
|
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
|
@@ -716,13 +772,11 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
|
AC_LIB_PROG_LD_GNU
|
|
|
])
|
|
|
|
|
|
-# lib-link.m4 serial 4 (gettext-0.12)
|
|
|
-dnl Copyright (C) 2001-2003 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.
|
|
|
+# lib-link.m4 serial 5 (gettext-0.14.2)
|
|
|
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
|
|
+dnl This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
|
@@ -1068,7 +1122,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
|
if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
|
if test -n "$GCC"; then
|
|
|
case $host_os in
|
|
|
- linux*) haveit=yes;;
|
|
|
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
|
esac
|
|
|
fi
|
|
|
fi
|
|
@@ -1117,7 +1171,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
|
if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
|
if test -n "$GCC"; then
|
|
|
case $host_os in
|
|
|
- linux*) haveit=yes;;
|
|
|
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
|
esac
|
|
|
fi
|
|
|
fi
|
|
@@ -1268,13 +1322,11 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
|
|
|
done
|
|
|
])
|
|
|
|
|
|
-# lib-prefix.m4 serial 3 (gettext-0.13)
|
|
|
-dnl Copyright (C) 2001-2003 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.
|
|
|
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
|
|
|
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
|
|
+dnl This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
|
@@ -1341,7 +1393,7 @@ AC_DEFUN([AC_LIB_PREFIX],
|
|
|
if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
|
if test -n "$GCC"; then
|
|
|
case $host_os in
|
|
|
- linux*) haveit=yes;;
|
|
|
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
|
esac
|
|
|
fi
|
|
|
fi
|
|
@@ -1426,11 +1478,9 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
|
|
|
|
|
# nls.m4 serial 1 (gettext-0.12)
|
|
|
dnl Copyright (C) 1995-2003 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 This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
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
|
|
@@ -1474,13 +1524,11 @@ AC_DEFUN([AM_MKINSTALLDIRS],
|
|
|
AC_SUBST(MKINSTALLDIRS)
|
|
|
])
|
|
|
|
|
|
-# po.m4 serial 3 (gettext-0.14)
|
|
|
-dnl Copyright (C) 1995-2003 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.
|
|
|
+# po.m4 serial 5 (gettext-0.14.2)
|
|
|
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
|
|
|
+dnl This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
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
|
|
@@ -1495,6 +1543,8 @@ dnl Authors:
|
|
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
|
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
|
|
|
|
|
+AC_PREREQ(2.50)
|
|
|
+
|
|
|
dnl Checks for all prerequisites of the po subdirectory.
|
|
|
AC_DEFUN([AM_PO_SUBDIRS],
|
|
|
[
|
|
@@ -1510,7 +1560,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|
|
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 &&
|
|
|
+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 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)
|
|
@@ -1519,7 +1569,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|
|
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= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
|
|
|
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
|
|
|
(if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
|
:)
|
|
|
dnl Remove leftover from FreeBSD xgettext call.
|
|
@@ -1527,7 +1577,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
|
|
|
|
|
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], :)
|
|
|
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 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.
|
|
@@ -1824,7 +1874,7 @@ changequote([,])dnl
|
|
|
QMFILES="$QMFILES $srcdirpre$lang.qm"
|
|
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
|
|
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
|
|
|
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
|
|
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
|
|
RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
|
|
|
done
|
|
|
# CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
@@ -1865,7 +1915,7 @@ changequote([,])dnl
|
|
|
QTCATALOGS="$QTCATALOGS $lang.qm"
|
|
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
|
|
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
|
|
|
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
|
|
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
|
|
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
|
|
|
done
|
|
|
fi
|
|
@@ -1885,7 +1935,7 @@ EOF
|
|
|
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
|
|
|
# Add dependencies that cannot be formulated as a simple suffix rule.
|
|
|
for lang in $ALL_LINGUAS; do
|
|
|
- frobbedlang=`echo $lang | sed -e 's/_/-/g'`
|
|
|
+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
|
|
cat >> "$ac_file.tmp" <<EOF
|
|
|
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
|
|
|
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
|
|
@@ -1901,13 +1951,11 @@ EOF
|
|
|
mv "$ac_file.tmp" "$ac_file"
|
|
|
])
|
|
|
|
|
|
-# progtest.m4 serial 3 (gettext-0.12)
|
|
|
-dnl Copyright (C) 1996-2003 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.
|
|
|
+# progtest.m4 serial 4 (gettext-0.14.2)
|
|
|
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
|
|
|
+dnl This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
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
|
|
@@ -1921,6 +1969,8 @@ dnl They are *not* in the public domain.
|
|
|
dnl Authors:
|
|
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
|
|
+AC_PREREQ(2.50)
|
|
|
+
|
|
|
# Search path for a program which passes the given test.
|
|
|
|
|
|
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
|
@@ -1970,6 +2020,7 @@ AC_CACHE_VAL(ac_cv_path_$1,
|
|
|
test -z "$ac_dir" && ac_dir=.
|
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
|
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
|
|
|
+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
|
|
|
if [$3]; then
|
|
|
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
|
|
|
break 2
|