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

Revert "fix --with-cligen build option"

Browse source 
This reverts commit ea14b4fa24.
This commit is contained in:
Philip Prindeville 2023-11-04 00:49:58 -06:00 • committed by Olof Hagsand
parent f5a2c0b182
commit 30fbb82fc6
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure vendored
View file

@ -5936,9 +5936,6 @@ LIBDIR=`eval echo \`eval echo $libdir\``
LIBEXECDIR=`eval echo $libexecdir` LIBEXECDIR=`eval echo $libexecdir`
LOCALSTATEDIR=`eval echo $localstatedir` LOCALSTATEDIR=`eval echo $localstatedir`
CPPFLAGS="-I${INCLUDEDIR} ${CPPFLAGS}"
LDFLAGS="-L${LIBDIR} ${LDFLAGS}"
# This is for cligen # This is for cligen
# Check whether --with-cligen was given. # Check whether --with-cligen was given.
@ -5952,8 +5949,8 @@ fi
if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then
echo "Using CLIGEN here: ${CLIGEN_DIR}" echo "Using CLIGEN here: ${CLIGEN_DIR}"
CPPFLAGS="-I${CLIGEN_DIR}${INCLUDEDIR} ${CPPFLAGS}" CPPFLAGS="-I${CLIGEN_DIR}/include ${CPPFLAGS}"
LDFLAGS="-L${CLIGEN_DIR}${LIBDIR} ${LDFLAGS}" LDFLAGS="-L${CLIGEN_DIR}/lib ${LDFLAGS}"
fi fi
# Disable/enable yang patch # Disable/enable yang patch

7
configure.ac
View file

@ -194,9 +194,6 @@ LIBDIR=`eval echo \`eval echo $libdir\``
LIBEXECDIR=`eval echo $libexecdir` LIBEXECDIR=`eval echo $libexecdir`
LOCALSTATEDIR=`eval echo $localstatedir` LOCALSTATEDIR=`eval echo $localstatedir`
CPPFLAGS="-I${INCLUDEDIR} ${CPPFLAGS}"
LDFLAGS="-L${LIBDIR} ${LDFLAGS}"
# This is for cligen # This is for cligen
AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installation in this dir])], [ AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installation in this dir])], [
CLIGEN_DIR="$withval" CLIGEN_DIR="$withval"
@ -204,8 +201,8 @@ AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installat
AC_SUBST(CLIGEN_DIR) AC_SUBST(CLIGEN_DIR)
if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then
echo "Using CLIGEN here: ${CLIGEN_DIR}" echo "Using CLIGEN here: ${CLIGEN_DIR}"
CPPFLAGS="-I${CLIGEN_DIR}${INCLUDEDIR} ${CPPFLAGS}" CPPFLAGS="-I${CLIGEN_DIR}/include ${CPPFLAGS}"
LDFLAGS="-L${CLIGEN_DIR}${LIBDIR} ${LDFLAGS}" LDFLAGS="-L${CLIGEN_DIR}/lib ${LDFLAGS}"
fi fi
# Disable/enable yang patch # Disable/enable yang patch