From b240395d9ab78e3d4051a7b31667f25c58077934 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 27 Jan 2005 00:14:33 +0000 Subject: [PATCH] Fix use of --with-ptl-*-libdir This commit was SVN r4182. --- src/mca/ptl/gm/configure.stub | 9 +++------ src/mca/ptl/mx/configure.stub | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/mca/ptl/gm/configure.stub b/src/mca/ptl/gm/configure.stub index cfaedf1fa9..7da262e207 100644 --- a/src/mca/ptl/gm/configure.stub +++ b/src/mca/ptl/gm/configure.stub @@ -52,13 +52,10 @@ AC_DEFUN([MCA_CONFIGURE_STUB],[ EXTRA_LDFLAGS= if test -n "$with_ptl_gm_libdir"; then - if test -d "$with_ptl_gm_libdir/lib"; then - EXTRA_LDFLAGS="-L$with_ptl_gm_libdir/lib" - elif test -d "$with_ptl_gm_libdir/binary/lib"; then - EXTRA_LDFLAGS="-L$with_ptl_gm_libdir/binary/lib" + if test -d "$with_ptl_gm_libdir"; then + EXTRA_LDFLAGS="-L$with_ptl_gm_libdir" else - AC_MSG_WARN([*** Warning: cannot find $with_ptl_gm_libdir/lib]) - AC_MSG_WARN([*** or $with_ptl_gm_libdir/binary/lib]) + AC_MSG_WARN([*** Warning: cannot find $with_ptl_gm_libdir]) AC_MSG_WARN([*** Will still try to configure gm ptl anyway...]) fi elif test -n "$with_ptl_gm"; then diff --git a/src/mca/ptl/mx/configure.stub b/src/mca/ptl/mx/configure.stub index cf4507c84d..5a73682351 100644 --- a/src/mca/ptl/mx/configure.stub +++ b/src/mca/ptl/mx/configure.stub @@ -50,13 +50,10 @@ AC_DEFUN([MCA_CONFIGURE_STUB],[ EXTRA_LDFLAGS= if test -n "$with_ptl_mx_libdir"; then - if test -d "$with_ptl_mx_libdir/lib"; then - EXTRA_LDFLAGS="-L$with_ptl_mx_libdir/lib" - elif test -d "$with_ptl_mx_libdir/binary/lib"; then - EXTRA_LDFLAGS="-L$with_ptl_mx_libdir/binary/lib" + if test -d "$with_ptl_mx_libdir"; then + EXTRA_LDFLAGS="-L$with_ptl_mx_libdir" else - AC_MSG_WARN([*** Warning: cannot find $with_ptl_mx_libdir/lib]) - AC_MSG_WARN([*** or $with_ptl_mx_libdir/binary/lib]) + AC_MSG_WARN([*** Warning: cannot find $with_ptl_mx_libdir]) AC_MSG_WARN([*** Will still try to configure mx ptl anyway...]) fi elif test -n "$with_ptl_mx"; then