]>
Commit | Line | Data |
---|---|---|
639079f5 ER |
1 | --- rpm-4.5/configure.ac~ 2008-04-13 03:20:07.000000000 +0300 |
2 | +++ rpm-4.5/configure.ac 2008-04-13 03:23:45.011443406 +0300 | |
0579a272 | 3 | @@ -1203,7 +1215,7 @@ |
012a8819 AM |
4 | dnl # XXX Propagate -lucb to popt ... |
5 | dnl export LIBS INCPATH CONFIG_SITE | |
6 | ||
c392b79a | 7 | -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) |
f2d15b8f | 8 | +AC_CONFIG_SUBDIRS(file db3) |
012a8819 | 9 | |
49deaedf | 10 | AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec |
012a8819 | 11 | scripts/perl.req scripts/perl.prov |
639079f5 | 12 | @@ -1534,7 +1534,6 @@ |
0579a272 | 13 | lua/Makefile |
49deaedf | 14 | ]) |
639079f5 ER |
15 | AC_CONFIG_COMMANDS([default],[[ |
16 | - [ -d popt ] && echo timestamp > popt/stamp-h.in | |
012a8819 | 17 | echo timestamp > stamp-h.in |
639079f5 | 18 | [ -d perl ] && cd perl && perl Makefile.PL INSTALLDIRS=vendor |
49deaedf | 19 | |
639079f5 ER |
20 | --- rpm-4.5/Makefile.am~ 2008-04-13 03:20:07.000000000 +0300 |
21 | +++ rpm-4.5/Makefile.am 2008-04-13 03:24:33.962259478 +0300 | |
22 | @@ -72,7 +72,6 @@ | |
012a8819 AM |
23 | -load lib/rpmlib.lcd \ |
24 | -load rpmdb/rpmdb.lcd \ | |
25 | -load rpmio/rpmio.lcd \ | |
26 | - -load popt/popt.lcd \ | |
639079f5 | 27 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmbuild_SOURCES) |
012a8819 AM |
28 | |
29 | .PHONY: lint | |
aa0d0676 AM |
30 | --- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100 |
31 | +++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100 | |
ed809d1d | 32 | @@ -82,39 +82,39 @@ |
1b8d261d MM |
33 | |
34 | tdir_SOURCES = tdir.c | |
c392b79a | 35 | tdir_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
36 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
37 | +tdir_LDADD = librpmio.la -lpopt | |
38 | ||
39 | tfts_SOURCES = tfts.c | |
c392b79a | 40 | tfts_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
41 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
42 | +tfts_LDADD = librpmio.la -lpopt | |
43 | ||
aa0d0676 | 44 | tget_SOURCES = tget.c |
c392b79a | 45 | tget_LDFLAGS = @LDFLAGS_STATIC@ |
aa0d0676 AM |
46 | -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
47 | +tget_LDADD = librpmio.la -lpopt | |
48 | ||
c392b79a | 49 | thkp_SOURCES = thkp.c |
50 | thkp_LDFLAGS = @LDFLAGS_STATIC@ | |
51 | -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
52 | +thkp_LDADD = librpmio.la -lpopt | |
53 | ||
aa0d0676 | 54 | tput_SOURCES = tput.c |
c392b79a | 55 | tput_LDFLAGS = @LDFLAGS_STATIC@ |
aa0d0676 AM |
56 | -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
57 | +tput_LDADD = librpmio.la -lpopt | |
58 | ||
59 | ||
1b8d261d | 60 | tglob_SOURCES = tglob.c |
c392b79a | 61 | tglob_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
62 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
63 | +tglob_LDADD = librpmio.la -lpopt | |
64 | ||
65 | tinv_SOURCES = tinv.c | |
c392b79a | 66 | tinv_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
67 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
68 | +tinv_LDADD = librpmio.la -lpopt | |
69 | ||
70 | tkey_SOURCES = tkey.c | |
c392b79a | 71 | tkey_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
72 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
73 | +tkey_LDADD = librpmio.la -lpopt | |
74 | ||
1b8d261d MM |
75 | trpmio_SOURCES = trpmio.c |
76 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
77 | +trpmio_LDADD = librpmio.la -lpopt | |
78 | ||
13e787b0 AF |
79 | tsw_SOURCES = tsw.c |
80 | tsw_LDFLAGS = librpmio.la | |
ed809d1d | 81 |