Fwd: Fix PIC flags with MPI wrappers using Portland C++ on GNU/Linux

diff --git a/gnulib b/gnulib
index c3d1ccf..0cd711b 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit c3d1ccfdb375b4cb1b912116c084a61422ef47e3
+Subproject commit 0cd711b27ba11019c96314a42e197bc288f415d7-dirty
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 4413a6d..ee63dda 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4055,13 +4055,19 @@ m4_if([$1], [CXX], [
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 	      ;;
+            *Portland\ Group*)
+              # Portland Group C++ compiler
+              _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+              _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+              _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+              ;;
 	    esac
 	    ;;
 	esac
@@ -4375,7 +4381,7 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
-	case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4797,6 +4803,10 @@ _LT_EOF
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
+	pgCC* | pgcpp*)                 # Portland Group C++ compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
 	pgf77* | pgf90* | pgf95* | pgfortran*)
 					# Portland Group f77 and f90 compilers
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
@@ -6450,7 +6460,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      ;;
 	    esac
 
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
             ;;
@@ -6486,7 +6496,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    fi
 	    ;;
 	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
+	    case `$CC -V 2>&1` in
 	    *Sun\ C*)
 	      # Sun C++ 5.9
 	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6507,6 +6517,38 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # in the archive.
 	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 	      ;;
+            *pgCC* | *pgcpp*)
+              # Portland Group C++ compiler
+              case `$CC -V` in
+              *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+                _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+                compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+                _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+                _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+                _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+                ;;
+              *) # Version 6 and above use weak symbols
+                _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+                _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+                ;;
+              esac
+                
+              _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+              _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+              _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+              ;;                
 	    esac
 	    ;;
 	esac

## --------------------------------------------- ##
## GNU Libtool 2.4.2.176-30304-dirty test suite. ##
## --------------------------------------------- ##

testsuite: command line was:
  $ /home/roessel/scorep-dev/04/patching/libtool/git-head/tests/testsuite MAKE=make CC=gcc CFLAGS=-g -O2 CPP=gcc -E CPPFLAGS= LD=/usr/bin/ld LDFLAGS= LIBS=-ldl  LN_S=ln -s NM=/usr/bin/nm -B RANLIB=ranlib AR=ar M4SH=autom4te --language=m4sh SED=/bin/sed STRIP=strip lt_INSTALL=/usr/bin/install -c MANIFEST_TOOL=: OBJEXT=o EXEEXT= SHELL=/bin/bash CONFIG_SHELL=/bin/bash CXX=g++ CXXFLAGS=-g -O2 CXXCPP=g++ -E F77=gfortran FFLAGS=-g -O2 FC=gfortran FCFLAGS=-g -O2 GCJ= GCJFLAGS=-g -O2 lt_cv_to_host_file_cmd=func_convert_file_noop lt_cv_to_tool_file_cmd=func_convert_file_noop _lt_pkgdatadir=/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/../git-head LIBTOOLIZE=/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/libtoolize LIBTOOL=/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/libtool tst_aclocaldir=/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/../git-head/m4

## ---------- ##
## ChangeLog. ##
## ---------- ##

| Autogenerated by `make dist'

## --------- ##
## Platform. ##
## --------- ##

hostname = atlantis
uname -m = i686
uname -r = 2.6.39-gentoo-r4
uname -s = Linux
uname -v = #1 SMP Wed Aug 10 16:43:56 CEST 2011

/usr/bin/uname -p = unknown
/bin/uname -X     = unknown

/bin/arch              = unknown
/usr/bin/arch -k       = unknown
/usr/convex/getsysinfo = unknown
/usr/bin/hostinfo      = unknown
/bin/machine           = unknown
/usr/bin/oslevel       = unknown
/bin/universe          = unknown

PATH: /home/roessel/scorep-dev/04/patching/libtool/_build-git-head/tests
PATH: /home/roessel/scorep-dev/04/patching/libtool/git-head/tests
PATH: /home/roessel/scorep-dev/04/patching/libtool/_install-git-head/bin
PATH: /opt/packages/gcc/4.6.2/bin
PATH: /usr/local/bin
PATH: /usr/bin
PATH: /bin
PATH: /usr/local/games
PATH: /usr/games

testsuite: atconfig:
| # Configurable variable values for building test suites.
| # Generated by ./config.status.
| # Copyright (C) 2012 Free Software Foundation, Inc.
| 
| # The test suite will define top_srcdir=/../.. etc.
| at_testdir='tests'
| abs_builddir='/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/tests'
| at_srcdir='../../git-head/tests'
| abs_srcdir='/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/../git-head/tests'
| at_top_srcdir='../../git-head'
| abs_top_srcdir='/home/roessel/scorep-dev/04/patching/libtool/_build-git-head/../git-head'
| at_top_build_prefix='../'
| abs_top_builddir='/home/roessel/scorep-dev/04/patching/libtool/_build-git-head'
| 
| # Backward compatibility with Autotest <= 2.59b:
| at_top_builddir=$at_top_build_prefix
| 
| AUTOTEST_PATH='tests'
| 
| SHELL=${CONFIG_SHELL-'/bin/bash'}

## ---------------- ##
## Tested programs. ##
## ---------------- ##

## ------------------ ##
## Running the tests. ##
## ------------------ ##
testsuite: starting at: Wed Sep 19 00:18:35 CEST 2012
1. fallback short option splitting (getopt-m4sh.at:73): ok     (0m0.199s 0m0.042s)
2. enhanced short option splitting (getopt-m4sh.at:86): ok     (0m0.194s 0m0.039s)
3. fallback long option splitting (getopt-m4sh.at:103): ok     (0m0.193s 0m0.044s)
4. enhanced long option splitting (getopt-m4sh.at:116): ok     (0m0.194s 0m0.040s)
5. fallback option appending (getopt-m4sh.at:133): ok     (0m0.197s 0m0.036s)
6. enhanced option appending (getopt-m4sh.at:148): ok     (0m0.193s 0m0.039s)
7. fallback arithmetic (getopt-m4sh.at:167): ok     (0m0.200s 0m0.035s)
8. enhanced arithmetic (getopt-m4sh.at:180): ok     (0m0.194s 0m0.039s)
9. fallback path slicing (getopt-m4sh.at:197): ok     (0m0.191s 0m0.049s)
10. enhanced path slicing (getopt-m4sh.at:210): ok     (0m0.192s 0m0.041s)
11. libtoolize macro installation (libtoolize.at:84): ok     (0m0.078s 0m0.086s)
12. libtoolize macro directory mismatch error (libtoolize.at:109): ok     (0m0.065s 0m0.062s)
13. libtoolize macro serial update (libtoolize.at:129): ok     (0m0.339s 0m0.461s)
14. libtoolize config files serial update (libtoolize.at:202): ok     (0m0.405s 0m0.600s)
15. diagnose missing LT_CONFIG_LTDL_DIR (libtoolize.at:282): ok     (0m0.091s 0m0.159s)
16. copy ltdl.m4 with shared macro directory (libtoolize.at:427): ok     (0m0.169s 0m0.324s)
17. correctly parse LTDL_INIT from configure.ac (libtoolize.at:439): ok     (0m0.170s 0m0.322s)
18. diagnose missing LTDL_INIT invocation (libtoolize.at:451): ok     (0m0.163s 0m0.374s)
19. upgrading verbatim style aclocal.m4 (libtoolize.at:528): ok     (0m1.717s 0m0.506s)
20. verbatim aclocal.m4 w/o AC_CONFIG_MACRO_DIR (libtoolize.at:652): ok     (0m1.796s 0m0.410s)
21. nonrecursive ltdl with AC_CONFIG_MACRO_DIR (libtoolize.at:784): ok     (0m0.098s 0m0.155s)
22. subproject ltdl with unconventional layout (libtoolize.at:855): ok     (0m0.183s 0m0.375s)
23. Subproject ltdl without GNU M4 (libtoolize.at:931): ok     (0m0.120s 0m0.278s)
24. LIBTOOLIZE_OPTIONS (libtoolize.at:1003): ok     (0m0.182s 0m0.230s)
25. cleanup old installation (libtoolize.at:1050): ok     (0m0.181s 0m0.372s)
26. standard command line options (help.at:26): ok     (0m0.686s 0m0.073s)
27. mode short-hands (help.at:45): ok     (0m0.775s 0m0.183s)
28. debug tracing (help.at:97): ok     (0m2.075s 0m0.671s)
29. duplicate members in archive tests (duplicate_members.at:26): ok     (0m0.719s 0m0.340s)
30. duplicate convenience archive names (duplicate_conv.at:25): ok     (0m1.249s 0m0.450s)
32. passing CC flags through libtool (flags.at:24): ok     (0m0.998s 0m0.261s)
33. passing CXX flags through libtool (flags.at:24): ok     (0m1.202s 0m0.357s)
34. passing F77 flags through libtool (flags.at:24): ok     (0m1.085s 0m0.333s)
35. passing FC flags through libtool (flags.at:24): ok     (0m1.279s 0m0.430s)
36. passing GCJ flags through libtool (flags.at:24): skipped (flags.at:24)
37. inherited_linker_flags (inherited_flags.at:26): ok     (0m0.894s 0m0.407s)
38. C convenience archives (convenience.at:30): ok     (0m1.249s 0m0.547s)
39. C++ convenience archives (convenience.at:69): ok     (0m1.687s 0m0.668s)
40. F77 convenience archives (convenience.at:109): ok     (0m1.440s 0m0.626s)
41. FC convenience archives (convenience.at:169): ok     (0m1.674s 0m0.724s)
42. Java convenience archives (convenience.at:229): skipped (convenience.at:230)
43. Link order test (link-order.at:27): ok     (0m1.761s 0m0.603s)
44. Link order of deplibs (link-order2.at:46): ok     (0m3.527s 0m1.015s)
45. Failure tests (fail.at:28): ok     (0m0.584s 0m0.153s)
46. shlibpath_overrides_runpath (shlibpath.at:25): ok     (0m0.753s 0m0.221s)
47. Runpath in libtool library files (runpath-in-lalib.at:25): ok     (0m0.695s 0m0.204s)
48. static linking flags for programs (static.at:68): ok     (0m4.291s 0m2.468s)
49. ccache -all-static (static.at:356): ok     (0m0.117s 0m0.038s)
50. Export test (export.at:25): ok     (0m1.980s 0m0.788s)
51. sys_lib_search_path (search-path.at:24): ok     (0m0.199s 0m0.046s)
52. sys_lib_search_path on w32 (search-path.at:62): skipped (search-path.at:83)
53. indirect convenience (indirect_deps.at:25): ok     (0m1.005s 0m0.382s)
54. indirect uninstalled (indirect_deps.at:71): ok     (0m1.157s 0m0.476s)
56. both of -o prog and -o prog$EXEEXT work (exeext.at:26): skipped (exeext.at:29)
57. execute mode (execute-mode.at:25): ok     (0m3.973s 0m0.759s)
58. bindir basic lib test (bindir.at:64): ok     (0m0.608s 0m0.213s)
59. bindir install tests (bindir.at:173): ok     (0m14.298s 0m4.913s)
60. cwrapper for uninstalled executables (cwrapper.at:25): ok     (0m1.639s 0m0.657s)
61. cwrapper string length (cwrapper.at:138): skipped (cwrapper.at:190)
62. cwrapper and installed shared libraries (cwrapper.at:201): ok     (0m0.617s 0m0.210s)
63. deplib in subdir (deplib-in-subdir.at:34): ok     (0m2.304s 0m1.002s)
64. inferred tag (infer-tag.at:30): ok     (0m0.034s 0m0.025s)
65. CXX inferred tag (infer-tag.at:42): ok     (0m0.047s 0m0.023s)
66. F77 inferred tag (infer-tag.at:55): ok     (0m0.058s 0m0.023s)
67. FC inferred tag (infer-tag.at:69): ok     (0m0.052s 0m0.029s)
68. GCJ inferred tag (infer-tag.at:83): skipped (infer-tag.at:84)
69. localized compiler messages (localization.at:24): ok     (0m0.074s 0m0.051s)
70. nocase library search (nocase.at:26): skipped (nocase.at:31)
71. Install tests (install.at:25): ok     (0m0.339s 0m0.085s)
72. versioning (versioning.at:24): ok     (0m3.064s 0m1.027s)
73. Simple DESTDIR install (destdir.at:48): ok     (0m0.418s 0m0.140s)
74. DESTDIR with in-package deplibs (destdir.at:75): ok     (0m1.564s 0m0.535s)
75. AM_PROG_LIBTOOL (old-m4-iface.at:41): ok     (0m1.840s 0m0.974s)
76. AC_WITH_LTDL (old-m4-iface.at:113): ok     (0m13.502s 0m5.042s)
77. Makefile.inc (old-ltdl-iface.at:35): ok     (0m8.252s 0m1.946s)
78. C subdir-objects (am-subdir.at:33): ok     (0m3.988s 0m1.195s)
79. C++ subdir-objects (am-subdir.at:93): ok     (0m4.613s 0m1.450s)
80. lt_dlexit unloading libs (lt_dlexit.at:30): ok     (0m0.462s 0m0.178s)
81. lt_dlopenadvise library loading (lt_dladvise.at:28): ok     (0m0.986s 0m0.313s)
83. lt_dlopen archive (lt_dlopen_a.at:23): ok     (0m0.376s 0m0.127s)
84. lt_dlopenext error messages (lt_dlopenext.at:23): ok     (0m0.488s 0m0.140s)
85. libdir of installed modules (ltdl-libdir.at:23): ok     (0m0.384s 0m0.084s)
86. ltdl API (ltdl-api.at:25): skipped (ltdl-api.at:31)
87. dlloader API (dlloader-api.at:23): ok     (0m0.330s 0m0.106s)
88. loadlibrary error messages (loadlibrary.at:23): skipped (loadlibrary.at:250)
90. resident modules (resident.at:27): ok     (0m0.298s 0m0.110s)
91. SList functionality (slist.at:24): ok     (0m0.192s 0m0.033s)
92. enforced lib prefix (need_lib_prefix.at:25): ok     (0m0.747s 0m0.238s)
93. compiling softlinked libltdl (standalone.at:31): ok     (0m9.406s 0m3.498s)
94. compiling copied libltdl (standalone.at:46): ok     (0m9.471s 0m3.471s)
95. installable libltdl (standalone.at:61): ok     (0m9.538s 0m3.639s)
96. linking libltdl without autotools (standalone.at:79): ok     (0m9.546s 0m3.655s)
97. compiling softlinked libltdl (subproject.at:57): ok     (0m14.038s 0m5.173s)
98. compiling copied libltdl (subproject.at:73): ok     (0m14.115s 0m5.130s)
99. installable libltdl (subproject.at:89): ok     (0m16.517s 0m5.466s)
100. linking libltdl without autotools (subproject.at:109): ok     (0m9.664s 0m3.577s)
101. compiling softlinked libltdl (nonrecursive.at:79): ok     (0m7.978s 0m2.089s)
102. compiling copied libltdl (nonrecursive.at:103): ok     (0m7.991s 0m2.141s)
103. installable libltdl (nonrecursive.at:127): ok     (0m10.313s 0m2.458s)
104. compiling softlinked libltdl (recursive.at:60): ok     (0m10.927s 0m2.391s)
105. compiling copied libltdl (recursive.at:80): ok     (0m10.963s 0m2.403s)
106. installable libltdl (recursive.at:100): ok     (0m13.421s 0m2.699s)
107. simple template test (template.at:28): ok     (0m0.488s 0m0.224s)
108. template test with subdirs (template.at:127): ok     (0m2.161s 0m0.779s)
109. C++ static constructors (ctor.at:27): ok     (0m0.404s 0m0.153s)
110. C++ exception handling (exceptions.at:24): ok     (0m2.546s 0m0.497s)
111. config.status (early-libtool.at:32): ok     (0m3.292s 0m1.015s)
112. config.lt (early-libtool.at:126): ok     (0m4.680s 0m2.179s)
113. test --with-pic (with-pic.at:24): ok     (0m6.870s 0m4.302s)
114. AC_NO_EXECUTABLES (no-executables.at:25): ok     (0m5.393s 0m2.697s)
116. installable libltdl (configure-iface.at:102): ok     (0m15.143s 0m5.269s)
117. --with-ltdl-include/lib (configure-iface.at:162): ok     (0m16.946s 0m6.960s)
118. --with-included-ltdl (configure-iface.at:243): ok     (0m14.813s 0m5.271s)
119. convenience libltdl (configure-iface.at:304): ok     (0m3.323s 0m1.244s)
120. Link option thorough search test (stresstest.at:31): ok     (0m37.585s 0m16.688s)
121. Run tests with low max_cmd_len (cmdline_wrap.at:28): ok     (1m32.954s 0m38.177s)
122. override pic_flag at configure time (pic_flag.at:24): ok     (0m5.629s 0m2.879s)
123. darwin fat compile (darwin.at:26): skipped (darwin.at:42)
124. darwin concurrent library extraction (darwin.at:103): ok     (0m1.595s 0m0.884s)
125. darwin gdb debug information (darwin.at:152): ok     (0m0.575s 0m0.219s)
126. darwin ld warnings changing configure results (darwin.at:208): ok     (0m7.138s 0m2.024s)
127. darwin can lt_dlopen .dylib and .so files (darwin.at:232): skipped (darwin.at:249)
128. dumpbin -symbols section hiding (dumpbin-symbols.at:25): skipped (dumpbin-symbols.at:42)
129. deplibs without file command (deplibs-mingw.at:27): ok     (0m0.419s 0m0.133s)
130. -L=.../lib -l (sysroot.at:203): skipped (sysroot.at:203)
131. -L SYSROOT/.../lib -l (sysroot.at:204): skipped (sysroot.at:204)
132. SYSROOT/.../*.la (sysroot.at:205): skipped (sysroot.at:205)
testsuite: ending at: Wed Sep 19 00:32:08 CEST 2012
testsuite: test suite duration: 0h 13m 33s

## ------------- ##
## Test results. ##
## ------------- ##

117 tests behaved as expected.
15 tests were skipped.