- We know that libltdl is not picky-clean. So don't use the picky-clean
CFLAGS when configuring (and therefore compiling) libltdl. - Move some of the output messages around This commit was SVN r443.
Этот коммит содержится в:
родитель
4717df3979
Коммит
42a849197a
13
configure.ac
13
configure.ac
@ -320,12 +320,18 @@ AC_MSG_RESULT([$lam_subdir_args])
|
|||||||
LAM_MCA
|
LAM_MCA
|
||||||
|
|
||||||
|
|
||||||
|
############################################################################
|
||||||
|
# Final top-level LAM configuration
|
||||||
|
############################################################################
|
||||||
|
|
||||||
|
lam_show_title "Final top-level LAM configuration"
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
# Libtool: part two
|
# Libtool: part two
|
||||||
# (after C compiler setup)
|
# (after C compiler setup)
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
lam_show_title "Libtool / libltdl configuration"
|
lam_show_subtitle "Libtool / libltdl configuration"
|
||||||
|
|
||||||
# Use convenience libltdl for the moment, because we need to force the
|
# Use convenience libltdl for the moment, because we need to force the
|
||||||
# use of the newest libltdl (i.e., the one that ships with libtool
|
# use of the newest libltdl (i.e., the one that ships with libtool
|
||||||
@ -369,6 +375,8 @@ else
|
|||||||
lam_subdir_args="$lam_subdir_args --disable-static"
|
lam_subdir_args="$lam_subdir_args --disable-static"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CFLAGS_save="$CFLAGS"
|
||||||
|
CFLAGS="$LAM_CFLAGS_BEFORE_PICKY"
|
||||||
LAM_CONFIG_SUBDIR(src/mca/libltdl, [$lam_subdir_args], [HAPPY=1], [HAPPY=0])
|
LAM_CONFIG_SUBDIR(src/mca/libltdl, [$lam_subdir_args], [HAPPY=1], [HAPPY=0])
|
||||||
if test "$HAPPY" = "1"; then
|
if test "$HAPPY" = "1"; then
|
||||||
LIBLTDL_SUBDIR=libltdl
|
LIBLTDL_SUBDIR=libltdl
|
||||||
@ -387,6 +395,7 @@ else
|
|||||||
LIBLTDL_LTLIB=
|
LIBLTDL_LTLIB=
|
||||||
WANT_LIBLTDL=0
|
WANT_LIBLTDL=0
|
||||||
fi
|
fi
|
||||||
|
CFLAGS="$CFLAGS_save"
|
||||||
AC_SUBST(LIBLTDL_SUBDIR)
|
AC_SUBST(LIBLTDL_SUBDIR)
|
||||||
AC_SUBST(LIBLTDL_LTLIB)
|
AC_SUBST(LIBLTDL_LTLIB)
|
||||||
AM_CONDITIONAL(WANT_LIBLTDL, test "$WANT_LIBLTDL" = "1")
|
AM_CONDITIONAL(WANT_LIBLTDL, test "$WANT_LIBLTDL" = "1")
|
||||||
@ -398,7 +407,7 @@ AC_DEFINE_UNQUOTED(LAM_WANT_LIBLTDL, $WANT_LIBLTDL,
|
|||||||
# final wrapper compiler config
|
# final wrapper compiler config
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
lam_show_title "Final top-level LAM configuration"
|
lam_show_subtitle "Wrapper compiler flags"
|
||||||
|
|
||||||
#
|
#
|
||||||
# This is needed for VPATH builds, so that it will -I the appropriate
|
# This is needed for VPATH builds, so that it will -I the appropriate
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user