diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-27 10:34:16 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-27 10:36:06 -0700 |
| commit | 69839f8903a24eab08f17a781b3797fb64dce9cf (patch) | |
| tree | ff66742d80c67c47f6c4574a05c3c85a8b0bde95 | |
| parent | f5effd041f58ef07703cca2b4f396758811e1eec (diff) | |
Bug 24173: libX11 from git fails to build with automake older then 1.11
AM_CONDITIONAL must come *before* the AC_OUTPUT that creates the
Makefiles, instead of after.
<http://bugs.freedesktop.org/show_bug.cgi?id=24173>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8bcbb32a..b8ccdceb 100644 --- a/configure.ac +++ b/configure.ac @@ -428,6 +428,10 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database]) XORG_CHECK_MALLOC_ZERO +# Support AM_SILENT_RULES if automake-1.11 or later is used +m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes]) +AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x) + AC_OUTPUT([Makefile include/Makefile man/Makefile @@ -516,10 +520,6 @@ if test -z "$man_pages_suffix"; then man_pages_suffix=none fi -# Support AM_SILENT_RULES if automake-1.11 or later is used -m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes]) -AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x) - echo "" echo "X11 will be built with the following settings:" echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N |