]>
Commit | Line | Data |
---|---|---|
b8dd31f7 JB |
1 | --- recode-3.5d/configure.in.orig Wed Jun 28 16:36:30 2000 |
2 | +++ recode-3.5d/configure.in Mon Jul 29 11:45:34 2002 | |
3 | @@ -32,7 +32,6 @@ | |
4 | ||
5 | jm_FUNC_MALLOC | |
6 | jm_FUNC_REALLOC | |
7 | -AC_SUBST(LIBOBJS) | |
8 | ||
9 | fp_OS_MICROSOFT | |
10 | AC_MSG_CHECKING(the default charset) | |
11 | @@ -52,12 +51,12 @@ | |
12 | ||
13 | # This is necessary so that .o files in LIBOBJS are also built via | |
14 | # the ANSI2KNR-filtering rules. | |
15 | -LIBOBJS=`echo $LIBOBJS | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'` | |
16 | +LIB@&t@OBJS=`echo $LIB@&t@OBJS | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'` | |
17 | ||
18 | LTALLOCA=`echo $ALLOCA | sed 's/\.o/.lo/g'` | |
19 | AC_SUBST(LTALLOCA) | |
20 | -LTLIBOBJS=`echo $LIBOBJS | sed 's/\.o /.lo /g;s/\.o$/.lo/'` | |
21 | -AC_SUBST(LTLIBOBJS) | |
22 | +LTLIB@&t@OBJS=`echo $LIB@&t@OBJS | sed 's/\.o /.lo /g;s/\.o$/.lo/'` | |
23 | +AC_SUBST(LTLIB@&t@OBJS) | |
24 | ||
25 | AC_OUTPUT(Makefile contrib/Makefile doc/Makefile i18n/Makefile lib/Makefile | |
26 | libiconv/Makefile m4/Makefile src/Makefile tests/Makefile tests/atconfig) | |
27 | --- recode-3.5d/acinclude.m4.orig Mon Jul 29 11:42:18 2002 | |
28 | +++ recode-3.5d/acinclude.m4 Mon Jul 29 11:47:01 2002 | |
29 | @@ -120,8 +120,7 @@ | |
30 | jm_cv_func_working_malloc=no) | |
31 | ]) | |
32 | if test $jm_cv_func_working_malloc = no; then | |
33 | - AC_SUBST(LIBOBJS) | |
34 | - LIBOBJS="$LIBOBJS malloc.$ac_objext" | |
35 | + AC_LIBOBJ([malloc]) | |
36 | AC_DEFINE_UNQUOTED(malloc, rpl_malloc, | |
37 | [Define to rpl_malloc if the replacement function should be used.]) | |
38 | fi | |
39 | @@ -156,8 +155,7 @@ | |
40 | jm_cv_func_working_realloc=no) | |
41 | ]) | |
42 | if test $jm_cv_func_working_realloc = no; then | |
43 | - AC_SUBST(LIBOBJS) | |
44 | - LIBOBJS="$LIBOBJS realloc.$ac_objext" | |
45 | + AC_LIBOBJ([realloc]) | |
46 | AC_DEFINE_UNQUOTED(realloc, rpl_realloc, | |
47 | [Define to rpl_realloc if the replacement function should be used.]) | |
48 | fi | |
49 | @@ -255,7 +253,7 @@ | |
50 | with_included_gettext=yes | |
51 | fi | |
52 | if test $with_included_gettext = yes; then | |
53 | - LIBOBJS="$LIBOBJS gettext.o" | |
54 | + AC_LIBOBJ([gettext]) | |
55 | AC_DEFINE(HAVE_GETTEXT) | |
56 | AC_DEFINE(HAVE_DCGETTEXT) | |
57 | else |