Fixes for vpath builds; this should enable 'make dist' again.
This commit was SVN r23973.
Этот коммит содержится в:
родитель
22496c774c
Коммит
6bd41cf5d8
@ -62,6 +62,6 @@ AC_DEFUN([MCA_opal_event_CONFIG],[
|
|||||||
AC_MSG_CHECKING([for winning component additional CPPFLAGS])
|
AC_MSG_CHECKING([for winning component additional CPPFLAGS])
|
||||||
AS_IF([test "$event_base_include_cppflags" != ""],
|
AS_IF([test "$event_base_include_cppflags" != ""],
|
||||||
[AC_MSG_RESULT([$event_base_include_cppflags])
|
[AC_MSG_RESULT([$event_base_include_cppflags])
|
||||||
CPPFLAGS="$CPPFLAGS $event_base_include_cppflags -DGOT_EVENT_BASE_INCLUDE_CPPFLAGS"],
|
CPPFLAGS="$CPPFLAGS $event_base_include_cppflags"],
|
||||||
[AC_MSG_RESULT([none])])
|
[AC_MSG_RESULT([none])])
|
||||||
])
|
])
|
||||||
|
@ -133,7 +133,7 @@ AC_DEFUN([MCA_opal_event_libevent207_CONFIG],[
|
|||||||
[AC_MSG_WARN([Failed to mkdir `dirname $file`])
|
[AC_MSG_WARN([Failed to mkdir `dirname $file`])
|
||||||
AC_MSG_ERROR([Cannot continue])])
|
AC_MSG_ERROR([Cannot continue])])
|
||||||
|
|
||||||
cat > "$file.in" <<EOF
|
cat > "$OMPI_TOP_SRCDIR/$file.in" <<EOF
|
||||||
/* event2/event-config.h
|
/* event2/event-config.h
|
||||||
*
|
*
|
||||||
* This file was generated by autoconf when libevent was built, and
|
* This file was generated by autoconf when libevent was built, and
|
||||||
@ -151,8 +151,8 @@ EOF
|
|||||||
|
|
||||||
sed -e 's/#define /#define _EVENT_/' \
|
sed -e 's/#define /#define _EVENT_/' \
|
||||||
-e 's/#undef /#undef _EVENT_/' \
|
-e 's/#undef /#undef _EVENT_/' \
|
||||||
-e 's/#ifndef /#ifndef _EVENT_/' < "$basedir/libevent/config.h" >> "$file.in"
|
-e 's/#ifndef /#ifndef _EVENT_/' < "$OMPI_TOP_BUILDDIR/$basedir/libevent/config.h" >> "$OMPI_TOP_SRCDIR/$file.in"
|
||||||
echo "#endif" >> "$file.in"
|
echo "#endif" >> "$OMPI_TOP_SRCDIR/$file.in"
|
||||||
AC_CONFIG_FILES([$file])
|
AC_CONFIG_FILES([$file])
|
||||||
|
|
||||||
# Must set this variable so that the framework m4 knows
|
# Must set this variable so that the framework m4 knows
|
||||||
@ -166,7 +166,7 @@ EOF
|
|||||||
file=$basedir/libevent
|
file=$basedir/libevent
|
||||||
event_base_include_cppflags="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
event_base_include_cppflags="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
||||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||||
[event_base_include_cppflags="$event_base_include_cpp_flags -I$OMPI_TOP_BUILDDIR/$file/include"])
|
[event_base_include_cppflags="$event_base_include_cppflags -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||||
if test "$with_devel_headers" = "yes" ; then
|
if test "$with_devel_headers" = "yes" ; then
|
||||||
WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS "'-I${includedir}/openmpi/opal/mca/event/libevent207/libevent -I${includedir}/openmpi/opal/mca/event/libevent207/libevent/include'
|
WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS "'-I${includedir}/openmpi/opal/mca/event/libevent207/libevent -I${includedir}/openmpi/opal/mca/event/libevent207/libevent/include'
|
||||||
fi
|
fi
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user