Skip to content

Commit 3ed1f0c

Browse files
committed
* Makefile.am (EXTRA_DIST): Update.
* nls.m4, progtest.m4: Really add from Gettext 0.17. svn path=/trunk/mono/; revision=113211
1 parent aad4f57 commit 3ed1f0c

File tree

6 files changed

+134
-8
lines changed

6 files changed

+134
-8
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2008-09-17 Raja R Harinath <[email protected]>
2+
3+
* Makefile.am (EXTRA_DIST): Update.
4+
* nls.m4, progtest.m4: Really add from Gettext 0.17.
5+
16
2008-09-15 Raja R Harinath <[email protected]>
27

38
* configure.in (AC_CONFIG_FILES): Put po/mcs/Makefile.in in its

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SUBDIRS = $(po_dirs) $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support d
77
## 'tools' is not normally built
88
DIST_SUBDIRS = po/mcs libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
99

10-
EXTRA_DIST= po.m4 config.rpath gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 progtest.m4 po.m4 mono-uninstalled.pc.in dtrace-prelink.sh build-mingw32.sh LICENSE mkinstalldirs
10+
EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in dtrace-prelink.sh build-mingw32.sh LICENSE mkinstalldirs
1111

1212
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
1313

autogen.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
102102
fi
103103
fi
104104

105-
echo "Running aclocal $ACLOCAL_FLAGS ..."
106-
aclocal $ACLOCAL_FLAGS || {
105+
echo "Running aclocal -I . $ACLOCAL_FLAGS ..."
106+
aclocal -I . $ACLOCAL_FLAGS || {
107107
echo
108108
echo "**Error**: aclocal failed. This may mean that you have not"
109109
echo "installed all of the packages you need, or you may need to"

configure.in

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,16 +389,14 @@ fi
389389
# we do not configure the full gettext, as we consume it dynamically from C#
390390
AM_PO_SUBDIRS
391391

392-
a='@GETTEXT_MACRO'
393-
b='_VERSION@'
394-
c="$a$b"
395392
po_dirs=po/mcs
396-
if grep -q $c $0; then
393+
if grep -q '@GETTEXT_MACRO''_VERSION@' $0; then
397394
po_dirs=
398395
fi
399-
AC_CONFIG_SUBDIRS(po/mcs)
400396
AC_SUBST(po_dirs)
401397

398+
AC_CONFIG_SUBDIRS(po/mcs)
399+
402400
AC_ARG_WITH([libgdiplus],
403401
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to NO)],
404402
[], [with_libgdiplus=installed])

nls.m4

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# nls.m4 serial 3 (gettext-0.15)
2+
dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
3+
dnl This file is free software; the Free Software Foundation
4+
dnl gives unlimited permission to copy and/or distribute it,
5+
dnl with or without modifications, as long as this notice is preserved.
6+
dnl
7+
dnl This file can can be used in projects which are not available under
8+
dnl the GNU General Public License or the GNU Library General Public
9+
dnl License but which still want to provide support for the GNU gettext
10+
dnl functionality.
11+
dnl Please note that the actual code of the GNU gettext library is covered
12+
dnl by the GNU Library General Public License, and the rest of the GNU
13+
dnl gettext package package is covered by the GNU General Public License.
14+
dnl They are *not* in the public domain.
15+
16+
dnl Authors:
17+
dnl Ulrich Drepper <[email protected]>, 1995-2000.
18+
dnl Bruno Haible <[email protected]>, 2000-2003.
19+
20+
AC_PREREQ(2.50)
21+
22+
AC_DEFUN([AM_NLS],
23+
[
24+
AC_MSG_CHECKING([whether NLS is requested])
25+
dnl Default is enabled NLS
26+
AC_ARG_ENABLE(nls,
27+
[ --disable-nls do not use Native Language Support],
28+
USE_NLS=$enableval, USE_NLS=yes)
29+
AC_MSG_RESULT($USE_NLS)
30+
AC_SUBST(USE_NLS)
31+
])

progtest.m4

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# progtest.m4 serial 4 (gettext-0.14.2)
2+
dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
3+
dnl This file is free software; the Free Software Foundation
4+
dnl gives unlimited permission to copy and/or distribute it,
5+
dnl with or without modifications, as long as this notice is preserved.
6+
dnl
7+
dnl This file can can be used in projects which are not available under
8+
dnl the GNU General Public License or the GNU Library General Public
9+
dnl License but which still want to provide support for the GNU gettext
10+
dnl functionality.
11+
dnl Please note that the actual code of the GNU gettext library is covered
12+
dnl by the GNU Library General Public License, and the rest of the GNU
13+
dnl gettext package package is covered by the GNU General Public License.
14+
dnl They are *not* in the public domain.
15+
16+
dnl Authors:
17+
dnl Ulrich Drepper <[email protected]>, 1996.
18+
19+
AC_PREREQ(2.50)
20+
21+
# Search path for a program which passes the given test.
22+
23+
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
24+
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
25+
AC_DEFUN([AM_PATH_PROG_WITH_TEST],
26+
[
27+
# Prepare PATH_SEPARATOR.
28+
# The user is always right.
29+
if test "${PATH_SEPARATOR+set}" != set; then
30+
echo "#! /bin/sh" >conf$$.sh
31+
echo "exit 0" >>conf$$.sh
32+
chmod +x conf$$.sh
33+
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
34+
PATH_SEPARATOR=';'
35+
else
36+
PATH_SEPARATOR=:
37+
fi
38+
rm -f conf$$.sh
39+
fi
40+
41+
# Find out how to test for executable files. Don't use a zero-byte file,
42+
# as systems may use methods other than mode bits to determine executability.
43+
cat >conf$$.file <<_ASEOF
44+
#! /bin/sh
45+
exit 0
46+
_ASEOF
47+
chmod +x conf$$.file
48+
if test -x conf$$.file >/dev/null 2>&1; then
49+
ac_executable_p="test -x"
50+
else
51+
ac_executable_p="test -f"
52+
fi
53+
rm -f conf$$.file
54+
55+
# Extract the first word of "$2", so it can be a program name with args.
56+
set dummy $2; ac_word=[$]2
57+
AC_MSG_CHECKING([for $ac_word])
58+
AC_CACHE_VAL(ac_cv_path_$1,
59+
[case "[$]$1" in
60+
[[\\/]]* | ?:[[\\/]]*)
61+
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
62+
;;
63+
*)
64+
ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
65+
for ac_dir in ifelse([$5], , $PATH, [$5]); do
66+
IFS="$ac_save_IFS"
67+
test -z "$ac_dir" && ac_dir=.
68+
for ac_exec_ext in '' $ac_executable_extensions; do
69+
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
70+
echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
71+
if [$3]; then
72+
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
73+
break 2
74+
fi
75+
fi
76+
done
77+
done
78+
IFS="$ac_save_IFS"
79+
dnl If no 4th arg is given, leave the cache variable unset,
80+
dnl so AC_PATH_PROGS will keep looking.
81+
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
82+
])dnl
83+
;;
84+
esac])dnl
85+
$1="$ac_cv_path_$1"
86+
if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
87+
AC_MSG_RESULT([$]$1)
88+
else
89+
AC_MSG_RESULT(no)
90+
fi
91+
AC_SUBST($1)dnl
92+
])

0 commit comments

Comments
 (0)