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
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
$NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
--- configure.orig Thu May 10 18:35:47 2001
+++ configure
@@ -19,6 +19,8 @@
ac_help="$ac_help
--with-libs=DIRS alternative spelling of --with-libraries"
ac_help="$ac_help
+ --disable-readline disable readline support"
+ac_help="$ac_help
--enable-locale enable locale support"
ac_help="$ac_help
--enable-recode enable character set recode support"
@@ -53,6 +55,8 @@
ac_help="$ac_help
--with-python build Python interface module"
ac_help="$ac_help
+ --with-python-compile byte-compile modules if Python is enabled"
+ac_help="$ac_help
--with-java build JDBC interface and Java tools"
ac_help="$ac_help
--with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]"
@@ -811,10 +815,36 @@
#
+# Readline support
+#
+echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6
+echo "configure:822: checking whether to build with readline support" >&5
+# Check whether --enable-readline was given
+if test x"${enable_readline+set}" = xset; then
+ case $enable_readline in
+ yes)
+ :
+ ;;
+ no)
+ :
+ ;;
+ *)
+ enableval=$enable_readline
+ { echo "configure: error: no argument expected for --enable-readline option" 1>&2; exit 1; }
+ ;;
+ esac # $enable_readline
+else
+ enable_readline=yes
+
+fi
+echo "$ac_t""$enable_readline" 1>&6
+
+
+#
# Locale (--enable-locale)
#
echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6
-echo "configure:818: checking whether to build with locale support" >&5
+echo "configure:848: checking whether to build with locale support" >&5
# Check whether --enable-locale was given
if test x"${enable_locale+set}" = xset; then
case $enable_locale in
@@ -1905,11 +1935,40 @@
fi
+# If python is enabled (above), then optionally byte-compile the modules.
+echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6
+echo "configure:1941: checking whether to byte-compile Python modules" >&5
+if test "$with_python" = yes; then
+ # Check whether --with-python_compile was given
+if test x"${with_python_compile+set}" = xset; then
+ case $with_python_compile in
+ yes)
+ :
+ ;;
+ no)
+ :
+ ;;
+ *)
+ withval=$with_python_compile
+ { echo "configure: error: no argument expected for --with-python_compile option" 1>&2; exit 1; }
+ ;;
+ esac # $with_python_compile
+else
+ with_python_compile=no
+
+fi
+else
+ with_python_compile=no
+fi
+echo "$ac_t""$with_python_compile" 1>&6
+
+
+
#
# Optionally build the Java/JDBC tools
#
echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6
-echo "configure:1913: checking whether to build Java/JDBC tools" >&5
+echo "configure:1972: checking whether to build Java/JDBC tools" >&5
# Check whether --with-java was given
if test x"${with_java+set}" = xset; then
case $with_java in
@@ -3095,8 +3154,9 @@
## Libraries
##
+if test "$enable_readline" = yes; then
echo $ac_n "checking for readline""... $ac_c" 1>&6
-echo "configure:3100: checking for readline" >&5
+echo "configure:3160: checking for readline" >&5
if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3118,13 +3178,30 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
+ if test "$cross_compiling" = yes; then
+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3188 "configure"
+#include "confdefs.h"
+int main() { return 0; }
+EOF
+if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
+rm -fr conftest*
+fi
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
rm -f conftest*
LIBS=$pgac_save_LIBS
done
@@ -3208,11 +3285,12 @@
else :
fi
+fi
if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
then
echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
-echo "configure:3216: checking for main in -lbsd" >&5
+echo "configure:3294: checking for main in -lbsd" >&5
ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8103,6 +8181,7 @@
s%@python_moduledir@%$python_moduledir%g
s%@python_extmakefile@%$python_extmakefile%g
s%@with_python@%$with_python%g
+s%@with_python_compile@%$with_python_compile%g
s%@ANT@%$ANT%g
s%@with_java@%$with_java%g
s%@with_krb4@%$with_krb4%g
|
