projects/aports·blob master · refs

227 lines · 6.5 KiB

1libreplace is not needed on Linux
2
3--- a/configure.ac
4+++ b/configure.ac
5@@ -273,8 +273,6 @@ AC_CHECK_FUNCS([strchr strcspn strdup st
6 AC_CHECK_FUNCS([strcasecmp strncasecmp strspn strtoul])
7 AC_CHECK_FUNCS([gethostbyname inet_ntoa select strrchr strstr strtol])
8
9-AC_REPLACE_FUNCS([getopt_long_only strncasecmp])
10-AC_REPLACE_FUNCS([__ns_initparse __ns_name_uncompress __ns_msg_getflag])
11 dnl Magnus Holmgren says this avoids linking a private function
12 AC_LIBOBJ([__ns_get16])
13
14@@ -282,7 +280,6 @@ AC_CONFIG_FILES([Makefile
15 Doxyfile
16 src/Makefile
17 src/include/Makefile
18- src/libreplace/Makefile
19 src/libspf2/Makefile
20 src/spfquery/Makefile
21 src/spftest/Makefile
22--- a/src/libspf2/Makefile.am
23+++ b/src/libspf2/Makefile.am
24@@ -34,10 +34,6 @@ libspf2_la_SOURCES = \
25 spf_utils.c \
26 spf_win32.c
27
28-libspf2_la_LIBADD = $(top_builddir)/src/libreplace/libreplace.la
29-
30-
31-
32 libspf2_la_LDFLAGS = -version-info 3:0:1
33
34 # Copied from the libtool info file:
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--- a/aclocal.m4
45+++ b/aclocal.m4
46@@ -1,4 +1,5 @@
47 # generated automatically by aclocal 1.11.1 -*- Autoconf -*-
48+# and touched to get build order right
49
50 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
51 # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
52--- a/configure
53+++ b/configure
54@@ -13602,73 +13602,6 @@ fi
55 done
56
57
58-ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
59-if test "x$ac_cv_func_getopt_long_only" = xyes; then :
60- $as_echo "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h
61-
62-else
63- case " $LIBOBJS " in
64- *" getopt_long_only.$ac_objext "* ) ;;
65- *) LIBOBJS="$LIBOBJS getopt_long_only.$ac_objext"
66- ;;
67-esac
68-
69-fi
70-
71-ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
72-if test "x$ac_cv_func_strncasecmp" = xyes; then :
73- $as_echo "#define HAVE_STRNCASECMP 1" >>confdefs.h
74-
75-else
76- case " $LIBOBJS " in
77- *" strncasecmp.$ac_objext "* ) ;;
78- *) LIBOBJS="$LIBOBJS strncasecmp.$ac_objext"
79- ;;
80-esac
81-
82-fi
83-
84-
85-ac_fn_c_check_func "$LINENO" "__ns_initparse" "ac_cv_func___ns_initparse"
86-if test "x$ac_cv_func___ns_initparse" = xyes; then :
87- $as_echo "#define HAVE___NS_INITPARSE 1" >>confdefs.h
88-
89-else
90- case " $LIBOBJS " in
91- *" __ns_initparse.$ac_objext "* ) ;;
92- *) LIBOBJS="$LIBOBJS __ns_initparse.$ac_objext"
93- ;;
94-esac
95-
96-fi
97-
98-ac_fn_c_check_func "$LINENO" "__ns_name_uncompress" "ac_cv_func___ns_name_uncompress"
99-if test "x$ac_cv_func___ns_name_uncompress" = xyes; then :
100- $as_echo "#define HAVE___NS_NAME_UNCOMPRESS 1" >>confdefs.h
101-
102-else
103- case " $LIBOBJS " in
104- *" __ns_name_uncompress.$ac_objext "* ) ;;
105- *) LIBOBJS="$LIBOBJS __ns_name_uncompress.$ac_objext"
106- ;;
107-esac
108-
109-fi
110-
111-ac_fn_c_check_func "$LINENO" "__ns_msg_getflag" "ac_cv_func___ns_msg_getflag"
112-if test "x$ac_cv_func___ns_msg_getflag" = xyes; then :
113- $as_echo "#define HAVE___NS_MSG_GETFLAG 1" >>confdefs.h
114-
115-else
116- case " $LIBOBJS " in
117- *" __ns_msg_getflag.$ac_objext "* ) ;;
118- *) LIBOBJS="$LIBOBJS __ns_msg_getflag.$ac_objext"
119- ;;
120-esac
121-
122-fi
123-
124-
125 case " $LIBOBJS " in
126 *" __ns_get16.$ac_objext "* ) ;;
127 *) LIBOBJS="$LIBOBJS __ns_get16.$ac_objext"
128@@ -13676,7 +13609,7 @@ case " $LIBOBJS " in
129 esac
130
131
132-ac_config_files="$ac_config_files Makefile Doxyfile src/Makefile src/include/Makefile src/libreplace/Makefile src/libspf2/Makefile src/spfquery/Makefile src/spftest/Makefile src/spfd/Makefile src/spf_example/Makefile"
133+ac_config_files="$ac_config_files Makefile Doxyfile src/Makefile src/include/Makefile src/libspf2/Makefile src/spfquery/Makefile src/spftest/Makefile src/spfd/Makefile src/spf_example/Makefile"
134
135 cat >confcache <<\_ACEOF
136 # This file is a shell script that caches the results of configure
137@@ -14693,7 +14626,6 @@ do
138 "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
139 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
140 "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
141- "src/libreplace/Makefile") CONFIG_FILES="$CONFIG_FILES src/libreplace/Makefile" ;;
142 "src/libspf2/Makefile") CONFIG_FILES="$CONFIG_FILES src/libspf2/Makefile" ;;
143 "src/spfquery/Makefile") CONFIG_FILES="$CONFIG_FILES src/spfquery/Makefile" ;;
144 "src/spftest/Makefile") CONFIG_FILES="$CONFIG_FILES src/spftest/Makefile" ;;
145--- a/config.h.in
146+++ b/config.h.in
147@@ -49,9 +49,6 @@
148 /* Define to 1 if you have the <getopt.h> header file. */
149 #undef HAVE_GETOPT_H
150
151-/* Define to 1 if you have the `getopt_long_only' function. */
152-#undef HAVE_GETOPT_LONG_ONLY
153-
154 /* Define to 1 if you have the <grp.h> header file. */
155 #undef HAVE_GRP_H
156
157--- a/src/libspf2/Makefile.in
158+++ b/src/libspf2/Makefile.in
159@@ -69,8 +69,7 @@ am__base_list = \
160 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
161 am__installdirs = "$(DESTDIR)$(libdir)"
162 LTLIBRARIES = $(lib_LTLIBRARIES)
163-libspf2_la_DEPENDENCIES = \
164- $(top_builddir)/src/libreplace/libreplace.la
165+libspf2_la_LIBADD =
166 am_libspf2_la_OBJECTS = spf_compile.lo spf_dns.lo spf_dns_cache.lo \
167 spf_dns_null.lo spf_dns_resolv.lo spf_dns_rr.lo \
168 spf_dns_test.lo spf_dns_windns.lo spf_dns_zone.lo \
169@@ -289,7 +288,6 @@ libspf2_la_SOURCES = \
170 spf_utils.c \
171 spf_win32.c
172
173-libspf2_la_LIBADD = $(top_builddir)/src/libreplace/libreplace.la
174 libspf2_la_LDFLAGS = -version-info 3:0:1
175 all: all-recursive
176
177--- a/src/Makefile.in
178+++ b/src/Makefile.in
179@@ -151,7 +151,7 @@ SED = @SED@
180 SET_MAKE = @SET_MAKE@
181 SHELL = @SHELL@
182 STRIP = @STRIP@
183-SUBDIRS = include libreplace libspf2 spfquery spftest spfd spf_example
184+SUBDIRS = include libspf2 spfquery spftest spfd spf_example
185 VERSION = @VERSION@
186 abs_builddir = @abs_builddir@
187 abs_srcdir = @abs_srcdir@
188--- a/src/spfd/spfd.c
189+++ b/src/spfd/spfd.c
190@@ -88,12 +88,8 @@
191 #include <grp.h>
192 #endif
193
194-#ifdef HAVE_GETOPT_LONG_ONLY
195 #define _GNU_SOURCE
196 #include <getopt.h>
197-#else
198-#include "libreplace/getopt.h"
199-#endif
200
201 #include <unistd.h>
202 #include <netdb.h>
203--- a/src/spfquery/spfquery.c
204+++ b/src/spfquery/spfquery.c
205@@ -46,8 +46,6 @@
206
207 #define SPF_TEST_VERSION "3.0"
208
209-#include "libreplace/win32_config.h"
210-
211 #ifdef HAVE_CONFIG_H
212 # include "config.h"
213 #endif
214@@ -88,12 +86,8 @@
215 # include <arpa/inet.h> /* in_addr struct */
216 #endif
217
218-#ifdef HAVE_GETOPT_LONG_ONLY
219 #define _GNU_SOURCE
220 #include <getopt.h>
221-#else
222-#include "libreplace/getopt.h"
223-#endif
224
225 #ifdef _WIN32
226 #include "spf_win32.h"
227