diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-03-05 13:39:41 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-03-05 13:39:41 (GMT) |
| commit | 8b6d3f9c4a774bef3081195d422993323b6bb2e0 (patch) | |
| tree | d24eca3e210687cc84e498299da10d349dd01c1a /googlemock | |
| parent | 3dd2e841c34bfe3d966ae6606f9b69d75f1a3442 (diff) | |
| parent | fc979623a91ec4af90532daeeb5bca68b25c67c0 (diff) | |
| download | googletest-8b6d3f9c4a774bef3081195d422993323b6bb2e0.zip googletest-8b6d3f9c4a774bef3081195d422993323b6bb2e0.tar.gz googletest-8b6d3f9c4a774bef3081195d422993323b6bb2e0.tar.bz2 | |
Merge pull request #2158 from CarloWood:master
PiperOrigin-RevId: 236716851
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/Makefile.am | 2 | ||||
| -rw-r--r-- | googlemock/configure.ac | 1 |
2 files changed, 3 insertions, 0 deletions
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]) |