]>
Commit | Line | Data |
---|---|---|
77a0fe7f AF |
1 | --- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-11 02:05:34.000000000 +0200 |
2 | +++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:05:34.000000000 +0200 | |
3 | @@ -65,34 +65,34 @@ | |
74c62e75 | 4 | $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) |
1b8d261d MM |
5 | |
6 | tdigest_SOURCES = tdigest.c | |
13e787b0 AF |
7 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt |
8 | +tdigest_LDADD = librpmio.la -lpopt -lgcrypt | |
1b8d261d MM |
9 | |
10 | tdir_SOURCES = tdir.c | |
11 | tdir_LDFLAGS = -all-static | |
12 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
13 | +tdir_LDADD = librpmio.la -lpopt | |
14 | ||
15 | tfts_SOURCES = tfts.c | |
16 | tfts_LDFLAGS = -all-static | |
17 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
18 | +tfts_LDADD = librpmio.la -lpopt | |
19 | ||
20 | tglob_SOURCES = tglob.c | |
21 | tglob_LDFLAGS = -all-static | |
22 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
23 | +tglob_LDADD = librpmio.la -lpopt | |
24 | ||
25 | tinv_SOURCES = tinv.c | |
26 | tinv_LDFLAGS = -all-static | |
27 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
28 | +tinv_LDADD = librpmio.la -lpopt | |
29 | ||
30 | tkey_SOURCES = tkey.c | |
31 | tkey_LDFLAGS = -all-static | |
32 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
33 | +tkey_LDADD = librpmio.la -lpopt | |
34 | ||
35 | tring_SOURCES = tring.c | |
36 | tring_LDFLAGS = -all-static | |
37 | -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
38 | +tring_LDADD = librpmio.la -lpopt | |
39 | ||
40 | trpmio_SOURCES = trpmio.c | |
41 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
42 | +trpmio_LDADD = librpmio.la -lpopt | |
43 | ||
13e787b0 AF |
44 | tsw_SOURCES = tsw.c |
45 | tsw_LDFLAGS = librpmio.la | |
77a0fe7f AF |
46 | --- rpm-4.3/rpmdb/Makefile.am.wiget 2003-05-23 17:00:19.000000000 +0200 |
47 | +++ rpm-4.3/rpmdb/Makefile.am 2003-06-11 02:05:34.000000000 +0200 | |
13e787b0 AF |
48 | @@ -49,7 +49,7 @@ |
49 | tagname.c tagtbl.c | |
50 | librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ | |
51 | $(top_builddir)/rpmio/librpmio.la \ | |
52 | - $(top_builddir)/popt/libpopt.la \ | |
53 | + @WITH_POPT_LIB@ \ | |
54 | @WITH_LIBELF_LIB@ \ | |
55 | @libdb3@ | |
56 | librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) | |
77a0fe7f AF |
57 | --- rpm-4.3/lib/Makefile.am.wiget 2003-05-23 16:59:36.000000000 +0200 |
58 | +++ rpm-4.3/lib/Makefile.am 2003-06-11 02:05:34.000000000 +0200 | |
59 | @@ -40,7 +40,7 @@ | |
13e787b0 AF |
60 | librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ |
61 | $(top_builddir)/rpmdb/librpmdb.la \ | |
62 | $(top_builddir)/rpmio/librpmio.la \ | |
63 | - $(top_builddir)/popt/libpopt.la | |
64 | + @WITH_POPT_LIB@ | |
1b8d261d | 65 | |
13e787b0 AF |
66 | getdate.c: getdate.y |
67 | @echo expect 10 shift/reduce conflicts | |
77a0fe7f AF |
68 | --- rpm-4.3/tools/Makefile.am.wiget 2003-05-23 17:00:27.000000000 +0200 |
69 | +++ rpm-4.3/tools/Makefile.am 2003-06-11 02:05:34.000000000 +0200 | |
70 | @@ -40,7 +40,7 @@ | |
74c62e75 AF |
71 | |
72 | debugedit_SOURCES = debugedit.c hashtab.c | |
73 | debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ | |
74 | - $(top_builddir)/popt/libpopt.la | |
75 | + -lpopt | |
1b8d261d | 76 | |
74c62e75 AF |
77 | javadeps_SOURCES = javadeps.c |
78 | ||
77a0fe7f AF |
79 | --- rpm-4.3/configure.ac.wiget 2003-06-11 02:05:34.000000000 +0200 |
80 | +++ rpm-4.3/configure.ac 2003-06-11 02:05:34.000000000 +0200 | |
81 | @@ -431,6 +431,17 @@ | |
82 | AC_SUBST(WITH_BEECRYPT_INCLUDE) | |
83 | AC_SUBST(WITH_BEECRYPT_LIB) | |
74c62e75 AF |
84 | |
85 | +WITH_POPT_SUBDIR= | |
86 | +WITH_POPT_LIB= | |
87 | +AC_CHECK_HEADERS([popt.h]) | |
88 | +AC_CHECK_LIB(popt, poptGetContext, [ | |
89 | + AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.]) | |
90 | + WITH_POPT_LIB="-lpopt" | |
91 | + ],[WITH_POPT_SUBDIR="popt" | |
92 | + WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"]) | |
93 | + | |
94 | +AC_SUBST(WITH_POPT_SUBDIR) | |
95 | +AC_SUBST(WITH_POPT_LIB) | |
96 | AC_CHECK_FUNC(setreuid, [], [ | |
97 | AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) | |
98 | ]) | |
77a0fe7f | 99 | @@ -491,6 +502,7 @@ |
74c62e75 AF |
100 | |
101 | dnl Check for Berkeley db3 API. | |
102 | AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], | |
103 | + AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"], | |
104 | AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"], | |
105 | AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], | |
106 | AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"], | |
77a0fe7f | 107 | @@ -499,6 +511,7 @@ |
74c62e75 AF |
108 | ) |
109 | ) | |
110 | ) | |
111 | + ) | |
112 | ) | |
113 | ||
114 | if test X"$DBLIBSRCS" = X; then | |
77a0fe7f | 115 | @@ -1257,7 +1270,7 @@ |
9768f206 AF |
116 | dnl # XXX Propagate -lucb to popt ... |
117 | dnl export LIBS INCPATH CONFIG_SITE | |
118 | ||
119 | -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) | |
74c62e75 | 120 | +AC_CONFIG_SUBDIRS(beecrypt file) |
9768f206 AF |
121 | |
122 | AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec | |
13e787b0 | 123 | scripts/perl.req scripts/perl.prov |
77a0fe7f | 124 | @@ -1281,7 +1294,7 @@ |
13e787b0 AF |
125 | python/rpmdb/test/Makefile |
126 | python/mpw/Makefile | |
127 | python/mpw/test/Makefile | |
74c62e75 AF |
128 | - ], [ echo timestamp > popt/stamp-h.in |
129 | + ], [ | |
130 | echo timestamp > beecrypt/stamp-h.in | |
131 | echo timestamp > stamp-h.in | |
132 | ] | |
77a0fe7f AF |
133 | --- rpm-4.3/Makefile.am.wiget 2003-05-23 16:57:23.000000000 +0200 |
134 | +++ rpm-4.3/Makefile.am 2003-06-11 02:08:38.000000000 +0200 | |
74c62e75 | 135 | @@ -14,7 +14,7 @@ |
9768f206 AF |
136 | po/*.in po/*.po po/rpm.pot \ |
137 | rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c | |
138 | ||
77a0fe7f | 139 | -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . |
f6609ff7 | 140 | +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . |
9768f206 AF |
141 | |
142 | INCLUDES = \ | |
143 | -I$(top_srcdir)/build \ | |
74c62e75 | 144 | @@ -34,7 +34,7 @@ |
9768f206 AF |
145 | $(top_builddir)/lib/librpm.la \ |
146 | $(top_builddir)/rpmdb/librpmdb.la \ | |
147 | $(top_builddir)/rpmio/librpmio.la \ | |
148 | - $(top_builddir)/popt/libpopt.la \ | |
149 | + -lpopt \ | |
9768f206 AF |
150 | @WITH_ZLIB_LIB@ \ |
151 | @INTLLIBS@ \ | |
74c62e75 AF |
152 | @LIBMISC@ |
153 | @@ -105,7 +105,6 @@ | |
9768f206 AF |
154 | -load lib/rpmlib.lcd \ |
155 | -load rpmdb/rpmdb.lcd \ | |
156 | -load rpmio/rpmio.lcd \ | |
157 | - -load popt/popt.lcd \ | |
158 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
159 | ||
74c62e75 | 160 | .PHONY: lint |