1 |
spock 08/11/30 19:05:20 |
2 |
|
3 |
Modified: elinks-0.11.3-lua-5.patch |
4 |
Added: elinks-0.11.5-makefile.patch |
5 |
Log: |
6 |
Version bump. Remove junk content from the lua patch. This commit fixes bugs #246575, #248280, and #249020. |
7 |
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 www-client/elinks/files/elinks-0.11.3-lua-5.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/elinks/files/elinks-0.11.3-lua-5.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/elinks/files/elinks-0.11.3-lua-5.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/elinks/files/elinks-0.11.3-lua-5.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: elinks-0.11.3-lua-5.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/elinks/files/elinks-0.11.3-lua-5.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- elinks-0.11.3-lua-5.patch 13 May 2007 10:03:51 -0000 1.1 |
23 |
+++ elinks-0.11.3-lua-5.patch 30 Nov 2008 19:05:20 -0000 1.2 |
24 |
@@ -10,1379 +10,6 @@ |
25 |
|
26 |
if test ! -z "$luadir"; then |
27 |
LUA_LIBS="-L$luadir/lib $LUA_LIBS" |
28 |
-diff -Naurp elinks-0.11.3-orig/configure.in.orig elinks-0.11.3/configure.in.orig |
29 |
---- elinks-0.11.3-orig/configure.in.orig 1970-01-01 01:00:00.000000000 +0100 |
30 |
-+++ elinks-0.11.3/configure.in.orig 2007-04-15 22:51:02.000000000 +0200 |
31 |
-@@ -0,0 +1,1342 @@ |
32 |
-+dnl Process this file with autoconf to produce a configure script. |
33 |
-+ |
34 |
-+AC_PREREQ(2.13) |
35 |
-+AC_INIT(src/main/main.c) |
36 |
-+AC_CONFIG_AUX_DIR(config) |
37 |
-+ |
38 |
-+PACKAGE=elinks |
39 |
-+VERSION=0.11.3 |
40 |
-+AC_SUBST(PACKAGE) |
41 |
-+AC_SUBST(VERSION) |
42 |
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version]) |
43 |
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version]) |
44 |
-+AC_CONFIG_HEADERS(config.h) |
45 |
-+ |
46 |
-+AC_CHECK_PROG(ACLOCAL,[aclocal],[aclocal],[config/missing aclocal]) |
47 |
-+AC_CHECK_PROG(AUTOCONF,[autoconf],[autoconf],[config/missing autoconf]) |
48 |
-+AC_CHECK_PROG(AUTOHEADER,[autoheader],[autoheader],[config/missing autoheader]) |
49 |
-+ |
50 |
-+MAKE= |
51 |
-+ |
52 |
-+for make in gnumake gmake make false; do |
53 |
-+ if test "x$MAKE" = x; then |
54 |
-+ AC_PATH_PROGS(MAKE, "$make") |
55 |
-+ fi |
56 |
-+done |
57 |
-+ |
58 |
-+builddir="`pwd`" |
59 |
-+ |
60 |
-+# Cleanup if we are configuring with a previous build in the tree |
61 |
-+if test -e Makefile.config; then |
62 |
-+ AC_MSG_CHECKING([for previous build to clean]) |
63 |
-+ "$MAKE" -C "$builddir/src" cleanall >/dev/null 2>/dev/null |
64 |
-+ AC_MSG_RESULT(done) |
65 |
-+fi |
66 |
-+ |
67 |
-+dnl =================================================================== |
68 |
-+dnl Load feature configuration file and start logging features. |
69 |
-+dnl =================================================================== |
70 |
-+ |
71 |
-+features="features.conf" |
72 |
-+AC_CHECK_FILE("$srcdir/$features", [ . $srcdir/$features ]) |
73 |
-+AC_CHECK_FILE("$builddir/$features", [ . $builddir/$features ]) |
74 |
-+echo "Feature summary:" > features.log |
75 |
-+ |
76 |
-+dnl =================================================================== |
77 |
-+dnl Checks for programs. |
78 |
-+dnl =================================================================== |
79 |
-+ |
80 |
-+AC_PROG_CC |
81 |
-+AC_PROG_AWK |
82 |
-+AC_PATH_PROGS(AWK, "$AWK") |
83 |
-+AC_PROG_RANLIB |
84 |
-+AC_PROG_INSTALL |
85 |
-+ |
86 |
-+AC_PATH_PROGS(CG_COMMIT_ID, "cg-commit-id") |
87 |
-+AC_PATH_PROGS(SPARSE, "sparse") |
88 |
-+ |
89 |
-+CONFIG_ASCIIDOC="no" |
90 |
-+CONFIG_POD2HTML="no" |
91 |
-+CONFIG_XMLTO="no" |
92 |
-+CONFIG_JW="no" |
93 |
-+ |
94 |
-+if test "x$CONFIG_DOC" != xno; then |
95 |
-+ AC_PATH_PROGS(ASCIIDOC, "asciidoc") |
96 |
-+ if test "x$ASCIIDOC" != "x"; then |
97 |
-+ EL_CONFIG(CONFIG_ASCIIDOC, [AsciiDoc]) |
98 |
-+ EL_CONFIG(MANUAL_ASCIIDOC, [HTML (one file)]) |
99 |
-+ EL_CONFIG(MAN_ASCIIDOC, [HTML]) |
100 |
-+ |
101 |
-+ echo > config.asciidoc-unsafe.txt |
102 |
-+ if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>/dev/null; then |
103 |
-+ ASCIIDOC_FLAGS=--unsafe |
104 |
-+ fi |
105 |
-+ rm config.asciidoc-unsafe.* |
106 |
-+ fi |
107 |
-+ |
108 |
-+ AC_PATH_PROGS(XMLTO, "xmlto") |
109 |
-+ if test "x$XMLTO" != "x"; then |
110 |
-+ EL_CONFIG(CONFIG_XMLTO, [XmlTo]) |
111 |
-+ EL_CONFIG(MANUAL_XMLTO, [HTML (multiple files)]) |
112 |
-+ EL_CONFIG(MAN_XMLTO, [man (groff)]) |
113 |
-+ fi |
114 |
-+ |
115 |
-+ AC_PATH_PROGS(JW, "jw") |
116 |
-+ if test "x$JW" != "x"; then |
117 |
-+ EL_CONFIG(CONFIG_JW, [JadeWrapper]) |
118 |
-+ EL_CONFIG(MANUAL_JW, [PDF]) |
119 |
-+ fi |
120 |
-+ |
121 |
-+ AC_PATH_PROGS(POD2HTML, "pod2html") |
122 |
-+ if test "x$POD2HTML" != "x"; then |
123 |
-+ EL_CONFIG(CONFIG_POD2HTML, [Pod2HTML]) |
124 |
-+ fi |
125 |
-+fi |
126 |
-+ |
127 |
-+AC_SUBST(ASCIIDOC_FLAGS) |
128 |
-+AC_SUBST(CONFIG_ASCIIDOC) |
129 |
-+AC_SUBST(CONFIG_POD2HTML) |
130 |
-+AC_SUBST(CONFIG_XMLTO) |
131 |
-+AC_SUBST(CONFIG_JW) |
132 |
-+ |
133 |
-+EL_CONFIG_DEPENDS(CONFIG_DOC, [CONFIG_ASCIIDOC CONFIG_XMLTO CONFIG_JW CONFIG_POD2HTML], [Documentation Tools]) |
134 |
-+EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MANUAL_ASCIIDOC MANUAL_XMLTO MANUAL_JW], [Manual Formats]) |
135 |
-+EL_CONFIG_DEPENDS(CONFIG_MANPAGE, [MAN_ASCIIDOC MAN_XMLTO], [Man Page Formats]) |
136 |
-+ |
137 |
-+dnl gcc specific options (to be continued at the bottom of configure) |
138 |
-+if test "x$ac_cv_prog_gcc" = "xyes"; then |
139 |
-+ dnl We want to see all warnings and live with none. |
140 |
-+ dnl We can't set up -Werror here as there may be some warnings in test |
141 |
-+ dnl suite of configure, and we don't want to fail them. |
142 |
-+ CFLAGS="$CFLAGS -Wall" |
143 |
-+fi |
144 |
-+ |
145 |
-+dnl =================================================================== |
146 |
-+dnl Checks for special OSes. |
147 |
-+dnl =================================================================== |
148 |
-+ |
149 |
-+dnl EL_CHECK_COMPILER_MACRO(define, name, flagname) |
150 |
-+AC_DEFUN([EL_CHECK_COMPILER_MACROS], |
151 |
-+[ |
152 |
-+ AC_MSG_CHECKING([for $2]) |
153 |
-+ |
154 |
-+ for flag in $3; do |
155 |
-+ AC_TRY_COMPILE(, [#ifndef $flag |
156 |
-+kill me! |
157 |
-+#endif ], $1=yes, $1=no) |
158 |
-+ if test "[$]$1" = yes; then |
159 |
-+ EL_CONFIG([$1], [$2]) |
160 |
-+ break |
161 |
-+ fi |
162 |
-+ done |
163 |
-+ |
164 |
-+ AC_MSG_RESULT([$]$1) |
165 |
-+]) |
166 |
-+ |
167 |
-+EL_CHECK_COMPILER_MACROS(CONFIG_BEOS, [BEOS], [__BEOS__]) |
168 |
-+AC_SUBST(CONFIG_BEOS) |
169 |
-+ |
170 |
-+EL_CHECK_COMPILER_MACROS(CONFIG_RISCOS, [RISCOS], [__riscos__]) |
171 |
-+AC_SUBST(CONFIG_RISCOS) |
172 |
-+ |
173 |
-+EL_CHECK_COMPILER_MACROS(CONFIG_WIN32, [WIN32], [_WIN32 __WIN32__]) |
174 |
-+AC_SUBST(CONFIG_WIN32) |
175 |
-+ |
176 |
-+EL_CHECK_COMPILER_MACROS(CONFIG_OS2, [EMX], [__EMX__]) |
177 |
-+AC_SUBST(CONFIG_OS2) |
178 |
-+test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zexe//g"` |
179 |
-+ |
180 |
-+AC_MSG_CHECKING([for UNIX]) |
181 |
-+dnl FIXME: some depend kind of mechanism |
182 |
-+if test "$CONFIG_BEOS" = no && \ |
183 |
-+ test "$CONFIG_RISCOS" = no && \ |
184 |
-+ test "$CONFIG_WIN32" = no && \ |
185 |
-+ test "$CONFIG_OS2" = no; then |
186 |
-+ EL_CONFIG(CONFIG_UNIX, [UNIX]) |
187 |
-+else |
188 |
-+ CONFIG_UNIX=no |
189 |
-+fi |
190 |
-+AC_MSG_RESULT($CONFIG_UNIX) |
191 |
-+AC_SUBST(CONFIG_UNIX) |
192 |
-+ |
193 |
-+dnl =================================================================== |
194 |
-+dnl Checks for header files. |
195 |
-+dnl =================================================================== |
196 |
-+ |
197 |
-+AC_HEADER_DIRENT |
198 |
-+AC_HEADER_STDC |
199 |
-+AC_HEADER_SYS_WAIT |
200 |
-+AC_HEADER_TIME |
201 |
-+ |
202 |
-+AC_CHECK_HEADERS(fcntl.h limits.h time.h unistd.h) |
203 |
-+AC_CHECK_HEADERS(sigaction.h) |
204 |
-+AC_CHECK_HEADERS(arpa/inet.h) |
205 |
-+AC_CHECK_HEADERS(netinet/in_systm.h netinet/in_system.h netinet/ip.h) |
206 |
-+AC_CHECK_HEADERS(net/if.h netdb.h netinet/in.h netinet/in6_var.h) |
207 |
-+AC_CHECK_HEADERS(ifaddrs.h) |
208 |
-+AC_CHECK_HEADERS(sys/cygwin.h io.h) |
209 |
-+AC_CHECK_HEADERS(sys/fmutex.h) |
210 |
-+AC_CHECK_HEADERS(sys/ioctl.h sys/sockio.h) |
211 |
-+AC_CHECK_HEADERS(sys/resource.h) |
212 |
-+AC_CHECK_HEADERS(sys/select.h) |
213 |
-+AC_CHECK_HEADERS(sys/signal.h) |
214 |
-+AC_CHECK_HEADERS(sys/socket.h) |
215 |
-+AC_CHECK_HEADERS(sys/time.h) |
216 |
-+AC_CHECK_HEADERS(sys/utsname.h) |
217 |
-+AC_CHECK_HEADERS(stdint.h inttypes.h) |
218 |
-+AC_CHECK_HEADERS(locale.h pwd.h) |
219 |
-+AC_CHECK_HEADERS(termios.h) |
220 |
-+ |
221 |
-+ |
222 |
-+AC_CHECK_HEADERS(sys/un.h, |
223 |
-+ [CONFIG_INTERLINK=yes |
224 |
-+ EL_CONFIG([CONFIG_INTERLINK], [interlinking])], |
225 |
-+ [CONFIG_INTERLINK=no]) |
226 |
-+AC_SUBST(CONFIG_INTERLINK) |
227 |
-+ |
228 |
-+dnl =================================================================== |
229 |
-+dnl Checks for typedefs, structures, and compiler characteristics. |
230 |
-+dnl =================================================================== |
231 |
-+ |
232 |
-+AC_STRUCT_TM |
233 |
-+AC_C_CONST |
234 |
-+AC_C_INLINE |
235 |
-+EL_CHECK_CODE(typeof, HAVE_TYPEOF, [], [int a; typeof(a) b;]) |
236 |
-+ |
237 |
-+AC_SYS_LARGEFILE |
238 |
-+AC_TYPE_SIZE_T |
239 |
-+AC_TYPE_OFF_T |
240 |
-+EL_CHECK_TYPE(ssize_t, int) |
241 |
-+EL_CHECK_SYS_TYPE(long long, HAVE_LONG_LONG, []) |
242 |
-+EL_CHECK_SYS_TYPE(off_t, HAVE_OFF_T, []) |
243 |
-+EL_CHECK_INT_TYPE(int32_t, HAVE_INT32_T) |
244 |
-+EL_CHECK_INT_TYPE(uint32_t, HAVE_UINT32_T) |
245 |
-+EL_CHECK_INT_TYPE(uint16_t, HAVE_UINT16_T) |
246 |
-+ |
247 |
-+AC_CHECK_SIZEOF(char, 1) |
248 |
-+AC_CHECK_SIZEOF(short, 2) |
249 |
-+AC_CHECK_SIZEOF(int, 4) |
250 |
-+AC_CHECK_SIZEOF(long, 4) |
251 |
-+test "x$HAVE_LONG_LONG" = xyes && AC_CHECK_SIZEOF(long long, 8) |
252 |
-+test "x$HAVE_OFF_T" = xyes && AC_CHECK_SIZEOF(off_t, 4) |
253 |
-+ |
254 |
-+dnl Check for variadic macros |
255 |
-+EL_CHECK_CODE([variadic macros], HAVE_VARIADIC_MACROS, |
256 |
-+ [#include <stdio.h> |
257 |
-+ #define a(b,c...) printf(b,##c)], |
258 |
-+ [a("foo");a("%s","bar");a("%s%s","baz","quux");]) |
259 |
-+ |
260 |
-+dnl Check for -rdynamic |
261 |
-+dnl FIXME: This check doesn't work. Something to do with the compiler |
262 |
-+dnl happily ignoring it and stderr not being checked for error messages. |
263 |
-+AC_MSG_CHECKING([for -rdynamic]) |
264 |
-+LDFLAGS_X="$LDFLAGS" |
265 |
-+LDFLAGS="$LDFLAGS -rdynamic" |
266 |
-+AC_TRY_LINK([], [], have_rdynamic=yes, have_rdynamic=no) |
267 |
-+test "$have_rdynamic" = no && LDFLAGS="$LDFLAGS_X" |
268 |
-+AC_MSG_RESULT($have_rdynamic) |
269 |
-+ |
270 |
-+dnl =================================================================== |
271 |
-+dnl Check for POSIX <regex.h> |
272 |
-+dnl =================================================================== |
273 |
-+ |
274 |
-+EL_CHECK_SYS_TYPE(regex_t, HAVE_REGEX_H, [#include <regex.h>]) |
275 |
-+ |
276 |
-+dnl =================================================================== |
277 |
-+dnl Checks for library functions. |
278 |
-+dnl =================================================================== |
279 |
-+ |
280 |
-+AC_PROG_GCC_TRADITIONAL |
281 |
-+AC_FUNC_MEMCMP |
282 |
-+AC_FUNC_MMAP |
283 |
-+AC_FUNC_STRFTIME |
284 |
-+AC_CHECK_FUNCS(cfmakeraw gethostbyaddr herror strerror) |
285 |
-+AC_CHECK_FUNCS(popen uname access chmod alarm timegm mremap) |
286 |
-+AC_CHECK_FUNCS(strcasecmp strncasecmp strcasestr strstr strchr strrchr) |
287 |
-+AC_CHECK_FUNCS(memmove bcopy stpcpy strdup index isdigit mempcpy memrchr) |
288 |
-+AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf) |
289 |
-+AC_CHECK_FUNCS(getifaddrs getpwnam inet_pton inet_ntop) |
290 |
-+AC_CHECK_FUNCS(fflush fsync fseeko ftello sigaction) |
291 |
-+AC_CHECK_FUNCS(gettimeofday clock_gettime) |
292 |
-+ |
293 |
-+AC_HAVE_FUNCS(cygwin_conv_to_full_win32_path) |
294 |
-+ |
295 |
-+AC_CHECK_FUNCS(setenv putenv, HAVE_SETENV_OR_PUTENV=yes) |
296 |
-+AC_CHECK_FUNCS(getuid, HAVE_GETUID=yes) |
297 |
-+AC_CHECK_FUNCS(geteuid, HAVE_GETEUID=yes) |
298 |
-+ |
299 |
-+dnl These aren't probably needed now, as they are commented in links.h. |
300 |
-+dnl I've no idea about their historical background, but I keep them here |
301 |
-+dnl just in the case they will help later. --pasky |
302 |
-+AC_CHECK_FUNCS(getpid, HAVE_GETPID=yes) |
303 |
-+AC_CHECK_FUNCS(setpgid getpgid setpgrp getpgrp) |
304 |
-+AC_CHECK_FUNCS(raise, HAVE_RAISE=yes) |
305 |
-+AC_CHECK_FUNCS(kill, HAVE_KILL=yes) |
306 |
-+ |
307 |
-+if test x"$HAVE_RAISE" = x; then |
308 |
-+ if test x"$HAVE_KILL" = x || test x"$HAVE_GETPID" = x; then |
309 |
-+ AC_ERROR([Unable to emulate raise()]) |
310 |
-+ fi |
311 |
-+fi |
312 |
-+ |
313 |
-+AC_CACHE_CHECK([for __va_copy],el_cv_HAVE_VA_COPY,[ |
314 |
-+AC_TRY_LINK([#include <stdarg.h> |
315 |
-+va_list ap1,ap2;], [__va_copy(ap1,ap2);], |
316 |
-+el_cv_HAVE_VA_COPY=yes,el_cv_HAVE_VA_COPY=no)]) |
317 |
-+if test x"$el_cv_HAVE_VA_COPY" = x"yes"; then |
318 |
-+ EL_DEFINE(HAVE_VA_COPY, __va_copy) |
319 |
-+fi |
320 |
-+ |
321 |
-+AC_CACHE_CHECK([for sysconf(_SC_PAGE_SIZE)],el_cv_HAVE_SC_PAGE_SIZE,[ |
322 |
-+AC_TRY_LINK([#include <unistd.h> |
323 |
-+], [int page_size = sysconf(_SC_PAGE_SIZE);], |
324 |
-+el_cv_HAVE_SC_PAGE_SIZE=yes,el_cv_HAVE_SC_PAGE_SIZE=no)]) |
325 |
-+if test x"$el_cv_HAVE_SC_PAGE_SIZE" = x"yes"; then |
326 |
-+ EL_DEFINE(HAVE_SC_PAGE_SIZE, _SC_PAGE_SIZE) |
327 |
-+fi |
328 |
-+ |
329 |
-+AC_CACHE_CHECK([for C99 vsnprintf],el_cv_HAVE_C99_VSNPRINTF,[ |
330 |
-+AC_TRY_RUN([ |
331 |
-+#include <stdio.h> |
332 |
-+#include <stdarg.h> |
333 |
-+#include <stdlib.h> |
334 |
-+#include <string.h> |
335 |
-+ |
336 |
-+char buf[8]; |
337 |
-+ |
338 |
-+int bar(char *buf, const char *format, va_list ap) |
339 |
-+{ |
340 |
-+ return vsnprintf(buf, 0, format, ap); |
341 |
-+} |
342 |
-+ |
343 |
-+void foo(const char *format, ...) { |
344 |
-+ va_list ap; |
345 |
-+ int len; |
346 |
-+ |
347 |
-+ va_start(ap, format); |
348 |
-+ len = bar(buf, format, ap); |
349 |
-+ va_end(ap); |
350 |
-+ if ((len != 6) && (len != 7)) exit(1); /* \n -> \r\n */ |
351 |
-+ |
352 |
-+ va_start(ap, format); |
353 |
-+ len = bar(buf, format, ap); |
354 |
-+ va_end(ap); |
355 |
-+ if ((len != 6) && (len != 7)) exit(1); |
356 |
-+ |
357 |
-+ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1); |
358 |
-+ |
359 |
-+ exit(0); |
360 |
-+} |
361 |
-+main() { foo("hello\n"); } |
362 |
-+], |
363 |
-+el_cv_HAVE_C99_VSNPRINTF=yes,el_cv_HAVE_C99_VSNPRINTF=no,el_cv_HAVE_C99_VSNPRINTF=cross)]) |
364 |
-+if test x"$el_cv_HAVE_C99_VSNPRINTF" = x"yes"; then |
365 |
-+ EL_DEFINE(HAVE_C99_VSNPRINTF, [C99 compliant vsnprintf()]) |
366 |
-+fi |
367 |
-+ |
368 |
-+AC_CHECK_LIB(dl, dlopen) # OpenSSL and Lua frequently needs it |
369 |
-+ |
370 |
-+dnl =================================================================== |
371 |
-+dnl Checks for libraries. |
372 |
-+dnl =================================================================== |
373 |
-+ |
374 |
-+dnl Replace `main' with a function in -lsocket: |
375 |
-+AC_CHECK_FUNC(socket, cf_result=yes, cf_result=no) |
376 |
-+if test "$cf_result" = no; then |
377 |
-+ AC_CHECK_LIB(socket, socket) |
378 |
-+fi |
379 |
-+ |
380 |
-+AC_CHECK_FUNC(setsockopt, cf_result=yes, cf_result=no) |
381 |
-+if test "$cf_result" = no; then |
382 |
-+ AC_CHECK_LIB(socket, setsockopt) |
383 |
-+fi |
384 |
-+ |
385 |
-+AC_CHECK_FUNC(gethostbyname, cf_result=yes, cf_result=no) |
386 |
-+if test "$cf_result" = no; then |
387 |
-+ AC_CHECK_LIB(socket, gethostbyname, cf_result=yes, cf_result=no) |
388 |
-+ if test "$cf_result" = no; then |
389 |
-+ AC_CHECK_LIB(nsl, gethostbyname) |
390 |
-+ else |
391 |
-+ test -z "`echo $LIBS | grep -- -lsocket`" && LIBS="$LIBS -lsocket" |
392 |
-+ fi |
393 |
-+fi |
394 |
-+ |
395 |
-+dnl =================================================================== |
396 |
-+dnl Checks for packaging specific options. |
397 |
-+dnl =================================================================== |
398 |
-+ |
399 |
-+AC_ARG_WITH(xterm, [ --with-xterm how to invoke the X terminal emulator], |
400 |
-+ [ if test "$withval" != no && test "$withval" != yes; then |
401 |
-+ AC_DEFINE_UNQUOTED(XTERM, "$withval", [How to invoke XTerm]) |
402 |
-+ fi ]) |
403 |
-+ |
404 |
-+dnl =================================================================== |
405 |
-+dnl Checks for a libraries, optional even if installed. |
406 |
-+dnl =================================================================== |
407 |
-+ |
408 |
-+dnl EL_CHECK_OPTIONAL_LIBRARY(define, name, header, lib, function) |
409 |
-+AC_DEFUN([EL_CHECK_OPTIONAL_LIBRARY], |
410 |
-+[ |
411 |
-+ AC_MSG_CHECKING([for $2 support]) |
412 |
-+ |
413 |
-+ if test "[$]$1" != no; then |
414 |
-+ AC_MSG_RESULT(yes) |
415 |
-+ EL_SAVE_FLAGS |
416 |
-+ if test -n "$withval" && test -d "$withval"; then |
417 |
-+ CFLAGS="$CFLAGS -I$withval/include"; |
418 |
-+ CPPFLAGS="$CPPFLAGS -I$withval/include"; |
419 |
-+ LDFLAGS="$LDFLAGS -L$withval/lib"; |
420 |
-+ fi |
421 |
-+ |
422 |
-+ AC_CHECK_HEADERS([$3], [$1=yes], [$1=no; break;]) |
423 |
-+ if test "[$]$1" = yes; then |
424 |
-+ AC_CHECK_LIB([$4], [$5], [$1=yes], [$1=no]) |
425 |
-+ fi |
426 |
-+ |
427 |
-+ if test "[$]$1" = yes; then |
428 |
-+ EL_CONFIG([$1], [$2]) |
429 |
-+ LIBS="$LIBS -l$4" |
430 |
-+ else |
431 |
-+ if test -n "[$]WITHVAL_$1" && |
432 |
-+ test "[$]WITHVAL_$1" != xno; then |
433 |
-+ AC_MSG_ERROR([$2 not found]) |
434 |
-+ fi |
435 |
-+ EL_RESTORE_FLAGS |
436 |
-+ fi |
437 |
-+ else |
438 |
-+ AC_MSG_RESULT(disabled) |
439 |
-+ fi |
440 |
-+]) |
441 |
-+ |
442 |
-+dnl EL_CONFIG_OPTIONAL_LIBRARY(define, name, header, lib, function, confhelp) |
443 |
-+AC_DEFUN([EL_CONFIG_OPTIONAL_LIBRARY], |
444 |
-+[ |
445 |
-+ $1=yes |
446 |
-+ WITHVAL_$1= |
447 |
-+ |
448 |
-+ AC_ARG_WITH([$2], [$6], [WITHVAL_$1="[$]withval"]) |
449 |
-+ if test "x[$]WITHVAL_$1" = xno; then $1=no; fi |
450 |
-+ |
451 |
-+ EL_CHECK_OPTIONAL_LIBRARY([$1], [$2], [$3], [$4], [$5]) |
452 |
-+ |
453 |
-+ EL_LOG_CONFIG([$1], [$2], []) |
454 |
-+]) |
455 |
-+ |
456 |
-+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GPM, gpm, gpm.h, gpm, Gpm_Open, |
457 |
-+ [ --without-gpm disable gpm (mouse) support]) |
458 |
-+ |
459 |
-+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GZIP, zlib, zlib.h, z, gzdopen, |
460 |
-+ [ --without-zlib disable zlib support]) |
461 |
-+ |
462 |
-+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen, |
463 |
-+ [ --without-bzlib disable bzlib support]) |
464 |
-+ |
465 |
-+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version, |
466 |
-+ [ --without-idn disable international domain names support]) |
467 |
-+ |
468 |
-+dnl =================================================================== |
469 |
-+dnl Bookmark and XBEL support |
470 |
-+dnl =================================================================== |
471 |
-+ |
472 |
-+EL_SAVE_FLAGS |
473 |
-+ |
474 |
-+EL_ARG_ENABLE(CONFIG_BOOKMARKS, bookmarks, [Bookmarks], |
475 |
-+ [ --disable-bookmarks disable bookmark support]) |
476 |
-+ |
477 |
-+# Check whether --enable-xbel or --disable-xbel was given. |
478 |
-+if test "x${enable_xbel}" != xno; then |
479 |
-+ AC_CHECK_HEADERS(expat.h, HAVE_LIBEXPAT=yes, HAVE_LIBEXPAT=no) |
480 |
-+ |
481 |
-+ if test "$HAVE_LIBEXPAT" = yes; then |
482 |
-+ AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_LIBEXPAT=yes, HAVE_LIBEXPAT=no) |
483 |
-+ if test "$HAVE_LIBEXPAT" = yes; then |
484 |
-+ LIBS="$LIBS -lexpat" |
485 |
-+ fi |
486 |
-+ fi |
487 |
-+fi |
488 |
-+ |
489 |
-+ |
490 |
-+EL_ARG_DEPEND(CONFIG_XBEL_BOOKMARKS, xbel, [CONFIG_BOOKMARKS:yes HAVE_LIBEXPAT:yes], |
491 |
-+ [XBEL bookmarks], |
492 |
-+ [ --disable-xbel disable XBEL bookmark support (requires expat)]) |
493 |
-+ |
494 |
-+if test "$CONFIG_XBEL_BOOKMARKS" != yes; then |
495 |
-+ EL_RESTORE_FLAGS |
496 |
-+fi |
497 |
-+ |
498 |
-+dnl =================================================================== |
499 |
-+dnl Checks for BSD sysmouse |
500 |
-+dnl =================================================================== |
501 |
-+ |
502 |
-+HAVE_SYSMOUSE_HEADER="no" |
503 |
-+ |
504 |
-+# Either of these header files provides the (same) sysmouse interface |
505 |
-+AC_CHECK_HEADERS(sys/consio.h machine/console.h, [HAVE_SYSMOUSE_HEADER="yes"]) |
506 |
-+ |
507 |
-+dnl =================================================================== |
508 |
-+dnl Checks for OS/2 |
509 |
-+dnl =================================================================== |
510 |
-+ |
511 |
-+if test "$CONFIG_OS2" = yes; then |
512 |
-+ EL_CONFIG_OS2 |
513 |
-+fi |
514 |
-+ |
515 |
-+dnl =================================================================== |
516 |
-+dnl Checks for Win32 |
517 |
-+dnl =================================================================== |
518 |
-+ |
519 |
-+if test "$CONFIG_WIN32" = yes; then |
520 |
-+ EL_CONFIG_WIN32 |
521 |
-+fi |
522 |
-+ |
523 |
-+dnl =================================================================== |
524 |
-+dnl Check for SpiderMonkey, optional even if installed. |
525 |
-+dnl =================================================================== |
526 |
-+ |
527 |
-+AC_ARG_WITH(spidermonkey, [ --without-spidermonkey disable SpiderMonkey Mozilla JavaScript engine support], |
528 |
-+ [if test "$withval" = no; then disable_spidermonkey=yes; fi]) |
529 |
-+AC_MSG_CHECKING([for SpiderMonkey]) |
530 |
-+ |
531 |
-+EL_SAVE_FLAGS |
532 |
-+cf_result=no |
533 |
-+ |
534 |
-+if test -z "$disable_spidermonkey"; then |
535 |
-+ if test ! -d "$withval"; then |
536 |
-+ withval=""; |
537 |
-+ fi |
538 |
-+ for spidermonkeydir in "$withval" "" /usr /usr/local /opt/spidermonkey /opt/js; do |
539 |
-+ for spidermonkeyinclude in "/include" "/include/js" "/include/smjs"; do |
540 |
-+ for spidermonkeylib in js smjs; do |
541 |
-+ if test "$cf_result" = no; then |
542 |
-+ SPIDERMONKEY_LIBS="-l$spidermonkeylib" |
543 |
-+ |
544 |
-+ if test ! -z "$spidermonkeydir"; then |
545 |
-+ SPIDERMONKEY_LIBS="-L$spidermonkeydir/lib $SPIDERMONKEY_LIBS" |
546 |
-+ SPIDERMONKEY_CFLAGS="-I$spidermonkeydir$spidermonkeyinclude" |
547 |
-+ fi |
548 |
-+ |
549 |
-+ LIBS="$SPIDERMONKEY_LIBS $LIBS_X" |
550 |
-+ CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS" |
551 |
-+ CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" |
552 |
-+ |
553 |
-+ AC_TRY_LINK([#define XP_UNIX |
554 |
-+ #include <jsapi.h>], |
555 |
-+ [JS_GetImplementationVersion()], |
556 |
-+ cf_result=yes, cf_result=no) |
557 |
-+ fi |
558 |
-+ done |
559 |
-+ done |
560 |
-+ done |
561 |
-+fi |
562 |
-+ |
563 |
-+AC_MSG_RESULT($cf_result) |
564 |
-+ |
565 |
-+if test "$cf_result" != yes; then |
566 |
-+ EL_RESTORE_FLAGS |
567 |
-+else |
568 |
-+ EL_CONFIG(CONFIG_SPIDERMONKEY, [SpiderMonkey]) |
569 |
-+ |
570 |
-+ CFLAGS="$CFLAGS_X" |
571 |
-+ AC_SUBST(SPIDERMONKEY_LIBS) |
572 |
-+ AC_SUBST(SPIDERMONKEY_CFLAGS) |
573 |
-+fi |
574 |
-+ |
575 |
-+AC_SUBST(CONFIG_SPIDERMONKEY) |
576 |
-+ |
577 |
-+EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_SPIDERMONKEY], [ECMAScript (JavaScript)]) |
578 |
-+ |
579 |
-+ |
580 |
-+dnl =================================================================== |
581 |
-+dnl Check for Guile, optional even if installed. |
582 |
-+dnl =================================================================== |
583 |
-+ |
584 |
-+enable_guile="no"; |
585 |
-+ |
586 |
-+AC_ARG_WITH(guile, [ --with-guile enable Guile support], |
587 |
-+ [ if test "x$withval" != xno; then enable_guile=yes; fi ]) |
588 |
-+ |
589 |
-+# The following is probably bad, ugly and so on. Stolen from Guile's (1.4) |
590 |
-+# GUILE_FLAGS but I really don't want to require people to have Guile in order |
591 |
-+# to compile CVS. Also, the macro seems to be really stupid regarding searching |
592 |
-+# for Guile in $PATH etc. --pasky |
593 |
-+ |
594 |
-+AC_MSG_CHECKING([for Guile]) |
595 |
-+ |
596 |
-+if test "$enable_guile" = "yes"; then |
597 |
-+ AC_MSG_RESULT(yes); |
598 |
-+ ## Based on the GUILE_FLAGS macro. |
599 |
-+ |
600 |
-+ if test -d "$withval"; then |
601 |
-+ GUILE_PATH="$withval:$PATH" |
602 |
-+ else |
603 |
-+ GUILE_PATH="$PATH" |
604 |
-+ fi |
605 |
-+ |
606 |
-+ AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $GUILE_PATH) |
607 |
-+ |
608 |
-+ ## First, let's just see if we can find Guile at all. |
609 |
-+ if test "$GUILE_CONFIG" != no; then |
610 |
-+ cf_result="yes"; |
611 |
-+ |
612 |
-+ GUILE_LIBS="`guile-config link`" |
613 |
-+ GUILE_CFLAGS="`guile-config compile`" |
614 |
-+ LIBS="$GUILE_LIBS $LIBS" |
615 |
-+ CPPFLAGS="$CPPFLAGS $GUILE_CFLAGS" |
616 |
-+ EL_CONFIG(CONFIG_GUILE, [Guile]) |
617 |
-+ AC_SUBST(GUILE_CFLAGS) |
618 |
-+ cat <<EOF |
619 |
-+*********************************************************************** |
620 |
-+The Guile support is incomplete and not so well integrated to ELinks |
621 |
-+yet. That means, e.g., that you have no Guile console and there might |
622 |
-+not be all the necessary hooks. Also, the Guile interface is not too |
623 |
-+well tested (success stories heartily welcomed!). See |
624 |
-+src/scripting/guile/README for further details and hints. |
625 |
-+*********************************************************************** |
626 |
-+EOF |
627 |
-+ else |
628 |
-+ if test -n "$withval" && test "x$withval" != xno; then |
629 |
-+ AC_MSG_ERROR([Guile not found]) |
630 |
-+ else |
631 |
-+ AC_MSG_WARN([Guile support disabled]) |
632 |
-+ fi |
633 |
-+ fi |
634 |
-+else |
635 |
-+ AC_MSG_RESULT(no); |
636 |
-+fi |
637 |
-+ |
638 |
-+dnl =================================================================== |
639 |
-+dnl Check for Perl |
640 |
-+dnl =================================================================== |
641 |
-+enable_perl="no"; |
642 |
-+ |
643 |
-+AC_ARG_WITH(perl, [ --with-perl enable Perl support], |
644 |
-+ [ |
645 |
-+if test "$withval" = yes; then |
646 |
-+ # FIXME: If withval is a valid directory append it to PATH |
647 |
-+ # so that you can specify one of several perl installations. |
648 |
-+ withval=""; |
649 |
-+ enable_perl=yes; |
650 |
-+fi |
651 |
-+ ]) |
652 |
-+ |
653 |
-+AC_MSG_CHECKING([for Perl]) |
654 |
-+ |
655 |
-+cf_result=no |
656 |
-+ |
657 |
-+EL_SAVE_FLAGS |
658 |
-+ |
659 |
-+if test "$enable_perl" = "yes"; then |
660 |
-+ PERL_LIBS="`perl -MExtUtils::Embed -e ldopts`" |
661 |
-+ PERL_CFLAGS="`perl -MExtUtils::Embed -e ccopts`" |
662 |
-+ LIBS="$PERL_LIBS $LIBS" |
663 |
-+ CFLAGS="$PERL_CFLAGS $CFLAGS" |
664 |
-+ CPPFLAGS="$CPPFLAGS $PERL_CFLAGS" |
665 |
-+ AC_TRY_LINK([ |
666 |
-+#include <EXTERN.h> |
667 |
-+#include <perl.h> |
668 |
-+#include <perlapi.h> |
669 |
-+], |
670 |
-+ [PerlInterpreter *my_perl = perl_alloc();], |
671 |
-+ cf_result=yes, cf_result=no) |
672 |
-+fi |
673 |
-+ |
674 |
-+if test "$cf_result" != "yes"; then |
675 |
-+ EL_RESTORE_FLAGS |
676 |
-+else |
677 |
-+ EL_CONFIG(CONFIG_PERL, [Perl]) |
678 |
-+ |
679 |
-+ CFLAGS="$CFLAGS_X" |
680 |
-+ AC_SUBST(PERL_LIBS) |
681 |
-+ AC_SUBST(PERL_CFLAGS) |
682 |
-+fi |
683 |
-+ |
684 |
-+if test "$cf_result"; then AC_MSG_RESULT($cf_result); fi |
685 |
-+dnl =================================================================== |
686 |
-+dnl Check for Python |
687 |
-+dnl =================================================================== |
688 |
-+enable_python="no"; |
689 |
-+ |
690 |
-+AC_ARG_WITH(python, [ --with-python enable Python support], |
691 |
-+ [ |
692 |
-+if test "$withval" = yes; then |
693 |
-+ # FIXME: If withval is a valid directory append it to PATH |
694 |
-+ # so that you can specify one of several Python installations. |
695 |
-+ withval=""; |
696 |
-+ enable_python=yes; |
697 |
-+ cat <<EOF |
698 |
-+*********************************************************************** |
699 |
-+The Python support is incomplete and not so well integrated to ELinks |
700 |
-+yet. That means, e.g.., that you have no Python console and there might |
701 |
-+not be all the necessary hooks. Also, the Python interface is not too |
702 |
-+well tested (success stories heartily welcomed!). |
703 |
-+*********************************************************************** |
704 |
-+EOF |
705 |
-+fi |
706 |
-+ ]) |
707 |
-+ |
708 |
-+AC_MSG_CHECKING([for Python]) |
709 |
-+ |
710 |
-+cf_result=no |
711 |
-+ |
712 |
-+EL_SAVE_FLAGS |
713 |
-+ |
714 |
-+if test "$enable_python" = "yes"; then |
715 |
-+ PYTHON_LIBS="-lpython`python -c 'from distutils import sysconfig; print sysconfig.get_config_var("VERSION")' 2> /dev/null`" |
716 |
-+ PYTHON_CFLAGS="-I`python -c 'from distutils import sysconfig; print sysconfig.get_python_inc()' 2> /dev/null`" |
717 |
-+ LIBS="$PYTHON_LIBS $LIBS" |
718 |
-+ CFLAGS="$PYTHON_CFLAGS $CFLAGS" |
719 |
-+ CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" |
720 |
-+ AC_TRY_LINK([ |
721 |
-+#include <Python.h> |
722 |
-+], |
723 |
-+ [Py_Initialize();], |
724 |
-+ cf_result=yes, cf_result=no) |
725 |
-+fi |
726 |
-+ |
727 |
-+if test "$cf_result" != "yes"; then |
728 |
-+ EL_RESTORE_FLAGS |
729 |
-+else |
730 |
-+ EL_CONFIG(CONFIG_PYTHON, [Python]) |
731 |
-+ |
732 |
-+ CFLAGS="$CFLAGS_X" |
733 |
-+ AC_SUBST(PYTHON_LIBS) |
734 |
-+ AC_SUBST(PYTHON_CFLAGS) |
735 |
-+fi |
736 |
-+ |
737 |
-+if test "$cf_result"; then AC_MSG_RESULT($cf_result); fi |
738 |
-+ |
739 |
-+ |
740 |
-+dnl =================================================================== |
741 |
-+dnl Check for Lua, optional even if installed. |
742 |
-+dnl =================================================================== |
743 |
-+ |
744 |
-+dnl Do this the long way, as FreeBSD reportedly needs -L<dir> for |
745 |
-+dnl anything other than /usr/lib, and Lua is very often in /usr/local/lib. |
746 |
-+ |
747 |
-+AC_ARG_WITH(lua, [ --without-lua disable Lua support], |
748 |
-+ [if test "$withval" = no; then disable_lua=yes; fi]) |
749 |
-+AC_MSG_CHECKING([for Lua]) |
750 |
-+ |
751 |
-+EL_SAVE_FLAGS |
752 |
-+cf_result=no |
753 |
-+ |
754 |
-+if test -z "$disable_lua"; then |
755 |
-+ if test ! -d "$withval"; then |
756 |
-+ withval=""; |
757 |
-+ fi |
758 |
-+ for luadir in "$withval" "" /usr /usr/local; do |
759 |
-+ for suffix in "" 50 51; do |
760 |
-+ if test "$cf_result" = no; then |
761 |
-+ LUA_LIBS="-llua$suffix -llualib$suffix -lm" |
762 |
-+ |
763 |
-+ if test ! -z "$luadir"; then |
764 |
-+ LUA_LIBS="-L$luadir/lib $LUA_LIBS" |
765 |
-+ LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix" |
766 |
-+ fi |
767 |
-+ |
768 |
-+ LIBS="$LUA_LIBS $LIBS_X" |
769 |
-+ CFLAGS="$CFLAGS_X $LUA_CFLAGS" |
770 |
-+ CPPFLAGS="$CPPFLAGS_X $LUA_CFLAGS" |
771 |
-+ |
772 |
-+ # Check that it is a compatible Lua version |
773 |
-+ AC_TRY_LINK([ #include <lua.h> |
774 |
-+ #include <lualib.h>], |
775 |
-+ [ lua_State *L = lua_open(); |
776 |
-+ luaopen_base(L); |
777 |
-+ luaopen_table(L); |
778 |
-+ luaopen_io(L); |
779 |
-+ luaopen_string(L); |
780 |
-+ luaopen_math(L); |
781 |
-+ lua_pushboolean(L, 1); |
782 |
-+ lua_close(L);], |
783 |
-+ cf_result=yes, cf_result=no) |
784 |
-+ fi |
785 |
-+ done |
786 |
-+ done |
787 |
-+fi |
788 |
-+ |
789 |
-+AC_MSG_RESULT($cf_result) |
790 |
-+ |
791 |
-+if test "$cf_result" != yes; then |
792 |
-+ EL_RESTORE_FLAGS |
793 |
-+else |
794 |
-+ EL_CONFIG(CONFIG_LUA, [Lua]) |
795 |
-+ AC_CHECK_HEADERS(lauxlib.h) |
796 |
-+ |
797 |
-+ CFLAGS="$CFLAGS_X" |
798 |
-+ AC_SUBST(LUA_LIBS) |
799 |
-+ AC_SUBST(LUA_CFLAGS) |
800 |
-+fi |
801 |
-+ |
802 |
-+ |
803 |
-+dnl =================================================================== |
804 |
-+dnl Check for Ruby, optional even if installed. |
805 |
-+dnl =================================================================== |
806 |
-+ |
807 |
-+EL_CONFIG_RUBY |
808 |
-+ |
809 |
-+dnl =================================================================== |
810 |
-+dnl Optional Spidermonkey-based ECMAScript browser scripting |
811 |
-+dnl =================================================================== |
812 |
-+ |
813 |
-+AC_ARG_ENABLE(sm-scripting, |
814 |
-+ [ --disable-sm-scripting ECMAScript browser scripting (requires Spidermonkey)], |
815 |
-+ [if test "$enableval" != no; then enableval="yes"; fi |
816 |
-+ CONFIG_SM_SCRIPTING="$enableval";]) |
817 |
-+ |
818 |
-+if test "x$CONFIG_SPIDERMONKEY" = xyes && |
819 |
-+ test "x$CONFIG_SM_SCRIPTING" = xyes; then |
820 |
-+ EL_CONFIG(CONFIG_SM_SCRIPTING, [SpiderMonkey]) |
821 |
-+else |
822 |
-+ CONFIG_SM_SCRIPTING=no |
823 |
-+fi |
824 |
-+ |
825 |
-+dnl =================================================================== |
826 |
-+dnl Setup global scripting |
827 |
-+dnl =================================================================== |
828 |
-+ |
829 |
-+EL_CONFIG_DEPENDS(CONFIG_SCRIPTING, [CONFIG_GUILE CONFIG_LUA CONFIG_PERL CONFIG_PYTHON CONFIG_RUBY CONFIG_SM_SCRIPTING], [Browser scripting]) |
830 |
-+AC_SUBST(CONFIG_GUILE) |
831 |
-+AC_SUBST(CONFIG_LUA) |
832 |
-+AC_SUBST(CONFIG_PERL) |
833 |
-+AC_SUBST(CONFIG_PYTHON) |
834 |
-+AC_SUBST(CONFIG_RUBY) |
835 |
-+AC_SUBST(CONFIG_SM_SCRIPTING) |
836 |
-+AC_SUBST(CONFIG_SCRIPTING) |
837 |
-+ |
838 |
-+ |
839 |
-+dnl =================================================================== |
840 |
-+dnl Check for SSL support. |
841 |
-+dnl =================================================================== |
842 |
-+ |
843 |
-+dnl We by default use OpenSSL, and we always prefer it. However, when GNUTLS |
844 |
-+dnl is enabled, we won't try to use OpenSSL anymore. |
845 |
-+ |
846 |
-+dnl For wiping SSL hooks.. |
847 |
-+#ifdef CONFIG_SSL |
848 |
-+ |
849 |
-+disable_openssl="" |
850 |
-+disable_gnutls="" |
851 |
-+enable_gnutls="" |
852 |
-+ |
853 |
-+AC_ARG_WITH(gnutls, [ --without-gnutls disable GNUTLS SSL support], |
854 |
-+ [if test "$with_gnutls" = no; then disable_gnutls=yes; fi]) |
855 |
-+AC_ARG_WITH(gnutls, [ --with-gnutls[=DIR] enable GNUTLS SSL support], |
856 |
-+ [if test "$with_gnutls" != no; then enable_gnutls=yes; fi]) |
857 |
-+gnutls_withval="$withval" |
858 |
-+ |
859 |
-+if test "$enable_gnutls" = yes; then |
860 |
-+ disable_openssl=yes; |
861 |
-+fi |
862 |
-+ |
863 |
-+AC_ARG_WITH(openssl, [ --without-openssl disable OpenSSL support], |
864 |
-+ [if test "$with_openssl" = no; then disable_openssl=yes; fi]) |
865 |
-+AC_ARG_WITH(openssl, [ --with-openssl[=DIR] enable OpenSSL support (default)]) |
866 |
-+openssl_withval="$withval" |
867 |
-+ |
868 |
-+dnl ---- OpenSSL |
869 |
-+ |
870 |
-+AC_MSG_CHECKING([for OpenSSL]) |
871 |
-+ |
872 |
-+EL_SAVE_FLAGS |
873 |
-+cf_result="no" |
874 |
-+ |
875 |
-+if test "$disable_openssl" = yes; then |
876 |
-+ cf_result="not used" |
877 |
-+else |
878 |
-+ for ssldir in "$openssl_withval" "" /usr /usr/local/openssl \ |
879 |
-+ /usr/lib/openssl /usr/local/ssl \ |
880 |
-+ /usr/local/www /usr/lib/ssl /usr/local \ |
881 |
-+ /usr/pkg /opt /opt/openssl; do |
882 |
-+ if test "$cf_result" = no; then |
883 |
-+ if test -d "$ssldir"; then |
884 |
-+ OPENSSL_CFLAGS="-I$ssldir/include" |
885 |
-+ LIBS="-L$ssldir/lib -lssl -lcrypto $LIBS_X" |
886 |
-+ CFLAGS="$CFLAGS_X $OPENSSL_CFLAGS" |
887 |
-+ CPPFLAGS="$CPPFLAGS_X $OPENSSL_CFLAGS" |
888 |
-+# # FIXME: This created serious portability problems. --pasky |
889 |
-+# if test "$CC" == "gcc"; then |
890 |
-+# # I'm not sure about compatibility here. --pasky |
891 |
-+# LIBS="$LIBS -R$ssldir/lib" |
892 |
-+# fi |
893 |
-+ else |
894 |
-+ LIBS="-lssl -lcrypto $LIBS_X" |
895 |
-+ fi |
896 |
-+ AC_TRY_LINK([#include <openssl/ssl.h>], |
897 |
-+ [OpenSSL_add_all_algorithms()], |
898 |
-+ cf_result=yes, cf_result=no) |
899 |
-+ if test "$cf_result" != yes; then |
900 |
-+ AC_TRY_LINK([#include <openssl/ssl.h>], |
901 |
-+ [SSLeay_add_ssl_algorithms()], |
902 |
-+ cf_result=yes, cf_result=no) |
903 |
-+ fi |
904 |
-+ fi |
905 |
-+ done |
906 |
-+ |
907 |
-+ if test "$cf_result" != yes; then |
908 |
-+ if test -n "$openssl_withval" && test "x$openssl_withval" != xno; then |
909 |
-+ AC_MSG_ERROR([OpenSSL not found]) |
910 |
-+ fi |
911 |
-+ EL_RESTORE_FLAGS |
912 |
-+ else |
913 |
-+ EL_CONFIG(CONFIG_OPENSSL, [OpenSSL]) |
914 |
-+ |
915 |
-+ CFLAGS="$CFLAGS_X" |
916 |
-+ AC_SUBST(OPENSSL_CFLAGS) |
917 |
-+ fi |
918 |
-+fi |
919 |
-+ |
920 |
-+AC_MSG_RESULT($cf_result) |
921 |
-+ |
922 |
-+CONFIG_GNUTLS_OPENSSL_COMPAT=no |
923 |
-+dnl ---- GNU TLS |
924 |
-+dnl We can't have AC_MSG_CHECKING here, because AC_PATH_PROG prints its own and |
925 |
-+dnl it looks ugly then. |
926 |
-+ |
927 |
-+if test "$cf_result" = yes; then |
928 |
-+ cf_result="not used" |
929 |
-+ |
930 |
-+else |
931 |
-+ EL_SAVE_FLAGS |
932 |
-+ cf_result="no" |
933 |
-+ |
934 |
-+ if test -z "$disable_gnutls"; then |
935 |
-+ # Sure, we maybe _could_ use their macro, but how to ensure |
936 |
-+ # that the ./configure script won't fail if the macro won't be |
937 |
-+ # found..? :( --pasky |
938 |
-+ |
939 |
-+ GNUTLS_PATH="$PATH:/usr/local/gnutls:/opt:/opt/gnutls" |
940 |
-+ |
941 |
-+ if test -d "$gnutls_withval"; then |
942 |
-+ GNUTLS_PATH="$gnutls_withval:$GNUTLS_PATH" |
943 |
-+ fi |
944 |
-+ |
945 |
-+ AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no, $GNUTLS_PATH) |
946 |
-+ |
947 |
-+ if test "$LIBGNUTLS_CONFIG" = "no" ; then |
948 |
-+ cf_result=no |
949 |
-+ else |
950 |
-+ GNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG --cflags` |
951 |
-+ GNUTLS_LIBS=`$LIBGNUTLS_CONFIG --libs` |
952 |
-+ |
953 |
-+ LIBS="$GNUTLS_LIBS $LIBS_X" |
954 |
-+ CFLAGS="$CFLAGS_X $GNUTLS_CFLAGS" |
955 |
-+ CPPFLAGS="$CPPFLAGS_X $GNUTLS_CFLAGS" |
956 |
-+ |
957 |
-+ # Verify if it's really usable. gnutls_session was |
958 |
-+ # renamed to gnutls_session_t before GNU TLS 1.2.0 |
959 |
-+ # (on 2004-06-13); ELinks now requires this. |
960 |
-+ AC_TRY_LINK([#include <gnutls/gnutls.h>], |
961 |
-+ [gnutls_session_t dummy; |
962 |
-+ gnutls_check_version(NULL)], |
963 |
-+ cf_result=yes, cf_result=no) |
964 |
-+ fi |
965 |
-+ |
966 |
-+ if test "$cf_result" = yes; then |
967 |
-+ EL_CONFIG(CONFIG_GNUTLS, [GNUTLS]) |
968 |
-+ |
969 |
-+ CFLAGS="$CFLAGS_X" |
970 |
-+ AC_SUBST(GNUTLS_CFLAGS) |
971 |
-+ |
972 |
-+ # Verify if the MD5 compatibility layer is usable. |
973 |
-+ CONFIG_GNUTLS_OPENSSL_COMPAT=yes |
974 |
-+ EL_CHECK_OPTIONAL_LIBRARY(CONFIG_GNUTLS_OPENSSL_COMPAT, |
975 |
-+ [GNU TLS OpenSSL compatibility], |
976 |
-+ gnutls/openssl.h, gnutls-openssl, |
977 |
-+ MD5_Init) |
978 |
-+ else |
979 |
-+ if test -n "$gnutls_withval" && test "x$gnutls_withval" != xno; then |
980 |
-+ AC_MSG_ERROR([GNUTLS (1.2 or later) not found. ELinks no longer supports GNUTLS 1.1.]) |
981 |
-+ fi |
982 |
-+ EL_RESTORE_FLAGS |
983 |
-+ fi |
984 |
-+ fi |
985 |
-+fi |
986 |
-+ |
987 |
-+AC_MSG_CHECKING([for GNU TLS (1.2 or later)]) |
988 |
-+AC_MSG_RESULT($cf_result) |
989 |
-+ |
990 |
-+dnl Final SSL setup |
991 |
-+ |
992 |
-+EL_CONFIG_DEPENDS(CONFIG_SSL, [CONFIG_OPENSSL CONFIG_GNUTLS], [SSL]) |
993 |
-+AC_SUBST(CONFIG_GNUTLS_OPENSSL_COMPAT) |
994 |
-+AC_SUBST(CONFIG_OPENSSL) |
995 |
-+AC_SUBST(CONFIG_GNUTLS) |
996 |
-+ |
997 |
-+#endif |
998 |
-+ |
999 |
-+AC_MSG_CHECKING([whether to be or not to be]) |
1000 |
-+AC_MSG_RESULT([needs to be determined experimentally]) |
1001 |
-+ |
1002 |
-+dnl =================================================================== |
1003 |
-+dnl Check for IPv6 support and related functions. |
1004 |
-+dnl =================================================================== |
1005 |
-+ |
1006 |
-+EL_CHECK_NET_TYPE(struct sockaddr_storage, HAVE_SA_STORAGE, []) |
1007 |
-+EL_CHECK_NET_TYPE(struct sockaddr_in6, HAVE_SA_IN6, [#include <netinet/in.h>]) |
1008 |
-+EL_CHECK_NET_TYPE(struct addrinfo, HAVE_ADDRINFO, [#include <netdb.h>]) |
1009 |
-+ |
1010 |
-+AC_CHECK_FUNC(getaddrinfo, HAVE_GETADDRINFO=yes, HAVE_GETADDRINFO=no) |
1011 |
-+if test "$HAVE_GETADDRINFO" != yes; then |
1012 |
-+ AC_CHECK_LIB(inet6, getaddrinfo, HAVE_GETADDRINFO=yes, HAVE_GETADDRINFO=no) |
1013 |
-+ if test "$HAVE_GETADDRINFO" = yes; then |
1014 |
-+ LIBS="$LIBS -linet6" |
1015 |
-+ fi |
1016 |
-+fi |
1017 |
-+ |
1018 |
-+ |
1019 |
-+dnl =================================================================== |
1020 |
-+dnl Checking for X11 (window title restoring). |
1021 |
-+dnl =================================================================== |
1022 |
-+ |
1023 |
-+AC_PATH_X |
1024 |
-+if test x"$no_x" != xyes; then |
1025 |
-+ if test -n "$x_includes"; then |
1026 |
-+ X_CFLAGS="-I$x_includes" |
1027 |
-+ CPPFLAGS="$CPPFLAGS -I$x_includes" |
1028 |
-+ fi |
1029 |
-+ if test -n "$x_libraries"; then |
1030 |
-+ LDFLAGS="$LDFLAGS -L$x_libraries" |
1031 |
-+ fi |
1032 |
-+ LIBS="-lX11 $LIBS" |
1033 |
-+ EL_DEFINE(HAVE_X11, [X11 for restoring window titles]) |
1034 |
-+ AC_SUBST(X_CFLAGS) |
1035 |
-+fi |
1036 |
-+ |
1037 |
-+ |
1038 |
-+dnl =================================================================== |
1039 |
-+dnl Backtraces displaying support. |
1040 |
-+dnl =================================================================== |
1041 |
-+ |
1042 |
-+AC_CHECK_HEADERS(execinfo.h, HAVE_EXECINFO=yes, HAVE_EXECINFO=no) |
1043 |
-+# possible checks for other system-specific means go here |
1044 |
-+ |
1045 |
-+ |
1046 |
-+dnl =================================================================== |
1047 |
-+dnl SMB protocol support. |
1048 |
-+dnl =================================================================== |
1049 |
-+ |
1050 |
-+AC_CHECK_PROG(HAVE_SMBCLIENT, smbclient, yes, no) |
1051 |
-+ |
1052 |
-+ |
1053 |
-+dnl =================================================================== |
1054 |
-+dnl Gettext grey zone. Beware. |
1055 |
-+dnl =================================================================== |
1056 |
-+ |
1057 |
-+ALL_LINGUAS="be bg ca cs da de el es et fi fr gl hr hu id is it lt nl nb pl pt pt_BR ro ru sk sr sv tr uk" |
1058 |
-+ |
1059 |
-+AM_GNU_GETTEXT |
1060 |
-+ |
1061 |
-+dnl AC_MSG_CHECKING([how many characters your English alphabet has]) |
1062 |
-+dnl # f33r d4 l33t... I hope it's portable. :) |
1063 |
-+dnl cf_result=$((48#z - 48#a + 1)); |
1064 |
-+dnl AC_MSG_RESULT($cf_result) |
1065 |
-+ |
1066 |
-+ |
1067 |
-+dnl =================================================================== |
1068 |
-+dnl Compile-time features control |
1069 |
-+dnl =================================================================== |
1070 |
-+ |
1071 |
-+EL_ARG_ENABLE(CONFIG_COOKIES, cookies, [Cookies], |
1072 |
-+ [ --disable-cookies disable cookie support]) |
1073 |
-+ |
1074 |
-+EL_ARG_ENABLE(CONFIG_FORMHIST, formhist, [Form history], |
1075 |
-+ [ --disable-formhist disable form history support]) |
1076 |
-+ |
1077 |
-+EL_ARG_ENABLE(CONFIG_GLOBHIST, globhist, [Global history], |
1078 |
-+ [ --disable-globhist disable global history support]) |
1079 |
-+ |
1080 |
-+ |
1081 |
-+EL_ARG_ENABLE(CONFIG_MAILCAP, mailcap, [Mailcap], |
1082 |
-+ [ --disable-mailcap disable mailcap support]) |
1083 |
-+ |
1084 |
-+EL_ARG_ENABLE(CONFIG_MIMETYPES, mimetypes, [Mimetypes files], |
1085 |
-+ [ --disable-mimetypes disable mimetypes files support]) |
1086 |
-+ |
1087 |
-+ |
1088 |
-+EL_ARG_DEPEND(CONFIG_IPV6, ipv6, |
1089 |
-+ [HAVE_SA_STORAGE:yes HAVE_SA_IN6:yes HAVE_ADDRINFO:yes HAVE_GETADDRINFO:yes], |
1090 |
-+ [IPv6], |
1091 |
-+ [ --disable-ipv6 disable IPv6 support]) |
1092 |
-+ |
1093 |
-+EL_ARG_ENABLE(CONFIG_BITTORRENT, bittorrent, [BitTorrent protocol], |
1094 |
-+ [ --enable-bittorrent enable BitTorrent protocol support]) |
1095 |
-+ |
1096 |
-+EL_ARG_ENABLE(CONFIG_DATA, data, [Data protocol], |
1097 |
-+ [ --disable-data disable data protocol support]) |
1098 |
-+ |
1099 |
-+EL_ARG_ENABLE(CONFIG_URI_REWRITE, uri-rewrite, [URI rewriting], |
1100 |
-+ [ --disable-uri-rewrite disable URI rewrite support]) |
1101 |
-+ |
1102 |
-+EL_ARG_DEPEND(CONFIG_CGI, cgi, [HAVE_SETENV_OR_PUTENV:yes], [Local CGI], |
1103 |
-+ [ --enable-cgi enable local CGI support]) |
1104 |
-+ |
1105 |
-+EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol], |
1106 |
-+ [ --enable-finger enable finger protocol support]) |
1107 |
-+ |
1108 |
-+dnl =================================================================== |
1109 |
-+dnl FSP protocol |
1110 |
-+dnl =================================================================== |
1111 |
-+EL_SAVE_FLAGS |
1112 |
-+ |
1113 |
-+if test "x${enable_fsp}" != xno; then |
1114 |
-+ AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) |
1115 |
-+ |
1116 |
-+ if test "$HAVE_FSPLIB" = yes; then |
1117 |
-+ AC_CHECK_LIB(fsplib, fsp_open_session, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) |
1118 |
-+ if test "$HAVE_FSPLIB" = yes; then |
1119 |
-+ LIBS="$LIBS -lfsplib" |
1120 |
-+ else |
1121 |
-+ AC_CHECK_LIB(fsp, fsp_open_session, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) |
1122 |
-+ if test "$HAVE_FSPLIB" = yes; then |
1123 |
-+ LIBS="$LIBS -lfsp" |
1124 |
-+ fi |
1125 |
-+ fi |
1126 |
-+ fi |
1127 |
-+fi |
1128 |
-+ |
1129 |
-+EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol], |
1130 |
-+ [ --enable-fsp enable FSP protocol support]) |
1131 |
-+ |
1132 |
-+if test "x$CONFIG_FSP" = xno; then |
1133 |
-+ EL_RESTORE_FLAGS |
1134 |
-+fi |
1135 |
-+ |
1136 |
-+EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol], |
1137 |
-+ [ --disable-ftp disable ftp protocol support]) |
1138 |
-+ |
1139 |
-+EL_ARG_ENABLE(CONFIG_GOPHER, gopher, [Gopher protocol], |
1140 |
-+ [ --enable-gopher enable gopher protocol support]) |
1141 |
-+ |
1142 |
-+EL_ARG_ENABLE(CONFIG_NNTP, nntp, [NNTP protocol], |
1143 |
-+ [ --enable-nntp enable nntp protocol support]) |
1144 |
-+ |
1145 |
-+dnl Force disable SMB before EL_ARG_DEPEND so that it logs the correct value. |
1146 |
-+if test "${enable_smb-no}" != no || test "${CONFIG_SMB-no}" != no; then |
1147 |
-+ AC_MSG_WARN([Forcing --disable-smb because of vulnerability CVE-2006-5925. |
1148 |
-+If you want to use SMB, please vote for bug 844 or post a patch.]) |
1149 |
-+fi |
1150 |
-+enable_smb=no |
1151 |
-+CONFIG_SMB=no |
1152 |
-+EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol], |
1153 |
-+ [ --enable-smb not currently allowed]) |
1154 |
-+dnl EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol], |
1155 |
-+dnl [ --disable-smb disable SMB protocol support (requires smbclient)]) |
1156 |
-+ |
1157 |
-+ |
1158 |
-+EL_ARG_ENABLE(CONFIG_MOUSE, mouse, [Mouse handling], |
1159 |
-+ [ --disable-mouse disable mouse support]) |
1160 |
-+ |
1161 |
-+# GPM mouse is Linux specific, so ... |
1162 |
-+CONFIG_SYSMOUSE=yes |
1163 |
-+EL_ARG_DEPEND(CONFIG_SYSMOUSE, sysmouse, |
1164 |
-+ [CONFIG_MOUSE:yes CONFIG_GPM:no HAVE_SYSMOUSE_HEADER:yes], |
1165 |
-+ [BSD sysmouse], |
1166 |
-+ [ --disable-sysmouse disable BSD sysmouse support]) |
1167 |
-+ |
1168 |
-+EL_ARG_ENABLE(CONFIG_88_COLORS, 88-colors, [88 colors], |
1169 |
-+ [ --enable-88-colors enable 88 color support]) |
1170 |
-+ |
1171 |
-+EL_ARG_ENABLE(CONFIG_256_COLORS, 256-colors, [256 colors], |
1172 |
-+ [ --enable-256-colors enable 256 color support]) |
1173 |
-+ |
1174 |
-+ |
1175 |
-+EL_ARG_ENABLE(CONFIG_EXMODE, exmode, [Exmode interface], |
1176 |
-+ [ --enable-exmode enable exmode (CLI) interface]) |
1177 |
-+ |
1178 |
-+EL_ARG_ENABLE(CONFIG_LEDS, leds, [LEDs], |
1179 |
-+ [ --disable-leds disable LEDs support]) |
1180 |
-+ |
1181 |
-+EL_ARG_ENABLE(CONFIG_MARKS, marks, [Marks], |
1182 |
-+ [ --disable-marks disable document marks support]) |
1183 |
-+ |
1184 |
-+ |
1185 |
-+EL_ARG_ENABLE(CONFIG_CSS, css, [Cascading Style Sheets], |
1186 |
-+ [ --disable-css disable Cascading Style Sheet support]) |
1187 |
-+ |
1188 |
-+EL_ARG_DEPEND(CONFIG_HTML_HIGHLIGHT, html-highlight, [CONFIG_CSS:yes], [HTML highlighting], |
1189 |
-+ [ --enable-html-highlight HTML highlighting using DOM engine]) |
1190 |
-+ |
1191 |
-+dnl Everything in the tree already uses CONFIG_DOM |
1192 |
-+dnl so resolve CONFIG_HTML_HIGHLIGHT to CONFIG_DOM |
1193 |
-+EL_CONFIG_DEPENDS(CONFIG_DOM, [CONFIG_HTML_HIGHLIGHT], [DOM engine]) |
1194 |
-+ |
1195 |
-+EL_ARG_DEPEND(CONFIG_BACKTRACE, backtrace, [HAVE_EXECINFO:yes], [Backtrace], |
1196 |
-+ [ --disable-backtrace disable backtrace support]) |
1197 |
-+ |
1198 |
-+EL_ARG_DEPEND(CONFIG_NO_ROOT_EXEC, no-root, [HAVE_GETUID:yes HAVE_GETEUID:yes], [No root exec], |
1199 |
-+ [ --enable-no-root enable prevention of usage by root]) |
1200 |
-+ |
1201 |
-+ |
1202 |
-+EL_ARG_ENABLE(CONFIG_DEBUG, debug, [Debug mode], |
1203 |
-+ [ --enable-debug enable leak debug and internal error checking]) |
1204 |
-+ |
1205 |
-+EL_ARG_DEPEND(CONFIG_FASTMEM, fastmem, [CONFIG_DEBUG:no], [Fast mode], |
1206 |
-+ [ --enable-fastmem enable direct use of system allocation functions, not usable with --enable-debug]) |
1207 |
-+ |
1208 |
-+EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs], |
1209 |
-+ [ --enable-own-libc force use of internal functions instead of those of system libc]) |
1210 |
-+ |
1211 |
-+EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary], |
1212 |
-+ [ --enable-small reduce binary size as far as possible (but see the bottom of doc/small.txt!)]) |
1213 |
-+ |
1214 |
-+if test "$CONFIG_OPENSSL" != yes && |
1215 |
-+ test "$CONFIG_GNUTLS_OPENSSL_COMPAT" != yes || |
1216 |
-+ test "$CONFIG_OWN_LIBC" = yes; |
1217 |
-+then |
1218 |
-+ AC_MSG_CHECKING(for built-in MD5 support) |
1219 |
-+ AC_MSG_RESULT(yes) |
1220 |
-+ EL_CONFIG(CONFIG_MD5, [Built-in MD5]) |
1221 |
-+fi |
1222 |
-+ |
1223 |
-+AC_SUBST(CONFIG_MD5) |
1224 |
-+ |
1225 |
-+if test "$CONFIG_BITTORRENT" = yes; then |
1226 |
-+ if test "$CONFIG_OPENSSL" != yes || |
1227 |
-+ test "$CONFIG_OWN_LIBC" = yes; |
1228 |
-+ then |
1229 |
-+ AC_MSG_CHECKING(for built-in SHA1 support) |
1230 |
-+ AC_MSG_RESULT(yes) |
1231 |
-+ EL_CONFIG(CONFIG_SHA1, [Built-in SHA1]) |
1232 |
-+ fi |
1233 |
-+fi |
1234 |
-+ |
1235 |
-+AC_SUBST(CONFIG_SHA1) |
1236 |
-+ |
1237 |
-+if test "$CONFIG_CSS" = yes || test "$CONFIG_DOM" = yes; |
1238 |
-+then |
1239 |
-+ EL_CONFIG(CONFIG_SCANNER, [Built-in scanner]) |
1240 |
-+fi |
1241 |
-+AC_SUBST(CONFIG_SCANNER) |
1242 |
-+ |
1243 |
-+AC_ARG_ENABLE(weehoofooboomookerchoo, |
1244 |
-+ [ |
1245 |
-+ Also check out the features.conf file for more information about features! |
1246 |
-+ ], |
1247 |
-+ [AC_MSG_ERROR(Are you strange, or what?)]) |
1248 |
-+ |
1249 |
-+ |
1250 |
-+dnl == EMX hack |
1251 |
-+ |
1252 |
-+test "$CONFIG_OS2" = yes && LDFLAGS="$LDFLAGS -Zexe" |
1253 |
-+test "$CONFIG_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"` |
1254 |
-+ |
1255 |
-+ |
1256 |
-+dnl =================================================================== |
1257 |
-+dnl Export directory paths |
1258 |
-+dnl =================================================================== |
1259 |
-+ |
1260 |
-+# Set up the ``entry points'' if they were not supplied by builder |
1261 |
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix |
1262 |
-+test "x$exec_prefix" = xNONE && exec_prefix=${prefix} |
1263 |
-+ |
1264 |
-+# Create CONFDIR #define for config.h |
1265 |
-+ |
1266 |
-+# XXX: This may be dependent on a particular version of autoconf. Whatever, |
1267 |
-+# it's autoconf fault to force us to do such hacks ;p. |
1268 |
-+if test x"$sysconfdir" = x"\${prefix}/etc"; then |
1269 |
-+ # sysconfdir is set to its default value... fine, let's append /elinks/ |
1270 |
-+ # XXX: We can't modify listing of the default in ./configure --help :-( |
1271 |
-+ sysconfdir_n=`eval echo "$sysconfdir"` |
1272 |
-+ sysconfdir=$sysconfdir_n |
1273 |
-+ (echo "$sysconfdir" | grep elinks >/dev/null 2>/dev/null) || \ |
1274 |
-+ sysconfdir="$sysconfdir/elinks" |
1275 |
-+fi |
1276 |
-+ |
1277 |
-+CONFDIR=$sysconfdir |
1278 |
-+AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR", [Directory containing default config]) |
1279 |
-+AC_SUBST(CONFDIR) |
1280 |
-+ |
1281 |
-+# Create LOCALEDIR #define for config.h |
1282 |
-+LOCALEDIR=`eval echo "$datadir/locale"` |
1283 |
-+AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Directory containing locales]) |
1284 |
-+AC_SUBST(LOCALEDIR) |
1285 |
-+ |
1286 |
-+# Create LIBDIR #define for config.h |
1287 |
-+LIBDIR=`eval echo "$libdir"` |
1288 |
-+AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [Directory containing libraries]) |
1289 |
-+AC_SUBST(LIBDIR) |
1290 |
-+ |
1291 |
-+EL_LOG_CONFIG(CONFDIR, [System configuration directory], []) |
1292 |
-+EL_LOG_CONFIG(LOCALEDIR, [Locale catalogs directory], []) |
1293 |
-+ |
1294 |
-+dnl =================================================================== |
1295 |
-+dnl A little fine tuning of gcc specific options (continued) |
1296 |
-+dnl =================================================================== |
1297 |
-+ |
1298 |
-+if test "x$ac_cv_prog_gcc" = "xyes"; then |
1299 |
-+ if test "$CONFIG_DEBUG" = "yes"; then |
1300 |
-+ dnl We want to see all warnings and live with none (in debug mode). |
1301 |
-+ CFLAGS="$CFLAGS -Werror" |
1302 |
-+ fi |
1303 |
-+ |
1304 |
-+ case "`$CC -dumpversion`" in |
1305 |
-+ 3.0|3.1|3.2) |
1306 |
-+ # These should be ok using -Werror |
1307 |
-+ ;; |
1308 |
-+ 3.*) |
1309 |
-+ # If gcc is version 3.3 (or higher?) it emits lots of false positive |
1310 |
-+ # "dereferencing type-punned pointer will break strict-aliasing rules" |
1311 |
-+ # warnings. Disable them by not doing any strict-aliasing. The |
1312 |
-+ # alternative is just too ugly. Thanks gcc guys!! ;) |
1313 |
-+ CFLAGS="$CFLAGS -fno-strict-aliasing" |
1314 |
-+ ;; |
1315 |
-+ 4.*) |
1316 |
-+ # Do not show warnings related to (char * | unsigned char *) type |
1317 |
-+ # difference. |
1318 |
-+ CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-pointer-sign" |
1319 |
-+ ;; |
1320 |
-+ *) |
1321 |
-+ # These should be ok using -Werror |
1322 |
-+ ;; |
1323 |
-+ esac |
1324 |
-+fi |
1325 |
-+ |
1326 |
-+# CFLAGS doesn't contain all compile flags. Some will be added only when |
1327 |
-+# needed in the respective source directory. To get all compile flags |
1328 |
-+# easily just add CPPFLAGS. |
1329 |
-+ALL_CFLAGS="$CFLAGS $CPPFLAGS" |
1330 |
-+ |
1331 |
-+EL_LOG_CONFIG(ALL_CFLAGS, [Compiler options (CFLAGS)], []) |
1332 |
-+EL_LOG_CONFIG(LIBS, [Linker options (LIBS)], []) |
1333 |
-+ |
1334 |
-+dnl =================================================================== |
1335 |
-+dnl Colored make output |
1336 |
-+dnl =================================================================== |
1337 |
-+ |
1338 |
-+if test $(`which tput` colors) -ge 4; then |
1339 |
-+ MAKE_COLOR=1 |
1340 |
-+ AC_SUBST(MAKE_COLOR) |
1341 |
-+fi |
1342 |
-+ |
1343 |
-+dnl =================================================================== |
1344 |
-+dnl Generated files |
1345 |
-+dnl =================================================================== |
1346 |
-+ |
1347 |
-+AC_OUTPUT([ \ |
1348 |
-+ Makefile.config \ |
1349 |
-+ contrib/elinks.spec \ |
1350 |
-+ contrib/lua/hooks.lua \ |
1351 |
-+ contrib/conv/w3m2links.awk \ |
1352 |
-+ doc/man/man1/elinks.1 \ |
1353 |
-+ src/intl/gettext/ref-add.sed \ |
1354 |
-+ src/intl/gettext/ref-del.sed |
1355 |
-+]) |
1356 |
-+ |
1357 |
-+abs_srcdir="$(cd "$srcdir" && pwd)" |
1358 |
-+# builddir is always absolute! |
1359 |
-+if test "$abs_srcdir" != "$builddir"; then |
1360 |
-+ # Bootstrap the Makefile creation |
1361 |
-+ echo "include $abs_srcdir/Makefile" > "$builddir/Makefile" |
1362 |
-+ "$MAKE" "SRC=$abs_srcdir" init |
1363 |
-+ # Make cg-status ignore this build directory |
1364 |
-+ echo "*" > "$builddir/.gitignore" |
1365 |
-+fi |
1366 |
-+ |
1367 |
-+ |
1368 |
-+dnl =================================================================== |
1369 |
-+dnl Configuration summary |
1370 |
-+dnl =================================================================== |
1371 |
-+ |
1372 |
-+AC_MSG_RESULT(The following feature summary has been saved to features.log) |
1373 |
-+cat features.log |
1374 |
-diff -Naurp elinks-0.11.3-orig/configure.in.rej elinks-0.11.3/configure.in.rej |
1375 |
---- elinks-0.11.3-orig/configure.in.rej 1970-01-01 01:00:00.000000000 +0100 |
1376 |
-+++ elinks-0.11.3/configure.in.rej 2007-05-13 11:51:49.000000000 +0200 |
1377 |
-@@ -0,0 +1,23 @@ |
1378 |
-+*************** |
1379 |
-+*** 742,751 **** |
1380 |
-+ AC_TRY_LINK([ #include <lua.h> |
1381 |
-+ #include <lualib.h>], |
1382 |
-+ [ lua_State *L = lua_open(); |
1383 |
-+- lua_baselibopen(L); |
1384 |
-+- lua_mathlibopen(L); |
1385 |
-+- lua_strlibopen(L); |
1386 |
-+- lua_tablibopen(L); |
1387 |
-+ lua_pushboolean(L, 1); |
1388 |
-+ lua_close(L);], |
1389 |
-+ cf_result=yes, cf_result=no) |
1390 |
-+--- 742,751 ---- |
1391 |
-+ AC_TRY_LINK([ #include <lua.h> |
1392 |
-+ #include <lualib.h>], |
1393 |
-+ [ lua_State *L = lua_open(); |
1394 |
-++ luaopen_base(L); |
1395 |
-++ luaopen_math(L); |
1396 |
-++ luaopen_string(L); |
1397 |
-++ luaopen_table(L); |
1398 |
-+ lua_pushboolean(L, 1); |
1399 |
-+ lua_close(L);], |
1400 |
-+ cf_result=yes, cf_result=no) |
1401 |
diff -Naurp elinks-0.11.3-orig/src/scripting/lua/core.c elinks-0.11.3/src/scripting/lua/core.c |
1402 |
--- elinks-0.11.3-orig/src/scripting/lua/core.c 2007-05-13 11:51:34.000000000 +0200 |
1403 |
+++ elinks-0.11.3/src/scripting/lua/core.c 2007-05-13 11:51:49.000000000 +0200 |
1404 |
|
1405 |
|
1406 |
|
1407 |
1.1 www-client/elinks/files/elinks-0.11.5-makefile.patch |
1408 |
|
1409 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/elinks/files/elinks-0.11.5-makefile.patch?rev=1.1&view=markup |
1410 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/elinks/files/elinks-0.11.5-makefile.patch?rev=1.1&content-type=text/plain |
1411 |
|
1412 |
Index: elinks-0.11.5-makefile.patch |
1413 |
=================================================================== |
1414 |
diff -Naurp elinks-0.11.5-orig/Makefile.lib elinks-0.11.5/Makefile.lib |
1415 |
--- elinks-0.11.5-orig/Makefile.lib 2008-11-30 13:30:08.000000000 +0100 |
1416 |
+++ elinks-0.11.5/Makefile.lib 2008-11-30 19:50:46.000000000 +0100 |
1417 |
@@ -95,9 +95,14 @@ endif |
1418 |
|
1419 |
# All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o. |
1420 |
# Sort them to filter out duplicated and get uniform order. |
1421 |
+SUBDIR_LIB_O_DEPS = \ |
1422 |
+ $(foreach subdir,$(sort $(SUBDIRS)),$(subdir)/$(LIB_O_NAME)) |
1423 |
+ |
1424 |
LIB_O_DEPS = \ |
1425 |
- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \ |
1426 |
- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME))) |
1427 |
+ $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) $(SUBDIR_LIB_O_DEPS) |
1428 |
+ |
1429 |
+$(SUBDIR_LIB_O_DEPS): |
1430 |
+ @$(call ncmd,recmake,$(subst /$(LIB_O_NAME),,$@),all) || exit 1; |
1431 |
|
1432 |
$(LIB_O_NAME): $(LIB_O_DEPS) |
1433 |
$(call cmd,ld_objs) |
1434 |
@@ -222,7 +227,8 @@ $(RULES_LOCAL): |
1435 |
|
1436 |
# Default deps |
1437 |
rule_deps = $(1)-recursive $(1)-default $(1)-local |
1438 |
-all: $(call rule_deps,all) |
1439 |
+all: all-default all-local |
1440 |
+ @$(MAKE) all-recursive |
1441 |
install: $(call rule_deps,install) |
1442 |
clean: $(call rule_deps,clean) |
1443 |
cleanall: $(call rule_deps,cleanall) |