Commit 0839221b authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r10740] Merge hydra-specific hwloc patches from r10209 and r10332.

No reviewer.
parent 5fd136e8
......@@ -9,10 +9,10 @@ ACLOCAL_AMFLAGS = -I ./config
SUBDIRS = src include
if HWLOC_BUILD_STANDALONE
SUBDIRS += utils tests
# SUBDIRS += utils tests
# We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
# There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
SUBDIRS += doc
# SUBDIRS += doc
endif
# Do not let automake automatically add the non-standalone dirs to the
......
:
autoreconf -ivf
autoreconf ${autoreconf_args:"-ivf"}
......@@ -573,6 +573,16 @@ EOF])
AC_CHECK_HEADERS([malloc.h])
AC_CHECK_FUNCS([getpagesize memalign posix_memalign])
# when autoheader is run, it doesn't know about
# PAC_FUNC_NEEDS_DECL, so it doesn't generate an appropriate line
# in config.h.in. We need to fool it with a dummy AC_DEFINE().
if false ; then
AC_DEFINE([NEEDS_GETPAGESIZE_DECL], 1, [Define to 1 if getpagesize needs a declaration])
fi
if test $ac_cv_func_getpagesize = "yes" ; then
PAC_FUNC_NEEDS_DECL([#include <unistd.h>],getpagesize)
fi
AC_CHECK_HEADERS([sys/utsname.h])
AC_CHECK_FUNCS([uname])
......
......@@ -176,6 +176,19 @@ AC_CONFIG_FILES([src/libltdl/Makefile])
#CPPFLAGS="$CPPFLAGS -I$HWLOC_top_builddir"
AC_CONFIG_COMMANDS_PRE([LT_CONFIG_H=`expr "$LT_CONFIG_H" : '.*/\(.*\)'`])
## Enable creation of libtool-style versioning or no versioning
AC_ARG_ENABLE(versioning,
[AC_HELP_STRING([--enable-versioning],[Enable library versioning])],,
[enable_versioning=yes])
if test "$enable_versioning" = "yes" ; then
libhwloc_so_versionflags="-version-info \$(libhwloc_so_version)"
else
libhwloc_so_versionflags="-avoid-version"
fi
export libhwloc_so_versionflags
AC_SUBST(libhwloc_so_versionflags)
# Party on
AC_OUTPUT
......
......@@ -29,6 +29,10 @@
#endif
#include <string.h>
#if defined(HAVE_GETPAGESIZE) && defined(NEEDS_GETPAGESIZE_DECL)
int getpagesize(void);
#endif
#ifdef HWLOC_HAVE_ATTRIBUTE_FORMAT
# if HWLOC_HAVE_ATTRIBUTE_FORMAT
# define __hwloc_attribute_format(type, str, arg) __attribute__((__format__(type, str, arg)))
......
......@@ -136,7 +136,7 @@ endif HWLOC_HAVE_WINDOWS
# Installable library
libhwloc_la_SOURCES = $(sources)
libhwloc_la_LDFLAGS = $(ldflags) -version-info $(libhwloc_so_version) $(HWLOC_LIBS)
libhwloc_la_LDFLAGS = $(ldflags) $(libhwloc_so_versionflags) $(HWLOC_LIBS)
if HWLOC_HAVE_PLUGINS
AM_CPPFLAGS += $(LTDLINCL)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment