Configure (autoconf) changes: Removed libcurl dependency, Disable restconf and disable restconf options. Added empty text datastore
This commit is contained in:
Olof hagsand
parent
af334bb746
commit
2758a30bb7
15 changed files with 812 additions and 182 deletions
153
configure
vendored
153
configure
vendored
|
|
@ -632,6 +632,8 @@ CPP
|
|||
OBJEXT
|
||||
EXEEXT
|
||||
ac_ct_CC
|
||||
with_keyvalue
|
||||
with_restconf
|
||||
RANLIB
|
||||
AR
|
||||
EXE_SUFFIX
|
||||
|
|
@ -702,6 +704,8 @@ ac_subst_files=''
|
|||
ac_user_opts='
|
||||
enable_option_checking
|
||||
with_cligen
|
||||
with_restconf
|
||||
with_keyvalue
|
||||
with_qdbm
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
|
|
@ -1327,6 +1331,8 @@ Optional Packages:
|
|||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-cligen=dir Use CLIGEN here
|
||||
--without-restconf disable support for restconf
|
||||
--without-keyvalue disable support for key-value xmldb datastore
|
||||
--with-qdbm=dir Use QDBM here
|
||||
|
||||
Some influential environment variables:
|
||||
|
|
@ -2320,6 +2326,8 @@ test -n "$target_alias" &&
|
|||
|
||||
|
||||
|
||||
# If yes, compile apps/restconf
|
||||
# If yes, compile datastore/keyvalue
|
||||
|
||||
#
|
||||
ac_ext=c
|
||||
|
|
@ -3534,7 +3542,6 @@ if test "${with_cligen}"; then
|
|||
fi
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
||||
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
||||
if ${ac_cv_path_GREP+:} false; then :
|
||||
|
|
@ -3859,21 +3866,92 @@ else
|
|||
fi
|
||||
|
||||
|
||||
# This is for qdbm
|
||||
# This is for restconf (and fastcgi)
|
||||
|
||||
# Check whether --with-restconf was given.
|
||||
if test "${with_restconf+set}" = set; then :
|
||||
withval=$with_restconf;
|
||||
else
|
||||
with_restconf=yes
|
||||
fi
|
||||
|
||||
if test "x${with_restconf}" == xyes; then
|
||||
# Lives in libfcgi-dev
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGX_Init in -lfcgi" >&5
|
||||
$as_echo_n "checking for FCGX_Init in -lfcgi... " >&6; }
|
||||
if ${ac_cv_lib_fcgi_FCGX_Init+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lfcgi $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 FCGX_Init ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return FCGX_Init ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_fcgi_FCGX_Init=yes
|
||||
else
|
||||
ac_cv_lib_fcgi_FCGX_Init=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_fcgi_FCGX_Init" >&5
|
||||
$as_echo "$ac_cv_lib_fcgi_FCGX_Init" >&6; }
|
||||
if test "x$ac_cv_lib_fcgi_FCGX_Init" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBFCGI 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-lfcgi $LIBS"
|
||||
|
||||
else
|
||||
as_fn_error $? "libfcgi-dev missing" "$LINENO" 5
|
||||
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=yes
|
||||
fi
|
||||
|
||||
|
||||
if test "x${with_keyvalue}" == xyes; then
|
||||
echo "yes keyvalue"
|
||||
# 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
|
||||
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 :
|
||||
|
|
@ -3900,7 +3978,7 @@ fi
|
|||
|
||||
done
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -lqdbm" >&5
|
||||
{ $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
|
||||
|
|
@ -3947,6 +4025,7 @@ else
|
|||
as_fn_error $? "libqdbm-dev required" "$LINENO" 5
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
|
||||
$as_echo_n "checking for crypt in -lcrypt... " >&6; }
|
||||
|
|
@ -4185,58 +4264,9 @@ fi
|
|||
done
|
||||
|
||||
|
||||
# Lives in libfcgi-dev
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGX_Init in -lfcgi" >&5
|
||||
$as_echo_n "checking for FCGX_Init in -lfcgi... " >&6; }
|
||||
if ${ac_cv_lib_fcgi_FCGX_Init+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lfcgi $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 FCGX_Init ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return FCGX_Init ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_fcgi_FCGX_Init=yes
|
||||
else
|
||||
ac_cv_lib_fcgi_FCGX_Init=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_fcgi_FCGX_Init" >&5
|
||||
$as_echo "$ac_cv_lib_fcgi_FCGX_Init" >&6; }
|
||||
if test "x$ac_cv_lib_fcgi_FCGX_Init" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBFCGI 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-lfcgi $LIBS"
|
||||
|
||||
else
|
||||
as_fn_error $? "libfcgi-dev missing" "$LINENO" 5
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
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 apps/dbctrl/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/docker/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile datastore/Makefile datastore/keyvalue/Makefile doc/Makefile"
|
||||
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 apps/dbctrl/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/docker/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile datastore/Makefile datastore/keyvalue/Makefile datastore/text/Makefile doc/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -4953,6 +4983,7 @@ do
|
|||
"docker/netconf/Dockerfile") CONFIG_FILES="$CONFIG_FILES docker/netconf/Dockerfile" ;;
|
||||
"datastore/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/Makefile" ;;
|
||||
"datastore/keyvalue/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/keyvalue/Makefile" ;;
|
||||
"datastore/text/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/text/Makefile" ;;
|
||||
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
||||
|
||||
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue