Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pkgconfig bugs #567

Closed
wants to merge 2 commits into from
Closed

Pkgconfig bugs #567

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae2430
Configure: Default to -lproj in all cases
Algunenano Jun 22, 2020
ea52314
Configure: Don't error if json-c is not found with pkg-config
Algunenano Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Configure: Default to -lproj in all cases
  • Loading branch information
@Algunenano
Algunenano committed Jun 22, 2020
commit 8ae2430a2ac19e41cd61957ae446baef02e76118
19 changes: 11 additions & 8 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,15 +864,18 @@ if test ! "x$PROJDIR" = "x"; then
fi
fi
elif test ! -z "$PKG_CONFIG"; then
dnl To keep compatibility with PROJ pre 4.8, default to lproj if not found
dnl To keep compatibility with PROJ pre 4.8, default to lproj if not found
PKG_CHECK_MODULES([PROJ], [proj],
[
PROJ_CPPFLAGS="$PROJ_CFLAGS"
PROJ_LDFLAGS="$PROJ_LIBS"
],
[
PROJ_LDFLAGS="-lproj"
])
[
PROJ_CPPFLAGS="$PROJ_CFLAGS"
PROJ_LDFLAGS="$PROJ_LIBS"
],
[
PROJ_LDFLAGS="-lproj"
])
else
dnl To keep compatibility with PROJ pre 4.8, default to lproj
PROJ_LDFLAGS="-lproj"
fi


Expand Down