mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 05:27:55 +00:00
Code Issues Releases Wiki Activity

[111-configure-options-with-cql-not-working-properly] Added check of existance by the config script

Browse Source
This commit is contained in:
Francis Dupont 2018-12-29 11:41:47 +01:00
parent 5174743730
commit 798cfefb0f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -835,6 +835,11 @@ if test "$CQL_CONFIG" != "" ; then
AC_MSG_ERROR([--with-cql should point to a pkg-config or cql_config program])
fi
$CQL_CONFIG --print-errors $cql_lib
if test $? -ne 0; then
AC_MSG_ERROR([$CQL_CONFIG $cql_lib failed])
fi
CQL_INCLUDEDIR=`$CQL_CONFIG --cflags-only-I $cql_lib`
CQL_CPPFLAGS="$CQL_INCLUDEDIR `$CQL_CONFIG --cflags-only-other $cql_lib`"
CQL_LIBS="`$CQL_CONFIG --libs $cql_lib`"

15
tools/cql_config
View File

@ -11,14 +11,14 @@ fi
if ! [ -f ${DIR}/cql_config_defines.sh ] || ! [ -x ${DIR}/cql_config_defines.sh ]
then
echo "missing path configuration file for DataStax Cassandra (cql_config_defines.sh)"
exit 0
exit 1
fi
source ${DIR}/cql_config_defines.sh
if [ $# -ne 1 ] && [ $# -ne 2 ]
then
echo "run: \`$0 --help\` for more help"
exit 0
exit 1
fi
if [ $1 == "--help" ]
then
@ -34,6 +34,8 @@ then
echo " get lib path"
echo "--modversion"
echo " get version"
echo "--print-errors"
echo " check existence"
echo "libraries:"
echo " cassandra"
echo " cassandra_static"
@ -41,12 +43,12 @@ then
else if [ $# -ne 2 ]
then
echo "run: \`$0 --help\` for more help"
exit 0
exit 1
else if [ $2 != "cassandra" ] && [ $2 != "cassandra_static" ]
then
echo "library $2 not supported"
echo "run: \`$0 --help\` for more help"
exit 0
exit 1
else
cql_lib=$2
fi
@ -74,5 +76,10 @@ then
echo "${MAJOR}.${MINOR}.${PATCH}"
exit 0
fi
if [ $1 == "--print-errors" ]
then
exit 0
fi
echo "wrong parameter"
echo "run: \`$0 --help\` for more help"
exit 1