Commit e1725fb9 authored by William Gropp's avatar William Gropp
Browse files

Fix for VPATH build for configure dependency

The configure dependency in Makefile.in was incorrect for a VPATH build,
causing the make to fail.  This adds a correct dependency, along with
adding an --enable-maintainer-mode similar to the Automake version.
It also fixes the dist target to work in a vpath directory.  subminor
version number was updated.
parent eaf436a8
MPE (Multi-Processing Environment) MPE (Multi-Processing Environment)
---------------------------------- ----------------------------------
Version 2.4.7. August, 2014 Version 2.4.8. August, 2015
Mathematics and Computer Science Division Mathematics and Computer Science Division
Argonne National Laboratory Argonne National Laboratory
...@@ -212,7 +212,7 @@ Other User Options: ...@@ -212,7 +212,7 @@ Other User Options:
have the X11 include files or that do not have the X11 include files or that do not
support X11 graphics. The default enable=yes. support X11 graphics. The default enable=yes.
--enable-collchk bild MPI Collective and Datatype --enable-collchk build MPI Collective and Datatype
checking library, libmpe_collchk.a checking library, libmpe_collchk.a
--enable-slog2[=build] Configure all the SLOG-2 tools. --enable-slog2[=build] Configure all the SLOG-2 tools.
...@@ -222,6 +222,13 @@ Other User Options: ...@@ -222,6 +222,13 @@ Other User Options:
jar files from the source code. jar files from the source code.
The default is enable=yes. The default is enable=yes.
--enable-maintainer-mode Intended for developers who may modify the
configure.ac script, this creates a
dependency for configure on the input files
such as configure.ac. Disabled by default
in the distributed tarball; enabled by default
in the git repository version.
--with-java=JAVA_HOME Specify the path of the top-level directory --with-java=JAVA_HOME Specify the path of the top-level directory
of the Java, j2sdk, installation. If this of the Java, j2sdk, installation. If this
option or --with-java2 is not given, option or --with-java2 is not given,
......
...@@ -9,6 +9,8 @@ CP = @CPRP@ ...@@ -9,6 +9,8 @@ CP = @CPRP@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = .:@top_srcdir@
# Build directories # Build directories
includebuild_dir = @includebuild_dir@ includebuild_dir = @includebuild_dir@
libbuild_dir = @libbuild_dir@ libbuild_dir = @libbuild_dir@
...@@ -194,12 +196,16 @@ owner-clean: clean_bin clean_lib distclean-misc ...@@ -194,12 +196,16 @@ owner-clean: clean_bin clean_lib distclean-misc
@-$(RM) -f mpe_conf.h.in @-$(RM) -f mpe_conf.h.in
@-$(RM) -f configure @-$(RM) -f configure
configure: configure.ac aclocal_core.m4 aclocal_f77.m4 aclocal_make.m4 \ configure_deps = $(top_srcdir)/configure.ac \
aclocal_mpi.m4 aclocal.m4 $(top_srcdir)/aclocal_core.m4 \
autoheader $(top_srcdir)/aclocal_f77.m4 \
autoconf $(top_srcdir)/aclocal_make.m4 \
$(top_srcdir)/aclocal_mpi.m4 \
$(top_srcdir)/aclocal.m4
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(configure_deps)
(cd $(top_srcdir) && ./autogen.sh)
Makefile: configure Makefile.in Makefile: $(top_srcdir)/configure $(top_srcdir)/Makefile.in config.status
./config.status ./config.status
# Allow dependencies target # Allow dependencies target
...@@ -222,6 +228,7 @@ ctags: tags ...@@ -222,6 +228,7 @@ ctags: tags
## TODO: Add support for things like DISTDIR ## TODO: Add support for things like DISTDIR
DISTDIRS = etc src include cross_spec sbin bin maint DISTDIRS = etc src include cross_spec sbin bin maint
DISTFILES = INSTALL INSTALL.cross Makefile.in README README.windows \ DISTFILES = INSTALL INSTALL.cross Makefile.in README README.windows \
COPYRIGHT \
aclocal.m4 aclocal_core.m4 aclocal_f77.m4 aclocal_inttypes.m4 \ aclocal.m4 aclocal_core.m4 aclocal_f77.m4 aclocal_inttypes.m4 \
aclocal_make.m4 aclocal_mpi.m4 autogen.sh fmpe.def mpe.def \ aclocal_make.m4 aclocal_mpi.m4 autogen.sh fmpe.def mpe.def \
mpe.vcproj mpewrap.vcproj configure.ac install-sh config.sub \ mpe.vcproj mpewrap.vcproj configure.ac install-sh config.sub \
...@@ -232,6 +239,8 @@ DISTFILES = INSTALL INSTALL.cross Makefile.in README README.windows \ ...@@ -232,6 +239,8 @@ DISTFILES = INSTALL INSTALL.cross Makefile.in README README.windows \
# for almost every file (!). # for almost every file (!).
# WARNING: To ensure a clean distribution file, this executes a "distclean" # WARNING: To ensure a clean distribution file, this executes a "distclean"
# step, which will remove all of the generated files, including this Makefile. # step, which will remove all of the generated files, including this Makefile.
# The sed on configure.ac changes the default for maintainer mode from on to
# off
dist: Makefile dist: Makefile
@$(MAKE) distclean @$(MAKE) distclean
@if [ ! -d tmp ] ; then mkdir tmp ; \ @if [ ! -d tmp ] ; then mkdir tmp ; \
...@@ -239,8 +248,10 @@ dist: Makefile ...@@ -239,8 +248,10 @@ dist: Makefile
@if [ -d mpe2-@VERSION@ ] ; then \ @if [ -d mpe2-@VERSION@ ] ; then \
echo "Remove the mpe2-@VERSION@ directory first"; exit 1; fi echo "Remove the mpe2-@VERSION@ directory first"; exit 1; fi
@if [ -f mpe2-@VERSION@.tgz ] ; then $(RM) -f mpe2-@VERSION@.tgz ; fi @if [ -f mpe2-@VERSION@.tgz ] ; then $(RM) -f mpe2-@VERSION@.tgz ; fi
for dir in $(DISTDIRS) ; do cp -rp $$dir tmp/$$dir ; done for dir in $(DISTDIRS) ; do cp -rp $(top_srcdir)/$$dir tmp/$$dir ; done
for file in $(DISTFILES) ; do cp -p $$file tmp/$$file ; done for file in $(DISTFILES) ; do cp -p $(top_srcdir)/$$file tmp/$$file ; done
sed -e 's%useMaintainerMode=yes%useMaintainerMode=no%g' \
$(top_srcdir)/configure.ac > tmp/configure.ac
(cd tmp && ./autogen.sh) (cd tmp && ./autogen.sh)
(cd tmp && chmod -R -N *) (cd tmp && chmod -R -N *)
(cd tmp && find . -name '.gitignore*' -print | xargs $(RM)) (cd tmp && find . -name '.gitignore*' -print | xargs $(RM))
......
MPE (Multi-Processing Environment) MPE (Multi-Processing Environment)
---------------------------------- ----------------------------------
Version 2.4.7. August, 2014 Version 2.4.8. August, 2015
Mathematics and Computer Science Division Mathematics and Computer Science Division
Argonne National Laboratory Argonne National Laboratory
......
...@@ -11,6 +11,17 @@ AC_INIT() ...@@ -11,6 +11,17 @@ AC_INIT()
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AC_CONFIG_HEADER(mpe_conf.h) AC_CONFIG_HEADER(mpe_conf.h)
# Some targets in the Makefile that are used to update the configure script
# and similar programs can cause trouble for users of a distribution.
# Following an approach similar to that in Automake, define a
# maintainer mode that is set to off by default in the distributed version
MAINTAINER_MODE_TRUE='#'
AC_ARG_ENABLE([maintainer_mode],[ --enable-maintainer-mode - Include Makefile targets intended for maintainers],[useMaintainerMode=$enable_val],[useMaintainerMode=yes])
if test $useMaintainerMode = "yes" ; then
MAINTAINER_MODE_TRUE=' '
fi
AC_SUBST([MAINTAINER_MODE_TRUE])
# #
echo "Configuring MPE Profiling System with $ac_configure_args" echo "Configuring MPE Profiling System with $ac_configure_args"
dnl dnl
...@@ -44,7 +55,7 @@ AC_ARG_ENABLE( softerror, ...@@ -44,7 +55,7 @@ AC_ARG_ENABLE( softerror,
, enable_softerror=${mpe_enable_softerror:-no} ) , enable_softerror=${mpe_enable_softerror:-no} )
# If you change the version here, make sure you change it in README and INSTALL # If you change the version here, make sure you change it in README and INSTALL
VERSION="2.4.7" VERSION="2.4.8"
AC_SUBST([VERSION]) AC_SUBST([VERSION])
dnl Don't preset F77 when MPE is configured with MPICH2 dnl Don't preset F77 when MPE is configured with MPICH2
dnl otherwise AC_PROG_F77 or other PAC F77 tests could be messed up below. dnl otherwise AC_PROG_F77 or other PAC F77 tests could be messed up below.
......
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