From 8d3d39319e7daaba297fdc01cc6d4703ff20ceb3 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 3 Dec 2023 21:49:52 +0100
Subject: [PATCH] Test: vagrant configure clixon changes

---
 test/vagrant/clixon.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/vagrant/clixon.sh b/test/vagrant/clixon.sh
index e7b59bf2..5d3cdc37 100755
--- a/test/vagrant/clixon.sh
+++ b/test/vagrant/clixon.sh
@@ -41,14 +41,13 @@ test -d src/cligen || (cd src;git clone https://github.com/clicon/cligen.git)
 cd src/cligen
 git pull origin master
 
+./configure
+
 if [ $release = "freebsd" -o $release = "dragonfly" ]; then
-    ./configure
     MAKE=$(which gmake)
 elif [ $release = "arch" ]; then
-    ./configure --prefix=/usr
     MAKE=/usr/bin/make
 else
-    ./configure --prefix=/usr
     MAKE=$(which make)
 fi
 echo "MAKE:$MAKE"
@@ -63,10 +62,10 @@ cd src/clixon
 git pull origin master
 
 if [ $release = "freebsd" -o $release = "dragonfly" ]; then
-    LDFLAGS=-L/usr/local/lib ./configure --with-cligen=/ --with-restconf=${with_restconf}
+    LDFLAGS="-L/usr/local/lib" CPPFLAGS="-I/usr/local/include" ./configure
 else
    # Problems with su not having "sbin" in path on centos when when we run tests later
-    ./configure --sbindir=/usr/sbin --libdir=/usr/lib --with-restconf=${with_restconf}
+    LDFLAGS="-L/usr/local/lib" CPPFLAGS="-I/usr/local/include" ./configure --sbindir=/usr/sbin --libdir=/usr/lib --with-restconf=${with_restconf}
 fi
 $MAKE clean
 $MAKE -j10
@@ -80,7 +79,7 @@ cd
 test -d src/clixon-util || (cd src;git clone https://github.com/clicon/clixon-util.git)
 cd src/clixon-util
 git pull origin main
-./configure --with-cligen=/ --with-clixon=/ 
+LDFLAGS="-L/usr/local/lib" CPPFLAGS="-I/usr/local/include" ./configure
 $MAKE clean
 $MAKE -j10
 sudo $MAKE install