Skip to content

Commit

Permalink
SteamOS compositor v1.29:
Browse files Browse the repository at this point in the history 
 - JohnV migrated the package to Brewmaster
 - New set_hd_mode step in SteamOS session, dumps display device EDID and diagnostic logs
 - Fix steamcompmgr interacting with multiple windows on Brewmaster, improve focusing heuristics

There's a regression with destroying windows that causes us to display white during fadeout, need to look into it.

Ran through all the known problematic games and testing scenarios.
  • Loading branch information
@Plagman
Plagman committed Sep 9, 2019
1 parent d740313 commit 305e0a4
Show file tree
Hide file tree
Showing 31 changed files with 2,978 additions and 172 deletions.
769 changes: 769 additions & 0 deletions Makefile
View file

Large diffs are not rendered by default.

104 changes: 94 additions & 10 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Expand All @@ -17,6 +17,23 @@


VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
Expand All @@ -33,9 +50,10 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
bin_PROGRAMS = steamcompmgr$(EXEEXT)
bin_PROGRAMS = steamcompmgr$(EXEEXT) loadargb_cursor$(EXEEXT) \
udev_is_boot_vga$(EXEEXT)
subdir = .
DIST_COMMON = $(am__configure_deps) $(dist_doc_DATA) \
DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Expand All @@ -49,12 +67,23 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docdir)"
PROGRAMS = $(bin_PROGRAMS)
am_loadargb_cursor_OBJECTS = loadargb_cursor-loadargbcursor.$(OBJEXT)
loadargb_cursor_OBJECTS = $(am_loadargb_cursor_OBJECTS)
am__DEPENDENCIES_1 =
loadargb_cursor_DEPENDENCIES = $(am__DEPENDENCIES_1)
loadargb_cursor_LINK = $(CCLD) $(loadargb_cursor_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
am_steamcompmgr_OBJECTS = steamcompmgr-steamcompmgr.$(OBJEXT)
steamcompmgr_OBJECTS = $(am_steamcompmgr_OBJECTS)
am__DEPENDENCIES_1 =
steamcompmgr_DEPENDENCIES = $(am__DEPENDENCIES_1)
steamcompmgr_LINK = $(CCLD) $(steamcompmgr_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
am_udev_is_boot_vga_OBJECTS = \
udev_is_boot_vga-udev_is_boot_vga.$(OBJEXT)
udev_is_boot_vga_OBJECTS = $(am_udev_is_boot_vga_OBJECTS)
udev_is_boot_vga_DEPENDENCIES = $(am__DEPENDENCIES_1)
udev_is_boot_vga_LINK = $(CCLD) $(udev_is_boot_vga_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
Expand All @@ -63,8 +92,15 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(steamcompmgr_SOURCES)
DIST_SOURCES = $(steamcompmgr_SOURCES)
SOURCES = $(loadargb_cursor_SOURCES) $(steamcompmgr_SOURCES) \
$(udev_is_boot_vga_SOURCES)
DIST_SOURCES = $(loadargb_cursor_SOURCES) $(steamcompmgr_SOURCES) \
$(udev_is_boot_vga_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
Expand Down Expand Up @@ -198,11 +234,17 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
steamcompmgr_SOURCES = src/steamcompmgr.c
steamcompmgr_SOURCES = src/steamcompmgr.c src/glext.h
loadargb_cursor_SOURCES = src/loadargbcursor.c
udev_is_boot_vga_SOURCES = src/udev_is_boot_vga.c
AM_CFLAGS = $(DEPS_CFLAGS)
AM_LIBS = $(DEPS_LIBS)
steamcompmgr_CFLAGS = $(DEPS_CFLAGS)
steamcompmgr_LDADD = $(DEPS_LIBS)
loadargb_cursor_CFLAGS = $(DEPS_CFLAGS)
loadargb_cursor_LDADD = $(DEPS_LIBS)
udev_is_boot_vga_CFLAGS = $(DEPS_CFLAGS)
udev_is_boot_vga_LDADD = $(DEPS_LIBS)
dist_doc_DATA = README
all: all-am

Expand Down Expand Up @@ -244,8 +286,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p; \
Expand Down Expand Up @@ -279,17 +324,25 @@ uninstall-binPROGRAMS:

clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
loadargb_cursor$(EXEEXT): $(loadargb_cursor_OBJECTS) $(loadargb_cursor_DEPENDENCIES) $(EXTRA_loadargb_cursor_DEPENDENCIES)
@rm -f loadargb_cursor$(EXEEXT)
$(loadargb_cursor_LINK) $(loadargb_cursor_OBJECTS) $(loadargb_cursor_LDADD) $(LIBS)
steamcompmgr$(EXEEXT): $(steamcompmgr_OBJECTS) $(steamcompmgr_DEPENDENCIES) $(EXTRA_steamcompmgr_DEPENDENCIES)
@rm -f steamcompmgr$(EXEEXT)
$(steamcompmgr_LINK) $(steamcompmgr_OBJECTS) $(steamcompmgr_LDADD) $(LIBS)
udev_is_boot_vga$(EXEEXT): $(udev_is_boot_vga_OBJECTS) $(udev_is_boot_vga_DEPENDENCIES) $(EXTRA_udev_is_boot_vga_DEPENDENCIES)
@rm -f udev_is_boot_vga$(EXEEXT)
$(udev_is_boot_vga_LINK) $(udev_is_boot_vga_OBJECTS) $(udev_is_boot_vga_LDADD) $(LIBS)

mostlyclean-compile:
-rm -f *.$(OBJEXT)

distclean-compile:
-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadargb_cursor-loadargbcursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/steamcompmgr-steamcompmgr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Po@am__quote@

.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Expand All @@ -305,6 +358,20 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

loadargb_cursor-loadargbcursor.o: src/loadargbcursor.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadargb_cursor_CFLAGS) $(CFLAGS) -MT loadargb_cursor-loadargbcursor.o -MD -MP -MF $(DEPDIR)/loadargb_cursor-loadargbcursor.Tpo -c -o loadargb_cursor-loadargbcursor.o `test -f 'src/loadargbcursor.c' || echo '$(srcdir)/'`src/loadargbcursor.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadargb_cursor-loadargbcursor.Tpo $(DEPDIR)/loadargb_cursor-loadargbcursor.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/loadargbcursor.c' object='loadargb_cursor-loadargbcursor.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadargb_cursor_CFLAGS) $(CFLAGS) -c -o loadargb_cursor-loadargbcursor.o `test -f 'src/loadargbcursor.c' || echo '$(srcdir)/'`src/loadargbcursor.c

loadargb_cursor-loadargbcursor.obj: src/loadargbcursor.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadargb_cursor_CFLAGS) $(CFLAGS) -MT loadargb_cursor-loadargbcursor.obj -MD -MP -MF $(DEPDIR)/loadargb_cursor-loadargbcursor.Tpo -c -o loadargb_cursor-loadargbcursor.obj `if test -f 'src/loadargbcursor.c'; then $(CYGPATH_W) 'src/loadargbcursor.c'; else $(CYGPATH_W) '$(srcdir)/src/loadargbcursor.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/loadargb_cursor-loadargbcursor.Tpo $(DEPDIR)/loadargb_cursor-loadargbcursor.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/loadargbcursor.c' object='loadargb_cursor-loadargbcursor.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(loadargb_cursor_CFLAGS) $(CFLAGS) -c -o loadargb_cursor-loadargbcursor.obj `if test -f 'src/loadargbcursor.c'; then $(CYGPATH_W) 'src/loadargbcursor.c'; else $(CYGPATH_W) '$(srcdir)/src/loadargbcursor.c'; fi`

steamcompmgr-steamcompmgr.o: src/steamcompmgr.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(steamcompmgr_CFLAGS) $(CFLAGS) -MT steamcompmgr-steamcompmgr.o -MD -MP -MF $(DEPDIR)/steamcompmgr-steamcompmgr.Tpo -c -o steamcompmgr-steamcompmgr.o `test -f 'src/steamcompmgr.c' || echo '$(srcdir)/'`src/steamcompmgr.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/steamcompmgr-steamcompmgr.Tpo $(DEPDIR)/steamcompmgr-steamcompmgr.Po
Expand All @@ -318,10 +385,27 @@ steamcompmgr-steamcompmgr.obj: src/steamcompmgr.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/steamcompmgr.c' object='steamcompmgr-steamcompmgr.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(steamcompmgr_CFLAGS) $(CFLAGS) -c -o steamcompmgr-steamcompmgr.obj `if test -f 'src/steamcompmgr.c'; then $(CYGPATH_W) 'src/steamcompmgr.c'; else $(CYGPATH_W) '$(srcdir)/src/steamcompmgr.c'; fi`

udev_is_boot_vga-udev_is_boot_vga.o: src/udev_is_boot_vga.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_is_boot_vga_CFLAGS) $(CFLAGS) -MT udev_is_boot_vga-udev_is_boot_vga.o -MD -MP -MF $(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Tpo -c -o udev_is_boot_vga-udev_is_boot_vga.o `test -f 'src/udev_is_boot_vga.c' || echo '$(srcdir)/'`src/udev_is_boot_vga.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Tpo $(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/udev_is_boot_vga.c' object='udev_is_boot_vga-udev_is_boot_vga.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_is_boot_vga_CFLAGS) $(CFLAGS) -c -o udev_is_boot_vga-udev_is_boot_vga.o `test -f 'src/udev_is_boot_vga.c' || echo '$(srcdir)/'`src/udev_is_boot_vga.c

udev_is_boot_vga-udev_is_boot_vga.obj: src/udev_is_boot_vga.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_is_boot_vga_CFLAGS) $(CFLAGS) -MT udev_is_boot_vga-udev_is_boot_vga.obj -MD -MP -MF $(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Tpo -c -o udev_is_boot_vga-udev_is_boot_vga.obj `if test -f 'src/udev_is_boot_vga.c'; then $(CYGPATH_W) 'src/udev_is_boot_vga.c'; else $(CYGPATH_W) '$(srcdir)/src/udev_is_boot_vga.c'; fi`
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Tpo $(DEPDIR)/udev_is_boot_vga-udev_is_boot_vga.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/udev_is_boot_vga.c' object='udev_is_boot_vga-udev_is_boot_vga.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(udev_is_boot_vga_CFLAGS) $(CFLAGS) -c -o udev_is_boot_vga-udev_is_boot_vga.obj `if test -f 'src/udev_is_boot_vga.c'; then $(CYGPATH_W) 'src/udev_is_boot_vga.c'; else $(CYGPATH_W) '$(srcdir)/src/udev_is_boot_vga.c'; fi`
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
$(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
Expand Down Expand Up @@ -487,7 +571,7 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
Expand Down
84 changes: 79 additions & 5 deletions aclocal.m4
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
Expand All @@ -14,8 +14,8 @@

m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
Expand Down Expand Up @@ -180,6 +180,61 @@ else
fi[]dnl
])# PKG_CHECK_MODULES


# PKG_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable pkgconfigdir as the location where a module
# should install pkg-config .pc files. By default the directory is
# $libdir/pkgconfig, but the default can be changed by passing
# DIRECTORY. The user can override through the --with-pkgconfigdir
# parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([pkgconfigdir],
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
[with_pkgconfigdir=]pkg_default)
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_INSTALLDIR


# PKG_NOARCH_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable noarch_pkgconfigdir as the location where a
# module should install arch-independent pkg-config .pc files. By
# default the directory is $datadir/pkgconfig, but the default can be
# changed by passing DIRECTORY. The user can override through the
# --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
AC_ARG_WITH([noarch-pkgconfigdir],
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
[with_noarch_pkgconfigdir=]pkg_default)
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR


# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# -------------------------------------------
# Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR

# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# Foundation, Inc.
#
Expand All @@ -198,7 +253,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [],
m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])

Expand All @@ -214,7 +269,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl
[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Expand Down Expand Up @@ -918,6 +973,25 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# serial 1

# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
AC_DEFUN([AM_RUN_LOG],
[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
(exit $ac_status); }])

# Check to make sure that the build environment is sane. -*- Autoconf -*-

# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
Expand Down
Loading

0 comments on commit 305e0a4

Please sign in to comment.