[GenABEL-dev] [Genabel-commits] r747 - in pkg: DatABEL DatABEL/src/DAlib GenABEL MixABEL MixABEL/src/ITERlib VariABEL

[Yurii Aulchenko]

This is aiming to solve the problem described at

http://forum.genabel.org/viewtopic.php?f=6&t=487&start=0

Additionally, I have removed the reference to R_HOME from 'configure'
files -- seems to work quite fine without, and I wonder why we had it
there in the first place?..

best wishes,
Yurii

On Wed, Jul 6, 2011 at 11:42 AM,  <noreply at r-forge.wu-wien.ac.at> wrote:
> Author: yurii
> Date: 2011-07-06 11:42:07 +0200 (Wed, 06 Jul 2011)
> New Revision: 747
>
> Modified:
>   pkg/DatABEL/configure
>   pkg/DatABEL/src/DAlib/dautil.cpp
>   pkg/GenABEL/configure
>   pkg/MixABEL/configure
>   pkg/MixABEL/src/ITERlib/iterator.cpp
>   pkg/VariABEL/configure
> Log:
> removing reference to R_HOME from 'configure' files throughout the project; adding '#include <stdarg.h>' to resolve compile problems in MixABEL
>
> Modified: pkg/DatABEL/configure
> ===================================================================
> --- pkg/DatABEL/configure       2011-07-05 12:03:35 UTC (rev 746)
> +++ pkg/DatABEL/configure       2011-07-06 09:42:07 UTC (rev 747)
> @@ -1 +1 @@
> -${R_HOME}/bin/R CMD BATCH configure.R
> +R CMD BATCH configure.R
>
> Modified: pkg/DatABEL/src/DAlib/dautil.cpp
> ===================================================================
> --- pkg/DatABEL/src/DAlib/dautil.cpp    2011-07-05 12:03:35 UTC (rev 746)
> +++ pkg/DatABEL/src/DAlib/dautil.cpp    2011-07-06 09:42:07 UTC (rev 747)
> @@ -3,6 +3,7 @@
>  #include <string>
>  #include <fstream>
>  #include <sstream>
> +#include <stdarg.h>
>
>  #include "dautil.h"
>
>
> Modified: pkg/GenABEL/configure
> ===================================================================
> --- pkg/GenABEL/configure       2011-07-05 12:03:35 UTC (rev 746)
> +++ pkg/GenABEL/configure       2011-07-06 09:42:07 UTC (rev 747)
> @@ -1 +1 @@
> -${R_HOME}/bin/R CMD BATCH configure.R
> +R CMD BATCH configure.R
>
> Modified: pkg/MixABEL/configure
> ===================================================================
> --- pkg/MixABEL/configure       2011-07-05 12:03:35 UTC (rev 746)
> +++ pkg/MixABEL/configure       2011-07-06 09:42:07 UTC (rev 747)
> @@ -1 +1 @@
> -${R_HOME}/bin/R CMD BATCH configure.R
> +R CMD BATCH configure.R
>
> Modified: pkg/MixABEL/src/ITERlib/iterator.cpp
> ===================================================================
> --- pkg/MixABEL/src/ITERlib/iterator.cpp        2011-07-05 12:03:35 UTC (rev 746)
> +++ pkg/MixABEL/src/ITERlib/iterator.cpp        2011-07-06 09:42:07 UTC (rev 747)
> @@ -1,4 +1,4 @@
> -
> +#include <stdarg.h>
>  #include "Rstaff.h"
>  #include "iterator_functions.h"
>  #include "iterator.h"
>
> Modified: pkg/VariABEL/configure
> ===================================================================
> --- pkg/VariABEL/configure      2011-07-05 12:03:35 UTC (rev 746)
> +++ pkg/VariABEL/configure      2011-07-06 09:42:07 UTC (rev 747)
> @@ -1 +1 @@
> -${R_HOME}/bin/R CMD BATCH configure.R
> +R CMD BATCH configure.R
>
> _______________________________________________
> Genabel-commits mailing list
> Genabel-commits at lists.r-forge.r-project.org
> https://lists.r-forge.r-project.org/cgi-bin/mailman/listinfo/genabel-commits
>