]>
Commit | Line | Data |
---|---|---|
1c3db853 MM |
1 | --- gettext-0.11.4/configure.in.orig Thu May 16 19:59:15 2002 |
2 | +++ gettext-0.11.4/configure.in Thu May 16 20:02:24 2002 | |
3 | @@ -10,7 +10,7 @@ | |
4 | AC_PROG_CC | |
5 | AC_PROG_INSTALL | |
6 | AC_PROG_YACC | |
7 | -gt_PROG_LEX | |
8 | +gt_AM_PROG_LEX | |
9 | ||
10 | gt_GCJ | |
11 | if test -n "$HAVE_GCJ"; then | |
12 | @@ -70,7 +70,6 @@ | |
13 | strerror strtoul uname utime utimes]) | |
14 | AC_REPLACE_FUNCS([memset stpcpy strcspn \ | |
15 | strcasecmp strncasecmp strpbrk strstr vasprintf]) | |
abf2458b | 16 | -AM_FUNC_GETLINE |
abf2458b AF |
17 | if test $am_cv_func_working_getline != yes; then |
18 | AC_CHECK_FUNCS(getdelim) | |
19 | fi | |
1c3db853 MM |
20 | @@ -158,16 +158,6 @@ |
21 | ||
22 | EOF | |
23 | ||
24 | -dnl These ought to go away some day. | |
25 | -changequote(,)dnl | |
26 | -LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` | |
27 | -changequote([, ])dnl | |
28 | -AC_SUBST(LTLIBOBJS) | |
29 | -changequote(,)dnl | |
30 | -LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` | |
31 | -changequote([, ])dnl | |
32 | -AC_SUBST(LTALLOCA) | |
33 | - | |
34 | AC_OUTPUT([Makefile \ | |
35 | lib/Makefile lib/javacomp.sh lib/javaexec.sh \ | |
36 | intl/Makefile intl-java/Makefile \ | |
37 | --- gettext-0.11.2/m4/lib-link.m4.orig Tue Apr 9 15:07:04 2002 | |
38 | +++ gettext-0.11.2/m4/lib-link.m4 Thu May 16 20:29:17 2002 | |
39 | @@ -64,7 +64,7 @@ | |
40 | ac_save_CPPFLAGS="$CPPFLAGS" | |
41 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | |
42 | ||
43 | - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ | |
44 | + AC_CACHE_CHECK([for lib[]$1], ac_cv_lib[]Name, [ | |
45 | ac_save_LIBS="$LIBS" | |
46 | LIBS="$LIBS $LIB[]NAME" | |
47 | AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) | |
48 | --- gettext-0.11.2/m4/fnmatch.m4.orig Mon Feb 4 14:32:49 2002 | |
49 | +++ gettext-0.11.2/m4/fnmatch.m4 Thu May 16 20:30:48 2002 | |
50 | @@ -44,7 +44,6 @@ | |
51 | dnl libgettextlib.so. | |
52 | AC_DEFINE([fnmatch], [posix_fnmatch], | |
53 | [Define to a replacement function name for fnmatch().]) | |
54 | - LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}" | |
55 | - AC_SUBST(LIBOBJS) | |
56 | + AC_LIBOBJ([pfnmatch]) | |
57 | fi | |
58 | ]) | |
59 | --- gettext-0.11.2/m4/getline.m4.orig Wed Jan 16 13:19:34 2002 | |
60 | +++ gettext-0.11.2/m4/getline.m4 Thu May 16 20:31:00 2002 | |
61 | @@ -47,7 +47,6 @@ | |
62 | dnl libgettextlib.so. | |
63 | AC_DEFINE([getline], [gnu_getline], | |
64 | [Define to a replacement function name for getline().]) | |
65 | - LIBOBJS="$LIBOBJS getline.${ac_objext}" | |
66 | - AC_SUBST(LIBOBJS) | |
67 | + AC_LIBOBJ([getline]) | |
68 | fi | |
69 | ]) | |
70 | --- gettext-0.11.2/lib/Makefile.am.orig Mon Mar 11 13:19:23 2002 | |
71 | +++ gettext-0.11.2/lib/Makefile.am Thu May 16 20:37:13 2002 | |
72 | @@ -87,8 +87,6 @@ | |
73 | ||
74 | # How to build libgettextlib.la. | |
75 | ||
76 | -libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@ | |
77 | - | |
78 | # Need @LTLIBINTL@ because many source files use gettext(). | |
79 | # Need @LTLIBICONV@ because linebreak.c uses iconv(). | |
80 | libgettextlib_la_LDFLAGS = \ | |
81 | --- gettext-0.11.4/m4/flex.m4.orig Wed Jan 16 13:19:34 2002 | |
82 | +++ gettext-0.11.4/m4/flex.m4 Sun Jul 28 23:25:51 2002 | |
83 | @@ -8,7 +8,7 @@ | |
84 | ||
85 | # Check for flex. | |
86 | ||
87 | -AC_DEFUN([gt_PROG_LEX], | |
88 | +AC_DEFUN([gt_AM_PROG_LEX], | |
89 | [ | |
90 | dnl Don't use AC_PROG_LEX or AM_PROG_LEX; we insist on flex. | |
91 | dnl Thus we don't need LEXLIB. |