summaryrefslogtreecommitdiff
path: root/www/elinks/patches/patch-aa
blob: 25d41040311832e5bbf867c0aea9c6f3a062ea12 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
$NetBSD: patch-aa,v 1.7 2007/08/09 13:03:21 joerg Exp $

--- configure.orig	2007-04-15 16:51:12.000000000 -0400
+++ configure
@@ -907,7 +907,7 @@ Optional Packages:
   --without-openssl       disable OpenSSL support
   --with-openssl=DIR    enable OpenSSL support (default)
   --with-x                use the X Window System
-  --with-libiconv=DIR     search for libiconv in DIR/include and DIR/lib
+  --with-libiconv-prefix=DIR     search for libiconv in DIR/include and DIR/lib
 
 Some influential environment variables:
   CC          C compiler command
@@ -2959,7 +2959,7 @@ _ACEOF
 
 
 		echo > config.asciidoc-unsafe.txt
-		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>/dev/null; then
+		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>&1 > /dev/null; then
 			ASCIIDOC_FLAGS=--unsafe
 		fi
 		rm config.asciidoc-unsafe.*
@@ -17564,7 +17564,7 @@ if test -z "$disable_lua"; then
 	for luadir in "$withval" "" /usr /usr/local; do
 		for suffix in "" 50 51; do
 			if test "$cf_result" = no; then
-				LUA_LIBS="-llua$suffix -llualib$suffix -lm"
+				LUA_LIBS="-llua$suffix -lm"
 
 				if test ! -z "$luadir"; then
 					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
@@ -20479,9 +20479,9 @@ done
 
 
 
-# Check whether --with-libiconv or --without-libiconv was given.
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
 if test "${with_libiconv+set}" = set; then
-  withval="$with_libiconv"
+  withval="$with_libiconv_prefix"
 
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
@@ -23231,7 +23231,7 @@ _ACEOF
 
 
 # Create LIBDIR #define for config.h
-LIBDIR=`eval echo "$libdir"`
+LIBDIR="$LOCALEDIR"
 
 cat >>confdefs.h <<_ACEOF
 #define LIBDIR "$LIBDIR"