fixes suggested by Ralf for supporting both Libtool 1 and 2 in Open MPI...

This commit was SVN r8538.

config/ompi_get_libtool_linker_flags.m4

@@ -50,7 +50,7 @@ ompi_check_linker_flags_work() {
     OMPI_LOG_MSG([$cmd], [yes])
     eval $cmd >&5 2>&5
     if test -n "[$]1"; then
-	output="`eval $cmd 2>/dev/null | head -n 1`"
+	output=`eval $cmd 2>/dev/null | head -n 1 | sed 's,^libtool:\( \| link: \),,'`
     fi
     status="$?"
     OMPI_LOG_MSG([\$? = $status], [yes])
@@ -80,8 +80,6 @@ eval "set $output"
 extra_ldflags=
 while test -n "[$]1"; do
     case "[$]1" in
-    libtool:) ;;
-    link:) ;;
     $CC) ;;
     *.libs/bar*) ;;
     bar*) ;;

ompi/mca/btl/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_btl.la
 libmca_btl_la_SOURCES =

ompi/mca/coll/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_coll.la
 libmca_coll_la_SOURCES =

ompi/mca/io/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_io.la
 libmca_io_la_SOURCES =

ompi/mca/topo/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_topo.la
 libmca_topo_la_SOURCES =

opal/mca/base/Makefile.am

@@ -20,6 +20,7 @@
 # (by default)
 
 AM_CPPFLAGS = \
+	$(OPAL_LTDL_CPPFLAGS) \
         -DOMPI_PKGLIBDIR=\"$(pkglibdir)\" \
         -DOMPI_SYSCONFDIR=\"$(sysconfdir)\"
 AM_LFLAGS = -Pmca_base_yy

orte/mca/iof/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_iof.la
 libmca_iof_la_SOURCES =

orte/mca/rml/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_rml.la
 libmca_rml_la_SOURCES =

orte/mca/sds/Makefile.am

@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 # main library setup
 noinst_LTLIBRARIES = libmca_sds.la
 libmca_sds_la_SOURCES =

test/support/Makefile.am

@@ -17,6 +17,7 @@
 #
 
 AM_CPPFLAGS = \
+	$(OPAL_LTDL_CPPFLAGS) \
         -DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
         -DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"