* configure --with-wwwdir=<dir> is removed
* test: * new test_helloworld.sh smoketest added for testing basic functions * stripped restconf fcgi default config * added yang variable
This commit is contained in:
parent
b5ecd6d5fa
commit
4102ca8a46
127 changed files with 343 additions and 163 deletions
19
configure
vendored
19
configure
vendored
|
|
@ -632,7 +632,6 @@ ac_ct_CXX
|
|||
CXXFLAGS
|
||||
CXX
|
||||
CPP
|
||||
wwwdir
|
||||
YANG_STANDARD_DIR
|
||||
YANG_INSTALLDIR
|
||||
CLIXON_YANG_PATCH
|
||||
|
|
@ -728,6 +727,7 @@ with_libxml2
|
|||
with_sigaction
|
||||
with_yang_installdir
|
||||
with_yang_standard_dir
|
||||
enable_nls
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
|
|
@ -1375,6 +1375,7 @@ Optional Features:
|
|||
--disable-nghttp2 Disable nghttp2 for native restconf http/2, ie
|
||||
http/1 only
|
||||
|
||||
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
|
|
@ -3395,10 +3396,6 @@ HAVE_LIBNGHTTP2=false
|
|||
# Examples require standard IETF YANGs. You need to provide these for example and tests
|
||||
|
||||
|
||||
# Home dir for web user, such as nginx fcgi sockets
|
||||
wwwdir=/www-data
|
||||
|
||||
|
||||
#
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
|
|
@ -5072,11 +5069,6 @@ fi
|
|||
|
||||
$as_echo "#define WITH_RESTCONF_FCGI 1" >>confdefs.h
|
||||
# For c-code that cant use strings
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define WWWDIR "$wwwdir"
|
||||
_ACEOF
|
||||
|
||||
elif test "x${with_restconf}" == xnative; then
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5
|
||||
|
|
@ -5676,6 +5668,13 @@ cat >>confdefs.h <<_ACEOF
|
|||
_ACEOF
|
||||
|
||||
|
||||
# Dummy to disable native language support (nls) to remove warnings in buildroot
|
||||
# Check whether --enable-nls was given.
|
||||
if test "${enable_nls+set}" = set; then :
|
||||
enableval=$enable_nls;
|
||||
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 include/Makefile etc/Makefile etc/clixonrc example/Makefile example/main/Makefile example/main/example.xml extras/rpm/Makefile docker/Makefile docker/base/Makefile docker/clixon-dev/Makefile docker/main/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/mandatory/Makefile doc/Makefile test/Makefile test/config.sh test/cicd/Makefile test/vagrant/Makefile"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue