* m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level directory upon failure. --- ChangeLog | 7 +++++++ m4/autotroll.m4 | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e584ef2..4c85044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Have AutoTroll always restore the initial ``current directory''. + + * m4/autotroll.m4 (AT_WITH_QT): Always come back to the top-level + directory upon failure. + +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add a warning about Python 2.6 and greater regarding Swilena. * configure.ac: Here. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index 9a7a96e..2a382d4 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -257,6 +257,7 @@ int main() _ASEOF if $QMAKE -project; then :; else AX_INSTEAD_IF([$4], [Calling $QMAKE -project failed.]) + cd .. break fi @@ -265,6 +266,7 @@ _ASEOF test -f $pro_file || pro_file=`echo *.pro` if test -f "$pro_file"; then :; else AX_INSTEAD_IF([$4], [Can't find the .pro file generated by Qmake.]) + cd .. break fi @@ -284,6 +286,7 @@ m4_ifval([$3], if $QMAKE $at_qmake_args; then :; else AX_INSTEAD_IF([$4], [Calling $QMAKE $at_qmake_args failed.]) + cd .. break fi -- 1.5.6.5