]>
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 | ]],[[]]) | |
9a1dbca2 JB |
22 | --- rpm-4.4.2/lib/Makefile.am.orig 2005-02-17 01:14:40.000000000 +0100 |
23 | +++ rpm-4.4.2/lib/Makefile.am 2005-07-23 13:32:57.886832096 +0200 | |
24 | @@ -98,7 +98,7 @@ | |
25 | $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \ | |
26 | -lselinux \ | |
012a8819 | 27 | $(top_builddir)/rpmio/librpmio.la \ |
9a1dbca2 JB |
28 | - $(top_builddir)/popt/libpopt.la |
29 | + -lpopt | |
30 | ||
31 | #tds: tds.c librpm.la | |
32 | # $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) | |
33 | @@ -109,8 +109,8 @@ | |
34 | tthread: tthread.o librpm.la | |
35 | $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@ | |
36 | ||
37 | -tsystem: tsystem.o $(top_builddir)/popt/libpopt.la | |
38 | - $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la | |
39 | +tsystem: tsystem.o | |
40 | + $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt | |
41 | ||
42 | tre: tre.o librpm.la | |
43 | $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \ | |
0579a272 AM |
44 | diff -urN rpm.org/Makefile.am rpm/Makefile.am |
45 | --- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200 | |
46 | +++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200 | |
012a8819 AM |
47 | @@ -107,7 +106,6 @@ |
48 | -load lib/rpmlib.lcd \ | |
49 | -load rpmdb/rpmdb.lcd \ | |
50 | -load rpmio/rpmio.lcd \ | |
51 | - -load popt/popt.lcd \ | |
52 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
53 | ||
54 | .PHONY: lint | |
aa0d0676 AM |
55 | --- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100 |
56 | +++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100 | |
c392b79a | 57 | @@ -71,47 +71,47 @@ |
aa0d0676 | 58 | tax_LDADD = librpmio.la |
1b8d261d MM |
59 | |
60 | tdigest_SOURCES = tdigest.c | |
13e787b0 AF |
61 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt |
62 | +tdigest_LDADD = librpmio.la -lpopt -lgcrypt | |
1b8d261d MM |
63 | |
64 | tdir_SOURCES = tdir.c | |
c392b79a | 65 | tdir_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
66 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
67 | +tdir_LDADD = librpmio.la -lpopt | |
68 | ||
69 | tfts_SOURCES = tfts.c | |
c392b79a | 70 | tfts_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
71 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
72 | +tfts_LDADD = librpmio.la -lpopt | |
73 | ||
aa0d0676 | 74 | tget_SOURCES = tget.c |
c392b79a | 75 | tget_LDFLAGS = @LDFLAGS_STATIC@ |
aa0d0676 AM |
76 | -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
77 | +tget_LDADD = librpmio.la -lpopt | |
78 | ||
c392b79a | 79 | thkp_SOURCES = thkp.c |
80 | thkp_LDFLAGS = @LDFLAGS_STATIC@ | |
81 | -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
82 | +thkp_LDADD = librpmio.la -lpopt | |
83 | ||
aa0d0676 | 84 | tput_SOURCES = tput.c |
c392b79a | 85 | tput_LDFLAGS = @LDFLAGS_STATIC@ |
aa0d0676 AM |
86 | -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
87 | +tput_LDADD = librpmio.la -lpopt | |
88 | ||
89 | ||
1b8d261d | 90 | tglob_SOURCES = tglob.c |
c392b79a | 91 | tglob_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
92 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
93 | +tglob_LDADD = librpmio.la -lpopt | |
94 | ||
95 | tinv_SOURCES = tinv.c | |
c392b79a | 96 | tinv_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
97 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
98 | +tinv_LDADD = librpmio.la -lpopt | |
99 | ||
100 | tkey_SOURCES = tkey.c | |
c392b79a | 101 | tkey_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
102 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
103 | +tkey_LDADD = librpmio.la -lpopt | |
104 | ||
105 | tring_SOURCES = tring.c | |
c392b79a | 106 | tring_LDFLAGS = @LDFLAGS_STATIC@ |
1b8d261d MM |
107 | -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
108 | +tring_LDADD = librpmio.la -lpopt | |
109 | ||
110 | trpmio_SOURCES = trpmio.c | |
111 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
112 | +trpmio_LDADD = librpmio.la -lpopt | |
113 | ||
13e787b0 AF |
114 | tsw_SOURCES = tsw.c |
115 | tsw_LDFLAGS = librpmio.la |