]>
Commit | Line | Data |
---|---|---|
7b6e0df3 JB |
1 | --- gettext-0.11.2/configure.in.orig Thu May 16 19:59:15 2002 |
2 | +++ gettext-0.11.2/configure.in Thu May 16 20:02:24 2002 | |
3 | @@ -40,6 +40,7 @@ | |
4 | ||
5 | dnl Check for build configuration. | |
6 | AM_PROG_LIBTOOL | |
7 | +AM_PROG_LEX | |
8 | ||
9 | AC_DEFINE(_GNU_SOURCE, 1, [Make sure we see all GNU extensions.]) | |
10 | ||
11 | @@ -58,7 +58,7 @@ | |
12 | jm_AC_TYPE_UNSIGNED_LONG_LONG | |
13 | AC_TYPE_OFF_T | |
14 | AC_TYPE_SIZE_T | |
15 | -AM_TYPE_PTRDIFF_T | |
16 | +AC_CHECK_TYPES(ptrdiff_t) | |
17 | jm_AC_TYPE_UINTMAX_T | |
18 | gt_TYPE_SSIZE_T | |
19 | AC_TYPE_PID_T | |
20 | @@ -70,7 +70,6 @@ | |
21 | strerror strtoul uname utime utimes]) | |
22 | AC_REPLACE_FUNCS([memset stpcpy strcspn \ | |
23 | strcasecmp strncasecmp strpbrk strstr vasprintf]) | |
9a524f77 | 24 | -AM_FUNC_GETLINE |
9a524f77 AF |
25 | if test $am_cv_func_working_getline != yes; then |
26 | AC_CHECK_FUNCS(getdelim) | |
27 | fi | |
7b6e0df3 JB |
28 | @@ -135,7 +135,7 @@ |
29 | AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) | |
30 | AC_LANG_SAVE | |
31 | AC_LANG_CPLUSPLUS | |
32 | - AC_TRY_COMPILER([int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) | |
33 | + AC_TRY_COMPILE([],[int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) | |
34 | AC_LANG_RESTORE | |
35 | AC_MSG_RESULT($ac_cv_prog_cxx_works) | |
36 | if test $ac_cv_prog_cxx_works = no; then | |
37 | @@ -158,17 +158,6 @@ | |
38 | ||
39 | EOF | |
40 | ||
41 | -dnl These can be removed when we drop support for autoconf-2.13 and switch | |
42 | -dnl to autoconf-2.52. | |
43 | -changequote(,)dnl | |
44 | -LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` | |
45 | -changequote([, ])dnl | |
46 | -AC_SUBST(LTLIBOBJS) | |
47 | -changequote(,)dnl | |
48 | -LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` | |
49 | -changequote([, ])dnl | |
50 | -AC_SUBST(LTALLOCA) | |
51 | - | |
52 | AC_OUTPUT([Makefile \ | |
53 | lib/Makefile lib/javacomp.sh lib/javaexec.sh \ | |
54 | intl/Makefile intl-java/Makefile \ | |
55 | --- gettext-0.11.2/m4/lib-link.m4.orig Tue Apr 9 15:07:04 2002 | |
56 | +++ gettext-0.11.2/m4/lib-link.m4 Thu May 16 20:29:17 2002 | |
57 | @@ -64,7 +64,7 @@ | |
58 | ac_save_CPPFLAGS="$CPPFLAGS" | |
59 | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | |
60 | ||
61 | - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ | |
62 | + AC_CACHE_CHECK([for lib[]$1], ac_cv_lib[]Name, [ | |
63 | ac_save_LIBS="$LIBS" | |
64 | LIBS="$LIBS $LIB[]NAME" | |
65 | AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) | |
66 | --- gettext-0.11.2/m4/fnmatch.m4.orig Mon Feb 4 14:32:49 2002 | |
67 | +++ gettext-0.11.2/m4/fnmatch.m4 Thu May 16 20:30:48 2002 | |
68 | @@ -44,7 +44,6 @@ | |
69 | dnl libgettextlib.so. | |
70 | AC_DEFINE([fnmatch], [posix_fnmatch], | |
71 | [Define to a replacement function name for fnmatch().]) | |
72 | - LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}" | |
73 | - AC_SUBST(LIBOBJS) | |
74 | + AC_LIBOBJ([pfnmatch]) | |
75 | fi | |
76 | ]) | |
77 | --- gettext-0.11.2/m4/getline.m4.orig Wed Jan 16 13:19:34 2002 | |
78 | +++ gettext-0.11.2/m4/getline.m4 Thu May 16 20:31:00 2002 | |
79 | @@ -47,7 +47,6 @@ | |
80 | dnl libgettextlib.so. | |
81 | AC_DEFINE([getline], [gnu_getline], | |
82 | [Define to a replacement function name for getline().]) | |
83 | - LIBOBJS="$LIBOBJS getline.${ac_objext}" | |
84 | - AC_SUBST(LIBOBJS) | |
85 | + AC_LIBOBJ([getline]) | |
86 | fi | |
87 | ]) | |
88 | --- gettext-0.11.2/lib/Makefile.am.orig Mon Mar 11 13:19:23 2002 | |
89 | +++ gettext-0.11.2/lib/Makefile.am Thu May 16 20:37:13 2002 | |
90 | @@ -87,8 +87,6 @@ | |
91 | ||
92 | # How to build libgettextlib.la. | |
93 | ||
94 | -libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@ | |
95 | - | |
96 | # Need @LTLIBINTL@ because many source files use gettext(). | |
97 | # Need @LTLIBICONV@ because linebreak.c uses iconv(). | |
98 | libgettextlib_la_LDFLAGS = \ |