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

Configure: changed --with-restconf= to say fcgi is NOT default

Browse source 
test_openconfig: Fixed upgrade of git added new dependencies (openconfig-platform)
This commit is contained in:
Olof hagsand 2021-10-13 10:00:15 +02:00
parent daf37f6ad7
commit e0ea85d6d5
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configure vendored
View file

@ -1385,7 +1385,7 @@ Optional Packages:
--with-cligen=dir Use CLIGEN installation in this dir --with-cligen=dir Use CLIGEN installation in this dir
--with-restconf=native Integration with embedded web server (DEFAULT) --with-restconf=native Integration with embedded web server (DEFAULT)
--with-restconf=fcgi FCGI interface for stand-alone web rev-proxy eg --with-restconf=fcgi FCGI interface for stand-alone web rev-proxy eg
nginx (default) nginx
--without-restconf Disable restconf altogether --without-restconf Disable restconf altogether
--with-configfile=FILE Set default path to config file --with-configfile=FILE Set default path to config file
--with-libxml2 Use gnome/libxml2 regex engine --with-libxml2 Use gnome/libxml2 regex engine
@ -2298,7 +2298,6 @@ else
: ${CFLAGS="-O2 -Wall"} : ${CFLAGS="-O2 -Wall"}
fi fi
# Check CLIgen # Check CLIgen
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then
CLIGEN_PREFIX="$ac_default_prefix" CLIGEN_PREFIX="$ac_default_prefix"

2
configure.ac
View file

@ -295,7 +295,7 @@ if test "x${with_restconf}" != "x"; then
fi fi
# These are dummies just to get the help strings right # These are dummies just to get the help strings right
AC_ARG_WITH([restconf], AC_ARG_WITH([restconf],
AS_HELP_STRING([--with-restconf=fcgi],[FCGI interface for stand-alone web rev-proxy eg nginx (default)])) AS_HELP_STRING([--with-restconf=fcgi],[FCGI interface for stand-alone web rev-proxy eg nginx]))
AC_ARG_WITH([restconf], AC_ARG_WITH([restconf],
AS_HELP_STRING([--without-restconf],[Disable restconf altogether])) AS_HELP_STRING([--without-restconf],[Disable restconf altogether]))

1
test/test_openconfig_interfaces.sh
View file

@ -28,6 +28,7 @@ cat <<EOF > $cfg
<CLICON_YANG_DIR>$OCDIR/interfaces</CLICON_YANG_DIR> <CLICON_YANG_DIR>$OCDIR/interfaces</CLICON_YANG_DIR>
<CLICON_YANG_DIR>$OCDIR/types</CLICON_YANG_DIR> <CLICON_YANG_DIR>$OCDIR/types</CLICON_YANG_DIR>
<CLICON_YANG_DIR>$OCDIR/vlan</CLICON_YANG_DIR> <CLICON_YANG_DIR>$OCDIR/vlan</CLICON_YANG_DIR>
<CLICON_YANG_DIR>$OCDIR/platform</CLICON_YANG_DIR>
<CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE> <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
<CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR> <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
<CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR> <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>