Add new paramter for configure.params: PARAM_WANT_COMPILE_EXTERNAL.

If set to 1, the relevant .m4 files will be copied to the component
directory, allowing "make dist" to fully bundle up everything needed
to build the component (thereby allowing the distribution tarball to
be built outside the Open MPI tree).

This commit was SVN r3258.

config/mca_acinclude.m4

@@ -8,23 +8,23 @@ dnl Tests provided by OMPI
 dnl General tests
 dnl
 
-sinclude(../../../../config/ompi_functions.m4)
-sinclude(../../../../config/ompi_get_version.m4)
+sinclude(@M4DIR@/ompi_functions.m4)
+sinclude(@M4DIR@/ompi_get_version.m4)
 
 dnl
 dnl C compiler tests
 dnl
 
-sinclude(../../../../config/ompi_setup_cc.m4)
-sinclude(../../../../config/ompi_check_optflags.m4)
+sinclude(@M4DIR@/ompi_setup_cc.m4)
+sinclude(@M4DIR@/ompi_check_optflags.m4)
 
 dnl
 dnl C++ compiler tests
 dnl
 
-sinclude(../../../../config/ompi_setup_cxx.m4)
-sinclude(../../../../config/cxx_find_template_repository.m4)
-sinclude(../../../../config/cxx_find_template_parameters.m4)
+sinclude(@M4DIR@/ompi_setup_cxx.m4)
+sinclude(@M4DIR@/cxx_find_template_repository.m4)
+sinclude(@M4DIR@/cxx_find_template_parameters.m4)
 
 dnl
 dnl This will be replaced with s_i_n_c_l_u_d_e(configure.stub) if it

config/mca_make_configure.pl

@@ -28,7 +28,8 @@ my %config_param_names = (PIFILE => "PARAM_INIT_FILE",
                           PVARPREFIX => "PARAM_VAR_PREFIX",
                           PAMNAME => "PARAM_AM_NAME",
                           PCFGHDRFILE => "PARAM_CONFIG_HEADER_FILE",
-                          PCFGFILES => "PARAM_CONFIG_FILES"
+                          PCFGFILES => "PARAM_CONFIG_FILES",
+                          PCOMPILEEXT => "PARAM_WANT_COMPILE_EXTERNAL",
                           );
 
 ############################################################################
@@ -121,6 +122,10 @@ if ($config_values{"PROCESSED_MCA_TYPE"} eq "crompi" ||
 $config_values{"MCA_COMPONENT_NAME"} = basename($component_topdir);
 
 # Parameter (changeable) values
+# PARAM_COMPILE_EXTERNAL: set
+
+$config_params{$config_param_names{PCOMPILEEXT}} = 0;
+
 # PARAM_CONFIG_AUX_DIR: set
 
 if (-d "$component_topdir/config") {
@@ -196,7 +201,7 @@ MCA_CONFIGURE_DIST_STUB";
 }
 
 ############################################################################
-# Read in the configure.params file (pomcably overriding the defaults
+# Read in the configure.params file (possibly overriding the defaults
 # set above)
 ############################################################################
 
@@ -275,12 +280,35 @@ if (! -d $config_params{PARAM_CONFIG_AUX_DIR}) {
     print "*** WARNING: PARAM_CONFIG_AUX_DIR does not exit:\n";
     print "*** WARNING:    $config_params{PARAM_CONFIG_AUX_DIR}\n";
     print "*** WARNING: Taking the liberty of trying to make it...\n";
-    if (mkdir($config_params{PARAM_CONFIG_AUX_DIR})) {
-        printf("BARF\n");
+    if (!mkdir($config_params{PARAM_CONFIG_AUX_DIR})) {
+        print "*** ERROR: Failed to make AUX_DIR: $config_params{PARAM_CONFIG_AUX_DIR}\n";
+        print "*** ERROR: Cannot continue\n";
         exit(1);
     }
 }
 
+# If we want to be able to compile outside the Open MPI tree, we need
+# to copy some files to the auxdir
+
+if ($config_params{PARAM_WANT_COMPILE_EXTERNAL} != 0) {
+    my $auxdir = $config_params{PARAM_CONFIG_AUX_DIR};
+    open (ACINCLUDE, "$ompi_topdir/config/mca_acinclude.m4");
+{
+        while (<ACINCLUDE>) {
+            chomp;
+            my $filename = $_;
+            if ($filename =~ /^.*sinclude\(\@M4DIR\@\/(.+)\).*$/) {
+                $filename =~ s/^.*sinclude\(\@M4DIR\@\/(.+)\).*$/\1/;
+                unlink("$auxdir/$filename")
+                    if (-f "$auxdir/$filename");
+                print "--> Copying m4 file: $filename ==> $auxdir\n";
+                system("cp -f $ompi_topdir/config/$filename $config_params{PARAM_CONFIG_AUX_DIR}");
+            }
+        }
+        close(ACINCLUDE);
+    }
+}
+
 ############################################################################
 # Read in the configure.ac template
 ############################################################################
@@ -328,6 +356,16 @@ sub make_template {
         "OMPI_SETUP_CXX" : "";
     $template =~ s/$search/$replace/;
 
+    # If we want to be able to compile outside the Open MPI tree, set
+    # the right include path for the M4 files
+
+    $search = "\@M4DIR\@";
+    $replace = ($config_params{PARAM_WANT_COMPLE_EXTERNAL} == 0) ?
+        $config_params{PARAM_CONFIG_AUX_DIR} : "../../../../config";
+    $template =~ s/$search/$replace/g;
+
+    # Write it out
+
     print "--> Writing output file: $dest\n";
     open(OUTPUT, ">$dest") ||
         die("Cannot open output flie: $dest");