author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 11 Mar 2013 10:38:09 -0700 | |
branch | s11-update |
changeset 2520 | ceec631e74d1 |
parent 327 | b3a36ee93012 |
permissions | -rw-r--r-- |
327
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
1 |
From: Dean Roehrich <[email protected]> |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
2 |
Subject: [Quilt-dev] [patch] allow --with-xgettext and --with-msgfmt |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
3 |
Date: Wed, 05 Nov 2008 20:47:31 CST |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
To: [email protected] |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
I needed to specify the GNU versions of xgettext and msgfmt on solaris, |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
and this was all I could think of to get me there. Anyone have a better |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
way to do this? |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
Dean |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
Index: configure.ac |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
=================================================================== |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
--- configure.ac.orig 2008-11-05 20:57:14.054642000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
+++ configure.ac 2008-11-05 20:57:38.805910000 -0600 |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -342,9 +342,35 @@ fi |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
|
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
21 |
+XGETTEXT=xgettext |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
22 |
+AC_MSG_CHECKING(for xgettext) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
23 |
+AC_ARG_WITH(xgettext, AC_HELP_STRING( |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
+ [--with-xgettext], |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
25 |
+ [name of the xgettext executable to use]), |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
26 |
+ [ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
27 |
+ XGETTEXT=$withval |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
28 |
+ ],[ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
29 |
+ AC_PATH_PROG(XGETTEXT, xgettext) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
30 |
+ ] |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
31 |
+ ) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
32 |
+AC_MSG_RESULT($XGETTEXT) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
33 |
+AC_SUBST(XGETTEXT) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
34 |
+ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
35 |
+MSGFMT=msgfmt |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
36 |
+AC_MSG_CHECKING(for msgfmt) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
37 |
+AC_ARG_WITH(msgfmt, AC_HELP_STRING( |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
38 |
+ [--with-msgfmt], |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
39 |
+ [name of the msgfmt executable to use]), |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
40 |
+ [ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
41 |
+ MSGFMT=$withval |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
42 |
+ ],[ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
43 |
+ AC_PATH_PROG(MSGFMT, msgfmt) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
44 |
+ ] |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
45 |
+ ) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
46 |
+AC_MSG_RESULT($MSGFMT) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
47 |
+AC_SUBST(MSGFMT) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
48 |
+ |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
49 |
AC_PATH_PROG(MSGMERGE, [msgmerge]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
50 |
-AC_PATH_PROG(MSGFMT, [msgfmt]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
51 |
-AC_PATH_PROG(XGETTEXT, [xgettext]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
52 |
AC_PATH_PROG(MSGUNIQ, [msguniq]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
53 |
AC_PATH_PROG(MSGCAT, [msgcat]) |
b3a36ee93012
7057088 move quilt to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
54 |
if test -n "$MSGFMT" -a -n "$MSGMERGE" -a -n "$XGETTEXT" -a -n "$MSGUNIQ" -a -n "$MSGCAT" ; then |