Add OMPI_LIB_PREFIX to AM_CPPFLAGS for programs that reference it internally.

jjhursey · jjhursey · commit 955fd6c97d04 · 2016-09-06T17:35:56.000-04:00
* Should fix the java bindings error
diff --git a/ompi/mpi/java/c/Makefile.am b/ompi/mpi/java/c/Makefile.am
@@ -17,7 +17,7 @@
 if OMPI_WANT_JAVA_BINDINGS
 
 # Get the include files that were generated from the .java source files
-AM_CPPFLAGS = -I$(top_builddir)/ompi/mpi/java/java $(OPAL_JDK_CPPFLAGS) -DOPAL_DYN_LIB_SUFFIX=\"$(OPAL_DYN_LIB_SUFFIX)\"
+AM_CPPFLAGS = -I$(top_builddir)/ompi/mpi/java/java $(OPAL_JDK_CPPFLAGS) -DOMPI_LIB_PREFIX=\"$(OMPI_LIB_PREFIX)\" -DOPAL_DYN_LIB_SUFFIX=\"$(OPAL_DYN_LIB_SUFFIX)\"
 
 headers = \
         mpiJava.h
diff --git a/opal/mca/btl/usnic/Makefile.am b/opal/mca/btl/usnic/Makefile.am
@@ -20,7 +20,7 @@
 # $HEADER$
 #
 
-AM_CPPFLAGS = -DBTL_IN_OPAL=1 $(opal_common_libfabric_CPPFLAGS)
+AM_CPPFLAGS = -DBTL_IN_OPAL=1 $(opal_common_libfabric_CPPFLAGS) -DOMPI_LIB_PREFIX=\"$(OMPI_LIB_PREFIX)\"
 
 EXTRA_DIST = README.txt README.test
 
diff --git a/oshmem/mca/memheap/base/Makefile.am b/oshmem/mca/memheap/base/Makefile.am
@@ -9,6 +9,8 @@
 
 dist_oshmemdata_DATA += base/help-oshmem-memheap.txt
 
+AM_CPPFLAGS = -DOMPI_LIB_PREFIX=\"$(OMPI_LIB_PREFIX)\"
+
 headers += \
         base/base.h
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# $HEADER$`
`21`	`21`	`#`
`22`	`22`
`23`		`-AM_CPPFLAGS = -DBTL_IN_OPAL=1 $(opal_common_libfabric_CPPFLAGS)`
	`23`	`+AM_CPPFLAGS = -DBTL_IN_OPAL=1 $(opal_common_libfabric_CPPFLAGS) -DOMPI_LIB_PREFIX=\"$(OMPI_LIB_PREFIX)\"`
`24`	`24`
`25`	`25`	`EXTRA_DIST = README.txt README.test`
`26`	`26`