diff options
| author | Carlo Wood <carlo@alinoe.com> | 2019-03-01 07:11:56 (GMT) |
|---|---|---|
| committer | Carlo Wood <carlo@alinoe.com> | 2019-03-01 07:11:56 (GMT) |
| commit | fc979623a91ec4af90532daeeb5bca68b25c67c0 (patch) | |
| tree | 7a2bb17ae3e7b0c1afad154e7751b55e5bb5cdb4 | |
| parent | efecb0bfa687cf87836494f5d62868485c00fb66 (diff) | |
| download | googletest-fc979623a91ec4af90532daeeb5bca68b25c67c0.zip googletest-fc979623a91ec4af90532daeeb5bca68b25c67c0.tar.gz googletest-fc979623a91ec4af90532daeeb5bca68b25c67c0.tar.bz2 | |
Minor build system fixes.refs/pull/2158/head
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | googlemock/Makefile.am | 2 | ||||
| -rw-r--r-- | googlemock/configure.ac | 1 | ||||
| -rw-r--r-- | googletest/configure.ac | 2 |
5 files changed, 5 insertions, 3 deletions
@@ -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/ diff --git a/Makefile.am b/Makefile.am index 433eefe..05c20c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/googlemock/Makefile.am b/googlemock/Makefile.am index 8e0128f..c77ef2b 100644 --- a/googlemock/Makefile.am +++ b/googlemock/Makefile.am @@ -1,5 +1,7 @@ # Automake file +ACLOCAL_AMFLAGS = -I m4 + # Nonstandard package files for distribution. EXTRA_DIST = LICENSE diff --git a/googlemock/configure.ac b/googlemock/configure.ac index 9456c3d..aaa4ad4 100644 --- a/googlemock/configure.ac +++ b/googlemock/configure.ac @@ -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]) diff --git a/googletest/configure.ac b/googletest/configure.ac index 254c8c4..6cb19f4 100644 --- a/googletest/configure.ac +++ b/googletest/configure.ac @@ -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]) |