1 --- rpm-4.0.4/configure.in.orig Sat Mar 16 20:30:55 2002
2 +++ rpm-4.0.4/configure.in Sat Mar 16 20:32:13 2002
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"
9 dnl Checks for programs.
15 AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()";
16 - LIBOBJS=fakefork.o])
17 + AC_LIBOBJ([fakefork])])
19 dnl AmigaOS and IXEmul have a fork() dummy
22 AC_CHECK_FUNCS(personality)
24 dnl XXX these are needed only by rpmgettext right now
25 -AM_FUNC_ERROR_AT_LINE
26 +AC_FUNC_ERROR_AT_LINE
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)
33 if test $ac_cv_func_fnmatch_works = no; then
34 - LIBOBJS="$LIBOBJS fnmatch.o"
35 + AC_LIBOBJ([fnmatch])
36 dnl XXX no expansion needed
37 dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
41 dnl if test $rpm_cv_regex = yes; then
42 dnl AC_DEFINE(USE_GNU_REGEX)
43 -dnl LIBOBJS="$LIBOBJS regex.o"
44 +dnl AC_LIBOBJ([regex.o])
50 if test "$rpm_cv_glob" = yes; then
51 AC_DEFINE(USE_GNU_GLOB)
52 - LIBOBJS="$LIBOBJS glob.o fnmatch.o"
54 + AC_LIBOBJ([fnmatch.o])
57 dnl Auto-detect which python bindings should be built.
59 AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="$LIBS -lc_r";
60 AC_DEFINE(HAVE_GETMNTINFO_R)], [
61 AC_DEFINE([USE_GETMNTENT], 1, [Defined if getmntent replacement is used])
62 - LIBOBJS="$LIBOBJS getmntent.o"])])])])
63 + AC_LIBOBJ([getmntent])])])])])
66 [__CHOWN_RHF="%{__chown} -Rhf"
68 CFLAGS="$CFLAGS -D__USE_FIXED_PROTOTYPES__"
69 AC_DEFINE(NEED_STRINGS_H)
70 AC_DEFINE(NEED_MYREALLOC)
71 - LIBOBJS="$LIBOBJS myrealloc.o"
72 + AC_LIBOBJ([myrealloc])
76 @@ -1103,10 +1101,9 @@
77 AC_SUBST(RPMCANONVENDOR)
80 -if test -n "$LIBOBJS" ; then
81 +if test -n "$LIB@&t@OBJS" ; then
82 LIBMISC='$(top_builddir)/misc/libmisc.a'
87 if test X"$prefix" = XNONE ; then
89 dnl AC_DEFINE_UNQUOTED(testdir, "$testdir")
92 -if test -n "$LIBOBJS"; then
93 +if test -n "$LIB@&t@OBJS"; then
94 INCPATH="-I\$(top_builddir)/misc $INCPATH"