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

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