@@ -864,7 +864,6 @@ Optional Packages:
864864 --with-tkconfig=DIR tkConfig.sh is in DIR
865865 --with-perl build Perl modules (PL/Perl)
866866 --with-python build Python modules (PL/Python)
867- --with-java build JDBC interface and Java tools
868867 --with-krb4 build with Kerberos 4 support
869868 --with-krb5 build with Kerberos 5 support
870869 --with-krb-srvnam=NAME name of the service principal in Kerberos [postgres]
@@ -3166,153 +3165,6 @@ echo "$as_me:$LINENO: result: $with_python" >&5
31663165echo "${ECHO_T}$with_python" >&6
31673166
31683167
3169- #
3170- # Optionally build the Java/JDBC tools
3171- #
3172- echo "$as_me:$LINENO: checking whether to build Java/JDBC tools" >&5
3173- echo $ECHO_N "checking whether to build Java/JDBC tools... $ECHO_C" >&6
3174-
3175-
3176-
3177- # Check whether --with-java or --without-java was given.
3178- if test "${with_java+set}" = set; then
3179- withval="$with_java"
3180-
3181- case $withval in
3182- yes)
3183- echo "$as_me:$LINENO: result: yes" >&5
3184- echo "${ECHO_T}yes" >&6
3185-
3186- for ac_prog in jakarta-ant ant ant.sh ant.bat
3187- do
3188- # Extract the first word of "$ac_prog", so it can be a program name with args.
3189- set dummy $ac_prog; ac_word=$2
3190- echo "$as_me:$LINENO: checking for $ac_word" >&5
3191- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3192- if test "${ac_cv_path_ANT+set}" = set; then
3193- echo $ECHO_N "(cached) $ECHO_C" >&6
3194- else
3195- case $ANT in
3196- [\\/]* | ?:[\\/]*)
3197- ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
3198- ;;
3199- *)
3200- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3201- for as_dir in $PATH
3202- do
3203- IFS=$as_save_IFS
3204- test -z "$as_dir" && as_dir=.
3205- for ac_exec_ext in '' $ac_executable_extensions; do
3206- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3207- ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
3208- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3209- break 2
3210- fi
3211- done
3212- done
3213-
3214- ;;
3215- esac
3216- fi
3217- ANT=$ac_cv_path_ANT
3218-
3219- if test -n "$ANT"; then
3220- echo "$as_me:$LINENO: result: $ANT" >&5
3221- echo "${ECHO_T}$ANT" >&6
3222- else
3223- echo "$as_me:$LINENO: result: no" >&5
3224- echo "${ECHO_T}no" >&6
3225- fi
3226-
3227- test -n "$ANT" && break
3228- done
3229-
3230-
3231- echo "$as_me:$LINENO: checking whether $ANT works" >&5
3232- echo $ECHO_N "checking whether $ANT works... $ECHO_C" >&6
3233- if test "${pgac_cv_prog_ant_works+set}" = set; then
3234- echo $ECHO_N "(cached) $ECHO_C" >&6
3235- else
3236-
3237- cat > conftest.java << EOF
3238- public class conftest {
3239- int testmethod(int a, int b) {
3240- return a + b;
3241- }
3242- }
3243- EOF
3244-
3245- cat > conftest.xml << EOF
3246- <project name="conftest" default="conftest">
3247- <target name="conftest">
3248- <javac srcdir="." includes="conftest.java">
3249- </javac>
3250- </target>
3251- </project>
3252- EOF
3253-
3254- pgac_cmd='$ANT -buildfile conftest.xml 1>&2'
3255- { (eval echo "$as_me:$LINENO: \"$pgac_cmd\"") >&5
3256- (eval $pgac_cmd) 2>&5
3257- ac_status=$?
3258- echo "$as_me:$LINENO: \$? = $ac_status" >&5
3259- (exit $ac_status); }
3260- pgac_save_status=$?
3261- if test $? = 0 && test -f ./conftest.class ; then
3262- pgac_cv_prog_ant_works=yes
3263- else
3264- echo "configure: failed java program was:" >&5
3265- cat conftest.java >&5
3266- echo "configure: failed build file was:" >&5
3267- cat conftest.xml >&5
3268- pgac_cv_prog_ant_works=no
3269- fi
3270-
3271- rm -f conftest* core core.* *.core
3272-
3273- fi
3274- echo "$as_me:$LINENO: result: $pgac_cv_prog_ant_works" >&5
3275- echo "${ECHO_T}$pgac_cv_prog_ant_works" >&6
3276-
3277- if test "$pgac_cv_prog_ant_works" != yes; then
3278- { { echo "$as_me:$LINENO: error: ant does not work" >&5
3279- echo "$as_me: error: ant does not work" >&2;}
3280- { (exit 1); exit 1; }; }
3281- fi
3282-
3283-
3284- if test -z "$ANT"; then
3285- { { echo "$as_me:$LINENO: error: Ant is required to build Java components
3286- If you have Ant already installed, see config.log for details on the failure." >&5
3287- echo "$as_me: error: Ant is required to build Java components
3288- If you have Ant already installed, see config.log for details on the failure." >&2;}
3289- { (exit 1); exit 1; }; }
3290- fi
3291- if "$ANT" -version | egrep -i 'ant version' | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
3292- { { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5
3293- echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}
3294- { (exit 1); exit 1; }; }
3295- fi
3296- ;;
3297- no)
3298- echo "$as_me:$LINENO: result: no" >&5
3299- echo "${ECHO_T}no" >&6
3300- ;;
3301- *)
3302- { { echo "$as_me:$LINENO: error: no argument expected for --with-java option" >&5
3303- echo "$as_me: error: no argument expected for --with-java option" >&2;}
3304- { (exit 1); exit 1; }; }
3305- ;;
3306- esac
3307-
3308- else
3309- with_java=no
3310- echo "$as_me:$LINENO: result: no" >&5
3311- echo "${ECHO_T}no" >&6
3312- fi;
3313-
3314-
3315-
33163168#
33173169# Kerberos 4
33183170#
@@ -18252,8 +18104,6 @@ s,@with_tcl@,$with_tcl,;t t
1825218104s,@with_tk@,$with_tk,;t t
1825318105s,@with_perl@,$with_perl,;t t
1825418106s,@with_python@,$with_python,;t t
18255- s,@ANT@,$ANT,;t t
18256- s,@with_java@,$with_java,;t t
1825718107s,@with_krb4@,$with_krb4,;t t
1825818108s,@with_krb5@,$with_krb5,;t t
1825918109s,@krb_srvtab@,$krb_srvtab,;t t