Bump up to hwloc v1.0rc3
This commit was SVN r23070.
Этот коммит содержится в:
Jeff Squyres
родитель
b6e401a512
Коммит
71cbe1a69f
@ -5,7 +5,14 @@
|
||||
# via AC_CONFIG_MACRO_DIR in configure.ac.
|
||||
ACLOCAL_AMFLAGS = -I ./config
|
||||
|
||||
SUBDIRS = src utils tests include doc
|
||||
SUBDIRS = src include
|
||||
if HWLOC_BUILD_STANDALONE
|
||||
SUBDIRS += utils tests doc
|
||||
endif
|
||||
|
||||
# Do not let automake automatically add the non-standalone dirs to the
|
||||
# distribution tarball if we're building in embedded mode.
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
|
||||
# Only install the pkg file if we're building in standalone mode
|
||||
if HWLOC_BUILD_STANDALONE
|
||||
@ -17,17 +24,16 @@ endif
|
||||
# "make distcheck" requires that tarballs are able to be able to "make
|
||||
# dist", so we have to include config/distscript.csh.
|
||||
#
|
||||
|
||||
EXTRA_DIST = \
|
||||
README VERSION COPYING AUTHORS \
|
||||
config/hwloc_get_version.sh \
|
||||
config/distscript.csh
|
||||
|
||||
if HWLOC_BUILD_STANDALONE
|
||||
#
|
||||
# Double check that we generated both the doxygen docs and a new copy
|
||||
# of the top-level README file.
|
||||
#
|
||||
|
||||
cannot-dist:
|
||||
@echo "ERROR: Did not build both of the doxygen docs and README."
|
||||
@echo "ERROR: This tarball is not complete!"
|
||||
@ -47,6 +53,7 @@ dist-hook:
|
||||
csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)" "$(HWLOC_SVN_R)"
|
||||
endif HWLOC_BUILD_README
|
||||
endif HWLOC_BUILD_DOXYGEN
|
||||
endif HWLOC_BUILD_STANDALONE
|
||||
|
||||
#
|
||||
# Build the top-level README file
|
||||
|
||||
@ -38,6 +38,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@am__append_1 = utils tests doc
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/hwloc.pc.in \
|
||||
@ -112,7 +113,6 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
||||
distdir dist dist-all distcheck
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
@ -311,7 +311,11 @@ top_srcdir = @top_srcdir@
|
||||
# Note that the -I directory must *exactly* match what was specified
|
||||
# via AC_CONFIG_MACRO_DIR in configure.ac.
|
||||
ACLOCAL_AMFLAGS = -I ./config
|
||||
SUBDIRS = src utils tests include doc
|
||||
SUBDIRS = src include $(am__append_1)
|
||||
|
||||
# Do not let automake automatically add the non-standalone dirs to the
|
||||
# distribution tarball if we're building in embedded mode.
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
|
||||
# Only install the pkg file if we're building in standalone mode
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@pkgconfigdir = $(libdir)/pkgconfig
|
||||
@ -556,6 +560,7 @@ GTAGS:
|
||||
|
||||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
@HWLOC_BUILD_STANDALONE_FALSE@dist-hook:
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
@ -863,20 +868,19 @@ uninstall-am: uninstall-pkgconfigDATA
|
||||
# Double check that we generated both the doxygen docs and a new copy
|
||||
# of the top-level README file.
|
||||
#
|
||||
|
||||
cannot-dist:
|
||||
@echo "ERROR: Did not build both of the doxygen docs and README."
|
||||
@echo "ERROR: This tarball is not complete!"
|
||||
@echo "ERROR: Cowardly refusing to complete successfully..."
|
||||
@exit 1
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@cannot-dist:
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@ @echo "ERROR: Did not build both of the doxygen docs and README."
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@ @echo "ERROR: This tarball is not complete!"
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@ @echo "ERROR: Cowardly refusing to complete successfully..."
|
||||
@HWLOC_BUILD_STANDALONE_TRUE@ @exit 1
|
||||
|
||||
# Refuse to make dist if we can't make the doxygen stuff (note that
|
||||
# BUILD_DOXYGEN will automatically be false if we're not building
|
||||
# standalone).
|
||||
@HWLOC_BUILD_DOXYGEN_FALSE@dist-hook: cannot-dist
|
||||
@HWLOC_BUILD_DOXYGEN_TRUE@@HWLOC_BUILD_README_FALSE@dist-hook: cannot-dist
|
||||
@HWLOC_BUILD_DOXYGEN_TRUE@@HWLOC_BUILD_README_TRUE@dist-hook:
|
||||
@HWLOC_BUILD_DOXYGEN_TRUE@@HWLOC_BUILD_README_TRUE@ csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)" "$(HWLOC_SVN_R)"
|
||||
@HWLOC_BUILD_DOXYGEN_FALSE@@HWLOC_BUILD_STANDALONE_TRUE@dist-hook: cannot-dist
|
||||
@HWLOC_BUILD_DOXYGEN_TRUE@@HWLOC_BUILD_README_FALSE@@HWLOC_BUILD_STANDALONE_TRUE@dist-hook: cannot-dist
|
||||
@HWLOC_BUILD_DOXYGEN_TRUE@@HWLOC_BUILD_README_TRUE@@HWLOC_BUILD_STANDALONE_TRUE@dist-hook:
|
||||
@HWLOC_BUILD_DOXYGEN_TRUE@@HWLOC_BUILD_README_TRUE@@HWLOC_BUILD_STANDALONE_TRUE@ csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)" "$(HWLOC_SVN_R)"
|
||||
|
||||
#
|
||||
# Build the top-level README file
|
||||
|
||||
@ -16,7 +16,7 @@ release=0
|
||||
# requirement is that it must be entirely printable ASCII characters
|
||||
# and have no white space.
|
||||
|
||||
greek=rc2
|
||||
greek=rc3
|
||||
|
||||
# If want_svn=1, then the SVN r number will be included in the overall
|
||||
# hwloc version number in some form.
|
||||
@ -33,11 +33,11 @@ want_svn=0
|
||||
# distribution tarball is being made from an SVN checkout, the value
|
||||
# of svn_r in this file is replaced with the output of "svnversion".
|
||||
|
||||
svn_r=r2008
|
||||
svn_r=r2013
|
||||
|
||||
# The date when this release was created
|
||||
|
||||
date="Apr 26, 2010"
|
||||
date="Apr 29, 2010"
|
||||
|
||||
# The shared library version of hwloc's public library. This version
|
||||
# is maintained in accordance with the "Library Interface Versions"
|
||||
|
||||
@ -541,14 +541,8 @@ EOF])
|
||||
# Always generate these files
|
||||
AC_CONFIG_FILES(
|
||||
hwloc_config_prefix[Makefile]
|
||||
hwloc_config_prefix[doc/Makefile]
|
||||
hwloc_config_prefix[include/Makefile]
|
||||
hwloc_config_prefix[src/Makefile ]
|
||||
hwloc_config_prefix[tests/Makefile ]
|
||||
hwloc_config_prefix[tests/linux/Makefile]
|
||||
hwloc_config_prefix[tests/xml/Makefile]
|
||||
hwloc_config_prefix[tests/ports/Makefile]
|
||||
hwloc_config_prefix[utils/Makefile]
|
||||
)
|
||||
|
||||
# Cleanup
|
||||
|
||||
@ -166,7 +166,9 @@ EOF
|
||||
fi
|
||||
|
||||
# Generate some files for the docs
|
||||
AC_CONFIG_FILES(hwloc_config_prefix[doc/doxygen-config.cfg])
|
||||
AC_CONFIG_FILES(
|
||||
hwloc_config_prefix[doc/Makefile]
|
||||
hwloc_config_prefix[doc/doxygen-config.cfg])
|
||||
])
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
@ -233,7 +235,9 @@ EOF
|
||||
HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_XML_CFLAGS"
|
||||
|
||||
# Only generate this if we're building the utilities
|
||||
AC_CONFIG_FILES(hwloc_config_prefix[hwloc.pc])
|
||||
AC_CONFIG_FILES(
|
||||
hwloc_config_prefix[utils/Makefile]
|
||||
hwloc_config_prefix[hwloc.pc])
|
||||
])dnl
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
@ -251,10 +255,14 @@ EOF
|
||||
|
||||
# Only generate these files if we're making the tests
|
||||
AC_CONFIG_FILES(
|
||||
hwloc_config_prefix[utils/test-hwloc-distrib.sh]
|
||||
hwloc_config_prefix[tests/Makefile ]
|
||||
hwloc_config_prefix[tests/linux/Makefile]
|
||||
hwloc_config_prefix[tests/xml/Makefile]
|
||||
hwloc_config_prefix[tests/ports/Makefile]
|
||||
hwloc_config_prefix[tests/linux/gather-topology.sh]
|
||||
hwloc_config_prefix[tests/linux/test-topology.sh]
|
||||
hwloc_config_prefix[tests/xml/test-topology.sh])
|
||||
hwloc_config_prefix[tests/xml/test-topology.sh]
|
||||
hwloc_config_prefix[utils/test-hwloc-distrib.sh])
|
||||
|
||||
AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x ]hwloc_config_prefix[tests/linux/test-topology.sh ]hwloc_config_prefix[tests/xml/test-topology.sh ]hwloc_config_prefix[tests/linux/gather-topology.sh ]hwloc_config_prefix[utils/test-hwloc-distrib.sh])
|
||||
|
||||
|
||||
76
opal/mca/paffinity/hwloc/hwloc/configure
поставляемый
76
opal/mca/paffinity/hwloc/hwloc/configure
поставляемый
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.65 for hwloc 1.0rc2.
|
||||
# Generated by GNU Autoconf 2.65 for hwloc 1.0rc3.
|
||||
#
|
||||
# Report bugs to <http://www.open-mpi.org/community/help/>.
|
||||
#
|
||||
@ -701,8 +701,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='hwloc'
|
||||
PACKAGE_TARNAME='hwloc'
|
||||
PACKAGE_VERSION='1.0rc2'
|
||||
PACKAGE_STRING='hwloc 1.0rc2'
|
||||
PACKAGE_VERSION='1.0rc3'
|
||||
PACKAGE_STRING='hwloc 1.0rc3'
|
||||
PACKAGE_BUGREPORT='http://www.open-mpi.org/community/help/'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -1541,7 +1541,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures hwloc 1.0rc2 to adapt to many kinds of systems.
|
||||
\`configure' configures hwloc 1.0rc3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1616,7 +1616,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of hwloc 1.0rc2:";;
|
||||
short | recursive ) echo "Configuration of hwloc 1.0rc3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1770,7 +1770,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
hwloc configure 1.0rc2
|
||||
hwloc configure 1.0rc3
|
||||
generated by GNU Autoconf 2.65
|
||||
|
||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
@ -2412,7 +2412,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by hwloc $as_me 1.0rc2, which was
|
||||
It was created by hwloc $as_me 1.0rc3, which was
|
||||
generated by GNU Autoconf 2.65. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -3346,7 +3346,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='hwloc'
|
||||
VERSION='1.0rc2'
|
||||
VERSION='1.0rc3'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -4710,10 +4710,20 @@ fi
|
||||
# If the user didn't specifically ask for embedding mode, default to
|
||||
# standalone mode
|
||||
if test "$enable_embedded_mode" != "yes"; then :
|
||||
if test ! -d "$srcdir/doc"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The hwloc source tree looks incomplete for a standalobe" >&5
|
||||
$as_echo "$as_me: WARNING: The hwloc source tree looks incomplete for a standalobe" >&2;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: build. Perhaps this hwloc tree is intended for an embedded" >&5
|
||||
$as_echo "$as_me: WARNING: build. Perhaps this hwloc tree is intended for an embedded" >&2;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: build? Try using the --enable-embedded-mode switch." >&5
|
||||
$as_echo "$as_me: WARNING: build? Try using the --enable-embedded-mode switch." >&2;}
|
||||
as_fn_error "Cannot continue" "$LINENO" 5
|
||||
else
|
||||
|
||||
hwloc_mode=standalone
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
# Setup the hwloc core
|
||||
|
||||
@ -9953,7 +9963,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CPPFLAGS="$old_CPPFLAGS"
|
||||
|
||||
# Always generate these files
|
||||
ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile src/Makefile tests/Makefile tests/linux/Makefile tests/xml/Makefile tests/ports/Makefile utils/Makefile"
|
||||
ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile"
|
||||
|
||||
|
||||
# Cleanup
|
||||
@ -10885,7 +10895,7 @@ $as_echo "no (default)" >&6; }
|
||||
fi
|
||||
|
||||
# Generate some files for the docs
|
||||
ac_config_files="$ac_config_files doc/doxygen-config.cfg"
|
||||
ac_config_files="$ac_config_files doc/Makefile doc/doxygen-config.cfg"
|
||||
|
||||
|
||||
|
||||
@ -11698,7 +11708,7 @@ done
|
||||
HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_XML_CFLAGS"
|
||||
|
||||
# Only generate this if we're building the utilities
|
||||
ac_config_files="$ac_config_files hwloc.pc"
|
||||
ac_config_files="$ac_config_files utils/Makefile hwloc.pc"
|
||||
|
||||
|
||||
|
||||
@ -11712,7 +11722,7 @@ EOF
|
||||
hwloc_build_tests=yes
|
||||
|
||||
# Only generate these files if we're making the tests
|
||||
ac_config_files="$ac_config_files utils/test-hwloc-distrib.sh tests/linux/gather-topology.sh tests/linux/test-topology.sh tests/xml/test-topology.sh"
|
||||
ac_config_files="$ac_config_files tests/Makefile tests/linux/Makefile tests/xml/Makefile tests/ports/Makefile tests/linux/gather-topology.sh tests/linux/test-topology.sh tests/xml/test-topology.sh utils/test-hwloc-distrib.sh"
|
||||
|
||||
|
||||
ac_config_commands="$ac_config_commands chmoding-scripts"
|
||||
@ -12513,13 +12523,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
|
||||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
(eval echo "\"\$as_me:12516: $ac_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12526: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:12519: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval echo "\"\$as_me:12529: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
(eval echo "\"\$as_me:12522: output\"" >&5)
|
||||
(eval echo "\"\$as_me:12532: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@ -13721,7 +13731,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 13724 "configure"' > conftest.$ac_ext
|
||||
echo '#line 13734 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -15221,11 +15231,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15224: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15234: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15228: \$? = $ac_status" >&5
|
||||
echo "$as_me:15238: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -15560,11 +15570,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15563: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15573: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15567: \$? = $ac_status" >&5
|
||||
echo "$as_me:15577: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -15665,11 +15675,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15668: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15678: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15672: \$? = $ac_status" >&5
|
||||
echo "$as_me:15682: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -15720,11 +15730,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15723: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15733: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15727: \$? = $ac_status" >&5
|
||||
echo "$as_me:15737: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -18087,7 +18097,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 18090 "configure"
|
||||
#line 18100 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -18183,7 +18193,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 18186 "configure"
|
||||
#line 18196 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19046,7 +19056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by hwloc $as_me 1.0rc2, which was
|
||||
This file was extended by hwloc $as_me 1.0rc3, which was
|
||||
generated by GNU Autoconf 2.65. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -19116,7 +19126,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
hwloc config.status 1.0rc2
|
||||
hwloc config.status 1.0rc3
|
||||
configured by $0, generated by GNU Autoconf 2.65,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
@ -19499,20 +19509,20 @@ do
|
||||
"include/private/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/private/config.h" ;;
|
||||
"include/hwloc/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/hwloc/config.h" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
||||
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
|
||||
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
||||
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
||||
"doc/doxygen-config.cfg") CONFIG_FILES="$CONFIG_FILES doc/doxygen-config.cfg" ;;
|
||||
"utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
|
||||
"hwloc.pc") CONFIG_FILES="$CONFIG_FILES hwloc.pc" ;;
|
||||
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
|
||||
"tests/linux/Makefile") CONFIG_FILES="$CONFIG_FILES tests/linux/Makefile" ;;
|
||||
"tests/xml/Makefile") CONFIG_FILES="$CONFIG_FILES tests/xml/Makefile" ;;
|
||||
"tests/ports/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ports/Makefile" ;;
|
||||
"utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
|
||||
"doc/doxygen-config.cfg") CONFIG_FILES="$CONFIG_FILES doc/doxygen-config.cfg" ;;
|
||||
"hwloc.pc") CONFIG_FILES="$CONFIG_FILES hwloc.pc" ;;
|
||||
"utils/test-hwloc-distrib.sh") CONFIG_FILES="$CONFIG_FILES utils/test-hwloc-distrib.sh" ;;
|
||||
"tests/linux/gather-topology.sh") CONFIG_FILES="$CONFIG_FILES tests/linux/gather-topology.sh" ;;
|
||||
"tests/linux/test-topology.sh") CONFIG_FILES="$CONFIG_FILES tests/linux/test-topology.sh" ;;
|
||||
"tests/xml/test-topology.sh") CONFIG_FILES="$CONFIG_FILES tests/xml/test-topology.sh" ;;
|
||||
"utils/test-hwloc-distrib.sh") CONFIG_FILES="$CONFIG_FILES utils/test-hwloc-distrib.sh" ;;
|
||||
"chmoding-scripts") CONFIG_COMMANDS="$CONFIG_COMMANDS chmoding-scripts" ;;
|
||||
"tests/ports/topology.c") CONFIG_LINKS="$CONFIG_LINKS tests/ports/topology.c:src/topology.c" ;;
|
||||
"tests/ports/traversal.c") CONFIG_LINKS="$CONFIG_LINKS tests/ports/traversal.c:src/traversal.c" ;;
|
||||
|
||||
@ -116,7 +116,12 @@ AS_IF([test "$hwloc_debug" = "1"],
|
||||
# If the user didn't specifically ask for embedding mode, default to
|
||||
# standalone mode
|
||||
AS_IF([test "$enable_embedded_mode" != "yes"],
|
||||
[HWLOC_BUILD_STANDALONE])
|
||||
[AS_IF([test ! -d "$srcdir/doc"],
|
||||
[AC_MSG_WARN([The hwloc source tree looks incomplete for a standalobe])
|
||||
AC_MSG_WARN([build. Perhaps this hwloc tree is intended for an embedded])
|
||||
AC_MSG_WARN([build? Try using the --enable-embedded-mode switch.])
|
||||
AC_MSG_ERROR([Cannot continue])],
|
||||
[HWLOC_BUILD_STANDALONE])])
|
||||
|
||||
# Setup the hwloc core
|
||||
HWLOC_SETUP_CORE([], [], [hwloc_setup=unhappy], [1])
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user