version 0.7-3

cran · Oct 22, 2021 · 52600a0 · 52600a0
1 parent 58a7346
commit 52600a0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 71 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RPostgreSQL
-Version: 0.7-2
-Date: 2021-10-02
+Version: 0.7-3
+Date: 2021-10-22
 Title: R Interface to the 'PostgreSQL' Database System
 Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar Prayaga (during 2008), Neil Tiffin
 Maintainer: Tomoaki Nishiyama <tomoakin@staff.kanazawa-u.ac.jp>
@@ -22,6 +22,6 @@ URL: https://github.com/tomoakin/RPostgreSQL,
         https://cran.r-project.org/package=DBI,
         https://www.postgresql.org
 NeedsCompilation: yes
-Packaged: 2021-10-02 01:46:35 UTC; tomoaki
+Packaged: 2021-10-21 14:01:31 UTC; tomoaki
 Repository: CRAN
-Date/Publication: 2021-10-06 15:50:13 UTC
+Date/Publication: 2021-10-22 04:40:05 UTC
diff --git a/MD5 b/MD5
@@ -1,5 +1,5 @@
 7ae4d57e0fee8bde38ca99d84dd5d09c *ChangeLog
-a33119e4c45fd03e25600d3e3edca5e5 *DESCRIPTION
+5d9740669b644768443fc57eec6f64bb *DESCRIPTION
 532949fe6f8ba0bcd380ecdc746d28d4 *LICENSE
 ef67e1a6b6119ab1e5c8ef1a91d67304 *NAMESPACE
 eeb697c8142a3ae9d80089a524196a4e *R/PostgreSQL.R
@@ -8,8 +8,8 @@ eeb697c8142a3ae9d80089a524196a4e *R/PostgreSQL.R
 0972c665e3149619a32f3b4d30528e0f *R/dbObjectId.R
 e186b6a39b159fc324e46e782b409e81 *R/zzz.R
 4b5e59c53d38086590d8d8553853ab04 *cleanup
-dba83315057e152c14dfcab716418893 *configure
-6c92b18d2064c6b7f1762c53371f0bcf *configure.ac
+c2e653a33f2ba766a8e1076b36ab77b5 *configure
+2a51074d649ac571c7a723abc9fb8974 *configure.ac
 d41d8cd98f00b204e9800998ecf8427e *configure.win
 b5dc804b1235adfa8c8a310b052420fe *inst/ANNOUNCEMENT
 946c54d9e826b3a9420e1e572a228773 *inst/NEWS

diff --git a/configure b/configure
@@ -1405,48 +1405,6 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -2887,28 +2845,20 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
  echo '#include <libpq-fe.h>' > conftest.c
- echo 'int main(){printf("%i",PQlibVersion());return 0;}' >> conftest.c
-$CC $CFLAGS -I${PG_INCDIR} -L${PG_LIBDIR} -lpq conftest.c -o pqconftest
-
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int main(){return system("./pqconftest");}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+ echo 'int main(){printf("%i...",PQlibVersion());return 0;}' >> conftest.c
+echo $CC $CFLAGS -I${PG_INCDIR} -L${PG_LIBDIR} conftest.c -lpq -o pqconftest
+$CC $CFLAGS -I${PG_INCDIR} -L${PG_LIBDIR} conftest.c -lpq -o pqconftest
+echo ./pqconftest
+./pqconftest
+status=$?
+if test $status -eq 0 ; then
+  echo "runs fine"
   ENABLE_LIBPQ=""
 else
-  ENABLE_LIBPQ=$DARWIN_INTERNAL_LIBPQ; echo "system -lpq don't appear to work; use internal"
+  echo "system -lpq don't appear to work; use internal"
+  ENABLE_LIBPQ=$DARWIN_INTERNAL_LIBPQ;
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f pqconftest conftest.c
 
 # Expand into arguments
 

diff --git a/configure.ac b/configure.ac
@@ -124,9 +124,20 @@ clean:
 
 AC_LANG(C)
  echo '#include <libpq-fe.h>' > conftest.c
- echo 'int main(){printf("%i",PQlibVersion());return 0;}' >> conftest.c
-$CC $CFLAGS -I${PG_INCDIR} -L${PG_LIBDIR} -lpq conftest.c -o pqconftest
-AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return system("./pqconftest");}]])],[ENABLE_LIBPQ="" ],[ENABLE_LIBPQ=$DARWIN_INTERNAL_LIBPQ; echo "system -lpq don't appear to work; use internal"],[])
+ echo 'int main(){printf("%i...",PQlibVersion());return 0;}' >> conftest.c
+echo $CC $CFLAGS -I${PG_INCDIR} -L${PG_LIBDIR} conftest.c -lpq -o pqconftest
+$CC $CFLAGS -I${PG_INCDIR} -L${PG_LIBDIR} conftest.c -lpq -o pqconftest
+echo ./pqconftest
+./pqconftest
+status=$?
+if test $status -eq 0 ; then
+  echo "runs fine"
+  ENABLE_LIBPQ="" 
+else
+  echo "system -lpq don't appear to work; use internal"
+  ENABLE_LIBPQ=$DARWIN_INTERNAL_LIBPQ; 
+fi
+rm -f pqconftest conftest.c
 
 # Expand into arguments