configury: --enable-dist ceased being useful long ago
The --enable-dist flag is a relic from a prior iteration of the build system. It isn't necessary any more.
Этот коммит содержится в:
родитель
db123b357f
Коммит
98a6664d8a
@ -3,7 +3,7 @@ dnl
|
|||||||
dnl Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
|
dnl Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
|
||||||
dnl University Research and Technology
|
dnl University Research and Technology
|
||||||
dnl Corporation. All rights reserved.
|
dnl Corporation. All rights reserved.
|
||||||
dnl Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved.
|
dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved.
|
||||||
dnl Copyright (c) 2015 Research Organization for Information Science
|
dnl Copyright (c) 2015 Research Organization for Information Science
|
||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
@ -361,8 +361,7 @@ AC_DEFUN([EXT_CONFIGURE_M4_CONFIG_COMPONENT],[
|
|||||||
|
|
||||||
EXT_COMPONENT_BUILD_CHECK($1, [should_build=1], [should_build=0])
|
EXT_COMPONENT_BUILD_CHECK($1, [should_build=1], [should_build=0])
|
||||||
|
|
||||||
# try to configure the component. pay no attention to
|
# try to configure the component
|
||||||
# --enable-dist, since we'll always have makefiles.
|
|
||||||
m4_ifdef([OMPI_MPIEXT_$1_CONFIG], [],
|
m4_ifdef([OMPI_MPIEXT_$1_CONFIG], [],
|
||||||
[m4_fatal([Could not find OMPI_MPIEXT_]$1[_CONFIG macro for ]$1[ component])])
|
[m4_fatal([Could not find OMPI_MPIEXT_]$1[_CONFIG macro for ]$1[ component])])
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
|||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
|
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
|
||||||
dnl Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
|
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2015 Research Organization for Information Science
|
dnl Copyright (c) 2015 Research Organization for Information Science
|
||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
@ -163,18 +163,6 @@ case "$prefix" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Allow the --enable-dist flag to be passed in
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(dist,
|
|
||||||
AC_HELP_STRING([--enable-dist],
|
|
||||||
[guarantee that that the "dist" make target will be functional, although may not guarantee that any other make target will be functional.]),
|
|
||||||
OPAL_WANT_DIST=yes, OPAL_WANT_DIST=no)
|
|
||||||
|
|
||||||
if test "$OPAL_WANT_DIST" = "yes"; then
|
|
||||||
AC_MSG_WARN([Configuring in 'make dist' mode])
|
|
||||||
AC_MSG_WARN([Most make targets may be non-functional!])
|
|
||||||
fi
|
|
||||||
|
|
||||||
# BEGIN: Derived from GASNet
|
# BEGIN: Derived from GASNet
|
||||||
|
|
||||||
# Suggestion from Paul Hargrove to disable --program-prefix and
|
# Suggestion from Paul Hargrove to disable --program-prefix and
|
||||||
|
@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|||||||
dnl University of Stuttgart. All rights reserved.
|
dnl University of Stuttgart. All rights reserved.
|
||||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
||||||
dnl $COPYRIGHT$
|
dnl $COPYRIGHT$
|
||||||
dnl
|
dnl
|
||||||
@ -583,8 +583,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[
|
|||||||
[MCA_$1_$2_$3_COMPILE_MODE($1, $2, $3, compile_mode)],
|
[MCA_$1_$2_$3_COMPILE_MODE($1, $2, $3, compile_mode)],
|
||||||
[MCA_COMPONENT_COMPILE_MODE($1, $2, $3, compile_mode)])
|
[MCA_COMPONENT_COMPILE_MODE($1, $2, $3, compile_mode)])
|
||||||
|
|
||||||
# try to configure the component. pay no attention to
|
# try to configure the component
|
||||||
# --enable-dist, since we'll always have makefiles.
|
|
||||||
m4_ifdef([MCA_$1_$2_$3_CONFIG],
|
m4_ifdef([MCA_$1_$2_$3_CONFIG],
|
||||||
[MCA_$1_$2_$3_CONFIG([should_build=$should_build],
|
[MCA_$1_$2_$3_CONFIG([should_build=$should_build],
|
||||||
[should_build=0])],
|
[should_build=0])],
|
||||||
|
4
contrib/dist/make_dist_tarball
поставляемый
Исполняемый файл → Обычный файл
4
contrib/dist/make_dist_tarball
поставляемый
Исполняемый файл → Обычный файл
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
#
|
#
|
||||||
# Additional copyrights may follow
|
# Additional copyrights may follow
|
||||||
@ -269,7 +269,7 @@ make_tarball() {
|
|||||||
#
|
#
|
||||||
echo "*** Running configure..."
|
echo "*** Running configure..."
|
||||||
rm -f success
|
rm -f success
|
||||||
(./configure --enable-dist 2>&1 && touch success) | tee config.out
|
(./configure 2>&1 && touch success) | tee config.out
|
||||||
if test ! -f success; then
|
if test ! -f success; then
|
||||||
echo "Configure failed. Aborting"
|
echo "Configure failed. Aborting"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
|
||||||
# Copyright (c) 2015 Research Organization for Information Science
|
# Copyright (c) 2015 Research Organization for Information Science
|
||||||
# and Technology (RIST). All rights reserved.
|
# and Technology (RIST). All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
@ -21,10 +21,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
AC_DEFUN([MCA_ompi_io_romio_POST_CONFIG], [
|
AC_DEFUN([MCA_ompi_io_romio_POST_CONFIG], [
|
||||||
AS_IF([test $1 -eq 0 -a "$enable_dist" = "yes"],
|
|
||||||
[AC_MSG_ERROR([ROMIO disabled but --enable-dist specifed. This will result in a bad tarball. Aborting configure.])])
|
|
||||||
AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1])
|
AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1])
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user