Commit 7762081d authored by Sergey Kosukhin's avatar Sergey Kosukhin Committed by Ralf Mueller
Browse files

Add a patch for libtool.m4.

parent 63924a97
#!/bin/sh
autoreconf -fvi || exit $?
patch -p 1 -i patch/ltmain_sh.patch -d .
patch -p 1 --no-backup-if-mismatch --forward -r - -i patch/libtool_m4.patch -d .
# The program 'patch' exits with exitcode=1 if the patch has already been applied.
# Consider this a normal scenario:
exitcode=$?; if test $exitcode -ne 0 && test $exitcode -ne 1; then exit $exitcode; fi
autoconf -f || exit $?
# Reset libtool.m4 timestamps to avoid confusing make
touch -r m4/ltversion.m4 m4/libtool.m4 || exit $?
patch -p 1 --no-backup-if-mismatch --forward -r - -i patch/ltmain_sh.patch -d .
exitcode=$?; if test $exitcode -ne 0 && test $exitcode -ne 1; then exit $exitcode; fi
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a3bc337..28d0091 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -7532,10 +7532,11 @@ if AC_TRY_EVAL(ac_compile); then
case $prev$p in
-L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
+ # Some compilers place space between "-{L,R,l}" and the path (value).
# Remove the space.
- if test x-L = "$p" ||
- test x-R = "$p"; then
+ if test x-L = x"$p" ||
+ test x-R = x"$p" ||
+ test x-l = x"$p"; then
prev=$p
continue
fi
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment