autogen.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 1b61fb98885e6a87b7ec3e66090e97f748bc5b89
Merge: 22cbfff 9ec9757
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Aug 12 10:53:05 2025 +0000
Merge branch 'issues/491' into 'main'
Fix regex to pick up libtool version
Closes #491
See merge request fontconfig/fontconfig!463
commit 9ec97570f1bf916af96ad0f20390058c5bb13cd6
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Aug 12 15:38:17 2025 +0900
Fix regex to pick up libtool version
Debian and Ubuntu seems having extra string after version string.
Modified regex to match in that case.
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/491
Changelog: fixed
diff --git a/autogen.sh b/autogen.sh
index d45f679..8e22684 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,8 +29,8 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
case "$1" in
---noconf*)
- AUTOGEN_SUBDIR_MODE="true"
+--noconf*)
+ AUTOGEN_SUBDIR_MODE="true"
shift
;;
esac
@@ -60,7 +60,7 @@ DIE=0
have_libtool=false
if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
- libtool_version=`$LIBTOOLIZE --version | sed 's/^.* \([0-9][.][0-9.]*\)[^ ]*$/\1/'`
+ libtool_version=`$LIBTOOLIZE --version | sed 's/.*libtool) \([0-9][.][0-9.]*\).*$/\1/'`
case $libtool_version in
1.4*|1.5*|1.6*|1.7*|2*)
have_libtool=true
@@ -118,9 +118,9 @@ $AUTORECONF $AUTORECONF_FLAGS
cd $ORIGDIR
if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
- echo Running $srcdir/configure "$@"
+ echo Running $srcdir/configure "$@"
$srcdir/configure "$@"
- echo
+ echo
echo "Now type 'make' to compile $PROJECT."
fi
