From 03d243474d4c787a76ca2f110bbb761a5325d893 Mon Sep 17 00:00:00 2001
From: Arlin Davis <arlin.r.davis@intel.com>
Date: Mon, 21 May 2012 15:27:53 -0700
Subject: [PATCH] configure changes.

---
 Makefile.am                                     | 12 ++++++------
 configure.in                                    |  2 +-
 dapl/udapl/{libdaplopcm.map => libdaplomcm.map} |  0
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename dapl/udapl/{libdaplopcm.map => libdaplomcm.map} (100%)

diff --git a/Makefile.am b/Makefile.am
index 53f14b1..462c8f7 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ if DEFINE_UCM
 daplliboucmdir = $(libdir)
 endif
 if DEFINE_MCM
-dapllibopcmdir = $(libdir)
+dapllibomcmdir = $(libdir)
 endif
 
 datlib_LTLIBRARIES = dat/udat/libdat2.la
@@ -110,14 +110,14 @@ dapl_udapl_libdaploucm_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAG
                                 -I$(srcdir)/dapl/openib_ucm \
 				-I$(srcdir)/dapl/openib_ucm/linux				
 endif
-if DEFINE_PCM
+if DEFINE_MCM
 dapl_udapl_libdaplomcm_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
                                 -DOPENIB -DCQ_WAIT_OBJECT \
                                 -I$(srcdir)/dat/include/ -I$(srcdir)/dapl/include/ \
                                 -I$(srcdir)/dapl/common -I$(srcdir)/dapl/udapl/linux \
 				-I$(srcdir)/dapl/openib_common \
-                                -I$(srcdir)/dapl/openib_ucm \
-				-I$(srcdir)/dapl/openib_ucm/linux				
+                                -I$(srcdir)/dapl/openib_mcm \
+				-I$(srcdir)/dapl/openib_mcm/linux				
 endif
 if HAVE_LD_VERSION_SCRIPT
     dat_version_script = -Wl,--version-script=$(srcdir)/dat/udat/libdat2.map
@@ -130,8 +130,8 @@ endif
 if DEFINE_UCM
     daploucm_version_script = -Wl,--version-script=$(srcdir)/dapl/udapl/libdaploucm.map
 endif
-if DEFINE_UCM
-    daplopcm_version_script = -Wl,--version-script=$(srcdir)/dapl/udapl/libdaplomcm.map
+if DEFINE_MCM
+    daplomcm_version_script = -Wl,--version-script=$(srcdir)/dapl/udapl/libdaplomcm.map
 endif
 else
     dat_version_script = 
diff --git a/configure.in b/configure.in
index 0089cb9..8b56580 100644
--- a/configure.in
+++ b/configure.in
@@ -194,5 +194,5 @@ AC_CACHE_CHECK(Check for SUSE_11 system, ac_cv_suse11,
     fi)
 AM_CONDITIONAL(OS_SUSE11, test "$ac_cv_suse11" = "yes")
 
-AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile dapl.spec daplpxd.init])
+AC_CONFIG_FILES([Makefile test/dtest/Makefile test/dapltest/Makefile dapl.spec daplmpxy.init])
 AC_OUTPUT
diff --git a/dapl/udapl/libdaplopcm.map b/dapl/udapl/libdaplomcm.map
similarity index 100%
rename from dapl/udapl/libdaplopcm.map
rename to dapl/udapl/libdaplomcm.map
-- 
2.41.0