Kaydet (Commit) 3cf4aecb authored tarafından Michael Stahl's avatar Michael Stahl

normalize values of HSQLDB_USE_JDBC_4_1

Change-Id: Ifdbd07db813fd5c8dc02ebd04aea8086ff333411
üst ad40015a
...@@ -8236,7 +8236,7 @@ else ...@@ -8236,7 +8236,7 @@ else
javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk` javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk`
if expr "$javanumver" '>=' 000100060000 > /dev/null; then if expr "$javanumver" '>=' 000100060000 > /dev/null; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
HSQLDB_USE_JDBC_4_1=YES HSQLDB_USE_JDBC_4_1=TRUE
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
......
...@@ -24,7 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\ ...@@ -24,7 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/i104901.patch \ external/hsqldb/patches/i104901.patch \
external/hsqldb/patches/fdo36824.patch \ external/hsqldb/patches/fdo36824.patch \
external/hsqldb/patches/limit_as_table_alias.patch \ external/hsqldb/patches/limit_as_table_alias.patch \
$(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\ $(if $(HSQLDB_USE_JDBC_4_1),\
external/hsqldb/patches/jdbc-4.1.patch \ external/hsqldb/patches/jdbc-4.1.patch \
) \ ) \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment