From 19621030a72fc43cc8d99b8a59194ab7dda9d6a3 Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Thu, 3 Oct 2024 09:12:35 +0200
Subject: [PATCH] fix 15

---
 configure    | 10 +++++-----
 configure.ac | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 65f0302880..62264b2e3f 100755
--- a/configure
+++ b/configure
@@ -720,7 +720,6 @@ NETCDF_LIBS
 NETCDF_CONFIG
 USE_PDAL
 PDAL_INC
-PDAL_CPPFLAGS
 PDAL_LIBS
 USE_LIBLAS
 LIBLAS_INC
@@ -10360,7 +10359,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 PDAL_LIBS=
-PDAL_CPPFLAGS=
+PDAL_INC=
 USE_PDAL=
 pdal="pdal"
 
@@ -10383,8 +10382,9 @@ printf "%s\n" "$as_me: WARNING: *** Unable to locate PDAL package." >&2;}
   PDAL=
   ac_save_libs="$LIBS"
   ac_save_cflags="$CFLAGS"
-  LIBS="$LIBS $PDAL_LIBS"
-  CFLAGS="$CFLAGS $PDAL_CFLAGS"
+  ac_save_ldflags="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $PDAL_LIBS"
+  CFLAGS="$CFLAGS $PDAL_INC"
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10448,13 +10448,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 
   LIBS=${ac_save_libs}
   CFLAGS=${ac_save_cflags}
+  LDFLAGS=${ac_save_ldflags}
 fi
 
 
 
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/configure.ac b/configure.ac
index 2ecc202f60..a96e96d6f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1062,7 +1062,7 @@ AC_MSG_CHECKING(whether to use PDAL)
 AC_LANG_PUSH(C++)
 
 PDAL_LIBS=
-PDAL_CPPFLAGS=
+PDAL_INC=
 USE_PDAL=
 pdal="pdal"
 
@@ -1082,8 +1082,10 @@ else
   PDAL=
   ac_save_libs="$LIBS"
   ac_save_cflags="$CFLAGS"
-  LIBS="$LIBS $PDAL_LIBS"
-  CFLAGS="$CFLAGS $PDAL_CFLAGS"
+  ac_save_ldflags="$LDFLAGS"
+  dnl LIBS="$LIBS $PDAL_LIBS"
+  LDFLAGS="$LDFLAGS $PDAL_LIBS"
+  CFLAGS="$CFLAGS $PDAL_INC"
   AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pdal/PointTable.hpp>
   #include <pdal/Streamable.hpp>
   class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],
@@ -1105,10 +1107,10 @@ else
 
   LIBS=${ac_save_libs}
   CFLAGS=${ac_save_cflags}
+  LDFLAGS=${ac_save_ldflags}
 fi
 
 AC_SUBST(PDAL_LIBS)
-AC_SUBST(PDAL_CPPFLAGS)
 AC_SUBST(PDAL_INC)
 AC_SUBST(USE_PDAL)