diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 6ed19b9..6c8c6ba 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -17,6 +17,7 @@ jobs: - uses: actions/checkout@v2 - name: picotls run: | + pushd .. git clone https://github.com/huitema/picotls.git cd picotls git submodule init @@ -24,19 +25,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 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"