projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 5b0f0ac9 MM |
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 | |
| 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" | |
| 35 | + AC_LIBOBJ([fnmatch]) | |
| 5b0f0ac9 MM |
36 | dnl XXX no expansion needed |
| 37 | dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch) | |
| da6eed38 JB |
38 | fi |
| 39 | @@ -771,7 +769,7 @@ | |
| 40 | dnl | |
| 41 | dnl if test $rpm_cv_regex = yes; then | |
| 42 | dnl AC_DEFINE(USE_GNU_REGEX) | |
| 43 | -dnl LIBOBJS="$LIBOBJS regex.o" | |
| 648d859d | 44 | +dnl AC_LIBOBJ([regex]) |
| da6eed38 JB |
45 | dnl fi |
| 46 | ||
| 47 | dnl | |
| 48 | @@ -810,7 +808,8 @@ | |
| 49 | ||
| 50 | if test "$rpm_cv_glob" = yes; then | |
| 51 | AC_DEFINE(USE_GNU_GLOB) | |
| 52 | - LIBOBJS="$LIBOBJS glob.o fnmatch.o" | |
| 648d859d JB |
53 | + AC_LIBOBJ([glob]) |
| 54 | + AC_LIBOBJ([fnmatch]) | |
| da6eed38 JB |
55 | fi |
| 56 | dnl | |
| 57 | dnl Auto-detect which python bindings should be built. | |
| 58 | @@ -899,7 +897,7 @@ | |
| 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])])])])]) | |
| 64 | ||
| 65 | AC_CHECK_FUNC(lchown, | |
| 66 | [__CHOWN_RHF="%{__chown} -Rhf" | |
| 67 | @@ -1014,7 +1012,7 @@ | |
| 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]) | |
| 73 | fi | |
| 74 | ||
| 75 | # | |
| 76 | @@ -1103,10 +1101,9 @@ | |
| 77 | AC_SUBST(RPMCANONVENDOR) | |
| 78 | AC_SUBST(RPMCANONOS) | |
| 79 | ||
| 80 | -if test -n "$LIBOBJS" ; then | |
| 81 | +if test -n "$LIB@&t@OBJS" ; then | |
| 82 | LIBMISC='$(top_builddir)/misc/libmisc.a' | |
| 83 | fi | |
| 84 | -AC_SUBST(LIBOBJS) | |
| 85 | AC_SUBST(LIBMISC) | |
| 86 | ||
| 87 | if test X"$prefix" = XNONE ; then | |
| 88 | @@ -1149,7 +1146,7 @@ | |
| 89 | dnl AC_DEFINE_UNQUOTED(testdir, "$testdir") | |
| 90 | AC_SUBST(testdir) | |
| 91 | ||
| 92 | -if test -n "$LIBOBJS"; then | |
| 93 | +if test -n "$LIB@&t@OBJS"; then | |
| 94 | INCPATH="-I\$(top_builddir)/misc $INCPATH" | |
| 95 | fi | |
| 96 | AC_SUBST(INCPATH) |