[packages/libtool.git] / libtool-test.patch

--- libtool-1.4.3/ltmain.sh.wiget	Wed Oct 23 04:26:24 2002
+++ libtool-1.4.3/ltmain.sh	Thu Oct 24 16:55:44 2002
@@ -1379,7 +1379,7 @@
 	;;
     esac
     for pass in $passes; do
-      if test $linkmode = prog; then
+      if test "$linkmode" = prog; then
 	# Determine which files to process
 	case $pass in
 	dlopen)
@@ -1396,11 +1396,11 @@
 	found=no
 	case $deplib in
 	-l*)
-	  if test $linkmode = oldlib && test $linkmode = obj; then
+	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
 	    continue
 	  fi
-	  if test $pass = conv; then
+	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -1420,7 +1420,7 @@
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
 	      deplibs="$deplib $deplibs"
-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
 	    fi
 	    continue
 	  fi
@@ -1429,16 +1429,16 @@
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
-	    test $pass = conv && continue
+	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    ;;
 	  prog)
-	    if test $pass = conv; then
+	    if test "$pass" = conv; then
 	      deplibs="$deplib $deplibs"
 	      continue
 	    fi
-	    if test $pass = scan; then
+	    if test "$pass" = scan; then
 	      deplibs="$deplib $deplibs"
 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    else
@@ -1453,7 +1453,7 @@
 	  continue
 	  ;; # -L
 	-R*)
-	  if test $pass = link; then
+	  if test "$pass" = link; then
 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
@@ -1466,7 +1466,7 @@
 	  ;;
 	*.la) lib="$deplib" ;;
 	*.$libext)
-	  if test $pass = conv; then
+	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
 	    continue
 	  fi
@@ -1489,7 +1489,7 @@
 	    continue
 	    ;;
 	  prog)
-	    if test $pass != link; then
+	    if test "$pass" != link; then
 	      deplibs="$deplib $deplibs"
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
@@ -1500,7 +1500,7 @@
 	  esac # linkmode
 	  ;; # *.$libext
 	*.lo | *.$objext)
-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	    # If there is no dlopen support or we're linking statically,
 	    # we need to preload.
 	    newdlprefiles="$newdlprefiles $deplib"
@@ -1550,13 +1550,13 @@
 
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
+	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
 	   # Add dl[pre]opened files of deplib
 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
 	fi
 
-	if test $pass = conv; then
+	if test "$pass" = conv; then
 	  # Only check for convenience libraries
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
@@ -1577,7 +1577,7 @@
               fi
 	      tmp_libs="$tmp_libs $deplib"
 	    done
-	  elif test $linkmode != prog && test $linkmode != lib; then
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
 	    exit 1
 	  fi
@@ -1595,7 +1595,7 @@
 	fi
 
 	# This library was specified with -dlopen.
-	if test $pass = dlopen; then
+	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
 	    exit 1
@@ -1644,7 +1644,7 @@
 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
 	# This library was specified with -dlpreopen.
-	if test $pass = dlpreopen; then
+	if test "$pass" = dlpreopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
 	    exit 1
@@ -1663,7 +1663,7 @@
 
 	if test -z "$libdir"; then
 	  # Link the convenience library
-	  if test $linkmode = lib; then
+	  if test "$linkmode" = lib; then
 	    deplibs="$dir/$old_library $deplibs"
 	  elif test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$dir/$old_library $compile_deplibs"
@@ -1674,7 +1674,7 @@
 	  continue
 	fi
 
-	if test $linkmode = prog && test $pass != link; then
+	if test "$linkmode" = prog && test "$pass" != link; then
 	  newlib_search_path="$newlib_search_path $ladir"
 	  deplibs="$lib $deplibs"
 
@@ -1713,7 +1713,7 @@
 	  # Link against this shared library
 
 	  if test "$linkmode,$pass" = "prog,link" ||
-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
+	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
 	    # Hardcode the library path.
 	    # Skip directories that are in the system default run-time
 	    # search path.
@@ -1735,7 +1735,7 @@
 	      esac
 	      ;;
 	    esac
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      # We need to hardcode the library path
 	      if test -n "$shlibpath_var"; then
 		# Make sure the rpath contains only unique directories.
@@ -1819,7 +1819,7 @@
 	    linklib=$newlib
 	  fi # test -n $old_archive_from_expsyms_cmds
 
-	  if test $linkmode = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -1868,7 +1868,7 @@
 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
 	      esac
 	    fi
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	    else
@@ -1885,7 +1885,7 @@
 	    fi
 	  fi
 
-	  if test $linkmode = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -1907,7 +1907,7 @@
 	      add="-l$name"
 	    fi
 
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -1915,7 +1915,7 @@
 	      test -n "$add" && deplibs="$add $deplibs"
 	    fi
 	  fi
-	elif test $linkmode = prog; then
+	elif test "$linkmode" = prog; then
 	  if test "$alldeplibs" = yes &&
 	     { test "$deplibs_check_method" = pass_all ||
 	       { test "$build_libtool_libs" = yes &&
@@ -1975,9 +1975,9 @@
 	  fi
 	fi # link shared/static library?
 
-	if test $linkmode = lib; then
+	if test "$linkmode" = lib; then
 	  if test -n "$dependency_libs" &&
-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+	     { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
 	       test $link_static = yes; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
@@ -2009,7 +2009,7 @@
 	    tmp_libs="$tmp_libs $deplib"
 	  done
 
-	  if test $link_all_deplibs != no; then
+	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
 	      case $deplib in
@@ -2052,15 +2052,15 @@
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
-      if test $pass = dlpreopen; then
+      if test "$pass" = dlpreopen; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	  deplibs="$deplib $deplibs"
 	done
       fi
-      if test $pass != dlopen; then
-	test $pass != scan && dependency_libs="$newdependency_libs"
-	if test $pass != conv; then
+      if test "$pass" != dlopen; then
+	test "$pass" != scan && dependency_libs="$newdependency_libs"
+	if test "$pass" != conv; then
 	  # Make sure lib_search_path contains only unique directories.
 	  lib_search_path=
 	  for dir in $newlib_search_path; do
@@ -2118,7 +2118,7 @@
 	deplibs=
       fi
     done # for pass
-    if test $linkmode = prog; then
+    if test "$linkmode" = prog; then
       dlfiles="$newdlfiles"
       dlprefiles="$newdlprefiles"
     fi
@@ -2473,7 +2473,7 @@
 	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
-	    if test $build_libtool_need_lc = "yes"; then
+	    if test "$build_libtool_need_lc" = "yes"; then
 	      deplibs="$deplibs -lc"
 	    fi
 	    ;;
@@ -2765,7 +2765,7 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
-	if test $hardcode_into_libs = yes; then
+	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
Commit	Line	Data
853ff239 AF	1	--- libtool-1.4.3/ltmain.sh.wiget Wed Oct 23 04:26:24 2002
	2	+++ libtool-1.4.3/ltmain.sh Thu Oct 24 16:55:44 2002
	3	@@ -1379,7 +1379,7 @@
2d6bee03	4	;;
	5	esac
	6	for pass in $passes; do
	7	- if test $linkmode = prog; then
	8	+ if test "$linkmode" = prog; then
	9	# Determine which files to process
	10	case $pass in
	11	dlopen)
853ff239	12	@@ -1396,11 +1396,11 @@
2d6bee03	13	found=no
	14	case $deplib in
	15	-l*)
	16	- if test $linkmode = oldlib && test $linkmode = obj; then
	17	+ if test "$linkmode" = oldlib && test "$linkmode" = obj; then
	18	$echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
	19	continue
	20	fi
	21	- if test $pass = conv; then
	22	+ if test "$pass" = conv; then
	23	deplibs="$deplib $deplibs"
	24	continue
	25	fi
853ff239	26	@@ -1420,7 +1420,7 @@
2d6bee03	27	finalize_deplibs="$deplib $finalize_deplibs"
	28	else
	29	deplibs="$deplib $deplibs"
	30	- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
	31	+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
	32	fi
	33	continue
	34	fi
853ff239	35	@@ -1429,16 +1429,16 @@
2d6bee03	36	case $linkmode in
	37	lib)
	38	deplibs="$deplib $deplibs"
	39	- test $pass = conv && continue
	40	+ test "$pass" = conv && continue
	41	newdependency_libs="$deplib $newdependency_libs"
	42	newlib_search_path="$newlib_search_path "`$echo "X$deplib" \| $Xsed -e 's/^-L//'`
	43	;;
	44	prog)
	45	- if test $pass = conv; then
	46	+ if test "$pass" = conv; then
	47	deplibs="$deplib $deplibs"
	48	continue
	49	fi
	50	- if test $pass = scan; then
	51	+ if test "$pass" = scan; then
	52	deplibs="$deplib $deplibs"
	53	newlib_search_path="$newlib_search_path "`$echo "X$deplib" \| $Xsed -e 's/^-L//'`
	54	else
853ff239	55	@@ -1453,7 +1453,7 @@
2d6bee03	56	continue
	57	;; # -L
	58	-R*)
	59	- if test $pass = link; then
	60	+ if test "$pass" = link; then
	61	dir=`$echo "X$deplib" \| $Xsed -e 's/^-R//'`
	62	# Make sure the xrpath contains only unique directories.
	63	case "$xrpath " in
853ff239	64	@@ -1466,7 +1466,7 @@
2d6bee03	65	;;
	66	*.la) lib="$deplib" ;;
	67	*.$libext)
	68	- if test $pass = conv; then
	69	+ if test "$pass" = conv; then
	70	deplibs="$deplib $deplibs"
	71	continue
	72	fi
853ff239	73	@@ -1489,7 +1489,7 @@
2d6bee03	74	continue
	75	;;
	76	prog)
	77	- if test $pass != link; then
	78	+ if test "$pass" != link; then
	79	deplibs="$deplib $deplibs"
	80	else
	81	compile_deplibs="$deplib $compile_deplibs"
853ff239	82	@@ -1500,7 +1500,7 @@
2d6bee03	83	esac # linkmode
	84	;; # *.$libext
	85	.lo \| .$objext)
	86	- if test $pass = dlpreopen \|\| test "$dlopen_support" != yes \|\| test "$build_libtool_libs" = no; then
	87	+ if test "$pass" = dlpreopen \|\| test "$dlopen_support" != yes \|\| test "$build_libtool_libs" = no; then
	88	# If there is no dlopen support or we're linking statically,
	89	# we need to preload.
	90	newdlprefiles="$newdlprefiles $deplib"
853ff239	91	@@ -1550,13 +1550,13 @@
2d6bee03	92
	93	if test "$linkmode,$pass" = "lib,link" \|\|
	94	test "$linkmode,$pass" = "prog,scan" \|\|
	95	- { test $linkmode = oldlib && test $linkmode = obj; }; then
	96	+ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
	97	# Add dl[pre]opened files of deplib
	98	test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
	99	test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
	100	fi
	101
	102	- if test $pass = conv; then
	103	+ if test "$pass" = conv; then
	104	# Only check for convenience libraries
	105	deplibs="$lib $deplibs"
	106	if test -z "$libdir"; then
853ff239 AF	107	@@ -1577,7 +1577,7 @@
853ff239 AF	108	fi
2d6bee03	109	tmp_libs="$tmp_libs $deplib"
	110	done
	111	- elif test $linkmode != prog && test $linkmode != lib; then
	112	+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
	113	$echo "$modename: \`$lib' is not a convenience library" 1>&2
	114	exit 1
	115	fi
853ff239	116	@@ -1595,7 +1595,7 @@
2d6bee03	117	fi
	118
	119	# This library was specified with -dlopen.
	120	- if test $pass = dlopen; then
	121	+ if test "$pass" = dlopen; then
	122	if test -z "$libdir"; then
	123	$echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
	124	exit 1
853ff239	125	@@ -1644,7 +1644,7 @@
2d6bee03	126	name=`$echo "X$laname" \| $Xsed -e 's/\.la$//' -e 's/^lib//'`
	127
	128	# This library was specified with -dlpreopen.
	129	- if test $pass = dlpreopen; then
	130	+ if test "$pass" = dlpreopen; then
	131	if test -z "$libdir"; then
	132	$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
	133	exit 1
853ff239	134	@@ -1663,7 +1663,7 @@
2d6bee03	135
	136	if test -z "$libdir"; then
	137	# Link the convenience library
	138	- if test $linkmode = lib; then
	139	+ if test "$linkmode" = lib; then
	140	deplibs="$dir/$old_library $deplibs"
	141	elif test "$linkmode,$pass" = "prog,link"; then
	142	compile_deplibs="$dir/$old_library $compile_deplibs"
853ff239	143	@@ -1674,7 +1674,7 @@
2d6bee03	144	continue
	145	fi
	146
	147	- if test $linkmode = prog && test $pass != link; then
	148	+ if test "$linkmode" = prog && test "$pass" != link; then
	149	newlib_search_path="$newlib_search_path $ladir"
	150	deplibs="$lib $deplibs"
	151
853ff239	152	@@ -1713,7 +1713,7 @@
2d6bee03	153	# Link against this shared library
	154
	155	if test "$linkmode,$pass" = "prog,link" \|\|
	156	- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
	157	+ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
	158	# Hardcode the library path.
	159	# Skip directories that are in the system default run-time
	160	# search path.
853ff239	161	@@ -1735,7 +1735,7 @@
2d6bee03	162	esac
	163	;;
	164	esac
	165	- if test $linkmode = prog; then
	166	+ if test "$linkmode" = prog; then
	167	# We need to hardcode the library path
	168	if test -n "$shlibpath_var"; then
	169	# Make sure the rpath contains only unique directories.
853ff239	170	@@ -1819,7 +1819,7 @@
2d6bee03	171	linklib=$newlib
	172	fi # test -n $old_archive_from_expsyms_cmds
	173
	174	- if test $linkmode = prog \|\| test "$mode" != relink; then
	175	+ if test "$linkmode" = prog \|\| test "$mode" != relink; then
	176	add_shlibpath=
	177	add_dir=
	178	add=
853ff239	179	@@ -1868,7 +1868,7 @@
2d6bee03	180	*) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
	181	esac
	182	fi
	183	- if test $linkmode = prog; then
	184	+ if test "$linkmode" = prog; then
	185	test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
	186	test -n "$add" && compile_deplibs="$add $compile_deplibs"
	187	else
853ff239	188	@@ -1885,7 +1885,7 @@
2d6bee03	189	fi
	190	fi
	191
	192	- if test $linkmode = prog \|\| test "$mode" = relink; then
	193	+ if test "$linkmode" = prog \|\| test "$mode" = relink; then
	194	add_shlibpath=
	195	add_dir=
	196	add=
853ff239	197	@@ -1907,7 +1907,7 @@
2d6bee03	198	add="-l$name"
	199	fi
	200
	201	- if test $linkmode = prog; then
	202	+ if test "$linkmode" = prog; then
	203	test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
	204	test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
	205	else
853ff239	206	@@ -1915,7 +1915,7 @@
2d6bee03	207	test -n "$add" && deplibs="$add $deplibs"
	208	fi
	209	fi
	210	- elif test $linkmode = prog; then
	211	+ elif test "$linkmode" = prog; then
	212	if test "$alldeplibs" = yes &&
	213	{ test "$deplibs_check_method" = pass_all \|\|
	214	{ test "$build_libtool_libs" = yes &&
853ff239	215	@@ -1975,9 +1975,9 @@
2d6bee03	216	fi
	217	fi # link shared/static library?
	218
	219	- if test $linkmode = lib; then
	220	+ if test "$linkmode" = lib; then
	221	if test -n "$dependency_libs" &&
	222	- { test $hardcode_into_libs != yes \|\| test $build_old_libs = yes \|\|
	223	+ { test "$hardcode_into_libs" != yes \|\| test $build_old_libs = yes \|\|
	224	test $link_static = yes; }; then
	225	# Extract -R from dependency_libs
	226	temp_deplibs=
853ff239	227	@@ -2009,7 +2009,7 @@
2d6bee03	228	tmp_libs="$tmp_libs $deplib"
	229	done
	230
	231	- if test $link_all_deplibs != no; then
	232	+ if test "$link_all_deplibs" != no; then
	233	# Add the search paths of all dependency libraries
	234	for deplib in $dependency_libs; do
	235	case $deplib in
853ff239	236	@@ -2052,15 +2052,15 @@
2d6bee03	237	fi # link_all_deplibs != no
	238	fi # linkmode = lib
	239	done # for deplib in $libs
	240	- if test $pass = dlpreopen; then
	241	+ if test "$pass" = dlpreopen; then
	242	# Link the dlpreopened libraries before other libraries
	243	for deplib in $save_deplibs; do
	244	deplibs="$deplib $deplibs"
	245	done
	246	fi
	247	- if test $pass != dlopen; then
	248	- test $pass != scan && dependency_libs="$newdependency_libs"
	249	- if test $pass != conv; then
	250	+ if test "$pass" != dlopen; then
	251	+ test "$pass" != scan && dependency_libs="$newdependency_libs"
	252	+ if test "$pass" != conv; then
	253	# Make sure lib_search_path contains only unique directories.
	254	lib_search_path=
	255	for dir in $newlib_search_path; do
853ff239	256	@@ -2118,7 +2118,7 @@
2d6bee03	257	deplibs=
	258	fi
	259	done # for pass
	260	- if test $linkmode = prog; then
	261	+ if test "$linkmode" = prog; then
	262	dlfiles="$newdlfiles"
	263	dlprefiles="$newdlprefiles"
	264	fi
853ff239	265	@@ -2473,7 +2473,7 @@
2d6bee03	266	;;
	267	*)
	268	# Add libc to deplibs on all other systems if necessary.
	269	- if test $build_libtool_need_lc = "yes"; then
	270	+ if test "$build_libtool_need_lc" = "yes"; then
	271	deplibs="$deplibs -lc"
	272	fi
	273	;;
853ff239	274	@@ -2765,7 +2765,7 @@
2d6bee03	275
	276	# Test again, we may have decided not to build it any more
	277	if test "$build_libtool_libs" = yes; then
	278	- if test $hardcode_into_libs = yes; then
	279	+ if test "$hardcode_into_libs" = yes; then
	280	# Hardcode the library paths
	281	hardcode_libdirs=
	282	dep_rpath=