[arrow] branch master updated: ARROW-4937: [R] Clean pkg-config related logic

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new a530848  ARROW-4937: [R] Clean pkg-config related logic
a530848 is described below

commit a530848605c1d0249d659b81a7b794e2c6755c64
Author: Kouhei Sutou <k...@clear-code.com>
AuthorDate: Mon Mar 18 09:04:57 2019 +0900

    ARROW-4937: [R] Clean pkg-config related logic
    
    * Remove unused codes
    * Hide error messages from pkg-config (We report our error messages)
    
    Author: Kouhei Sutou <k...@clear-code.com>
    
    Closes #3951 from kou/r-configure-pkg-config-clean and squashes the 
following commits:
    
    e5383fd8 <Kouhei Sutou>  Clean pkg-config related logic
---
 r/configure | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/r/configure b/r/configure
index f0c6d49..a3bc690 100755
--- a/r/configure
+++ b/r/configure
@@ -37,15 +37,13 @@ PKG_LIBS=""
 # Use pkg-config if available
 pkg-config --version >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-  PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors ${PKG_CONFIG_NAME}`
-  PKGCONFIG_LIBS=`pkg-config --libs ${PKG_CONFIG_NAME}`
-  PKGCONFIG_CFLAGS=$(pkg-config --cflags arrow)
+  PKGCONFIG_CFLAGS=$(pkg-config --cflags --silence-errors arrow)
   if [ $? -ne 0 ]; then
     echo "Apache Arrow C++ was not found using pkg-config"
     exit 1
   fi
   PKGCONFIG_LIBS=$(pkg-config --libs arrow)
-  PKGCONFIG_CFLAGS_PARQUET=$(pkg-config --cflags parquet)
+  PKGCONFIG_CFLAGS_PARQUET=$(pkg-config --cflags --silence-errors parquet)
   if [ $? -eq 0 ]; then
     PKGCONFIG_CFLAGS="${PKGCONFIG_CFLAGS} ${PKGCONFIG_CFLAGS_PARQUET} 
-DARROW_R_WITH_PARQUET"
     PKGCONFIG_LIBS="${PKGCONFIG_LIBS} $(pkg-config --libs parquet)"