Minor build system fixes.

This commit is contained in:
Carlo Wood 2019-03-01 08:11:56 +01:00
parent efecb0bfa6
commit fc979623a9
5 changed files with 5 additions and 3 deletions

1
.gitignore vendored
View File

@ -35,6 +35,7 @@ googletest/m4/ltoptions.m4
googletest/m4/ltsugar.m4
googletest/m4/ltversion.m4
googletest/m4/lt~obsolete.m4
googlemock/m4
# Ignore generated directories.
googlemock/fused-src/

View File

@ -1,6 +1,4 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
# Build . before src so that our all-local and clean-local hooks kicks in at

View File

@ -1,5 +1,7 @@
# Automake file
ACLOCAL_AMFLAGS = -I m4
# Nonstandard package files for distribution.
EXTRA_DIST = LICENSE

View File

@ -8,6 +8,7 @@ AC_INIT([Google C++ Mocking Framework],
# Provide various options to initialize the Autoconf and configure processes.
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([./LICENSE])
AC_CONFIG_MACRO_DIRS([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([build-aux/config.h])
AC_CONFIG_FILES([Makefile])

View File

@ -12,7 +12,7 @@ AC_INIT([Google C++ Testing Framework],
# Provide various options to initialize the Autoconf and configure processes.
AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([./LICENSE])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIRS([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([build-aux/config.h])
AC_CONFIG_FILES([Makefile])