| | 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 |
| | 4 | @@ -1203,7 +1215,7 @@ |
| | 5 | dnl # XXX Propagate -lucb to popt ... |
| | 6 | dnl export LIBS INCPATH CONFIG_SITE |
| | 7 | |
| | 8 | -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) |
| | 9 | +AC_CONFIG_SUBDIRS(file) |
| | 10 | |
| | 11 | AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec |
| | 12 | scripts/perl.req scripts/perl.prov |
| | 13 | @@ -1227,7 +1239,7 @@ |
| | 14 | python/rpmdb/test/Makefile |
| | 15 | lua/Makefile |
| | 16 | ]) |
| | 17 | -AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in |
| | 18 | +AC_CONFIG_COMMANDS([default],[[ |
| | 19 | echo timestamp > stamp-h.in |
| | 20 | |
| | 21 | ]],[[]]) |
| | 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 |
| | 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 |
| | 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 |
| | 35 | @@ -82,39 +82,39 @@ |
| | 36 | |
| | 37 | tdir_SOURCES = tdir.c |
| | 38 | tdir_LDFLAGS = @LDFLAGS_STATIC@ |
| | 39 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 40 | +tdir_LDADD = librpmio.la -lpopt |
| | 41 | |
| | 42 | tfts_SOURCES = tfts.c |
| | 43 | tfts_LDFLAGS = @LDFLAGS_STATIC@ |
| | 44 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 45 | +tfts_LDADD = librpmio.la -lpopt |
| | 46 | |
| | 47 | tget_SOURCES = tget.c |
| | 48 | tget_LDFLAGS = @LDFLAGS_STATIC@ |
| | 49 | -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 50 | +tget_LDADD = librpmio.la -lpopt |
| | 51 | |
| | 52 | thkp_SOURCES = thkp.c |
| | 53 | thkp_LDFLAGS = @LDFLAGS_STATIC@ |
| | 54 | -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 55 | +thkp_LDADD = librpmio.la -lpopt |
| | 56 | |
| | 57 | tput_SOURCES = tput.c |
| | 58 | tput_LDFLAGS = @LDFLAGS_STATIC@ |
| | 59 | -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 60 | +tput_LDADD = librpmio.la -lpopt |
| | 61 | |
| | 62 | |
| | 63 | tglob_SOURCES = tglob.c |
| | 64 | tglob_LDFLAGS = @LDFLAGS_STATIC@ |
| | 65 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 66 | +tglob_LDADD = librpmio.la -lpopt |
| | 67 | |
| | 68 | tinv_SOURCES = tinv.c |
| | 69 | tinv_LDFLAGS = @LDFLAGS_STATIC@ |
| | 70 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 71 | +tinv_LDADD = librpmio.la -lpopt |
| | 72 | |
| | 73 | tkey_SOURCES = tkey.c |
| | 74 | tkey_LDFLAGS = @LDFLAGS_STATIC@ |
| | 75 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 76 | +tkey_LDADD = librpmio.la -lpopt |
| | 77 | |
| | 78 | trpmio_SOURCES = trpmio.c |
| | 79 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la |
| | 80 | +trpmio_LDADD = librpmio.la -lpopt |
| | 81 | |
| | 82 | tsw_SOURCES = tsw.c |
| | 83 | tsw_LDFLAGS = librpmio.la |
| | 84 | |
projects / packages / rpm.git / blame_incremental