Skip to content

Commit be62b6b

Browse files
committed
Update to libtool 2.4.2.
1 parent bcba0cd commit be62b6b

File tree

4 files changed

+105
-130
lines changed

4 files changed

+105
-130
lines changed

configure

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,7 +2305,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
23052305
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
23062306
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
23072307
as_fn_error $? "failed to load site script $ac_site_file
2308-
See \`config.log' for more details" "$LINENO" 5 ; }
2308+
See \`config.log' for more details" "$LINENO" 5; }
23092309
fi
23102310
done
23112311

@@ -2445,7 +2445,7 @@ fi
24452445
$as_echo "$ac_cv_build" >&6; }
24462446
case $ac_cv_build in
24472447
*-*-*) ;;
2448-
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
2448+
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
24492449
esac
24502450
build=$ac_cv_build
24512451
ac_save_IFS=$IFS; IFS='-'
@@ -2478,7 +2478,7 @@ fi
24782478
$as_echo "$ac_cv_host" >&6; }
24792479
case $ac_cv_host in
24802480
*-*-*) ;;
2481-
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
2481+
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
24822482
esac
24832483
host=$ac_cv_host
24842484
ac_save_IFS=$IFS; IFS='-'
@@ -2511,7 +2511,7 @@ fi
25112511
$as_echo "$ac_cv_target" >&6; }
25122512
case $ac_cv_target in
25132513
*-*-*) ;;
2514-
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
2514+
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
25152515
esac
25162516
target=$ac_cv_target
25172517
ac_save_IFS=$IFS; IFS='-'
@@ -2641,11 +2641,11 @@ am_lf='
26412641
'
26422642
case `pwd` in
26432643
*[\\\"\#\$\&\'\`$am_lf]*)
2644-
as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
2644+
as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
26452645
esac
26462646
case $srcdir in
26472647
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2648-
as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
2648+
as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
26492649
esac
26502650

26512651
# Do `set' in a subshell so we don't clobber the current shell's
@@ -3320,7 +3320,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
33203320
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
33213321
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
33223322
as_fn_error 77 "C++ compiler cannot create executables
3323-
See \`config.log' for more details" "$LINENO" 5 ; }
3323+
See \`config.log' for more details" "$LINENO" 5; }
33243324
else
33253325
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
33263326
$as_echo "yes" >&6; }
@@ -3363,7 +3363,7 @@ else
33633363
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
33643364
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
33653365
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3366-
See \`config.log' for more details" "$LINENO" 5 ; }
3366+
See \`config.log' for more details" "$LINENO" 5; }
33673367
fi
33683368
rm -f conftest conftest$ac_cv_exeext
33693369
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3422,7 +3422,7 @@ $as_echo "$ac_try_echo"; } >&5
34223422
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
34233423
as_fn_error $? "cannot run C++ compiled programs.
34243424
If you meant to cross compile, use \`--host'.
3425-
See \`config.log' for more details" "$LINENO" 5 ; }
3425+
See \`config.log' for more details" "$LINENO" 5; }
34263426
fi
34273427
fi
34283428
fi
@@ -3474,7 +3474,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
34743474
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
34753475
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
34763476
as_fn_error $? "cannot compute suffix of object files: cannot compile
3477-
See \`config.log' for more details" "$LINENO" 5 ; }
3477+
See \`config.log' for more details" "$LINENO" 5; }
34783478
fi
34793479
rm -f conftest.$ac_cv_objext conftest.$ac_ext
34803480
fi
@@ -3916,7 +3916,7 @@ else
39163916
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
39173917
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
39183918
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
3919-
See \`config.log' for more details" "$LINENO" 5 ; }
3919+
See \`config.log' for more details" "$LINENO" 5; }
39203920
fi
39213921

39223922
ac_ext=c
@@ -6293,7 +6293,7 @@ fi
62936293
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
62946294
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
62956295
as_fn_error $? "no acceptable C compiler found in \$PATH
6296-
See \`config.log' for more details" "$LINENO" 5 ; }
6296+
See \`config.log' for more details" "$LINENO" 5; }
62976297

62986298
# Provide some information about the compiler.
62996299
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -7787,7 +7787,7 @@ if test "${enable_threads+set}" = set; then :
77877787
no) :
77887788
;; #(
77897789
*) :
7790-
as_fn_error $? "bad value ${enableval} for --enable-threads" "$LINENO" 5 ;;
7790+
as_fn_error $? "bad value ${enableval} for --enable-threads" "$LINENO" 5 ;;
77917791
esac
77927792
else
77937793
enable_threads=yes
@@ -8370,7 +8370,7 @@ else
83708370
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
83718371
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
83728372
as_fn_error $? "cannot run test program while cross compiling
8373-
See \`config.log' for more details" "$LINENO" 5 ; }
8373+
See \`config.log' for more details" "$LINENO" 5; }
83748374
else
83758375
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
83768376
/* end confdefs.h. */
@@ -8421,7 +8421,7 @@ else
84218421
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
84228422
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
84238423
as_fn_error $? "cannot run test program while cross compiling
8424-
See \`config.log' for more details" "$LINENO" 5 ; }
8424+
See \`config.log' for more details" "$LINENO" 5; }
84258425
else
84268426
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
84278427
/* end confdefs.h. */
@@ -8625,8 +8625,8 @@ esac
86258625

86268626

86278627

8628-
macro_version='2.4'
8629-
macro_revision='1.3294'
8628+
macro_version='2.4.2'
8629+
macro_revision='1.3337'
86308630

86318631

86328632

@@ -16085,7 +16085,7 @@ else
1608516085
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1608616086
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1608716087
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
16088-
See \`config.log' for more details" "$LINENO" 5 ; }
16088+
See \`config.log' for more details" "$LINENO" 5; }
1608916089
fi
1609016090

1609116091
ac_ext=cpp
@@ -20328,7 +20328,7 @@ do
2032820328
"tests/timeformat_test/Makefile") CONFIG_FILES="$CONFIG_FILES tests/timeformat_test/Makefile" ;;
2032920329
"log4cplus.pc") CONFIG_FILES="$CONFIG_FILES log4cplus.pc" ;;
2033020330

20331-
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
20331+
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
2033220332
esac
2033320333
done
2033420334

@@ -20646,7 +20646,7 @@ do
2064620646
esac
2064720647
case $ac_mode$ac_tag in
2064820648
:[FHL]*:*);;
20649-
:L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
20649+
:L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
2065020650
:[FH]-) ac_tag=-:-;;
2065120651
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
2065220652
esac
@@ -20674,7 +20674,7 @@ do
2067420674
[\\/$]*) false;;
2067520675
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
2067620676
esac ||
20677-
as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
20677+
as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
2067820678
esac
2067920679
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
2068020680
as_fn_append ac_file_inputs " '$ac_f'"
@@ -20701,7 +20701,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
2070120701

2070220702
case $ac_tag in
2070320703
*:-:* | *:-) cat >"$ac_tmp/stdin" \
20704-
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
20704+
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
2070520705
esac
2070620706
;;
2070720707
esac

install-sh

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# install - install a program, script, or datafile
33

4-
scriptversion=2009-04-28.21; # UTC
4+
scriptversion=2011-01-19.21; # UTC
55

66
# This originates from X11R5 (mit/util/scripts/install.sh), which was
77
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
156156
-s) stripcmd=$stripprog;;
157157

158158
-t) dst_arg=$2
159+
# Protect names problematic for `test' and other utilities.
160+
case $dst_arg in
161+
-* | [=\(\)!]) dst_arg=./$dst_arg;;
162+
esac
159163
shift;;
160164

161165
-T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
186190
fi
187191
shift # arg
188192
dst_arg=$arg
193+
# Protect names problematic for `test' and other utilities.
194+
case $dst_arg in
195+
-* | [=\(\)!]) dst_arg=./$dst_arg;;
196+
esac
189197
done
190198
fi
191199

@@ -200,7 +208,11 @@ if test $# -eq 0; then
200208
fi
201209

202210
if test -z "$dir_arg"; then
203-
trap '(exit $?); exit' 1 2 13 15
211+
do_exit='(exit $ret); exit $ret'
212+
trap "ret=129; $do_exit" 1
213+
trap "ret=130; $do_exit" 2
214+
trap "ret=141; $do_exit" 13
215+
trap "ret=143; $do_exit" 15
204216

205217
# Set umask so as not to create temps with too-generous modes.
206218
# However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
228240

229241
for src
230242
do
231-
# Protect names starting with `-'.
243+
# Protect names problematic for `test' and other utilities.
232244
case $src in
233-
-*) src=./$src;;
245+
-* | [=\(\)!]) src=./$src;;
234246
esac
235247

236248
if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
252264
echo "$0: no destination specified." >&2
253265
exit 1
254266
fi
255-
256267
dst=$dst_arg
257-
# Protect names starting with `-'.
258-
case $dst in
259-
-*) dst=./$dst;;
260-
esac
261268

262269
# If destination is a directory, append the input filename; won't work
263270
# if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
385392

386393
case $dstdir in
387394
/*) prefix='/';;
388-
-*) prefix='./';;
395+
[-=\(\)!]*) prefix='./';;
389396
*) prefix='';;
390397
esac
391398

@@ -403,7 +410,7 @@ do
403410

404411
for d
405412
do
406-
test -z "$d" && continue
413+
test X"$d" = X && continue
407414

408415
prefix=$prefix$d
409416
if test -d "$prefix"; then

0 commit comments

Comments
 (0)