diff options
author | Didier Raboud <didier@raboud.com> | 2010-05-23 00:04:56 +0200 |
---|---|---|
committer | Didier Raboud <didier@raboud.com> | 2010-05-23 00:04:56 +0200 |
commit | d4e4171fdc1f17f8acd5129dcb4d69fc58bd11f4 (patch) | |
tree | 865a50bf11c9cc6c2e3de0ff9bbe6ac2a45f042b /configure | |
parent | 9ecc61cbf49d7d1742433d6333c56f2f1b8ad2b0 (diff) | |
parent | 6fefeecb6abbb1f7dfe07ade1a0abef06dac5d32 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -883,7 +883,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2748,11 +2748,6 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -2791,6 +2786,12 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub |