summaryrefslogtreecommitdiff
path: root/www/wml/patches/patch-aa
blob: b8a5122f1ae590ee94a2fb3a39dd74b618918a17 (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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
$NetBSD: patch-aa,v 1.3 2015/04/02 12:34:06 jperkin Exp $

Use POSIX shell mode where available, from newer autoconf.

--- configure.orig	2006-08-19 06:09:50.000000000 +0000
+++ configure
@@ -17,8 +17,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
 DUALCASE=1; export DUALCASE # for MKS sh
 
@@ -2785,7 +2790,7 @@ for dir in `echo $PATH | sed -e 's/:/ /g
          if test -f "$dir/$perl"; then
              if test -x "$dir/$perl"; then
                  perlprog="$dir/$perl"
-                 if $perlprog -e 'require 5.003'; then
+                 if $perlprog -e 'use 5.003'; then
                      perlvers=`$perlprog -e 'printf "%.3f",$]'`
                      break 2
                  fi
@@ -2797,7 +2802,7 @@ done
 fi; PATH_PERL=$perlprog
 echo "$as_me:$LINENO: result: $perlprog v$perlvers" >&5
 echo "${ECHO_T}$perlprog v$perlvers" >&6
-if $perlprog -e 'require 5.003'; then
+if $perlprog -e 'use 5.003'; then
     :
 else
     echo ""
@@ -2856,7 +2861,7 @@ if test ".$with_openworld" = .no; then
 else
     echo "$as_me:$LINENO: checking for Perl module Getopt::Long (2.16)" >&5
 echo $ECHO_N "checking for Perl module Getopt::Long (2.16)... $ECHO_C" >&6
-rc=`$path_perl -e 'eval {require Getopt::Long 2.16}; print "ok" unless $@'`;
+rc=`$path_perl -e 'eval {use Getopt::Long 2.16}; print "ok" unless $@'`;
 if test ".$rc" = .ok; then
     have_getoptlong=1
     echo "$as_me:$LINENO: result: found" >&5
@@ -2870,7 +2875,7 @@ fi
 
     echo "$as_me:$LINENO: checking for Perl module Bit::Vector (5.2)" >&5
 echo $ECHO_N "checking for Perl module Bit::Vector (5.2)... $ECHO_C" >&6
-rc=`$path_perl -e 'eval {require Bit::Vector 5.2}; print "ok" unless $@'`;
+rc=`$path_perl -e 'eval {use Bit::Vector 5.2}; print "ok" unless $@'`;
 if test ".$rc" = .ok; then
     have_bitvector=1
     echo "$as_me:$LINENO: result: found" >&5
@@ -2882,9 +2887,9 @@ echo "${ECHO_T}not found" >&6
 fi
 
 
-    echo "$as_me:$LINENO: checking for Perl module File::PathConvert (ANY)" >&5
-echo $ECHO_N "checking for Perl module File::PathConvert (ANY)... $ECHO_C" >&6
-rc=`$path_perl -e 'eval {require File::PathConvert }; print "ok" unless $@'`;
+    echo "$as_me:$LINENO: checking for Perl module File::Spec (0.87)" >&5
+echo $ECHO_N "checking for Perl module File::Spec (0.87)... $ECHO_C" >&6
+rc=`$path_perl -e 'eval {use File::Spec 0.87}; print "ok" unless $@'`;
 if test ".$rc" = .ok; then
     have_filepathconvert=1
     echo "$as_me:$LINENO: result: found" >&5
@@ -2898,7 +2903,7 @@ fi
 
     echo "$as_me:$LINENO: checking for Perl module Image::Size (2.6)" >&5
 echo $ECHO_N "checking for Perl module Image::Size (2.6)... $ECHO_C" >&6
-rc=`$path_perl -e 'eval {require Image::Size 2.6}; print "ok" unless $@'`;
+rc=`$path_perl -e 'eval {use Image::Size 2.6}; print "ok" unless $@'`;
 if test ".$rc" = .ok; then
     have_imagesize=1
     echo "$as_me:$LINENO: result: found" >&5
@@ -2912,7 +2917,7 @@ fi
 
     echo "$as_me:$LINENO: checking for Perl module IO::File (1.07)" >&5
 echo $ECHO_N "checking for Perl module IO::File (1.07)... $ECHO_C" >&6
-rc=`$path_perl -e 'eval {require IO::File 1.07}; print "ok" unless $@'`;
+rc=`$path_perl -e 'eval {use IO::File 1.07}; print "ok" unless $@'`;
 if test ".$rc" = .ok; then
     have_io=1
     echo "$as_me:$LINENO: result: found" >&5
@@ -2926,7 +2931,7 @@ fi
 
     echo "$as_me:$LINENO: checking for Perl module Term::ReadKey (2.11)" >&5
 echo $ECHO_N "checking for Perl module Term::ReadKey (2.11)... $ECHO_C" >&6
-rc=`$path_perl -e 'eval {require Term::ReadKey 2.11}; print "ok" unless $@'`;
+rc=`$path_perl -e 'eval {use Term::ReadKey 2.11}; print "ok" unless $@'`;
 if test ".$rc" = .ok; then
     have_termreadkey=1
     echo "$as_me:$LINENO: result: found" >&5