Skip to content

Commit

Permalink
fix 15
Browse files Browse the repository at this point in the history
  • Loading branch information
nilason committed Oct 3, 2024
1 parent 04e0e7a commit 1962103
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
10 changes: 5 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,6 @@ NETCDF_LIBS
NETCDF_CONFIG
USE_PDAL
PDAL_INC
PDAL_CPPFLAGS
PDAL_LIBS
USE_LIBLAS
LIBLAS_INC
Expand Down Expand Up @@ -10360,7 +10359,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu


PDAL_LIBS=
PDAL_CPPFLAGS=
PDAL_INC=
USE_PDAL=
pdal="pdal"

Expand All @@ -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. */
Expand Down Expand Up @@ -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'
Expand Down
10 changes: 6 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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;]])],
Expand All @@ -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)

Expand Down

0 comments on commit 1962103

Please sign in to comment.