diff --git a/config/ompi_check_bproc.m4 b/config/ompi_check_bproc.m4
index 32dc951f89..ed51e4d616 100644
--- a/config/ompi_check_bproc.m4
+++ b/config/ompi_check_bproc.m4
@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -24,8 +25,9 @@
 # --------------------------------------------------------
 AC_DEFUN([OMPI_CHECK_BPROC],[
     AC_ARG_WITH([bproc],
-                [AC_HELP_STRING([--with-bproc],
+                [AC_HELP_STRING([--with-bproc(=DIR)],
                                 [Directory where the BProc software is installed])])
+    OMPI_CHECK_WITHDIR([bproc], [$with_bproc], [include/sys/bproc.h])
 
     AS_IF([test ! -z "$with_bproc" -a "$with_bproc" = "no"],[$4], [ 
         ompi_check_bproc_save_CPPFLAGS="$CPPFLAGS"
diff --git a/config/ompi_check_gm.m4 b/config/ompi_check_gm.m4
index d7c9430467..ecc33e7ad7 100644
--- a/config/ompi_check_gm.m4
+++ b/config/ompi_check_gm.m4
@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -124,9 +125,11 @@ AC_DEFUN([OMPI_CHECK_GM],[
     AC_ARG_WITH([gm],
         [AC_HELP_STRING([--with-gm(=DIR)],
              [Build GM (Myrinet) support, searching for libraries in DIR])])
+    OMPI_CHECK_WITHDIR([gm], [$with_gm], [include/gm.h])
     AC_ARG_WITH([gm-libdir],
         [AC_HELP_STRING([--with-gm-libdir=DIR],
              [Search for GM (Myrinet) libraries in DIR])])
+    OMPI_CHECK_WITHDIR([gm-libdir], [$with_gm_libdir], [libgm.*])
 
     AS_IF([test "$with_gm" != "no"],
           [AS_IF([test ! -z "$with_gm" -a "$with_gm" != "yes"],
diff --git a/config/ompi_check_loadleveler.m4 b/config/ompi_check_loadleveler.m4
index 96d598f1eb..83f96598ed 100644
--- a/config/ompi_check_loadleveler.m4
+++ b/config/ompi_check_loadleveler.m4
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,13 +18,13 @@
 # $HEADER$
 #
 
-
 # OMPI_CHECK_LOADLEVELER(prefix, [action-if-found], [action-if-not-found])
 # --------------------------------------------------------
 AC_DEFUN([OMPI_CHECK_LOADLEVELER],[
     AC_ARG_WITH([loadleveler],
                 [AC_HELP_STRING([--with-loadleveler(=DIR)],
                                 [Directory where the loadleveler software is installed])])
+    OMPI_CHECK_WITHDIR([loadleveler], [$with_loadleveler], [include/llapi.h])
 
     AS_IF([test "$with_loadleveler" = "no"],
           [ompi_check_loadleveler_happy="no"],
diff --git a/config/ompi_check_lsf.m4 b/config/ompi_check_lsf.m4
index d225f0792e..79ac4dd55c 100644
--- a/config/ompi_check_lsf.m4
+++ b/config/ompi_check_lsf.m4
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -25,9 +25,11 @@ AC_DEFUN([OMPI_CHECK_LSF],[
     AC_ARG_WITH([lsf],
         [AC_HELP_STRING([--with-lsf(=DIR)],
              [Build LSF support])])
+    OMPI_CHECK_WITHDIR([lsf], [$with_lsf], [include/lsf/lsbatch.h])
     AC_ARG_WITH([lsf-libdir],
        [AC_HELP_STRING([--with-lsf-libdir=DIR],
              [Search for LSF libraries in DIR])])
+    OMPI_CHECK_WITHDIR([lsf-libdir], [$with_lsf_libdir], [libbat.*])
 
     # Defaults
     ompi_check_lsf_dir_msg="compiler default"
diff --git a/config/ompi_check_mx.m4 b/config/ompi_check_mx.m4
index 99100ecd76..9d59ce1059 100644
--- a/config/ompi_check_mx.m4
+++ b/config/ompi_check_mx.m4
@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -67,9 +68,11 @@ AC_DEFUN([OMPI_CHECK_MX],[
     AC_ARG_WITH([mx],
         [AC_HELP_STRING([--with-mx(=DIR)],
              [Build MX (Myrinet Express) support, searching for libraries in DIR])])
+    OMPI_CHECK_WITHDIR([mx], [$with_mx], [include/myriexpress.h])
     AC_ARG_WITH([mx-libdir],
         [AC_HELP_STRING([--with-mx-libdir=DIR],
              [Search for MX (Myrinet Express) libraries in DIR])])
+    OMPI_CHECK_WITHDIR([mx-libdir], [$with_mx_libdir], [libmyriexpress.*])
 
     ompi_check_mx_$1_save_CPPFLAGS="$CPPFLAGS"
     ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS"
diff --git a/config/ompi_check_portals.m4 b/config/ompi_check_portals.m4
index f0e1cf95e0..865344879b 100644
--- a/config/ompi_check_portals.m4
+++ b/config/ompi_check_portals.m4
@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -40,6 +41,7 @@ AC_DEFUN([OMPI_CHECK_PORTALS],[
     AC_ARG_WITH([portals],
         [AC_HELP_STRING([--with-portals(=DIR)],
              [Build Portals support, searching for installation in DIR])])
+    OMPI_CHECK_WITHDIR([portals], [$with_portals], [include/portals3.h])
     AC_ARG_WITH([portals-config],
             AC_HELP_STRING([--with-portals-config],
                            [configuration to use for Portals support.
diff --git a/config/ompi_check_psm.m4 b/config/ompi_check_psm.m4
index fa6045e0b8..dcd4086bb2 100644
--- a/config/ompi_check_psm.m4
+++ b/config/ompi_check_psm.m4
@@ -11,7 +11,7 @@
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2006      QLogic Corp. All rights reserved.
-#
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -28,9 +28,11 @@ AC_DEFUN([OMPI_CHECK_PSM],[
     AC_ARG_WITH([psm],
         [AC_HELP_STRING([--with-psm(=DIR)],
              [Build PSM (QLogic InfiniPath PSM) support, searching for libraries in DIR])])
+    OMPI_CHECK_WITHDIR([psm], [$with_psm], [include/psm.h])
     AC_ARG_WITH([psm-libdir],
         [AC_HELP_STRING([--with-psm-libdir=DIR],
              [Search for PSM (QLogic InfiniPath PSM) libraries in DIR])])
+    OMPI_CHECK_WITHDIR([psm-libdir], [$with_psm_libdir], [libpsm_infinipath.*])
 
     ompi_check_psm_$1_save_CPPFLAGS="$CPPFLAGS"
     ompi_check_psm_$1_save_LDFLAGS="$LDFLAGS"
diff --git a/config/ompi_check_tm.m4 b/config/ompi_check_tm.m4
index 917226420b..6da44eb8c9 100644
--- a/config/ompi_check_tm.m4
+++ b/config/ompi_check_tm.m4
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -42,6 +42,7 @@ AC_DEFUN([OMPI_CHECK_TM],[
     AC_ARG_WITH([tm],
                 [AC_HELP_STRING([--with-tm(=DIR)],
                                 [Directory where the tm software is installed])])
+    OMPI_CHECK_WITHDIR([tm], [$with_tm], [include/tm.h])
 
     ompi_check_tm_found=no
     AS_IF([test "$with_tm" = "no"],
diff --git a/config/ompi_check_udapl.m4 b/config/ompi_check_udapl.m4
index 2754c7f8f0..12d4216810 100644
--- a/config/ompi_check_udapl.m4
+++ b/config/ompi_check_udapl.m4
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,7 +18,6 @@
 # $HEADER$
 #
 
-
 # OMPI_CHECK_UDAPL(prefix, [action-if-found], [action-if-not-found])
 # --------------------------------------------------------
 # check if uDAPL support can be found.  sets prefix_{CPPFLAGS, 
@@ -28,9 +27,11 @@ AC_DEFUN([OMPI_CHECK_UDAPL],[
     AC_ARG_WITH([udapl],
         [AC_HELP_STRING([--with-udapl(=DIR)],
              [Build uDAPL support, searching for libraries in DIR])])
+    OMPI_CHECK_WITHDIR([udapl], [$with_udapl], [include/dat/udat.h])
     AC_ARG_WITH([udapl-libdir],
        [AC_HELP_STRING([--with-udapl-libdir=DIR],
              [Search for uDAPL libraries in DIR])])
+    OMPI_CHECK_WITHDIR([udapl-libdir], [$with_udapl_libdir], [libdat.*])
 
     # Special case for OFED/Linux: the default /etc/dat.conf that
     # ships with OFED is broken in that it includes DAT providers that
diff --git a/config/ompi_check_withdir.m4 b/config/ompi_check_withdir.m4
index ce468e311f..459667a4e3 100644
--- a/config/ompi_check_withdir.m4
+++ b/config/ompi_check_withdir.m4
@@ -23,7 +23,7 @@ AC_DEFUN([OMPI_CHECK_WITHDIR],[
                  [AC_MSG_RESULT([not found])
                   AC_MSG_WARN([Directory $2 not found])
                   AC_MSG_ERROR([Cannot continue])],
-                 [AS_IF([test "x`ls $2/$3`" = "x"],
+                 [AS_IF([test "x`ls $2/$3` 2> /dev/null" = "x"],
                         [AC_MSG_RESULT([not found])
                          AC_MSG_WARN([Expected file $2/$3 not found])
                          AC_MSG_ERROR([Cannot continue])],
diff --git a/ompi/mca/btl/elan/configure.m4 b/ompi/mca/btl/elan/configure.m4
index 70753b2094..a1f46eac4d 100644
--- a/ompi/mca/btl/elan/configure.m4
+++ b/ompi/mca/btl/elan/configure.m4
@@ -3,6 +3,7 @@
 # Copyright (c) 2007      The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -19,9 +20,11 @@ AC_DEFUN([OMPI_CHECK_ELAN],[
     AC_ARG_WITH([elan],
 	[AC_HELP_STRING([--with-elan(=DIR)],
 		[Build Elan (QsNet2) support, searching for libraries in DIR])])
+    OMPI_CHECK_WITHDIR([elan], [$with_elan], [include/elan/elan.h])
     AC_ARG_WITH([elan-libdir],
 	[AC_HELP_STRING([--with-elan-libdir=DIR],
 		[Search for Elan (QsNet2) libraries in DIR])])
+    OMPI_CHECK_WITHDIR([elan-libdir], [$with_elan_libdir], [libelan.*])
     
     AS_IF([test "$with_elan" != "no"],
 	[AS_IF([test ! -z "$with_elan" -a "$with_elan" != "yes"],
diff --git a/ompi/mca/btl/sctp/configure.m4 b/ompi/mca/btl/sctp/configure.m4
index 9fec0d265f..66d881fbc2 100644
--- a/ompi/mca/btl/sctp/configure.m4
+++ b/ompi/mca/btl/sctp/configure.m4
@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,7 +18,6 @@
 # $HEADER$
 #
 
-
 # OMPI_CHECK_SCTP(prefix, [action-if-found], [action-if-not-found])
 # --------------------------------------------------------
 # check if SCTP support can be found.  sets prefix_{CPPFLAGS,
@@ -27,6 +27,7 @@ AC_DEFUN([OMPI_CHECK_SCTP],[
     AC_ARG_WITH([sctp],
 	[AC_HELP_STRING([--with-sctp(=DIR)],
 		[Build SCTP support, searching for libraries in DIR])])
+    OMPI_CHECK_WITHDIR([sctp], [$with_sctp], [include/netinet/sctp.h])
     AC_ARG_WITH([sctp-libdir],
 	[AC_HELP_STRING([--with-sctp-libdir=DIR],
 		[Search for SCTP libraries in DIR])])
@@ -91,6 +92,8 @@ AC_DEFUN([OMPI_CHECK_SCTP],[
 	;;
     esac
 
+    OMPI_CHECK_WITHDIR([sctp-libdir], [$with_sctp_libdir], [lib${ompi_sctp_api_libname}.*])
+
     AS_IF([test "$with_sctp" != "no" -a "$ompi_sctp_try_to_build" = "yes"],
 	[AS_IF([test ! -z "$with_sctp" -a "$with_sctp" != "yes"],
 		[ompi_check_sctp_dir="$with_sctp"])
diff --git a/opal/mca/crs/blcr/configure.m4 b/opal/mca/crs/blcr/configure.m4
index f51d1e1028..2747da7063 100644
--- a/opal/mca/crs/blcr/configure.m4
+++ b/opal/mca/crs/blcr/configure.m4
@@ -8,6 +8,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -21,9 +22,11 @@ AC_DEFUN([MCA_crs_blcr_CONFIG],[
     AC_ARG_WITH([blcr],
                 [AC_HELP_STRING([--with-blcr(=DIR)],
                                 [Path to BLCR Installation])])
+    OMPI_CHECK_WITHDIR([blcr], [$with_blcr], [include/libcr.h])
     AC_ARG_WITH([blcr-libdir],
                 [AC_HELP_STRING([--with-blcr-libdir=DIR],
                                 [Search for BLCR libraries in DIR])])
+    OMPI_CHECK_WITHDIR([blcr-libdir], [$with_blcr_libdir], [libcr.*])
 
     check_crs_blcr_good="no"
 
diff --git a/opal/mca/maffinity/libnuma/configure.m4 b/opal/mca/maffinity/libnuma/configure.m4
index 7871fc338a..c6d6b1aa76 100644
--- a/opal/mca/maffinity/libnuma/configure.m4
+++ b/opal/mca/maffinity/libnuma/configure.m4
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -18,14 +18,14 @@
 # $HEADER$
 #
 
-
 # MCA_<framework>_<component>_CONFIG([action-if-can-compile], 
 #                                    [action-if-cant-compile])
 # ------------------------------------------------
 AC_DEFUN([MCA_maffinity_libnuma_CONFIG],[
     AC_ARG_WITH([libnuma],
-                [AC_HELP_STRING([--with-libnuma],
+                [AC_HELP_STRING([--with-libnuma=(DIR)],
                                 [Directory where the libnuma software is installed])])
+    OMPI_CHECK_WITHDIR([libnuma], [$with_libnuma], [include/numa.h])
 
     AS_IF([test "$with_libnuma" = "no"],
           [maffinity_libnuma_happy="no"],
diff --git a/opal/mca/memchecker/valgrind/configure.m4 b/opal/mca/memchecker/valgrind/configure.m4
index a9858069e9..02049843dd 100644
--- a/opal/mca/memchecker/valgrind/configure.m4
+++ b/opal/mca/memchecker/valgrind/configure.m4
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
-# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -25,6 +25,7 @@ AC_DEFUN([MCA_memchecker_valgrind_CONFIG],[
     AC_ARG_WITH([valgrind],
         [AC_HELP_STRING([--with-valgrind(=DIR)],
             [Directory where the valgrind software is installed])])
+    OMPI_CHECK_WITHDIR([valgrind], [$with_valgrind], [include/valgrind/valgrind.h])
 
     memchecker_valgrind_CPPFLAGS=
     opal_memchecker_valgrind_CPPFLAGS=
diff --git a/orte/mca/ess/portals_utcp/configure.m4 b/orte/mca/ess/portals_utcp/configure.m4
index 585dcc9053..c372baa34d 100644
--- a/orte/mca/ess/portals_utcp/configure.m4
+++ b/orte/mca/ess/portals_utcp/configure.m4
@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,7 +18,6 @@
 # $HEADER$
 #
 
-
 # MCA_ess_portals_utcp_CONFIG(action-if-can-compile, 
 #                        [action-if-cant-compile])
 # ------------------------------------------------
@@ -32,6 +32,7 @@ AC_DEFUN([MCA_ess_portals_utcp_CONFIG],[
     AC_ARG_WITH(portals, 
         AC_HELP_STRING([--with-portals=DIR],
                        [Specify the installation directory of PORTALS]))
+    OMPI_CHECK_WITHDIR([portals], [$with_portals], [include/portals3.h])
 
     AS_IF([test -n "$with_portals"],
           [AS_IF([test -d "$with_portals/include"],