]>
Commit | Line | Data |
---|---|---|
74c62e75 AF |
1 | --- rpm-4.2/rpmio/Makefile.am.wiget Thu Mar 27 23:16:15 2003 |
2 | +++ rpm-4.2/rpmio/Makefile.am Thu Mar 27 23:16:15 2003 | |
3 | @@ -70,34 +70,34 @@ | |
4 | $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) | |
1b8d261d MM |
5 | |
6 | tdigest_SOURCES = tdigest.c | |
7 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
8 | +tdigest_LDADD = librpmio.la -lpopt | |
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 | ||
44 | dumpasn1_SOURCES = dumpasn1.c | |
45 | ||
a6e513ca | 46 | |
74c62e75 AF |
47 | --- rpm-4.2/tools/Makefile.am.wiget Fri Mar 7 19:21:19 2003 |
48 | +++ rpm-4.2/tools/Makefile.am Thu Mar 27 23:23:19 2003 | |
49 | @@ -37,7 +37,7 @@ | |
50 | ||
51 | debugedit_SOURCES = debugedit.c hashtab.c | |
52 | debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ | |
53 | - $(top_builddir)/popt/libpopt.la | |
54 | + -lpopt | |
1b8d261d | 55 | |
74c62e75 AF |
56 | javadeps_SOURCES = javadeps.c |
57 | ||
58 | --- rpm-4.2/configure.ac.wiget Thu Mar 27 23:16:15 2003 | |
59 | +++ rpm-4.2/configure.ac Thu Mar 27 23:58:46 2003 | |
60 | @@ -407,6 +407,17 @@ | |
61 | ]) | |
62 | AC_SUBST(WITH_LIBDWARF_INCLUDE) | |
63 | ||
64 | +WITH_POPT_SUBDIR= | |
65 | +WITH_POPT_LIB= | |
66 | +AC_CHECK_HEADERS([popt.h]) | |
67 | +AC_CHECK_LIB(popt, poptGetContext, [ | |
68 | + AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.]) | |
69 | + WITH_POPT_LIB="-lpopt" | |
70 | + ],[WITH_POPT_SUBDIR="popt" | |
71 | + WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"]) | |
72 | + | |
73 | +AC_SUBST(WITH_POPT_SUBDIR) | |
74 | +AC_SUBST(WITH_POPT_LIB) | |
75 | AC_CHECK_FUNC(setreuid, [], [ | |
76 | AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) | |
77 | ]) | |
78 | @@ -465,6 +474,7 @@ | |
79 | ||
80 | dnl Check for Berkeley db3 API. | |
81 | AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], | |
82 | + AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"], | |
83 | AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"], | |
84 | AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], | |
85 | AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"], | |
86 | @@ -473,6 +483,7 @@ | |
87 | ) | |
88 | ) | |
89 | ) | |
90 | + ) | |
91 | ) | |
92 | ||
93 | if test X"$DBLIBSRCS" = X; then | |
94 | @@ -1226,7 +1237,7 @@ | |
9768f206 AF |
95 | dnl # XXX Propagate -lucb to popt ... |
96 | dnl export LIBS INCPATH CONFIG_SITE | |
97 | ||
98 | -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) | |
74c62e75 | 99 | +AC_CONFIG_SUBDIRS(beecrypt file) |
9768f206 AF |
100 | |
101 | AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec | |
102 | macros.perl scripts/perl.req scripts/perl.prov | |
74c62e75 AF |
103 | @@ -1248,7 +1259,7 @@ |
104 | python/Makefile | |
105 | python/rpmdb/Makefile | |
106 | python/test/Makefile | |
107 | - ], [ echo timestamp > popt/stamp-h.in | |
108 | + ], [ | |
109 | echo timestamp > beecrypt/stamp-h.in | |
110 | echo timestamp > stamp-h.in | |
111 | ] | |
112 | --- rpm-4.2/Makefile.am.wiget Mon Mar 10 20:35:20 2003 | |
113 | +++ rpm-4.2/Makefile.am Thu Mar 27 23:50:55 2003 | |
114 | @@ -14,7 +14,7 @@ | |
9768f206 AF |
115 | po/*.in po/*.po po/rpm.pot \ |
116 | rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c | |
117 | ||
74c62e75 AF |
118 | -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . |
119 | +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . | |
9768f206 AF |
120 | |
121 | INCLUDES = \ | |
122 | -I$(top_srcdir)/build \ | |
74c62e75 | 123 | @@ -34,7 +34,7 @@ |
9768f206 AF |
124 | $(top_builddir)/lib/librpm.la \ |
125 | $(top_builddir)/rpmdb/librpmdb.la \ | |
126 | $(top_builddir)/rpmio/librpmio.la \ | |
127 | - $(top_builddir)/popt/libpopt.la \ | |
128 | + -lpopt \ | |
9768f206 AF |
129 | @WITH_ZLIB_LIB@ \ |
130 | @INTLLIBS@ \ | |
74c62e75 AF |
131 | @LIBMISC@ |
132 | @@ -105,7 +105,6 @@ | |
9768f206 AF |
133 | -load lib/rpmlib.lcd \ |
134 | -load rpmdb/rpmdb.lcd \ | |
135 | -load rpmio/rpmio.lcd \ | |
136 | - -load popt/popt.lcd \ | |
137 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
138 | ||
74c62e75 AF |
139 | .PHONY: lint |
140 | --- rpm-4.2/rpmdb/Makefile.am.syslib Fri Mar 28 00:45:58 2003 | |
141 | +++ rpm-4.2/rpmdb/Makefile.am Fri Mar 28 00:48:00 2003 | |
142 | @@ -49,7 +49,7 @@ | |
143 | tagname.c tagtbl.c | |
144 | librpmdb_la_LDFLAGS = -release @VERSION@ \ | |
145 | $(top_builddir)/rpmio/librpmio.la \ | |
146 | - $(top_builddir)/popt/libpopt.la \ | |
147 | + @WITH_POPT_LIB@ \ | |
148 | @WITH_LIBELF_LIB@ \ | |
149 | @libdb3@ | |
150 | librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) | |
151 | --- rpm-4.2/lib/Makefile.am.wiget Fri Mar 28 01:31:52 2003 | |
152 | +++ rpm-4.2/lib/Makefile.am Fri Mar 28 01:32:37 2003 | |
153 | @@ -39,7 +39,7 @@ | |
154 | librpm_la_LDFLAGS = -release @VERSION@ \ | |
155 | $(top_builddir)/rpmdb/librpmdb.la \ | |
156 | $(top_builddir)/rpmio/librpmio.la \ | |
157 | - $(top_builddir)/popt/libpopt.la | |
158 | + @WITH_POPT_LIB@ | |
9768f206 | 159 | |
74c62e75 AF |
160 | getdate.c: getdate.y |
161 | @echo expect 10 shift/reduce conflicts |