From 84f0d4735a2e4a91d8e7bc0b2028c9234dc9fc7c Mon Sep 17 00:00:00 2001
From: Mike McGreevy <mamcgree@hdfgroup.org>
Date: Fri, 6 Mar 2015 11:16:04 -0500
Subject: [svn-r26382] Merge r26289 from autotools_rework branch to trunk:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Purpose:

    Fix HDFFV-9124 - Remove old libtool post-processing

Description:
 
    This revision removes some post-processing of the generated libtool
    script, which was added back in 2003 (see svn revisions 6285 and 6293)
    to address a deficiency in which the script failed to set the '$wl'
    variable for icc and pgcc compilers. Libtool has since fixed the issue,
    and the post-processing we've been running has essentially been a no-op
    for years, so it's safe for us to remove the post-processing snippet.

Tested:

    Jam using pgcc and icc compilers.
---
 configure    | 17 -----------------
 configure.ac | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/configure b/configure
index 7fb39a4..715a147 100755
--- a/configure
+++ b/configure
@@ -31701,23 +31701,6 @@ touch ./config/stamp2
 ## Finally the makefiles
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
-## Post processing to patch up some deficiencies in libtool
-case $host_os in
-  linux* | freebsd* )
-    ## If gcc is not used, need to set $wl to use "-Wl,"
-    if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
-      : using gcc
-    else
-      echo 'fixing $wl in' $ofile
-ed - $ofile <<EOF 2> /dev/null
-g/^wl=""/s//wl="-Wl,"/
-w
-q
-EOF
-    fi
-    ;;
-esac
-
 ## Are we compiling static libraries, shared libraries, or both?  This
 ## is only used for the libhdf5.settings file. We can't just look at
 ## $enable_static and $enable_shared because if they're yes the ltconfig
diff --git a/configure.ac b/configure.ac
index 1ba1b43..c5e456f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3797,23 +3797,6 @@ touch ./config/stamp2
 ## Finally the makefiles
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
-## Post processing to patch up some deficiencies in libtool
-case $host_os in
-  linux* | freebsd* )
-    ## If gcc is not used, need to set $wl to use "-Wl,"
-    if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then
-      : using gcc
-    else
-      echo 'fixing $wl in' $ofile
-ed - $ofile <<EOF 2> /dev/null
-g/^wl=""/s//wl="-Wl,"/
-w
-q
-EOF
-    fi
-    ;;
-esac
-
 ## Are we compiling static libraries, shared libraries, or both?  This
 ## is only used for the libhdf5.settings file. We can't just look at
 ## $enable_static and $enable_shared because if they're yes the ltconfig
-- 
cgit v0.12