From f364368350841e9b119be39c569d829773bb711d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Date: Tue, 18 Mar 2014 17:01:10 +0100 Subject: configure.ac: respect 'g' variants of libtool/libtoolize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BSD OS'es (OS X for me) provide GNU tools with prefixed 'g'. To find correct versions of libtool/libtoolize on those systems search also for glibtool/glibtoolize. Signed-off-by: Andreas Bießmann Signed-off-by: Bryan Hundven [yann.morin.1998@free.fr: search for the g-variant first] Signed-off-by: "Yann E. MORIN" Message-Id: <2f1530b54afcb6a00e1d.1395158786@andreas-mbp.er.biessmann.org> Patchwork-Id: 331467 diff --git a/configure.ac b/configure.ac index ce26b1c..705980f 100644 --- a/configure.ac +++ b/configure.ac @@ -242,7 +242,7 @@ AC_CACHE_VAL([ac_cv_path_LIBTOOL], [Specify the full PATH to GNU libtool >= 1.5.26]), [ac_cv_path_LIBTOOL=$withval])]) AC_CACHE_CHECK([for GNU libtool >= 1.5.26], [ac_cv_path_LIBTOOL], - [AC_PATH_PROGS_FEATURE_CHECK([LIBTOOL], [libtool], + [AC_PATH_PROGS_FEATURE_CHECK([LIBTOOL], [glibtool libtool], [[LIBTOOL_ver=$($ac_path_LIBTOOL --version 2>&1 \ |$EGREP '\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)') test -n "$LIBTOOL_ver" && ac_cv_path_LIBTOOL=$ac_path_LIBTOOL ac_path_LIBTOOL_found=:]], @@ -258,7 +258,7 @@ AC_CACHE_VAL([ac_cv_path_LIBTOOLIZE], [Specify the full PATH to GNU libtoolize >= 1.5.26]), [ac_cv_path_LIBTOOLIZE=$withval])]) AC_CACHE_CHECK([for GNU libtoolize >= 1.5.26], [ac_cv_path_LIBTOOLIZE], - [AC_PATH_PROGS_FEATURE_CHECK([LIBTOOLIZE], [libtoolize], + [AC_PATH_PROGS_FEATURE_CHECK([LIBTOOLIZE], [glibtoolize libtoolize], [[LIBTOOLIZE_ver=$($ac_path_LIBTOOLIZE --version 2>&1 \ |$EGREP '\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)') test -n "$LIBTOOLIZE_ver" && ac_cv_path_LIBTOOLIZE=$ac_path_LIBTOOLIZE ac_path_LIBTOOLIZE_found=:]], -- cgit v0.10.2-6-g49f6