experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The key-value datastore is no longer supported. Use the default text datastore.

Browse source
This commit is contained in:
Olof hagsand 2018-03-18 16:57:18 +00:00
parent 9b951b5ce6
commit 52e510cfdf
6 changed files with 276 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

109
configure vendored
View file

@ -632,7 +632,6 @@ CPP
OBJEXT
EXEEXT
ac_ct_CC
with_keyvalue
with_restconf
RANLIB
AR
@ -707,8 +706,6 @@ ac_user_opts='
enable_option_checking
with_cligen
with_restconf
with_keyvalue
with_qdbm
with_configfile
'
ac_precious_vars='build_alias
@ -1346,8 +1343,6 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-cligen=dir Use CLIGEN here
--without-restconf disable support for restconf
--with-keyvalue enable support for key-value xmldb datastore
--with-qdbm=dir Use QDBM here, if keyvalue
--with-configfile=FILE set default path to config file
Some influential environment variables:
@ -2349,7 +2344,6 @@ test -n "$target_alias" &&
# If yes, compile apps/restconf
# If yes, compile datastore/keyvalue
#
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@ -3946,107 +3940,6 @@ fi
fi
# This is for keyvalue datastore (and qdbm)
# Check whether --with-keyvalue was given.
if test "${with_keyvalue+set}" = set; then :
withval=$with_keyvalue;
else
with_keyvalue=no
fi
if test "x${with_keyvalue}" == xyes; then
# This is for qdbm
# Check whether --with-qdbm was given.
if test "${with_qdbm+set}" = set; then :
withval=$with_qdbm;
fi
if test "${with_qdbm}"; then
echo "Using QDBM here: ${with_qdbm}"
CPPFLAGS="-I${with_qdbm}/include ${CPPFLAGS}"
LDFLAGS="-L${with_qdbm}/lib ${LDFLAGS}"
fi
# Problem: depot.h may be in qdbm/depot.h.
for ac_header in depot.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "depot.h" "ac_cv_header_depot_h" "$ac_includes_default"
if test "x$ac_cv_header_depot_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DEPOT_H 1
_ACEOF
else
for ac_header in qdbm/depot.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "qdbm/depot.h" "ac_cv_header_qdbm_depot_h" "$ac_includes_default"
if test "x$ac_cv_header_qdbm_depot_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_QDBM_DEPOT_H 1
_ACEOF
else
as_fn_error $? "libqdbm-dev required" "$LINENO" 5
fi
done
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -lqdbm" >&5
$as_echo_n "checking for dpopen in -lqdbm... " >&6; }
if ${ac_cv_lib_qdbm_dpopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lqdbm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char dpopen ();
int
main ()
{
return dpopen ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_qdbm_dpopen=yes
else
ac_cv_lib_qdbm_dpopen=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qdbm_dpopen" >&5
$as_echo "$ac_cv_lib_qdbm_dpopen" >&6; }
if test "x$ac_cv_lib_qdbm_dpopen" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBQDBM 1
_ACEOF
LIBS="-lqdbm $LIBS"
else
as_fn_error $? "libqdbm-dev required" "$LINENO" 5
fi
ac_config_files="$ac_config_files datastore/keyvalue/Makefile"
fi
# Set default config file location
# Check whether --with-configfile was given.
@ -4311,7 +4204,6 @@ _ACEOF
# See also datastore/keyvalue/Makefile in with_keyvalue clause above
ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/docker/Makefile extras/rpm/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile datastore/Makefile datastore/text/Makefile yang/Makefile doc/Makefile"
cat >confcache <<\_ACEOF
@ -5005,7 +4897,6 @@ do
case $ac_config_target in
"include/clixon_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/clixon_config.h" ;;
"lib/clixon/clixon.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/clixon/clixon.h" ;;
"datastore/keyvalue/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/keyvalue/Makefile" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/src/Makefile" ;;