Last step under current RFC: OMPI_CHECK_WITHDIR -> OPAL_CHECK_WITHDIR

This commit was SVN r31585.
2014-05-01 15:38:07 +00:00 · 2014-05-01 15:38:07 +00:00 · e20dae536c
--- a/config/ompi_check_gni.m4
+++ b/config/ompi_check_gni.m4
@ -42,17 +42,17 @@ AC_DEFUN([OMPI_CHECK_GNI], [
        [Build GNI (Cray Gemini) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])

    dnl does the path exist?
-    OMPI_CHECK_WITHDIR([gni], [$with_gni], [.])
+    OPAL_CHECK_WITHDIR([gni], [$with_gni], [.])

    AC_ARG_WITH([gni-libdir], [
        AC_HELP_STRING([--with-gni-libdir=DIR], [
            Search for GNI (Cray Gemini) libraries in DIR])])
-    OMPI_CHECK_WITHDIR([gni-libdir], [$with_gni_libdir], [libugni.*])
+    OPAL_CHECK_WITHDIR([gni-libdir], [$with_gni_libdir], [libugni.*])

    AC_ARG_WITH([gni-includedir], [
        AC_HELP_STRING([--with-gni-includedir=DIR], [
            Search for GNI (Cray Gemini) headers in DIR])])
-    OMPI_CHECK_WITHDIR([gni-includedir], [$with_gni_includedir], [gni_pub.h])
+    OPAL_CHECK_WITHDIR([gni-includedir], [$with_gni_includedir], [gni_pub.h])

    AS_IF([test "$with_gni_includedir" != "" -a "$with_gni_includedir" != "yes" -a "$with_gni_includedir" != "no"],
          [$1_CPPFLAGS="$$1_CPPFLAGS -I$with_gni_includedir"])
--- a/config/ompi_check_libfca.m4
+++ b/config/ompi_check_libfca.m4
@ -21,7 +21,7 @@ AC_DEFUN([OMPI_CHECK_FCA],[
    AC_ARG_WITH([fca],
        [AC_HELP_STRING([--with-fca(=DIR)],
             [Build fca (Mellanox Fabric Collective Accelerator) support, searching for libraries in DIR])])
-    OMPI_CHECK_WITHDIR([fca], [$with_fca], [lib/libfca.so])
+    OPAL_CHECK_WITHDIR([fca], [$with_fca], [lib/libfca.so])

    AS_IF([test "$with_fca" != "no"],
          [AS_IF([test ! -z "$with_fca" -a "$with_fca" != "yes"],
--- a/config/ompi_check_libhcoll.m4
+++ b/config/ompi_check_libhcoll.m4
@ -20,7 +20,7 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[
    AC_ARG_WITH([hcoll],
        [AC_HELP_STRING([--with-hcoll(=DIR)],
             [Build hcoll (Mellanox Hierarchical Collectives) support, searching for libraries in DIR])])
-    OMPI_CHECK_WITHDIR([hcoll], [$with_hcoll], [lib/libhcoll.so])
+    OPAL_CHECK_WITHDIR([hcoll], [$with_hcoll], [lib/libhcoll.so])

    AS_IF([test "$with_hcoll" != "no"],
          [AS_IF([test ! -z "$with_hcoll" -a "$with_hcoll" != "yes"],
--- a/config/ompi_check_lustre.m4
+++ b/config/ompi_check_lustre.m4
@ -42,7 +42,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
    AC_ARG_WITH([lustre],
        [AC_HELP_STRING([--with-lustre(=DIR)],
             [Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/liblustreapi.h])
+    OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/liblustreapi.h])

    AS_IF([test -z "$with_lustre"],
          [ompi_check_lustre_dir="/usr"],
--- a/config/ompi_check_mx.m4
+++ b/config/ompi_check_mx.m4
@ -68,11 +68,11 @@ AC_DEFUN([OMPI_CHECK_MX],[
    AC_ARG_WITH([mx],
        [AC_HELP_STRING([--with-mx(=DIR)],
             [Build MX (Myrinet Express) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([mx], [$with_mx], [include/myriexpress.h])
+    OPAL_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.*])
+    OPAL_CHECK_WITHDIR([mx-libdir], [$with_mx_libdir], [libmyriexpress.*])

    ompi_check_mx_$1_save_CPPFLAGS="$CPPFLAGS"
    ompi_check_mx_$1_save_LDFLAGS="$LDFLAGS"
--- a/config/ompi_check_mxm.m4
+++ b/config/ompi_check_mxm.m4
@ -17,11 +17,11 @@ AC_DEFUN([OMPI_CHECK_MXM],[
    AC_ARG_WITH([mxm],
        [AC_HELP_STRING([--with-mxm(=DIR)],
             [Build Mellanox Messaging support])])
-    OMPI_CHECK_WITHDIR([mxm], [$with_mxm], [include/mxm/api/mxm_api.h])
+    OPAL_CHECK_WITHDIR([mxm], [$with_mxm], [include/mxm/api/mxm_api.h])
    AC_ARG_WITH([mxm-libdir],
        [AC_HELP_STRING([--with-mxm-libdir=DIR],
             [Search for Mellanox Messaging libraries in DIR])])
-    OMPI_CHECK_WITHDIR([mxm-libdir], [$with_mxm_libdir], [libmxm.*])
+    OPAL_CHECK_WITHDIR([mxm-libdir], [$with_mxm_libdir], [libmxm.*])

    ompi_check_mxm_$1_save_CPPFLAGS="$CPPFLAGS"
    ompi_check_mxm_$1_save_LDFLAGS="$LDFLAGS"
--- a/config/ompi_check_plfs.m4
+++ b/config/ompi_check_plfs.m4
@ -42,7 +42,7 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
    AC_ARG_WITH([plfs],
        [AC_HELP_STRING([--with-plfs(=DIR)],
             [Build Plfs support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([plfs], [$with_plfs], [include/plfs.h])
+    OPAL_CHECK_WITHDIR([plfs], [$with_plfs], [include/plfs.h])

    AC_ARG_WITH([plfs-libs], 
        [AC_HELP_STRING([--with-plfs-libs=LIBS],
--- a/config/ompi_check_portals.m4
+++ b/config/ompi_check_portals.m4
@ -41,7 +41,7 @@ AC_DEFUN([OMPI_CHECK_PORTALS],[
    AC_ARG_WITH([portals],
        [AC_HELP_STRING([--with-portals(=DIR)],
             [Build Portals support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([portals], [$with_portals], [include/portals3.h])
+    OPAL_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.
--- a/config/ompi_check_portals4.m4
+++ b/config/ompi_check_portals4.m4
@ -28,11 +28,11 @@ AC_DEFUN([OMPI_CHECK_PORTALS4],[
    AC_ARG_WITH([portals4],
        [AC_HELP_STRING([--with-portals4(=DIR)],
             [Build Portals4 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([portals4], [$with_portals4], [include/portals4.h])
+    OPAL_CHECK_WITHDIR([portals4], [$with_portals4], [include/portals4.h])
    AC_ARG_WITH([portals4-libdir],
        [AC_HELP_STRING([--with-portals4-libdir=DIR],
             [Search for Portals4 libraries in DIR])])
-    OMPI_CHECK_WITHDIR([portals4-libdir], [$with_portals4_libdir], [libportals.*])
+    OPAL_CHECK_WITHDIR([portals4-libdir], [$with_portals4_libdir], [libportals.*])

    ompi_check_portals4_$1_save_CPPFLAGS="$CPPFLAGS"
    ompi_check_portals4_$1_save_LDFLAGS="$LDFLAGS"
--- a/config/ompi_check_psm.m4
+++ b/config/ompi_check_psm.m4
@ -28,11 +28,11 @@ AC_DEFUN([OMPI_CHECK_PSM],[
    AC_ARG_WITH([psm],
        [AC_HELP_STRING([--with-psm(=DIR)],
             [Build PSM (Qlogic InfiniPath) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([psm], [$with_psm], [include/psm.h])
+    OPAL_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.*])
+    OPAL_CHECK_WITHDIR([psm-libdir], [$with_psm_libdir], [libpsm_infinipath.*])

    ompi_check_psm_$1_save_CPPFLAGS="$CPPFLAGS"
    ompi_check_psm_$1_save_LDFLAGS="$LDFLAGS"
--- a/config/ompi_check_pvfs2.m4
+++ b/config/ompi_check_pvfs2.m4
@ -42,7 +42,7 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[
    AC_ARG_WITH([pvfs2],
        [AC_HELP_STRING([--with-pvfs2(=DIR)],
             [Build Pvfs2 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([pvfs2], [$with_pvfs2], [include/pvfs2.h])
+    OPAL_CHECK_WITHDIR([pvfs2], [$with_pvfs2], [include/pvfs2.h])

    AC_ARG_WITH([pvfs2-libs], 
        [AC_HELP_STRING([--with-pvfs2-libs=LIBS],
--- a/config/ompi_check_udapl.m4
+++ b/config/ompi_check_udapl.m4
@ -27,11 +27,11 @@ AC_DEFUN([OMPI_CHECK_UDAPL],[
    AC_ARG_WITH([udapl],
        [AC_HELP_STRING([--with-udapl(=DIR)],
             [Build uDAPL support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([udapl], [$with_udapl], [include/dat/udat.h])
+    OPAL_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.*])
+    OPAL_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
--- a/config/ompi_check_ugni.m4
+++ b/config/ompi_check_ugni.m4
@ -45,15 +45,15 @@ AC_DEFUN([OMPI_CHECK_UGNI], [
 		    [Build uGNI support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])

 	dnl does the path exist?
-	OMPI_CHECK_WITHDIR([ugni], [$with_ugni], [.])
+	OPAL_CHECK_WITHDIR([ugni], [$with_ugni], [.])

 	AC_ARG_WITH([ugni-libdir], [AC_HELP_STRING([--with-ugni-libdir=DIR],
 		    [Search for uGNI libraries in DIR])])
-	OMPI_CHECK_WITHDIR([ugni-libdir], [$with_ugni_libdir], [libugni.*])
+	OPAL_CHECK_WITHDIR([ugni-libdir], [$with_ugni_libdir], [libugni.*])

 	AC_ARG_WITH([ugni-includedir],
 	    [AC_HELP_STRING([--with-ugni-includedir=DIR], [Search for uGNI headers in DIR])])
-	OMPI_CHECK_WITHDIR([ugni-includedir], [$with_ugni_includedir], [gni_pub.h])
+	OPAL_CHECK_WITHDIR([ugni-includedir], [$with_ugni_includedir], [gni_pub.h])

 	AS_IF([test "$with_ugni_includedir" != "" -a "$with_ugni_includedir" != "yes" -a "$with_ugni_includedir" != "no"],
 	    [ompi_check_ugni_CPPFLAGS="-I$with_ugni_includedir"])
--- a/config/ompi_check_withdir.m4
+++ b/config/ompi_check_withdir.m4
@ -13,9 +13,9 @@ dnl
 dnl $HEADER$
 dnl

-# OMPI_CHECK_WITHDIR(with_option_name, dir_value, file_in_dir)
+# OPAL_CHECK_WITHDIR(with_option_name, dir_value, file_in_dir)
 # ----------------------------------------------------
-AC_DEFUN([OMPI_CHECK_WITHDIR],[
+AC_DEFUN([OPAL_CHECK_WITHDIR],[
    AC_MSG_CHECKING([--with-$1 value])
    AS_IF([test "$2" = "yes" -o "$2" = "no" -o "x$2" = "x"],
          [AC_MSG_RESULT([simple ok (unspecified)])],
--- a/config/ompi_setup_component_package.m4
+++ b/config/ompi_setup_component_package.m4
@ -59,11 +59,11 @@ AC_DEFUN([OPAL_SETUP_COMPONENT_PACKAGE],[
    AC_ARG_WITH([$3],
        [AC_HELP_STRING([--with-$3(=DIR)],
                        [Build $3 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([$3], [$with_$3], [$4])
+    OPAL_CHECK_WITHDIR([$3], [$with_$3], [$4])
    AC_ARG_WITH([$3-libdir],
        [AC_HELP_STRING([--with-$3-libdir=DIR],
                        [Search for the $3 libraries in DIR])])
-    OMPI_CHECK_WITHDIR([$3-libdir], [$with_$3_libdir], [$5])
+    OPAL_CHECK_WITHDIR([$3-libdir], [$with_$3_libdir], [$5])

    AS_IF([test ! -z "$with_$3" -a "$with_$3" != "yes"],
          [$1_$2_dir="$with_$3"])
--- a/config/opal_check_verbs.m4
+++ b/config/opal_check_verbs.m4
@ -118,9 +118,9 @@ AC_DEFUN([OPAL_CHECK_VERBS_DIR],[
          ])

    # Sanity check the --with values
-    OMPI_CHECK_WITHDIR([verbs], [$with_verbs], 
+    OPAL_CHECK_WITHDIR([verbs], [$with_verbs], 
                       [include/infiniband/verbs.h])
-    OMPI_CHECK_WITHDIR([verbs-libdir], [$with_verbs_libdir], 
+    OPAL_CHECK_WITHDIR([verbs-libdir], [$with_verbs_libdir], 
                       [libibverbs.*])

    # Set standardized shell variables for OFED lovin' components to
--- a/config/opal_setup_java.m4
+++ b/config/opal_setup_java.m4
@ -147,8 +147,8 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
              [opal_java_found=1])

        if test "$opal_java_found" = "1"; then
-            OMPI_CHECK_WITHDIR([jdk-bindir], [$with_jdk_bindir], [javac])
-            OMPI_CHECK_WITHDIR([jdk-headers], [$with_jdk_headers], [jni.h])
+            OPAL_CHECK_WITHDIR([jdk-bindir], [$with_jdk_bindir], [javac])
+            OPAL_CHECK_WITHDIR([jdk-headers], [$with_jdk_headers], [jni.h])

            # Look for various Java-related programs
            opal_java_happy=no
--- a/config/opal_setup_libltdl.m4
+++ b/config/opal_setup_libltdl.m4
@ -76,7 +76,7 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[
              ;;
           *) 
              AC_MSG_RESULT([external copy ($libltdl_location)])
-              OMPI_CHECK_WITHDIR([libltdl], [$libltdl_location], 
+              OPAL_CHECK_WITHDIR([libltdl], [$libltdl_location], 
                                 [include/ltdl.h])
              # If we're using an extern libltdl, then reset the
              # LTDLINCL that was set earlier (ie., there's no need to
--- a/config/orte_check_alps.m4
+++ b/config/orte_check_alps.m4
@ -29,7 +29,7 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
        AC_ARG_WITH([alps],
                    [AC_HELP_STRING([--with-alps(=DIR|yes|no)],
                    [Build with ALPS scheduler component, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries (default: no)])])
-        OMPI_CHECK_WITHDIR([alps], [$with_alps], [.])
+        OPAL_CHECK_WITHDIR([alps], [$with_alps], [.])

        AC_ARG_WITH([alps-libdir],
                    [AC_HELP_STRING([--with-alps-libdir=DIR],
--- a/config/orte_check_lsf.m4
+++ b/config/orte_check_lsf.m4
@ -25,11 +25,11 @@ AC_DEFUN([ORTE_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])
+    OPAL_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.*])
+    OPAL_CHECK_WITHDIR([lsf-libdir], [$with_lsf_libdir], [libbat.*])

    # Defaults
    orte_check_lsf_dir_msg="compiler default"
--- a/config/orte_check_tm.m4
+++ b/config/orte_check_tm.m4
@ -45,7 +45,7 @@ AC_DEFUN([ORTE_CHECK_TM],[
    AC_ARG_WITH([tm],
                [AC_HELP_STRING([--with-tm(=DIR)],
                                [Build TM (Torque, PBSPro, and compatible) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([tm], [$with_tm], [include/tm.h])
+    OPAL_CHECK_WITHDIR([tm], [$with_tm], [include/tm.h])

    orte_check_tm_found=no
    AS_IF([test "$with_tm" = "no"],
--- a/config/orte_setup_java.m4
+++ b/config/orte_setup_java.m4
@ -144,8 +144,8 @@ AC_DEFUN([ORTE_SETUP_JAVA],[
              [found=1])

        if test "$found" = "1"; then
-            OMPI_CHECK_WITHDIR([jdk-bindir], [$with_jdk_bindir], [javac])
-            OMPI_CHECK_WITHDIR([jdk-headers], [$with_jdk_headers], [jni.h])
+            OPAL_CHECK_WITHDIR([jdk-bindir], [$with_jdk_bindir], [javac])
+            OPAL_CHECK_WITHDIR([jdk-headers], [$with_jdk_headers], [jni.h])

            # Look for various Java-related programs
            orte_java_happy=no
--- a/ompi/mca/btl/scif/configure.m4
+++ b/ompi/mca/btl/scif/configure.m4
@ -14,7 +14,7 @@ AC_DEFUN([MCA_ompi_btl_scif_CONFIG],[

    AC_ARG_WITH([scif], [AC_HELP_STRING([--with-scif(=DIR)]),
 		[Build with SCIF, searching for headers in DIR])])
-    OMPI_CHECK_WITHDIR([scif], [$with_scif], [include/scif.h])
+    OPAL_CHECK_WITHDIR([scif], [$with_scif], [include/scif.h])

    btl_scif_happy="no"

--- a/ompi/mca/btl/sctp/configure.m4
+++ b/ompi/mca/btl/sctp/configure.m4
@ -28,7 +28,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])
+    OPAL_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])])
@ -93,7 +93,7 @@ AC_DEFUN([OMPI_CHECK_SCTP],[
        ;;
    esac

-    OMPI_CHECK_WITHDIR([sctp-libdir], [$with_sctp_libdir], [lib${ompi_sctp_api_libname}.*])
+    OPAL_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"],
--- a/ompi/mca/btl/sm/configure.m4
+++ b/ompi/mca/btl/sm/configure.m4
@ -23,7 +23,7 @@ AC_DEFUN([OMPI_CHECK_KNEM],[
        [AC_HELP_STRING([--with-knem(=DIR)],
             [Build knem Linux kernel module support, searching for headers in DIR])])

-    OMPI_CHECK_WITHDIR([knem], [$with_knem], [include/knem_io.h])
+    OPAL_CHECK_WITHDIR([knem], [$with_knem], [include/knem_io.h])
    ompi_check_knem_$1_save_CPPFLAGS="$CPPFLAGS"

    AS_IF([test "$with_knem" != "no"],
--- a/ompi/mca/btl/usnic/configure.m4
+++ b/ompi/mca/btl/usnic/configure.m4
@ -34,11 +34,11 @@ AC_DEFUN([OMPI_CHECK_LIBNL3],[
    AC_ARG_WITH([libnl3],
        [AC_HELP_STRING([--with-libnl3(=DIR)],
             [Build libnl3 support])])
-    OMPI_CHECK_WITHDIR([libnl3], [$with_libnl3], [include/libnl3/netlink/netlink.h])
+    OPAL_CHECK_WITHDIR([libnl3], [$with_libnl3], [include/libnl3/netlink/netlink.h])
    AC_ARG_WITH([libnl3-libdir],
        [AC_HELP_STRING([--with-libnl3-libdir=DIR],
             [Search for libnl3 libraries in DIR])])
-    OMPI_CHECK_WITHDIR([libnl3-libdir], [$with_libnl3_libdir], [libnl-3.*])
+    OPAL_CHECK_WITHDIR([libnl3-libdir], [$with_libnl3_libdir], [libnl-3.*])

    ompi_check_libnl3_$1_save_CPPFLAGS="$CPPFLAGS"
    ompi_check_libnl3_$1_save_LDFLAGS="$LDFLAGS"
--- a/ompi/mca/btl/vader/configure.m4
+++ b/ompi/mca/btl/vader/configure.m4
@ -23,12 +23,12 @@ AC_DEFUN([OMPI_CHECK_XPMEM], [
    AC_ARG_WITH([xpmem],
                [AC_HELP_STRING([--with-xpmem(=DIR)],
                [Build with XPMEM kernel module support, searching for headers in DIR])])
-    OMPI_CHECK_WITHDIR([xpmem], [$with_xpmem], [include/xpmem.h include/sn/xpmem.h])
+    OPAL_CHECK_WITHDIR([xpmem], [$with_xpmem], [include/xpmem.h include/sn/xpmem.h])

    AC_ARG_WITH([xpmem-libdir],
                [AC_HELP_STRING([--with-xpmem-libdir=DIR],
                                [Search for XPMEM library in DIR])])
-    OMPI_CHECK_WITHDIR([xpmem-libdir], [$with_xpmem_libdir], [libxpmem.*])
+    OPAL_CHECK_WITHDIR([xpmem-libdir], [$with_xpmem_libdir], [libxpmem.*])

    ompi_check_xpmem_happy="no"

--- a/ompi/mca/mpool/udreg/configure.m4
+++ b/ompi/mca/mpool/udreg/configure.m4
@ -26,7 +26,7 @@ AC_DEFUN([MCA_ompi_mpool_udreg_CONFIG],[

    AC_ARG_WITH([udreg], [AC_HELP_STRING([--with-udreg(=DIR)],
 		[Build support for Cray udreg support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
-    OMPI_CHECK_WITHDIR([udreg], [$with_udreg], [.])
+    OPAL_CHECK_WITHDIR([udreg], [$with_udreg], [.])

    mpool_udreg_happy="no"

--- a/opal/mca/crs/blcr/configure.m4
+++ b/opal/mca/crs/blcr/configure.m4
@ -25,11 +25,11 @@ AC_DEFUN([MCA_opal_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])
+    OPAL_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.*])
+    OPAL_CHECK_WITHDIR([blcr-libdir], [$with_blcr_libdir], [libcr.*])

    check_crs_blcr_good="no"

--- a/opal/mca/crs/criu/configure.m4
+++ b/opal/mca/crs/criu/configure.m4
@ -28,11 +28,11 @@ AC_DEFUN([MCA_opal_crs_criu_CONFIG],[
    AC_ARG_WITH([criu],
                [AC_HELP_STRING([--with-criu(=DIR)],
                                [Path to CRIU Installation])])
-    OMPI_CHECK_WITHDIR([criu], [$with_criu], [include/criu/criu.h])
+    OPAL_CHECK_WITHDIR([criu], [$with_criu], [include/criu/criu.h])
    AC_ARG_WITH([criu-libdir],
                [AC_HELP_STRING([--with-criu-libdir=DIR],
                                [Search for CRIU libraries in DIR])])
-    OMPI_CHECK_WITHDIR([criu-libdir], [$with_criu_libdir], [libcriu.*])
+    OPAL_CHECK_WITHDIR([criu-libdir], [$with_criu_libdir], [libcriu.*])

    # If we do not want FT or CRIU, don't compile this component
    AS_IF([test "$opal_want_ft_cr" = "1" && test "$with_criu" = "yes"],
--- a/opal/mca/crs/dmtcp/configure.m4
+++ b/opal/mca/crs/dmtcp/configure.m4
@ -25,7 +25,7 @@ AC_DEFUN([MCA_opal_crs_dmtcp_CONFIG],[
    AC_ARG_WITH([dmtcp],
                [AC_HELP_STRING([--with-dmtcp(=DIR)],
                                [Path to DMTCP Installation])])
-    OMPI_CHECK_WITHDIR([dmtcp], [$with_dmtcp], [include/mtcp.h])
+    OPAL_CHECK_WITHDIR([dmtcp], [$with_dmtcp], [include/mtcp.h])

    # Configure option to specify where to look for DMTCP libraries
    #   (Default: $with_dmtcp/lib)
@ -33,7 +33,7 @@ AC_DEFUN([MCA_opal_crs_dmtcp_CONFIG],[
    AC_ARG_WITH([dmtcp-libdir],
                [AC_HELP_STRING([--with-dmtcp-libdir=DIR],
                                [Search for DMTCP libraries in DIR])])
-    OMPI_CHECK_WITHDIR([dmtcp-libdir], [$with_dmtcp_libdir], [libmtcp.so])
+    OPAL_CHECK_WITHDIR([dmtcp-libdir], [$with_dmtcp_libdir], [libmtcp.so])

    #
    # Check if Open MPI was compiled with Checkpoint/Restart support
--- a/opal/mca/event/external/configure.m4
+++ b/opal/mca/event/external/configure.m4
@ -86,14 +86,14 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
    # If we want external support, try it
    AS_IF([test "$opal_event_external_want" = "yes"],
          [ # Error out if the specified dir does not exist
-           OMPI_CHECK_WITHDIR([libevent-libdir], [$with_libevent_libdir], 
+           OPAL_CHECK_WITHDIR([libevent-libdir], [$with_libevent_libdir], 
                              [libevent.*])

           AC_MSG_CHECKING([for external libevent in])
           AS_IF([test "$with_libevent" != "external" -a "$with_libevent" != "yes"],
                 [opal_event_dir=$with_libevent
                  AC_MSG_RESULT([$opal_event_dir])
-                  OMPI_CHECK_WITHDIR([libevent], [$with_libdir], 
+                  OPAL_CHECK_WITHDIR([libevent], [$with_libdir], 
                                     [include/event.h])
                 ],
                 [AC_MSG_RESULT([(default search paths)])])
--- a/opal/mca/hwloc/external/configure.m4
+++ b/opal/mca/hwloc/external/configure.m4
@ -108,7 +108,7 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[

    # If we still want external support, try it
    AS_IF([test "$opal_hwloc_external_want" = "yes"],
-          [OMPI_CHECK_WITHDIR([hwloc-libdir], [$with_hwloc_libdir], 
+          [OPAL_CHECK_WITHDIR([hwloc-libdir], [$with_hwloc_libdir], 
                              [libhwloc.*])

           AC_MSG_CHECKING([looking for external hwloc in])
--- a/opal/mca/memchecker/valgrind/configure.m4
+++ b/opal/mca/memchecker/valgrind/configure.m4
@ -29,7 +29,7 @@ AC_DEFUN([MCA_opal_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])
+    OPAL_CHECK_WITHDIR([valgrind], [$with_valgrind], [include/valgrind/valgrind.h])

    opal_memchecker_valgrind_CPPFLAGS=
    opal_memchecker_valgrind_save_CPPFLAGS="$CPPFLAGS"