diff options
| author | Benedikt Morbach <benedikt.morbach@googlemail.com> | 2012-01-30 18:41:31 (GMT) |
|---|---|---|
| committer | Paul Seidler <sepek@exherbo.org> | 2012-04-11 10:46:35 (GMT) |
| commit | fc2801ec7a5bc64b6bffd8e332930f0f7f242754 (patch) | |
| tree | 1db5e17a2f481da81dd9ad7cf5ef5b12eaf1abc6 | |
| parent | fc845b38376377f634641e80ee44dfaffcb13280 (diff) | |
autotools.exlib: look for AM_INIT_AUTOMAKE in configure.ac
There might be a non-top-level Makefile.am
This is also what upstream is doing in autoreconf (2.63)
| -rw-r--r-- | exlibs/autotools.exlib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exlibs/autotools.exlib b/exlibs/autotools.exlib index 65fd520..127c089 100644 --- a/exlibs/autotools.exlib +++ b/exlibs/autotools.exlib @@ -182,7 +182,7 @@ _elibtoolize() { lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")$(autotools_check_macro "LT_INIT")" [[ -n ${lttest} ]] || return 0 - [[ -f Makefile.am || -f GNUmakefile.am ]] && opts="--automake" + [[ -n $(autotools_check_macro "AM_INIT_AUTOMAKE") ]] && opts="--automake" autotools_run_tool libtoolize "$@" ${opts} @@ -241,7 +241,7 @@ eautomake() { autotools_select_versions local extra_opts - [[ -f Makefile.am || -f GNUmakefile.am ]] || return 0 + [[ -n $(autotools_check_macro "AM_INIT_AUTOMAKE") ]] || return 0 if [[ -z ${FROM_EAUTORECONF} && ( -f Makefile.in || -f GNUMakefile.in ) ]]; then local used_automake installed_automake |