| 1 |
commit: 87e80c5f4f04419eb8ec2986b2713ef59e7969fd |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 29 15:06:10 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 29 15:17:03 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e80c5f |
| 7 |
|
| 8 |
autotools.eclass: run libtoolize with --ltdl automatically #534088 |
| 9 |
|
| 10 |
eclass/autotools.eclass | 10 ++++++++-- |
| 11 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass |
| 14 |
index 54e5d03..bc4032a 100644 |
| 15 |
--- a/eclass/autotools.eclass |
| 16 |
+++ b/eclass/autotools.eclass |
| 17 |
@@ -198,7 +198,7 @@ eautoreconf() { |
| 18 |
intltool false "autotools_run_tool intltoolize --automake --copy --force" |
| 19 |
gtkdoc false "autotools_run_tool --at-missing gtkdocize --copy" |
| 20 |
gnomedoc false "autotools_run_tool --at-missing gnome-doc-prepare --copy --force" |
| 21 |
- libtool false "_elibtoolize --install --copy --force" |
| 22 |
+ libtool false "_elibtoolize --auto-ltdl --install --copy --force" |
| 23 |
) |
| 24 |
for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do |
| 25 |
if _at_uses_${tools[i]} ; then |
| 26 |
@@ -264,6 +264,7 @@ _at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; } |
| 27 |
_at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; } |
| 28 |
_at_uses_gnomedoc() { _at_uses_pkg GNOME_DOC_INIT; } |
| 29 |
_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; } |
| 30 |
+_at_uses_libltdl() { _at_uses_pkg LT_CONFIG_LTDL_DIR; } |
| 31 |
|
| 32 |
# @FUNCTION: eaclocal_amflags |
| 33 |
# @DESCRIPTION: |
| 34 |
@@ -313,6 +314,11 @@ eaclocal() { |
| 35 |
_elibtoolize() { |
| 36 |
local LIBTOOLIZE=${LIBTOOLIZE:-$(type -P glibtoolize > /dev/null && echo glibtoolize || echo libtoolize)} |
| 37 |
|
| 38 |
+ if [[ $1 == "--auto-ltdl" ]] ; then |
| 39 |
+ shift |
| 40 |
+ _at_uses_libltdl && set -- "$@" --ltdl |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
[[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake |
| 44 |
|
| 45 |
autotools_run_tool ${LIBTOOLIZE} "$@" |
| 46 |
@@ -519,7 +525,7 @@ autotools_run_tool() { |
| 47 |
# Keep a list of all the macros we might use so that we only |
| 48 |
# have to run the trace code once. Order doesn't matter. |
| 49 |
ALL_AUTOTOOLS_MACROS=( |
| 50 |
- A{C,M}_PROG_LIBTOOL LT_INIT |
| 51 |
+ A{C,M}_PROG_LIBTOOL LT_INIT LT_CONFIG_LTDL_DIR |
| 52 |
A{C,M}_CONFIG_HEADER{S,} |
| 53 |
AC_CONFIG_SUBDIRS |
| 54 |
AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR |
Archives