always include ltdl.h with the full opal path, so that we always grab our

version instead of the (possible) system installed version.

This commit was SVN r8248.

opal/mca/base/Makefile.am

@@ -20,7 +20,6 @@
 # (by default)
 
 AM_CPPFLAGS = \
-        $(OPAL_LTDL_CPPFLAGS) \
         -DOMPI_PKGLIBDIR=\"$(pkglibdir)\" \
         -DOMPI_SYSCONFDIR=\"$(sysconfdir)\"
 AM_LFLAGS = -Pmca_base_yy

opal/mca/base/mca_base_component_find.c

@@ -24,9 +24,7 @@
 #include <stdlib.h>
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
+#include "opal/libltdl/ltdl.h"
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
 #endif
 
 #include "opal/util/output.h"

opal/mca/base/mca_base_component_repository.c

@@ -26,9 +26,7 @@
 #include <stdio.h>
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
+#include "opal/libltdl/ltdl.h"
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
 #endif
 
 #include "opal/class/opal_list.h"

opal/mca/base/mca_base_component_repository.h

@@ -22,9 +22,7 @@
 #include "ompi_config.h"
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
+#include "opal/libltdl/ltdl.h"
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
 #else
 /* if we don't have libltdl, provide dummy handle type */
 typedef void* lt_dlhandle;

test/support/Makefile.am

@@ -17,7 +17,6 @@
 #
 
 AM_CPPFLAGS = \
-        $(OPAL_LTDL_CPPFLAGS) \
         -DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
         -DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"
 

test/support/components.c

@@ -23,9 +23,7 @@
 #include "ompi/include/constants.h"
 #include "opal/include/constants.h"
 #include "opal/mca/mca.h"
-/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
+#include "opal/libltdl/ltdl.h"
-   directory's Makefile.am to get opal/libltdl */ 
-#include "ltdl.h"
 
 #include "components.h"
 

test/support/components.h

@@ -20,8 +20,8 @@
 #ifndef OMPI_SUPPORT_COMPONENTS_H
 #define OMPI_SUPPORT_COMPONENTS_H
 
-#include "libltdl/ltdl.h"
+#include "opal/libltdl/ltdl.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {