diff --git a/configure b/configure index c6e83f57364..c69c6f1ba9c 100755 --- a/configure +++ b/configure @@ -9400,7 +9400,6 @@ 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 @@ -9408,10 +9407,8 @@ 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" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9458,7 +9455,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 index 340e6d9d807..3b1d1657cc2 100755 --- a/configure.ac +++ b/configure.ac @@ -1059,7 +1059,6 @@ 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 @@ -1067,10 +1066,8 @@ else 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 #include class St:public pdal::Streamable {};]], [[pdal::PointTable table;]])],[],[ @@ -1082,7 +1079,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 index 937cabd8a57..664304a20dd 100644 --- a/include/Make/Platform.make.in +++ b/include/Make/Platform.make.in @@ -181,7 +181,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 index eb24a95a099..fa7bceb3557 100644 --- 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 index 7aa932d84ff..23badee9202 100644 --- 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)),)