Skip to content

Commit

Permalink
ARROW-12601: [R][Packaging] Fix pkg-config check in r/configure
Browse files Browse the repository at this point in the history
Fixes false positives in a check that pkg-config is installed

Closes apache#10198 from ianmcook/ARROW-12601

Authored-by: Ian Cook <[email protected]>
Signed-off-by: Ian Cook <[email protected]>
  • Loading branch information
ianmcook authored and kszucs committed May 17, 2021
1 parent 8004518 commit b1303cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion r/configure
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ elif [ "$INCLUDE_DIR" ] && [ "$LIB_DIR" ]; then
else
# Use pkg-config if available and allowed
pkg-config --version >/dev/null 2>&1
if [ "$ARROW_USE_PKG_CONFIG" != "false" ] && [ $? -eq 0 ]; then
if [ $? -eq 0 ] && [ "$ARROW_USE_PKG_CONFIG" != "false" ]; then
PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors ${PKG_CONFIG_NAME}`
PKGCONFIG_LIBS=`pkg-config --libs-only-l --silence-errors ${PKG_CONFIG_NAME}`
PKGCONFIG_DIRS=`pkg-config --libs-only-L --silence-errors ${PKG_CONFIG_NAME}`
Expand Down

0 comments on commit b1303cd

Please sign in to comment.