Add a command to autogen --skip-configure to allow the autogen/configure steps
to be split for the build tinderbox. Originally committed to SVN as r2834.
This commit is contained in:
parent
544c325dde
commit
af68c58f56
1 changed files with 32 additions and 28 deletions
|
@ -225,21 +225,22 @@ if test "$DIE" -eq 1; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo
|
if ! test "$1" = "--skip-configure"; then
|
||||||
echo "I am going to run ./configure with the following arguments:"
|
echo
|
||||||
echo
|
echo "I am going to run ./configure with the following arguments:"
|
||||||
echo " --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@"
|
echo
|
||||||
echo
|
echo " --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@"
|
||||||
|
echo
|
||||||
|
|
||||||
if test -z "$*"; then
|
if test -z "$*"; then
|
||||||
echo "If you wish to pass additional arguments, please specify them "
|
echo "If you wish to pass additional arguments, please specify them "
|
||||||
echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
|
echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
|
||||||
echo "environment variable."
|
echo "environment variable."
|
||||||
echo
|
echo
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo "--- Checking for required M4 files ---"
|
echo "--- Checking for required M4 files ---"
|
||||||
|
|
||||||
if test -z "$ACLOCAL_FLAGS"; then
|
if test -z "$ACLOCAL_FLAGS"; then
|
||||||
|
@ -326,24 +327,27 @@ $INTLTOOLIZE --force --automake || exit $?
|
||||||
|
|
||||||
cd $ORIGDIR
|
cd $ORIGDIR
|
||||||
|
|
||||||
echo "--- $srcdir/configure ---"
|
if ! test "$1" = "--skip-configure"; then
|
||||||
$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@"
|
echo "--- $srcdir/configure ---"
|
||||||
RC=$?
|
$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@"
|
||||||
|
RC=$?
|
||||||
|
|
||||||
echo
|
|
||||||
echo
|
|
||||||
echo "***********************************************************************"
|
|
||||||
echo "*"
|
|
||||||
echo "* Please do not ask for support when using the SVN verison of aegisub,"
|
|
||||||
echo "* download an official distfile in order to receive support."
|
|
||||||
echo "*"
|
|
||||||
echo "***********************************************************************"
|
|
||||||
echo
|
|
||||||
|
|
||||||
if test $RC -ne 0; then
|
|
||||||
echo
|
echo
|
||||||
echo "Configure failed or did not finish!"
|
echo
|
||||||
exit $RC
|
echo "***********************************************************************"
|
||||||
|
echo "*"
|
||||||
|
echo "* Please do not ask for support when using the SVN verison of aegisub,"
|
||||||
|
echo "* download an official distfile in order to receive support."
|
||||||
|
echo "*"
|
||||||
|
echo "***********************************************************************"
|
||||||
|
echo
|
||||||
|
|
||||||
|
if test $RC -ne 0; then
|
||||||
|
echo
|
||||||
|
echo "Configure failed or did not finish!"
|
||||||
|
exit $RC
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Now type 'make' to compile $PROJECT."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Now type 'make' to compile $PROJECT."
|
|
||||||
|
|
Loading…
Reference in a new issue