configure: pdal - backport of #2749 (#2757)

OSGeo · Jan 18, 2023 · 2f20bc1 · 2f20bc1
1 parent 1b7d220
commit 2f20bc1
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 17 deletions.
diff --git a/configure b/configure
@@ -9015,18 +9015,15 @@ fi
 
   if test "$PDAL_CONFIG" != "" ; then
     PDAL_LIBS=`"$PDAL_CONFIG" --libs`
-    PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags`
     PDAL_INC=`"$PDAL_CONFIG" --includes`
     USE_PDAL=1
   fi
 
   PDAL=
   ac_save_libs="$LIBS"
   ac_save_cflags="$CFLAGS"
-  ac_save_cppflags="$CPPFLAGS"
   LIBS="$LIBS $PDAL_LIBS"
   CFLAGS="$CFLAGS $PDAL_CFLAGS"
-  CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC"
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9318,7 +9315,6 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LIBS=${ac_save_libs}
   CFLAGS=${ac_save_cflags}
-  CPPFLAGS=${ac_save_cppflags}
 
 
 $as_echo "#define HAVE_PDAL 1" >>confdefs.h

diff --git a/configure.ac b/configure.ac
@@ -992,18 +992,15 @@ else
 
   if test "$PDAL_CONFIG" != "" ; then
     PDAL_LIBS=`"$PDAL_CONFIG" --libs`
-    PDAL_CPPFLAGS=`"$PDAL_CONFIG" --cxxflags`
     PDAL_INC=`"$PDAL_CONFIG" --includes`
     USE_PDAL=1
   fi
 
   PDAL=
   ac_save_libs="$LIBS"
   ac_save_cflags="$CFLAGS"
-  ac_save_cppflags="$CPPFLAGS"
   LIBS="$LIBS $PDAL_LIBS"
   CFLAGS="$CFLAGS $PDAL_CFLAGS"
-  CPPFLAGS="$CPPFLAGS $PDAL_CPPFLAGS $PDAL_INC"
   AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pdal/PointTable.hpp>
   #include <pdal/Streamable.hpp>
   class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[
@@ -1015,7 +1012,6 @@ else
   ])
   LIBS=${ac_save_libs}
   CFLAGS=${ac_save_cflags}
-  CPPFLAGS=${ac_save_cppflags}
 
   AC_DEFINE(HAVE_PDAL, 1, [define if PDAL exists])
 fi

diff --git a/include/Make/Platform.make.in b/include/Make/Platform.make.in
@@ -180,7 +180,6 @@ USE_LIBLAS          = @USE_LIBLAS@
 
 #LAS LiDAR through PDAL
 PDALLIBS             = @PDAL_LIBS@
-PDALCPPFLAGS         = @PDAL_CPPFLAGS@
 PDALINC              = @PDAL_INC@
 USE_PDAL             = @USE_PDAL@
 

diff --git a/raster/r.in.pdal/Makefile b/raster/r.in.pdal/Makefile
@@ -10,12 +10,6 @@ EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-$(OBJDIR)/main.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
-$(OBJDIR)/info.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
-$(OBJDIR)/grasslidarfilter.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
 LINK = $(CXX)
 
 ifneq ($(strip $(CXX)),)

diff --git a/vector/v.in.pdal/Makefile b/vector/v.in.pdal/Makefile
@@ -10,8 +10,6 @@ EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-$(OBJDIR)/main.o : EXTRA_CFLAGS += $(PDALCPPFLAGS)
-
 LINK = $(CXX)
 
 ifneq ($(strip $(CXX)),)