From 473547481b7d34525633cb4778943ff88c5a7886 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 21 May 2010 13:58:53 +0000 Subject: [PATCH] Don't reset LTDLINCL unless we're using an external libltdl installation. This commit was SVN r23192. --- opal/config/opal_setup_libltdl.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/opal/config/opal_setup_libltdl.m4 b/opal/config/opal_setup_libltdl.m4 index 818b08ef2b..b39bd856ba 100644 --- a/opal/config/opal_setup_libltdl.m4 +++ b/opal/config/opal_setup_libltdl.m4 @@ -34,7 +34,6 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[ # $enable_shared and $enable_static and pass down the corresponding # flags. - LTDLINCL= LIBLTDL= LIBLTDL_SUBDIR= OPAL_HAVE_LTDL_ADVISE=0 @@ -66,6 +65,10 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[ ;; external) AC_MSG_RESULT([external copy (unspecified)]) + # If we're using an extern libltdl, then reset the + # LTDLINCL that was set earlier (ie., there's no need to + # -I into our internal libltdl tree). + LDTLINCL= libltdl_location= libltdl_need_external=1 ;; @@ -73,6 +76,10 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[ AC_MSG_RESULT([external copy ($libltdl_location)]) OMPI_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 + # -I into our internal libltdl tree). + LDTLINCL= libltdl_need_external=1 ;; esac