summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2011-07-07 20:09:35 -0500
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2011-07-07 20:09:35 -0500
commit0a080be7fb703e88b44da21e5a4989f7b6a5ad16 (patch)
treece2dd6168e5cd1d1da4342a5af40796b69db4002
parente7fa2bf63190cfa93d33f676d61e4a9c113aa32c (diff)
downloadcygwin-filesystem-0a080be7fb703e88b44da21e5a4989f7b6a5ad16.tar.gz
cygwin-filesystem-0a080be7fb703e88b44da21e5a4989f7b6a5ad16.tar.xz
cygwin-filesystem-0a080be7fb703e88b44da21e5a4989f7b6a5ad16.zip
autoreconf: define LIBTOOLIZE if cygwin-libtool is installed
In that case, the libtool macros in %_cygwin_datadir/aclocal (picked up by _cygwin_autoreconf) may cause a mismatch with the ltmain.sh provided by the native libtoolize.
-rw-r--r--macros.cygwin5
1 files changed, 4 insertions, 1 deletions
diff --git a/macros.cygwin b/macros.cygwin
index 665f7c6..a9a6ae3 100644
--- a/macros.cygwin
+++ b/macros.cygwin
@@ -96,6 +96,9 @@ package or when debugging this package.\
x=`basename $i|tr "a-z+-\." "A-ZX__"`; \
declare -x $x="$i" ; export $x; \
done; \
+ if [ -x %{_cygwin_bindir}/libtoolize ]; then \
+ LIBTOOLIZE=%{_cygwin_bindir}/libtoolize; export LIBTOOLIZE; \
+ fi; \
unset x i
%_cygwin_pkg_config \
@@ -103,7 +106,7 @@ package or when debugging this package.\
export PKG_CONFIG_LIBDIR; \
pkg-config
-%_cygwin_autoreconf \
+%_cygwin_autoreconf %{_cygwin_env} ; \
autoreconf -f -i -I %{_cygwin_datadir}/aclocal
%_cygwin_configure %{_cygwin_env} ; \