mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
Remove JDBC from the build system and documentation, too.
This commit is contained in:
Tom Lane
150
configure
vendored
150
configure
vendored
@ -864,7 +864,6 @@ Optional Packages:
|
||||
--with-tkconfig=DIR tkConfig.sh is in DIR
|
||||
--with-perl build Perl modules (PL/Perl)
|
||||
--with-python build Python modules (PL/Python)
|
||||
--with-java build JDBC interface and Java tools
|
||||
--with-krb4 build with Kerberos 4 support
|
||||
--with-krb5 build with Kerberos 5 support
|
||||
--with-krb-srvnam=NAME name of the service principal in Kerberos [postgres]
|
||||
@ -3166,153 +3165,6 @@ echo "$as_me:$LINENO: result: $with_python" >&5
|
||||
echo "${ECHO_T}$with_python" >&6
|
||||
|
||||
|
||||
#
|
||||
# Optionally build the Java/JDBC tools
|
||||
#
|
||||
echo "$as_me:$LINENO: checking whether to build Java/JDBC tools" >&5
|
||||
echo $ECHO_N "checking whether to build Java/JDBC tools... $ECHO_C" >&6
|
||||
|
||||
|
||||
|
||||
# Check whether --with-java or --without-java was given.
|
||||
if test "${with_java+set}" = set; then
|
||||
withval="$with_java"
|
||||
|
||||
case $withval in
|
||||
yes)
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
|
||||
for ac_prog in jakarta-ant ant ant.sh ant.bat
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_ANT+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $ANT in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
ANT=$ac_cv_path_ANT
|
||||
|
||||
if test -n "$ANT"; then
|
||||
echo "$as_me:$LINENO: result: $ANT" >&5
|
||||
echo "${ECHO_T}$ANT" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$ANT" && break
|
||||
done
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking whether $ANT works" >&5
|
||||
echo $ECHO_N "checking whether $ANT works... $ECHO_C" >&6
|
||||
if test "${pgac_cv_prog_ant_works+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat > conftest.java << EOF
|
||||
public class conftest {
|
||||
int testmethod(int a, int b) {
|
||||
return a + b;
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
cat > conftest.xml << EOF
|
||||
<project name="conftest" default="conftest">
|
||||
<target name="conftest">
|
||||
<javac srcdir="." includes="conftest.java">
|
||||
</javac>
|
||||
</target>
|
||||
</project>
|
||||
EOF
|
||||
|
||||
pgac_cmd='$ANT -buildfile conftest.xml 1>&2'
|
||||
{ (eval echo "$as_me:$LINENO: \"$pgac_cmd\"") >&5
|
||||
(eval $pgac_cmd) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }
|
||||
pgac_save_status=$?
|
||||
if test $? = 0 && test -f ./conftest.class ; then
|
||||
pgac_cv_prog_ant_works=yes
|
||||
else
|
||||
echo "configure: failed java program was:" >&5
|
||||
cat conftest.java >&5
|
||||
echo "configure: failed build file was:" >&5
|
||||
cat conftest.xml >&5
|
||||
pgac_cv_prog_ant_works=no
|
||||
fi
|
||||
|
||||
rm -f conftest* core core.* *.core
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $pgac_cv_prog_ant_works" >&5
|
||||
echo "${ECHO_T}$pgac_cv_prog_ant_works" >&6
|
||||
|
||||
if test "$pgac_cv_prog_ant_works" != yes; then
|
||||
{ { echo "$as_me:$LINENO: error: ant does not work" >&5
|
||||
echo "$as_me: error: ant does not work" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$ANT"; then
|
||||
{ { echo "$as_me:$LINENO: error: Ant is required to build Java components
|
||||
If you have Ant already installed, see config.log for details on the failure." >&5
|
||||
echo "$as_me: error: Ant is required to build Java components
|
||||
If you have Ant already installed, see config.log for details on the failure." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if "$ANT" -version | egrep -i 'ant version' | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
|
||||
{ { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5
|
||||
echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
;;
|
||||
no)
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
;;
|
||||
*)
|
||||
{ { echo "$as_me:$LINENO: error: no argument expected for --with-java option" >&5
|
||||
echo "$as_me: error: no argument expected for --with-java option" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
;;
|
||||
esac
|
||||
|
||||
else
|
||||
with_java=no
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi;
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Kerberos 4
|
||||
#
|
||||
@ -18252,8 +18104,6 @@ s,@with_tcl@,$with_tcl,;t t
|
||||
s,@with_tk@,$with_tk,;t t
|
||||
s,@with_perl@,$with_perl,;t t
|
||||
s,@with_python@,$with_python,;t t
|
||||
s,@ANT@,$ANT,;t t
|
||||
s,@with_java@,$with_java,;t t
|
||||
s,@with_krb4@,$with_krb4,;t t
|
||||
s,@with_krb5@,$with_krb5,;t t
|
||||
s,@krb_srvtab@,$krb_srvtab,;t t
|
||||
|
||||
Reference in New Issue
Block a user