From 938109bef497309cea12b3f9824e4b454277aa2c Mon Sep 17 00:00:00 2001
From: Tom Barbette <tom.barbette@uclouvain.be>
Date: Tue, 23 Apr 2024 11:05:59 +0200
Subject: [PATCH 1/2] Add picoquic to CI

It looks like upstream will never merge a make install command. So let's
use the default horrible behavior of looking in ../picotls and
../picoquic...
---
 .github/workflows/c-cpp.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 2db4538..40d6655 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -15,6 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: picotls
       run: |
+        pushd ..
         git clone https://github.com/huitema/picotls.git
         cd picotls
         git submodule init
@@ -22,19 +23,19 @@ jobs:
         cmake .
         make
         cd ..
+        popd
     - name: picoquic
       run: |
+        pushd ..
         git clone https://github.com/private-octopus/picoquic.git
         cd picoquic
         cmake .
         make
-        make DESTDIR=$(pwd)/../ install
-         cd ..
+        cd ..
+        popd
     - name: build
       run: |
         ./autogen.sh
-        export LD_LIBRARY_PATH=$(pwd)/usr/local/lib/:$(pwd)/picoquic/:$LD_LIBRARY_PATH
-        ls usr/local/
-        ls usr/local/lib
-        ./configure "CFLAGS=-I$(pwd)/usr/local/include/ -I$(pwd)/picoquic/picoquic/" "LDFLAGS=-L$(pwd)/picoquic/"
+        ./configure
         make
+        grep HAVE_QUIC config.status

From d3028dfcdf78c824f9995a56aec46918181be1c1 Mon Sep 17 00:00:00 2001
From: Tom Barbette <tom.barbette@uclouvain.be>
Date: Tue, 23 Apr 2024 11:07:55 +0200
Subject: [PATCH 2/2] Change the error message

Forget about make install
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5f55126..2bdb3f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ if test "$have_picoquic" = "yes"; then
     AC_DEFINE([HAVE_QUIC],[1],[Have QUIC support])
     AC_SUBST([HAVE_QUIC],[1])
 else
-    echo "WARNING! Picoquic was not found! Did you 'make install' it?"
+    echo "WARNING! Picoquic was not found! Is it built in ../picoquic?"
 fi
 LIBS="$save_LIBS"