]>
Commit | Line | Data |
---|---|---|
0579a272 AM |
1 | diff -urN rpm.org/configure.ac rpm/configure.ac |
2 | --- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200 | |
3 | +++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200 | |
0579a272 | 4 | @@ -1203,7 +1215,7 @@ |
012a8819 AM |
5 | dnl # XXX Propagate -lucb to popt ... |
6 | dnl export LIBS INCPATH CONFIG_SITE | |
7 | ||
c392b79a | 8 | -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) |
012a8819 AM |
9 | +AC_CONFIG_SUBDIRS(file) |
10 | ||
49deaedf | 11 | AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec |
012a8819 | 12 | scripts/perl.req scripts/perl.prov |
0579a272 | 13 | @@ -1227,7 +1239,7 @@ |
012a8819 | 14 | python/rpmdb/test/Makefile |
0579a272 | 15 | lua/Makefile |
49deaedf AM |
16 | ]) |
17 | -AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in | |
18 | +AC_CONFIG_COMMANDS([default],[[ | |
012a8819 | 19 | echo timestamp > stamp-h.in |
49deaedf AM |
20 | |
21 | ]],[[]]) | |
0579a272 AM |
22 | diff -urN rpm.org/Makefile.am rpm/Makefile.am |
23 | --- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200 | |
24 | +++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200 | |
012a8819 AM |
25 | @@ -107,7 +106,6 @@ |
26 | -load lib/rpmlib.lcd \ | |
27 | -load rpmdb/rpmdb.lcd \ | |
28 | -load rpmio/rpmio.lcd \ | |
29 | - -load popt/popt.lcd \ | |
30 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
31 | ||
32 | .PHONY: lint | |
aa0d0676 AM |
33 | --- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100 |
34 | +++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100 | |
c392b79a | 35 | @@ -71,47 +71,47 @@ |
aa0d0676 | 36 | tax_LDADD = librpmio.la |
1b8d261d MM |
37 | |
38 | tdigest_SOURCES = tdigest.c | |
13e787b0 AF |
39 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt |
40 | +tdigest_LDADD = librpmio.la -lpopt -lgcrypt | |
1b8d261d MM |
41 | |
42 | tdir_SOURCES = tdir.c | |
c392b79a | 43 | tdir_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
44 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
45 | +tdir_LDADD = librpmio.la -lpopt | |
46 | ||
47 | tfts_SOURCES = tfts.c | |
c392b79a | 48 | tfts_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
49 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
50 | +tfts_LDADD = librpmio.la -lpopt | |
51 | ||
aa0d0676 | 52 | tget_SOURCES = tget.c |
c392b79a | 53 | tget_LDFLAGS = @LDFLAGS_STATIC@ |
aa0d0676 AM |
54 | -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
55 | +tget_LDADD = librpmio.la -lpopt | |
56 | ||
c392b79a | 57 | thkp_SOURCES = thkp.c |
58 | thkp_LDFLAGS = @LDFLAGS_STATIC@ | |
59 | -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
60 | +thkp_LDADD = librpmio.la -lpopt | |
61 | ||
aa0d0676 | 62 | tput_SOURCES = tput.c |
c392b79a | 63 | tput_LDFLAGS = @LDFLAGS_STATIC@ |
aa0d0676 AM |
64 | -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
65 | +tput_LDADD = librpmio.la -lpopt | |
66 | ||
67 | ||
1b8d261d | 68 | tglob_SOURCES = tglob.c |
c392b79a | 69 | tglob_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
70 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
71 | +tglob_LDADD = librpmio.la -lpopt | |
72 | ||
73 | tinv_SOURCES = tinv.c | |
c392b79a | 74 | tinv_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
75 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
76 | +tinv_LDADD = librpmio.la -lpopt | |
77 | ||
78 | tkey_SOURCES = tkey.c | |
c392b79a | 79 | tkey_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
80 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
81 | +tkey_LDADD = librpmio.la -lpopt | |
82 | ||
83 | tring_SOURCES = tring.c | |
c392b79a | 84 | tring_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
85 | -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
86 | +tring_LDADD = librpmio.la -lpopt | |
87 | ||
88 | trpmio_SOURCES = trpmio.c | |
89 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
90 | +trpmio_LDADD = librpmio.la -lpopt | |
91 | ||
13e787b0 AF |
92 | tsw_SOURCES = tsw.c |
93 | tsw_LDFLAGS = librpmio.la |