]>
Commit | Line | Data |
---|---|---|
12ffadbc AM |
1 | From d559339883f61bfb44188c4fe92851a2905e8a8e Mon Sep 17 00:00:00 2001 |
2 | From: Matt Domsch <mdomsch@fedoraproject.org> | |
3 | Date: Thu, 23 Jan 2014 10:51:07 -0600 | |
4 | Subject: [PATCH 1/2] remove libreplace, unneeded on Linux | |
5 | ||
6 | --- | |
7 | configure.ac | 3 --- | |
8 | src/Makefile.am | 2 +- | |
9 | src/libspf2/Makefile.am | 4 ---- | |
10 | 3 files changed, 1 insertion(+), 8 deletions(-) | |
11 | ||
12 | diff --git a/configure.ac b/configure.ac | |
13 | index 63e398c..63e5392 100644 | |
14 | --- a/configure.ac | |
15 | +++ b/configure.ac | |
16 | @@ -273,8 +273,6 @@ AC_CHECK_FUNCS([strchr strcspn strdup strerror]) | |
17 | AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul]) | |
18 | AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol]) | |
19 | ||
20 | -AC_REPLACE_FUNCS([getopt_long_only strncasecmp]) | |
21 | -AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag]) | |
22 | dnl Magnus Holmgren says this avoids linking a private function | |
23 | AC_LIBOBJ([__ns_get16]) | |
24 | ||
25 | @@ -282,7 +280,6 @@ AC_CONFIG_FILES([Makefile | |
26 | Doxyfile | |
27 | src/Makefile | |
28 | src/include/Makefile | |
29 | - src/libreplace/Makefile | |
30 | src/libspf2/Makefile | |
31 | src/spfquery/Makefile | |
32 | src/spftest/Makefile | |
33 | diff --git a/src/Makefile.am b/src/Makefile.am | |
34 | index 307bf10..02f09b4 100644 | |
35 | --- a/src/Makefile.am | |
36 | +++ b/src/Makefile.am | |
37 | @@ -4,5 +4,5 @@ AUTOMAKE_OPTIONS = foreign | |
38 | # Attempt to disable parallel processing. | |
39 | .NOTPARALLEL: | |
40 | .NO_PARALLEL: | |
41 | -SUBDIRS = include libreplace libspf2 spfquery spftest spfd spf_example | |
42 | +SUBDIRS = include libspf2 spfquery spftest spfd spf_example | |
43 | TARGETS = | |
44 | diff --git a/src/libspf2/Makefile.am b/src/libspf2/Makefile.am | |
45 | index 6b5a147..77ef3b9 100644 | |
46 | --- a/src/libspf2/Makefile.am | |
47 | +++ b/src/libspf2/Makefile.am | |
48 | @@ -34,10 +34,6 @@ libspf2_la_SOURCES = \ | |
49 | spf_utils.c \ | |
50 | spf_win32.c | |
51 | ||
52 | -libspf2_la_LIBADD = $(top_builddir)/src/libreplace/libreplace.la | |
53 | - | |
54 | - | |
55 | - | |
56 | libspf2_la_LDFLAGS = -version-info 3:0:1 | |
57 | ||
58 | # Copied from the libtool info file: | |
59 | -- | |
60 | 1.8.4.2 | |
61 |