diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2015-01-06 16:20:04 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2015-01-06 15:57:11 +0000 |
| commit | dd65274bfd2128e185cbc41b367f619ac87e70a7 (patch) | |
| tree | 446a65fa0effee79bc503a66696017264cf89738 /configure.ac | |
| parent | 1d7da82938de1d40db9f34eb42e73a909c6ffa91 (diff) | |
| download | wireshark-dd65274bfd2128e185cbc41b367f619ac87e70a7.tar.gz | |
Revert e65f581ffa86f6bfd566a9b66ca2c882f465727f, which
reverts commit 89291ad4f3293893387b385a0800cad42215ddd4
Protect the new macro with "m4_ifdef" instead.
Add comments to keep the old and the new flags in sync.
Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0
Reviewed-on: https://code.wireshark.org/review/6343
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1194aa8e54..13ac6beb18 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,10 @@ AC_PREREQ(2.60) AC_MIN_VERSION=2.60 AC_SUBST(AC_MIN_VERSION) +dnl Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS +dnl in configure.ac in sync, otherwise there will be an error running autogen.sh. +m4_ifdef([AC_CONFIG_MACRO_DIRS],AC_CONFIG_MACRO_DIRS([./aclocal-fallback])) + dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or dnl `AC_CANONICAL_HOST', or `AC_CANONICAL_TARGET', depending on the |