1
1

Make autogen.sh and friends be a little smarter -- don't let autogen.sh

complete successfully if you have a [an obvious] problem in your module

This commit was SVN r380.
Этот коммит содержится в:
Jeff Squyres 2004-01-14 20:57:03 +00:00
родитель f7c3e7f1ff
Коммит a0089087aa
3 изменённых файлов: 71 добавлений и 24 удалений

Просмотреть файл

@ -311,6 +311,10 @@ EOF
"$rgt_lam_topdir/config/mca_make_configure.pl" \
--lamdir "$rgt_lam_topdir" \
--moduledir "`pwd`"
if test "$?" != "0"; then
echo "*** autogen.sh failed to complete!"
exit 1
fi
happy=1
file=configure.ac
elif test -f configure.in; then

Просмотреть файл

@ -24,6 +24,7 @@ AC_SUBST(top_lam_builddir)
# Get the version of @MCA_TYPE@ @MCA_MODULE_NAME@ that we are installing.
if test -n "@PARAM_VERSION_FILE@" -a -f "@PARAM_VERSION_FILE@"; then
LAM_GET_VERSION($srcdir/../../../../../config, @PARAM_VERSION_FILE@,
@PARAM_VAR_PREFIX@)
@ -48,13 +49,17 @@ AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_CVS_VERSION,
AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_VERSION,
"$@PARAM_VAR_PREFIX@_VERSION",
[Overall LAM MCA @MCA_TYPE@ @MCA_MODULE_NAME@ version number])
version_string="version $@PARAM_VAR_PREFIX@_VERSION"
else
version_string=""
fi
#
# Start it up
#
LAM_CONFIGURE_SETUP
lam_show_title "Configuring MCA @MCA_TYPE@ @MCA_MODULE_NAME@ module version $@PARAM_VAR_PREFIX@_VERSION"
lam_show_title "Configuring MCA @MCA_TYPE@ @MCA_MODULE_NAME@ module $version_string"
lam_show_subtitle "Initialization, setup"
#

Просмотреть файл

@ -244,6 +244,42 @@ foreach my $key (sort keys(%config_param_names)) {
}
# Do some error checking on the values that we've determined
if (! -f $config_params{PARAM_INIT_FILE}) {
print "*** WARNING: PARAM_INIT_FILE does not exist:\n";
print "*** WARNING: $config_params{PARAM_INIT_FILE}\n";
print "*** WARNING: resulting configure script will not run properly!\n";
exit(1);
}
if ($config_params{PARAM_INIT_FILE} eq "" ||
! -f $config_params{PARAM_INIT_FILE}) {
print "*** WARNING: PARAM_VERSION_FILE does not exit:\n";
print "*** WARNING: $config_params{PARAM_VERSION_FILE} does not exist!\n";
print "*** WARNING: resulting configure script will not check for the version!!\n";
}
my @files = split(/ /, $config_params{PARAM_CONFIG_FILES});
foreach my $file (@files) {
if (! -f "$file.in" && ! -f "$file.am") {
print "*** WARNING: PARAM_CONFIG_FILES file does not exist:\n";
print "*** WARNING: $file.[in|am]\n";
print "*** WARNING: resulting configure script may not run correctly!!\n";
exit(1);
}
}
if (! -d $config_params{PARAM_CONFIG_AUX_DIR}) {
print "*** WARNING: PARAM_CONFIG_AUX_DIR does not exit:\n";
print "*** WARNING: $config_params{PARAM_CONFIG_AUX_DIR}\n";
print "*** WARNING: Taking the liberty of trying to make it...\n";
if (mkdir($config_params{PARAM_CONFIG_AUX_DIR})) {
printf("BARF\n");
exit(1);
}
}
############################################################################
# Read in the configure.ac template
############################################################################
@ -312,3 +348,5 @@ make_template("$lam_topdir/config/mca_acinclude.m4",
############################################################################
print "\n$announce_str finished\n";
exit(0);