[rpostgresql] r224 committed - Remove dependency to GNU make

[rpost...@googlecode.com]

Revision: 224
Author: tomo...@kenroku.kanazawa-u.ac.jp
Date: Sat Dec 31 05:11:32 2011
Log: Remove dependency to GNU make
http://code.google.com/p/rpostgresql/source/detail?r=224

Modified:
/trunk/RPostgreSQL/ChangeLog
/trunk/RPostgreSQL/DESCRIPTION
/trunk/RPostgreSQL/configure
/trunk/RPostgreSQL/configure.in
/trunk/RPostgreSQL/src/Makevars.in

=======================================
--- /trunk/RPostgreSQL/ChangeLog Thu Dec 29 03:31:45 2011
+++ /trunk/RPostgreSQL/ChangeLog Sat Dec 31 05:11:32 2011
@@ -1,3 +1,14 @@
+2011-12-31 Tomoaki NISHIYAMA <tomo...@kenroku.asrc.kanazawa-u.ac.jp>
+
+ Move conditionals from Makevars.in to configure.in and
+ configure so that the GNU extension is not used.
+
+ * ChangeLog
+ * DESCRIPTION
+ * configure
+ * configure.in
+ * src/Makevars.in
+
2011-12-29 Tomoaki NISHIYAMA <tomo...@kenroku.asrc.kanazawa-u.ac.jp>

Prepare for release. As the last update makes many incompatibilities,
=======================================
--- /trunk/RPostgreSQL/DESCRIPTION Thu Dec 29 03:31:45 2011
+++ /trunk/RPostgreSQL/DESCRIPTION Sat Dec 31 05:11:32 2011
@@ -1,5 +1,5 @@
Package: RPostgreSQL
-Version: 0.3-0
+Version: 0.3-1
Date: $Date$
Title: R interface to the PostgreSQL database system
Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar
Prayaga (during 2008), Neil Tiffin
=======================================
--- /trunk/RPostgreSQL/configure Thu Nov 24 07:28:58 2011
+++ /trunk/RPostgreSQL/configure Sat Dec 31 05:11:32 2011
@@ -600,6 +600,7 @@

ac_subst_vars='LTLIBOBJS
LIBOBJS
+ENABLE_LIBPQ
PKG_LIBS
PKG_CPPFLAGS
R_OS_TYPE
@@ -3005,6 +3006,27 @@
# Now substitute these two variable in src/Makevars.in to create
src/Makevars

+
+ENABLE_LIBPQ=
+if test $R_OS_TYPE == "darwin" ; then
+ENABLE_LIBPQ='
+
+PKG_CPPFLAGS=-Ilibpq
+PKG_LIBS=libpq/libpq.a
+
+.PHONY: all
+all: $(SHLIB)
+$(SHLIB): libpq/libpq.5.dylib
+
+libpq/libpq.5.dylib:
+ (cd libpq; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -f Makefile.darwin)
+
+clean:
+ (cd libpq; $(MAKE) -f Makefile.darwin clean)
+'
+fi
+
+
ac_config_files="$ac_config_files src/Makevars"

cat >confcache <<\_ACEOF
=======================================
--- /trunk/RPostgreSQL/configure.in Thu Nov 24 07:28:58 2011
+++ /trunk/RPostgreSQL/configure.in Sat Dec 31 05:11:32 2011
@@ -113,4 +113,25 @@
# Now substitute these two variable in src/Makevars.in to create
src/Makevars
AC_SUBST(PKG_CPPFLAGS)
AC_SUBST(PKG_LIBS)
+
+ENABLE_LIBPQ=
+if test $R_OS_TYPE == "darwin" ; then
+ENABLE_LIBPQ='
+
+PKG_CPPFLAGS=-Ilibpq
+PKG_LIBS=libpq/libpq.a
+
+.PHONY: all
+all: $(SHLIB)
+$(SHLIB): libpq/libpq.5.dylib
+
+libpq/libpq.5.dylib:
+ (cd libpq; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -f Makefile.darwin)
+
+clean:
+ (cd libpq; $(MAKE) -f Makefile.darwin clean)
+'
+fi
+
+AC_SUBST(ENABLE_LIBPQ)
AC_OUTPUT(src/Makevars)
=======================================
--- /trunk/RPostgreSQL/src/Makevars.in Fri Dec 2 01:48:02 2011
+++ /trunk/RPostgreSQL/src/Makevars.in Sat Dec 31 05:11:32 2011
@@ -2,20 +2,4 @@
PKG_LIBS=@PKG_LIBS@
R_OS_TYPE=@R_OS_TYPE@

-ifeq ($(R_OS_TYPE),darwin)
-#overwrite everything to use internal source
-PKG_CPPFLAGS=-Ilibpq
-PKG_LIBS=libpq/libpq.a
-
-.PHONY: all
-all: $(SHLIB)
-$(SHLIB): libpq/libpq.5.dylib
-
-libpq/libpq.5.dylib:
- (cd libpq; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" -f Makefile.darwin)
-
-clean:
- (cd libpq; $(MAKE) -f Makefile.darwin clean)
-endif
-
-
+@ENABLE_LIBPQ@