]>
Commit | Line | Data |
---|---|---|
648d859d JB |
1 | --- rpm-4.0.2/configure.in.orig Sat Mar 16 20:30:55 2002 |
2 | +++ rpm-4.0.2/configure.in Sat Mar 16 20:32:13 2002 | |
da6eed38 JB |
3 | @@ -17,8 +17,6 @@ |
4 | dnl Set of available languages. | |
5 | ALL_LINGUAS="cs da de en_RN es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312" | |
6 | ||
7 | -LIBOBJS= | |
8 | - | |
9 | dnl Checks for programs. | |
10 | AC_PROG_CC | |
11 | AC_AIX | |
12 | @@ -452,7 +450,7 @@ | |
13 | done | |
14 | ||
15 | AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()"; | |
16 | - LIBOBJS=fakefork.o]) | |
17 | + AC_LIBOBJ([fakefork])]) | |
18 | ||
19 | dnl AmigaOS and IXEmul have a fork() dummy | |
20 | case "$target" in | |
21 | @@ -489,7 +487,7 @@ | |
22 | AC_CHECK_FUNCS(personality) | |
23 | ||
24 | dnl XXX these are needed only by rpmgettext right now | |
25 | -AM_FUNC_ERROR_AT_LINE | |
26 | +AC_FUNC_ERROR_AT_LINE | |
27 | ||
28 | dnl ==> AM_GNU_GETTEXT does this (and more) | |
29 | dnl AC_CHECK_HEADERS(unistd.h limits.h locale.h malloc.h string.h sys/param.h) | |
30 | @@ -726,7 +724,7 @@ | |
31 | ||
32 | AC_FUNC_FNMATCH | |
33 | if test $ac_cv_func_fnmatch_works = no; then | |
34 | - LIBOBJS="$LIBOBJS fnmatch.o" | |
648d859d | 35 | - AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch) |
da6eed38 | 36 | + AC_LIBOBJ([fnmatch]) |
648d859d | 37 | +dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch) |
da6eed38 | 38 | fi |
648d859d | 39 | |
da6eed38 JB |
40 | @@ -771,7 +769,7 @@ |
41 | dnl | |
42 | dnl if test $rpm_cv_regex = yes; then | |
43 | dnl AC_DEFINE(USE_GNU_REGEX) | |
44 | -dnl LIBOBJS="$LIBOBJS regex.o" | |
648d859d | 45 | +dnl AC_LIBOBJ([regex]) |
da6eed38 JB |
46 | dnl fi |
47 | ||
48 | dnl | |
49 | @@ -810,7 +808,8 @@ | |
50 | ||
51 | if test "$rpm_cv_glob" = yes; then | |
52 | AC_DEFINE(USE_GNU_GLOB) | |
53 | - LIBOBJS="$LIBOBJS glob.o fnmatch.o" | |
648d859d JB |
54 | + AC_LIBOBJ([glob]) |
55 | + AC_LIBOBJ([fnmatch]) | |
da6eed38 JB |
56 | fi |
57 | dnl | |
58 | dnl Auto-detect which python bindings should be built. | |
59 | @@ -899,7 +897,7 @@ | |
60 | AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="$LIBS -lc_r"; | |
61 | AC_DEFINE(HAVE_GETMNTINFO_R)], [ | |
62 | AC_DEFINE([USE_GETMNTENT], 1, [Defined if getmntent replacement is used]) | |
63 | - LIBOBJS="$LIBOBJS getmntent.o"])])])]) | |
64 | + AC_LIBOBJ([getmntent])])])])]) | |
65 | ||
66 | AC_CHECK_FUNC(lchown, | |
67 | [__CHOWN_RHF="%{__chown} -Rhf" | |
68 | @@ -1014,7 +1012,7 @@ | |
69 | CFLAGS="$CFLAGS -D__USE_FIXED_PROTOTYPES__" | |
70 | AC_DEFINE(NEED_STRINGS_H) | |
71 | AC_DEFINE(NEED_MYREALLOC) | |
72 | - LIBOBJS="$LIBOBJS myrealloc.o" | |
73 | + AC_LIBOBJ([myrealloc]) | |
74 | fi | |
75 | ||
76 | # | |
77 | @@ -1103,10 +1101,9 @@ | |
78 | AC_SUBST(RPMCANONVENDOR) | |
79 | AC_SUBST(RPMCANONOS) | |
80 | ||
81 | -if test -n "$LIBOBJS" ; then | |
82 | +if test -n "$LIB@&t@OBJS" ; then | |
83 | LIBMISC='$(top_builddir)/misc/libmisc.a' | |
84 | fi | |
85 | -AC_SUBST(LIBOBJS) | |
86 | AC_SUBST(LIBMISC) | |
87 | ||
88 | if test X"$prefix" = XNONE ; then | |
89 | @@ -1149,7 +1146,7 @@ | |
90 | dnl AC_DEFINE_UNQUOTED(testdir, "$testdir") | |
91 | AC_SUBST(testdir) | |
92 | ||
93 | -if test -n "$LIBOBJS"; then | |
94 | +if test -n "$LIB@&t@OBJS"; then | |
95 | INCPATH="-I\$(top_builddir)/misc $INCPATH" | |
96 | fi | |
97 | AC_SUBST(INCPATH) | |
648d859d JB |
98 | --- rpm-4.0.2/acconfig.h.orig Wed Mar 27 20:25:58 2002 |
99 | +++ rpm-4.0.2/acconfig.h Wed Mar 27 20:33:00 2002 | |
100 | @@ -12,7 +12,7 @@ | |
101 | a given entry is in the file. | |
102 | ||
103 | Leave the following blank line there!! Autoheader needs it. */ | |
104 | -^L | |
105 | +\f | |
106 | ||
107 | /* Define to the name of the distribution. */ | |
108 | #undef PACKAGE | |
109 | @@ -162,7 +162,7 @@ | |
110 | /* Build with dmalloc support? */ | |
111 | #undef DMALLOC | |
112 | ||
113 | -^L | |
114 | +\f | |
115 | /* Leave that blank line there!! Autoheader needs it. | |
116 | If you're adding to this file, keep in mind: | |
117 | The entries are in sort -df order: alphabetical, case insensitive, |