Generated config in RcppArmadillo/config

Author: eddelbuettel

cleanup

@@ -17,7 +17,7 @@ rm -f  config.log config.status confdefs.h \
        vignettes/*~ \
        */*~ *~ \
        inst/include/RcppArmadilloLapack.h \
-       inst/include/RcppArmadillo/internal/RcppArmadilloConfigGenerated.h \
+       inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h \
        src/Makevars \
        vignettes/jss.bst vignettes/pinp.cls
 

configure

@@ -3407,7 +3407,7 @@ ARMA_HAVE_OPENMP="${arma_have_openmp}"
 
 OPENMP_FLAG="${openmp_flag}"
 
-ac_config_files="$ac_config_files inst/include/RcppArmadillo/internal/RcppArmadilloConfigGenerated.h src/Makevars"
+ac_config_files="$ac_config_files inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h src/Makevars"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4109,7 +4109,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "inst/include/RcppArmadillo/internal/RcppArmadilloConfigGenerated.h") CONFIG_FILES="$CONFIG_FILES inst/include/RcppArmadillo/internal/RcppArmadilloConfigGenerated.h" ;;
+    "inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h") CONFIG_FILES="$CONFIG_FILES inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h" ;;
     "src/Makevars") CONFIG_FILES="$CONFIG_FILES src/Makevars" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

configure.ac

@@ -207,5 +207,5 @@ fi
 AC_SUBST([ARMA_LAPACK],["${arma_lapack}"])
 AC_SUBST([ARMA_HAVE_OPENMP], ["${arma_have_openmp}"])
 AC_SUBST([OPENMP_FLAG], ["${openmp_flag}"])
-AC_CONFIG_FILES([inst/include/RcppArmadillo/internal/RcppArmadilloConfigGenerated.h src/Makevars])
+AC_CONFIG_FILES([inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h src/Makevars])
 AC_OUTPUT

inst/include/RcppArmadillo/Alt_R_RNG.h

@@ -0,0 +1,4 @@
+
+// This file support the legacy location and includes from the new location
+
+#include "RcppArmadillo/rng/Alt_R_RNG.h"

inst/include/RcppArmadillo/internal/RcppArmadilloConfigGenerated.h.in renamed to inst/include/RcppArmadillo/config/RcppArmadilloConfigGenerated.h.in

@@ -106,7 +106,7 @@
 #else
   // on the other OSs we test via LAPACK_LIBS (in configure) which
   // updates this include file
-  #include <RcppArmadillo/internal/RcppArmadilloConfigGenerated.h>
+  #include <RcppArmadillo/config/RcppArmadilloConfigGenerated.h>
 #endif
 
 // Many client packages do not set the OpenMP compiler flag in their src/Makevars