diff options
Diffstat (limited to 'databases/odbc-postgresql/patches/patch-ac')
| -rw-r--r-- | databases/odbc-postgresql/patches/patch-ac | 65 |
1 files changed, 17 insertions, 48 deletions
diff --git a/databases/odbc-postgresql/patches/patch-ac b/databases/odbc-postgresql/patches/patch-ac index 8f12225ff0e..d3e2641f669 100644 --- a/databases/odbc-postgresql/patches/patch-ac +++ b/databases/odbc-postgresql/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2002/10/19 03:51:03 jlam Exp $ ---- configure.orig Thu Aug 16 11:36:31 2001 +--- configure.orig Mon Sep 30 23:34:27 2002 +++ configure -@@ -19,6 +19,8 @@ +@@ -19,6 +19,8 @@ ac_help="$ac_help ac_help="$ac_help --with-libs=DIRS alternative spelling of --with-libraries" ac_help="$ac_help @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ --enable-locale enable locale support" ac_help="$ac_help --enable-recode enable character set recode support" -@@ -53,6 +55,8 @@ +@@ -53,6 +55,8 @@ ac_help="$ac_help ac_help="$ac_help --with-python build Python interface module" ac_help="$ac_help @@ -20,14 +20,14 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ --with-java build JDBC interface and Java tools" ac_help="$ac_help --with-krb4[=DIR] build with Kerberos 4 support [/usr/athena]" -@@ -811,6 +815,32 @@ +@@ -817,6 +821,32 @@ fi # +# 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 ++echo "configure:828: 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 @@ -53,13 +53,13 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ # Locale (--enable-locale) # echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6 -@@ -1905,6 +1935,35 @@ - fi +@@ -1859,6 +1889,35 @@ fi + echo "$ac_t""$with_python" 1>&6 +# 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 ++echo "configure:1895: 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 @@ -89,50 +89,19 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ # # Optionally build the Java/JDBC tools # -@@ -3095,8 +3154,9 @@ +@@ -3282,9 +3341,10 @@ fi ## 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 +-echo "configure:3288: checking for readline" >&5 ++echo "configure:3348: 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,6 +3285,7 @@ +@@ -3408,6 +3468,7 @@ EOF else : fi @@ -140,9 +109,9 @@ $NetBSD: patch-ac,v 1.1 2002/04/03 09:29:55 jlam Exp $ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then -@@ -8103,6 +8181,7 @@ - s%@python_moduledir@%$python_moduledir%g - s%@python_extmakefile@%$python_extmakefile%g +@@ -9007,6 +9068,7 @@ s%@with_tcl@%$with_tcl%g + s%@with_tk@%$with_tk%g + s%@with_perl@%$with_perl%g s%@with_python@%$with_python%g +s%@with_python_compile@%$with_python_compile%g s%@ANT@%$ANT%g |