From ea14b4fa24eb4138dbcdf317a53febdb102c9993 Mon Sep 17 00:00:00 2001
From: "R. Christian McDonald" <rcm@rcm.sh>
Date: Mon, 2 Oct 2023 17:47:35 -0400
Subject: [PATCH] fix --with-cligen build option

---
 configure.ac | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c88c1e69..30af6071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,9 @@ SH_SUFFIX=".so"
 # Postfix for static libs 
 LIBSTATIC_SUFFIX=".a"
 
+CPPFLAGS="-I$(eval echo ${includedir}) ${CPPFLAGS}"
+LDFLAGS="-L$(eval echo ${libdir}) ${LDFLAGS}"
+
 # This is for cligen
 AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installation in this dir])], [
   CLIGEN_DIR="$withval"
@@ -187,8 +190,8 @@ AC_ARG_WITH([cligen], [AS_HELP_STRING([--with-cligen=dir], [Use CLIGEN installat
 AC_SUBST(CLIGEN_DIR)
 if test -n "${CLIGEN_DIR}" -a -d "${CLIGEN_DIR}"; then
     echo "Using CLIGEN here: ${CLIGEN_DIR}"
-    CPPFLAGS="-I${CLIGEN_DIR}$(eval echo ${includedir}) ${CPPFLAGS}"
-    LDFLAGS="-L${CLIGEN_DIR}$(eval echo ${libdir}) ${LDFLAGS}"
+    CPPFLAGS="-I${CLIGEN_DIR}/include ${CPPFLAGS}"
+    LDFLAGS="-L${CLIGEN_DIR}/lib ${LDFLAGS}"
 fi
 
 # Disable/enable yang patch