mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-07 12:08:19 +02:00
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>
This commit is contained in:
parent
f5effd041f
commit
69839f8903
1 changed files with 4 additions and 4 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue