diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-01-06 18:50:43 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-01-06 18:50:43 +0000 |
| commit | 9a4f0d8ca31af2b48313d19b2dc67a5bea5c50f6 (patch) | |
| tree | 6633b7f0d3cefbbea2358fd6c7c6028ad076fcb8 | |
| parent | 9f99d056a263e71a5e6181224829def906cf0226 (diff) | |
configure: move SHAVE_INIT behind all checks
Move SHAVE_INIT behind all other checks, in particular AG_GST_CHECK_CHECKS.
This should fix problems with header checking and checking for localtime_r,
which causes compilation errors with clean checkouts where common/shave has
not been created yet when those checks are run. It seems like SHAVE_INIT
changes the environment so that checks depending on a compiler need shave
to exist at that point, which will fail if AC_OUTPUT hasn't created it yet.
Fixes #605930.
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index cbb7dd702a..d50c91ec3f 100644 --- a/configure.ac +++ b/configure.ac @@ -657,12 +657,12 @@ AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/gstreamer-$GST_MAJORMINO AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_INSTALLED, "$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner]) -SHAVE_INIT([common],[enable]) - dnl things for our internal libcheck (must be called even if building dnl libcheck is disabled because it defines conditionals) AG_GST_CHECK_CHECKS() +SHAVE_INIT([common],[enable]) + AC_CONFIG_FILES( Makefile common/shave |