diff --git a/configure.ac b/configure.ac index 2067833f88..e4896c1a30 100644 --- a/configure.ac +++ b/configure.ac @@ -1046,84 +1046,7 @@ LTDL_CONVENIENCE LT_INIT([dlopen win32-dll]) ]) -ompi_show_subtitle "GNU libltdl setup" - -# AC_CONFIG_SUBDIRS appears to be broken for non-gcc compilers (i.e., -# passing precious variables down to the sub-configure). -# -# Finally, make ltdl follow the same shared/static convention that was -# user for the main OMPI libraries. So manually examine -# $enable_shared and $enable_static and pass down the corresponding -# flags. - -if test "$OPAL_ENABLE_DLOPEN_SUPPORT" = "1" ; then - ompi_subdir_args="$ompi_subdir_args --enable-ltdl-convenience --disable-ltdl-install" - if test "$enable_shared" = "yes"; then - ompi_subdir_args="$ompi_subdir_args --enable-shared" - else - ompi_subdir_args="$ompi_subdir_args --disable-shared" - fi - if test "$enable_static" = "yes"; then - ompi_subdir_args="$ompi_subdir_args --enable-static" - else - ompi_subdir_args="$ompi_subdir_args --disable-static" - fi - - CFLAGS_save="$CFLAGS" - CFLAGS="$OMPI_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS" - - OMPI_CONFIG_SUBDIR(opal/libltdl, [$ompi_subdir_args], [HAPPY=1], [HAPPY=0]) - if test "$HAPPY" = "1"; then - LIBLTDL_SUBDIR=libltdl - - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="-I." - AC_EGREP_HEADER([lt_dladvise_init], [opal/libltdl/ltdl.h], - [OPAL_HAVE_LTDL_ADVISE=1], - [OPAL_HAVE_LTDL_ADVISE=0]) - CPPFLAGS="$CPPFLAGS_save" - - # Arrgh. This is gross. But I can't think of any other way to do - # it. :-( - - flags=`$EGREP ^LIBADD_DL opal/libltdl/Makefile | cut -d= -f2-` - OMPI_CHECK_LINKER_FLAGS([opal/libltdl/libtool], [-export-dynamic $flags]) - - WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $extra_ldflags" - LDFLAGS="-export-dynamic $LDFLAGS" - else - AC_MSG_WARN([Failed to build GNU libltdl. This usually means that something]) - AC_MSG_WARN([is incorrectly setup with your environment. There may be useful information in]) - AC_MSG_WARN([opal/libltdl/config.log. You can also disable GNU libltdl, which will disable]) - AC_MSG_WARN([dynamic shared object loading, by configuring with --disable-dlopen.]) - AC_MSG_ERROR([Cannot continue]) - fi - CFLAGS="$CFLAGS_save" -else - AC_MSG_WARN([libltdl support disabled (by --disable-dlopen)]) - - LIBLTDL= - LIBLTDL_SUBDIR= - OPAL_HAVE_LTDL_ADVISE=0 - - # append instead of prepend, since LIBS are going to be system - # type things needed by everyone. Normally, libltdl will push - # these into LIBS, but since we've disabled libltdl, we need - # to do it here. - WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $LIBS" -fi - -AC_SUBST(LTDLINCL) -AC_SUBST(LIBLTDL) -AC_SUBST(LIBLTDL_SUBDIR) - -AC_DEFINE_UNQUOTED(OPAL_WANT_LIBLTDL, $OPAL_ENABLE_DLOPEN_SUPPORT, - [Whether to include support for libltdl or not]) - -AC_DEFINE_UNQUOTED(OPAL_HAVE_LTDL_ADVISE, $OPAL_HAVE_LTDL_ADVISE, - [Whether libltdl appears to have the lt_dladvise interface]) - -AM_CONDITIONAL(OPAL_HAVE_DLOPEN, [test "$OPAL_ENABLE_DLOPEN_SUPPORT" = "1"] ) +OPAL_SETUP_LIBLTDL ############################################################################