Skip to content

Commit

Permalink
fix 1
Browse files Browse the repository at this point in the history
  • Loading branch information
nilason committed Oct 2, 2024
1 parent 4808e54 commit 3cf0eed
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/osgeo4w.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ jobs:
- name: Set number of cores for compilation
run: |
echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
ls -l /mingw64/lib/pkgconfig
ls -l /mingw64/lib
shell: msys2 {0}

- name: Compile GRASS GIS
Expand Down
4 changes: 3 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -4705,6 +4705,8 @@ fi

# Check for custom PKG_CONFIG
PKG_CONFIG=${PKG_CONFIG-pkg-config}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: PKG_CONFIG: $PKG_CONFIG" >&5
printf "%s\n" "$as_me: PKG_CONFIG: $PKG_CONFIG" >&6;}

# Check for full floating-point support, including Infinity and NaN
IEEEFLAG=
Expand Down Expand Up @@ -10369,7 +10371,7 @@ else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }

if test -s "${PKG_CONFIG} --exists ${pdal}" ; then
if ! ${PKG_CONFIG} --exists ${pdal} ; then
as_fn_error $? "*** Unable to locate PDAL package." "$LINENO" 5
fi

Expand Down
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ AC_SUBST(WINDRES)

# Check for custom PKG_CONFIG
PKG_CONFIG=${PKG_CONFIG-pkg-config}
AC_MSG_NOTICE([PKG_CONFIG: $PKG_CONFIG])

# Check for full floating-point support, including Infinity and NaN
IEEEFLAG=
Expand Down Expand Up @@ -1070,7 +1071,7 @@ if test "$with_pdal" = "no" ; then
else
AC_MSG_RESULT(yes)

if test -s "${PKG_CONFIG} --exists ${pdal}" ; then
if ! ${PKG_CONFIG} --exists ${pdal} ; then
AC_MSG_ERROR([*** Unable to locate PDAL package.])
fi

Expand Down

0 comments on commit 3cf0eed

Please sign in to comment.