build: build ldap with sasl and ssl support

Pass the libpq build prefix to configure in order to find just built
libraries.

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index d3e8a29387fe5ac08896a5434793f1ee4ba56069..0f510920f7868db07032e85c1558ebd8592ba8e3 100644 (file)
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -101,7 +101,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/libpq.build
-          key: libpq-${{ env.LIBPQ_VERSION }}-${{ matrix.platform }}-${{ matrix.arch }}-1
+          key: libpq-${{ env.LIBPQ_VERSION }}-${{ matrix.platform }}-${{ matrix.arch }}-2
 
       - name: Create the binary package source tree
         run: python3 ./tools/build/copy_to_binary.py

diff --git a/tools/build/build_libpq.sh b/tools/build/build_libpq.sh
index dd056495b18d9c54862865bfa1a2fe76a921249c..612439fea70b4282cc762c13147d2fbdd1b47cdf 100755 (executable)
--- a/tools/build/build_libpq.sh
+++ b/tools/build/build_libpq.sh
@@ -86,7 +86,8 @@ if [ "$ID" == "centos" ]; then
         cd "${sasl_dir}"
 
         autoreconf -i
-        ./configure --prefix=${LIBPQ_BUILD_PREFIX}
+        ./configure --prefix=${LIBPQ_BUILD_PREFIX} \
+            CPPFLAGS=-I${LIBPQ_BUILD_PREFIX}/include/ LDFLAGS=-L${LIBPQ_BUILD_PREFIX}/lib
         make
     else
         cd "${sasl_dir}"
@@ -113,7 +114,9 @@ if [ "$ID" == "centos" ]; then
 
         cd "${ldap_dir}"
 
-        ./configure --prefix=${LIBPQ_BUILD_PREFIX} --enable-backends=no --enable-null
+        ./configure --prefix=${LIBPQ_BUILD_PREFIX} --enable-backends=no --enable-null \
+            CPPFLAGS=-I${LIBPQ_BUILD_PREFIX}/include/ LDFLAGS=-L${LIBPQ_BUILD_PREFIX}/lib
+
         make depend
         make -C libraries/liblutil/
         make -C libraries/liblber/