Move from an autogen to configure time option

 * Set via an environment variable: OMPI_LIBMPI_NAME
   - `./configure OMPI_LIBMPI_NAME=wookie`
   - That has the nice benefit of being somewhat harder to find for
     more casual users.

Author: jjhursey

autogen.pl

@@ -7,7 +7,7 @@
 # Copyright (c) 2013-2014 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015-2016 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
-# Copyright (c) 2015-2016 IBM Corporation.  All rights reserved.
+# Copyright (c) 2015      IBM Corporation.  All rights reserved.
 #
 # $COPYRIGHT$
 #
@@ -48,7 +48,6 @@
 my $no_ompi_arg = 0;
 my $no_orte_arg = 0;
 my $no_oshmem_arg = 0;
-my $libmpi_name_arg = "mpi";
 my $quiet_arg = 0;
 my $debug_arg = 0;
 my $help_arg = 0;
@@ -1081,7 +1080,6 @@ sub in_tarball {
 my $ok = Getopt::Long::GetOptions("no-ompi" => \$no_ompi_arg,
                                   "no-orte" => \$no_orte_arg,
                                   "no-oshmem" => \$no_oshmem_arg,
-                                  "libmpi-name=s" => \$libmpi_name_arg,
                                   "quiet|q" => \$quiet_arg,
                                   "debug|d" => \$debug_arg,
                                   "help|h" => \$help_arg,
@@ -1098,7 +1096,6 @@ sub in_tarball {
   --no-ompi | -no-ompi          Do not build the Open MPI layer
   --no-orte | -no-orte          Do not build the ORTE layer
   --no-oshmem | -no-oshmem      Do not build the OSHMEM layer
-  --libmpi-name | -libmpi-name  Override the default lib name of: lib$libmpi_name_arg
   --quiet | -q                  Do not display normal verbose output
   --debug | -d                  Output lots of debug information
   --help | -h                   This help list
@@ -1327,11 +1324,6 @@ sub in_tarball {
 m4_define([project_name_long], [$project_name_long])
 m4_define([project_name_short], [$project_name_short])\n";
 
-if( !$no_ompi_arg ) {
-    $m4 .= "\ndnl Library prefix
-m4_define([ompi_lib_prefix], [$libmpi_name_arg])\n";
-}
-
 # Setup MCA
 mca_run_global($projects);
 

config/opal_set_lib_prefix.m4

@@ -41,15 +41,14 @@ AC_DEFUN([ORTE_SET_LIB_PREFIX],[
 ])dnl
 
 #
-# Same as OPAL LIB_PREFIX, but for the OMPI layer
-#
-AC_DEFUN([OMPI_SET_LIB_PREFIX],[
-    AS_IF([test "$ompi_lib_prefix_set" = "yes"],
-          [AC_MSG_WARN([OMPI lib prefix was already set!])
-           AC_MSG_WARN([This is a configury programming error])
-           AC_MSG_ERROR([Cannot continue])])
+# Rename 'libmpi' and 'libmpi_FOO' with a configure time environment variable.
+#
+AC_DEFUN([OMPI_SET_LIB_NAME],[
+    AC_ARG_VAR([OMPI_LIBMPI_NAME],
+               ["Replace \"libmpi\" with \"libOMPI_LIBMPI_NAME\" (default=mpi)"])
+    if test -z "$OMPI_LIBMPI_NAME"; then
+        OMPI_LIBMPI_NAME=mpi
+    fi
 
-    OMPI_LIBMPI_NAME=$1
-    ompi_lib_prefix_set=yes
     AC_SUBST(OMPI_LIBMPI_NAME)
 ])dnl

configure.ac

@@ -280,7 +280,7 @@ OPAL_SET_LIB_PREFIX([])
 m4_ifdef([project_orte],
           [ORTE_SET_LIB_PREFIX([])])
 m4_ifdef([project_ompi],
-          [OMPI_SET_LIB_PREFIX([ompi_lib_prefix])])
+          [OMPI_SET_LIB_NAME([])])
 
 ############################################################################
 # Libtool: part one