/[pkg-kde]/tags/packages/kdemultimedia/kdemultimedia-3.5.2-2/debian/patches/98_buildprep.diff
ViewVC logotype

Contents of /tags/packages/kdemultimedia/kdemultimedia-3.5.2-2/debian/patches/98_buildprep.diff

Parent Directory Parent Directory | Revision Log Revision Log

Revision 596 - (show annotations) (download)
Thu Mar 3 05:41:41 2005 UTC (8 years, 3 months ago) by dato-guest
Original Path: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
File size: 1170132 byte(s) 
The buildprep patch for kdemultimedia.
1 #DPATCHLEVEL=1
2 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/acinclude.m4 kdemultimedia-3.4.0/acinclude.m4
3 --- kdemultimedia-3.4.0.orig/acinclude.m4 2005-02-25 18:21:55.000000000 +0100
4 +++ kdemultimedia-3.4.0/acinclude.m4 2005-03-03 06:32:15.000000000 +0100
5 @@ -1682,15 +1682,6 @@
6 KDE_USE_CLOSURE_TRUE="#"
7 KDE_USE_CLOSURE_FALSE=""
8 KDE_NO_UNDEFINED=""
9 - case $host in
10 - *-*-linux-gnu)
11 - KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
12 - [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
13 - [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
14 - [KDE_NO_UNDEFINED=""])],
15 - [KDE_NO_UNDEFINED=""])
16 - ;;
17 - esac
18 fi
19 AC_SUBST(KDE_USE_CLOSURE_TRUE)
20 AC_SUBST(KDE_USE_CLOSURE_FALSE)
21 @@ -2131,9 +2122,6 @@
22 save_CXXFLAGS="$CXXFLAGS"
23 kde_safe_LIBS="$LIBS"
24 LIBS="$LIBS $X_EXTRA_LIBS"
25 -if test "$GXX" = "yes"; then
26 -CXXFLAGS="$CXXFLAGS -pedantic-errors"
27 -fi
28 AC_TRY_COMPILE([
29 $2
30 ],
31 @@ -5686,6 +5674,7 @@
32 ## the same distribution terms that you use for the rest of that program.
33
34 # serial 47 AC_PROG_LIBTOOL
35 +# Debian $Rev: 214 $
36
37
38 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
39 @@ -5745,7 +5734,7 @@
40 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
41
42 # Always use our own libtool.
43 -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
44 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
45 AC_SUBST(LIBTOOL)dnl
46
47 # Prevent multiple expansion
48 @@ -6159,12 +6148,11 @@
49 if AC_TRY_EVAL(ac_compile); then
50 case "`/usr/bin/file conftest.o`" in
51 *32-bit*)
52 - LINUX_64_MODE="32"
53 case $host in
54 x86_64-*linux*)
55 LD="${LD-ld} -m elf_i386"
56 ;;
57 - ppc64-*linux*)
58 + ppc64-*linux*|powerpc64-*linux*)
59 LD="${LD-ld} -m elf32ppclinux"
60 ;;
61 s390x-*linux*)
62 @@ -6176,7 +6164,6 @@
63 esac
64 ;;
65 *64-bit*)
66 - LINUX_64_MODE="64"
67 case $host in
68 x86_64-*linux*)
69 LD="${LD-ld} -m elf_x86_64"
70 @@ -6306,7 +6293,7 @@
71 AC_MSG_CHECKING([the maximum length of command line arguments])
72 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
73 i=0
74 - testring="ABCD"
75 + teststring="ABCD"
76
77 case $build_os in
78 msdosdjgpp*)
79 @@ -6335,20 +6322,26 @@
80 lt_cv_sys_max_cmd_len=8192;
81 ;;
82
83 + amigaos*)
84 + # On AmigaOS with pdksh, this test takes hours, literally.
85 + # So we just punt and use a minimum line length of 8192.
86 + lt_cv_sys_max_cmd_len=8192;
87 + ;;
88 +
89 *)
90 # If test is not a shell built-in, we'll probably end up computing a
91 # maximum length that is only half of the actual maximum length, but
92 # we can't tell.
93 - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
94 - = "XX$testring") >/dev/null 2>&1 &&
95 - new_result=`expr "X$testring" : ".*" 2>&1` &&
96 + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
97 + = "XX$teststring") >/dev/null 2>&1 &&
98 + new_result=`expr "X$teststring" : ".*" 2>&1` &&
99 lt_cv_sys_max_cmd_len=$new_result &&
100 test $i != 17 # 1/2 MB should be enough
101 do
102 i=`expr $i + 1`
103 - testring=$testring$testring
104 + teststring=$teststring$teststring
105 done
106 - testring=
107 + teststring=
108 # Add a significant safety factor because C++ compilers can tack on massive
109 # amounts of additional arguments before passing them to the linker.
110 # It appears as though 1/2 is a usable value.
111 @@ -6498,7 +6491,7 @@
112 lt_cv_dlopen_self=yes
113 ])
114 ;;
115 -
116 +
117 *)
118 AC_CHECK_FUNC([shl_load],
119 [lt_cv_dlopen="shl_load"],
120 @@ -6587,13 +6580,6 @@
121 mkdir out
122 printf "$lt_simple_compile_test_code" > conftest.$ac_ext
123
124 - # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
125 - # that will create temporary files in the current directory regardless of
126 - # the output directory. Thus, making CWD read-only will cause this test
127 - # to fail, enabling locking or at least warning the user not to do parallel
128 - # builds.
129 - chmod -w .
130 -
131 lt_compiler_flag="-o out/conftest2.$ac_objext"
132 # Insert the option either (1) after the last *FLAGS variable, or
133 # (2) before a word containing "conftest.", or (3) at the end.
134 @@ -6617,8 +6603,11 @@
135 fi
136 fi
137 chmod u+w .
138 - $rm conftest* out/*
139 - rmdir out
140 + $rm conftest*
141 + # SGI C++ compiler will create directory out/ii_files/ for
142 + # template instantiation
143 + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
144 + $rm out/* && rmdir out
145 cd ..
146 rmdir conftest
147 $rm conftest*
148 @@ -6735,7 +6724,7 @@
149 *)
150 AC_MSG_RESULT([no])
151 ;;
152 - esac
153 + esac
154 fi
155 ])# AC_LIBTOOL_SYS_LIB_STRIP
156
157 @@ -6748,7 +6737,7 @@
158 library_names_spec=
159 libname_spec='lib$name'
160 soname_spec=
161 -shrext=".so"
162 +shrext_cmds=".so"
163 postinstall_cmds=
164 postuninstall_cmds=
165 finish_cmds=
166 @@ -6758,7 +6747,20 @@
167 version_type=none
168 dynamic_linker="$host_os ld.so"
169 sys_lib_dlsearch_path_spec="/lib /usr/lib"
170 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
171 +if test "$GCC" = yes; then
172 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
173 + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
174 + # if the path contains ";" then we assume it to be the separator
175 + # otherwise default to the standard path separator (i.e. ":") - it is
176 + # assumed that no part of a normal pathname contains ";" but that should
177 + # okay in the real world where ";" in dirpaths is itself problematic.
178 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
179 + else
180 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
181 + fi
182 +else
183 + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
184 +fi
185 need_lib_prefix=unknown
186 hardcode_into_libs=no
187
188 @@ -6823,7 +6825,7 @@
189 amigaos*)
190 library_names_spec='$libname.ixlibrary $libname.a'
191 # Create ${libname}_ixlibrary.a entries in /sys/libs.
192 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
193 + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
194 ;;
195
196 beos*)
197 @@ -6848,7 +6850,7 @@
198
199 cygwin* | mingw* | pw32*)
200 version_type=windows
201 - shrext=".dll"
202 + shrext_cmds=".dll"
203 need_version=no
204 need_lib_prefix=no
205
206 @@ -6913,7 +6915,7 @@
207 soname_spec='${libname}${release}${major}$shared_ext'
208 shlibpath_overrides_runpath=yes
209 shlibpath_var=DYLD_LIBRARY_PATH
210 - shrext='$(test .$module = .yes && echo .so || echo .dylib)'
211 + shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
212 # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
213 if test "$GCC" = yes; then
214 sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
215 @@ -6936,7 +6938,7 @@
216 dynamic_linker=no
217 ;;
218
219 -freebsd*-gnu*)
220 +kfreebsd*-gnu)
221 version_type=linux
222 need_lib_prefix=no
223 need_version=no
224 @@ -6996,7 +6998,7 @@
225 need_version=no
226 case "$host_cpu" in
227 ia64*)
228 - shrext='.so'
229 + shrext_cmds='.so'
230 hardcode_into_libs=yes
231 dynamic_linker="$host_os dld.so"
232 shlibpath_var=LD_LIBRARY_PATH
233 @@ -7011,7 +7013,7 @@
234 sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
235 ;;
236 hppa*64*)
237 - shrext='.sl'
238 + shrext_cmds='.sl'
239 hardcode_into_libs=yes
240 dynamic_linker="$host_os dld.sl"
241 shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
242 @@ -7022,7 +7024,7 @@
243 sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
244 ;;
245 *)
246 - shrext='.sl'
247 + shrext_cmds='.sl'
248 dynamic_linker="$host_os dld.sl"
249 shlibpath_var=SHLIB_PATH
250 shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
251 @@ -7084,22 +7086,19 @@
252 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
253 soname_spec='${libname}${release}${shared_ext}$major'
254 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
255 - libsuff=
256 - if test "x$LINUX_64_MODE" = x64; then
257 - # Some platforms are per default 64-bit, so there's no /lib64
258 - if test -d /lib64; then
259 - libsuff=64
260 - fi
261 - fi
262 shlibpath_var=LD_LIBRARY_PATH
263 shlibpath_overrides_runpath=no
264 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
265 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
266 # This implies no fast_install, which is unacceptable.
267 # Some rework will be needed to allow for fast_install
268 # before this can be enabled.
269 hardcode_into_libs=yes
270
271 + # Append ld.so.conf contents to the search path
272 + if test -f /etc/ld.so.conf; then
273 + lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
274 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
275 + fi
276 +
277 # We used to test for /lib/ld.so.1 and disable shared libraries on
278 # powerpc, because MkLinux only supported shared libraries with the
279 # GNU dynamic linker. Since this was broken with cross compilers,
280 @@ -7109,6 +7108,30 @@
281 dynamic_linker='GNU/Linux ld.so'
282 ;;
283
284 +netbsdelf*-gnu)
285 + version_type=linux
286 + need_lib_prefix=no
287 + need_version=no
288 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
289 + soname_spec='${libname}${release}${shared_ext}$major'
290 + shlibpath_var=LD_LIBRARY_PATH
291 + shlibpath_overrides_runpath=no
292 + hardcode_into_libs=yes
293 + dynamic_linker='NetBSD ld.elf_so'
294 + ;;
295 +
296 +knetbsd*-gnu)
297 + version_type=linux
298 + need_lib_prefix=no
299 + need_version=no
300 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
301 + soname_spec='${libname}${release}${shared_ext}$major'
302 + shlibpath_var=LD_LIBRARY_PATH
303 + shlibpath_overrides_runpath=no
304 + hardcode_into_libs=yes
305 + dynamic_linker='GNU ld.so'
306 + ;;
307 +
308 netbsd*)
309 version_type=sunos
310 need_lib_prefix=no
311 @@ -7118,7 +7141,7 @@
312 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
313 dynamic_linker='NetBSD (a.out) ld.so'
314 else
315 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
316 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
317 soname_spec='${libname}${release}${shared_ext}$major'
318 dynamic_linker='NetBSD ld.elf_so'
319 fi
320 @@ -7147,7 +7170,7 @@
321 openbsd*)
322 version_type=sunos
323 need_lib_prefix=no
324 - need_version=no
325 + need_version=yes
326 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
327 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
328 shlibpath_var=LD_LIBRARY_PATH
329 @@ -7167,7 +7190,7 @@
330
331 os2*)
332 libname_spec='$name'
333 - shrext=".dll"
334 + shrext_cmds=".dll"
335 need_lib_prefix=no
336 library_names_spec='$libname${shared_ext} $libname.a'
337 dynamic_linker='OS/2 ld.exe'
338 @@ -7758,31 +7781,23 @@
339 ;;
340
341 cygwin*)
342 - lt_cv_deplibs_check_method=pass_all
343 + # func_win32_libid is a shell function defined in ltmain.sh
344 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
345 + lt_cv_file_magic_cmd='func_win32_libid'
346 ;;
347 -
348 +
349 mingw* | pw32*)
350 - # win32_libid is a shell function defined in ltmain.sh
351 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
352 - lt_cv_file_magic_cmd='win32_libid'
353 + # Base MSYS/MinGW do not provide the 'file' command needed by
354 + # func_win32_libid shell function, so use a weaker test based on 'objdump'.
355 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
356 + lt_cv_file_magic_cmd='$OBJDUMP -f'
357 ;;
358
359 darwin* | rhapsody*)
360 - # this will be overwritten by pass_all, but leave it in just in case
361 - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
362 - lt_cv_file_magic_cmd='/usr/bin/file -L'
363 - case "$host_os" in
364 - rhapsody* | darwin1.[[012]])
365 - lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
366 - ;;
367 - *) # Darwin 1.3 on
368 - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
369 - ;;
370 - esac
371 lt_cv_deplibs_check_method=pass_all
372 ;;
373
374 -freebsd*)
375 +freebsd* | kfreebsd*-gnu)
376 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
377 case $host_cpu in
378 i*86 )
379 @@ -7821,42 +7836,21 @@
380 ;;
381
382 irix5* | irix6* | nonstopux*)
383 - case $host_os in
384 - irix5* | nonstopux*)
385 - # this will be overridden with pass_all, but let us keep it just in case
386 - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
387 - ;;
388 - *)
389 - case $LD in
390 - *-32|*"-32 ") libmagic=32-bit;;
391 - *-n32|*"-n32 ") libmagic=N32;;
392 - *-64|*"-64 ") libmagic=64-bit;;
393 - *) libmagic=never-match;;
394 - esac
395 - # this will be overridden with pass_all, but let us keep it just in case
396 - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
397 - ;;
398 + case $LD in
399 + *-32|*"-32 ") libmagic=32-bit;;
400 + *-n32|*"-n32 ") libmagic=N32;;
401 + *-64|*"-64 ") libmagic=64-bit;;
402 + *) libmagic=never-match;;
403 esac
404 - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
405 lt_cv_deplibs_check_method=pass_all
406 ;;
407
408 # This must be Linux ELF.
409 linux*)
410 - case $host_cpu in
411 - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
412 - lt_cv_deplibs_check_method=pass_all ;;
413 - # the debian people say, arm and glibc 2.3.1 works for them with pass_all
414 - arm* )
415 - lt_cv_deplibs_check_method=pass_all ;;
416 - *)
417 - # glibc up to 2.1.1 does not perform some relocations on ARM
418 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
419 - esac
420 - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
421 + lt_cv_deplibs_check_method=pass_all
422 ;;
423
424 -netbsd*)
425 +netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
426 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
427 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
428 else
429 @@ -7885,9 +7879,6 @@
430 ;;
431
432 osf3* | osf4* | osf5*)
433 - # this will be overridden with pass_all, but let us keep it just in case
434 - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
435 - lt_cv_file_magic_test_file=/shlib/libc.so
436 lt_cv_deplibs_check_method=pass_all
437 ;;
438
439 @@ -7897,7 +7888,6 @@
440
441 solaris*)
442 lt_cv_deplibs_check_method=pass_all
443 - lt_cv_file_magic_test_file=/lib/libc.so
444 ;;
445
446 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
447 @@ -8163,7 +8153,7 @@
448 fi
449 if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
450 AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
451 - if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
452 + if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
453 else
454 AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
455 _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
456 @@ -8213,7 +8203,7 @@
457 fi
458 ;;
459
460 -aix4*)
461 +aix4* | aix5*)
462 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
463 test "$enable_shared" = yes && enable_static=no
464 fi
465 @@ -8223,29 +8213,29 @@
466 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
467 case "$host_os" in
468 rhapsody* | darwin1.[[012]])
469 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
470 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
471 ;;
472 *) # Darwin 1.3 on
473 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
474 - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
475 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
476 else
477 - case ${MACOSX_DEPLOYMENT_TARGET} in
478 - 10.[012])
479 - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
480 - ;;
481 - 10.*)
482 - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
483 - ;;
484 - esac
485 + case ${MACOSX_DEPLOYMENT_TARGET} in
486 + 10.[[012]])
487 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
488 + ;;
489 + 10.*)
490 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
491 + ;;
492 + esac
493 fi
494 ;;
495 esac
496 output_verbose_link_cmd='echo'
497 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
498 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
499 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
500 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
501 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
502 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
503 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
504 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
505 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
506 _LT_AC_TAGVAR(hardcode_direct, $1)=no
507 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
508 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
509 @@ -8253,8 +8243,8 @@
510 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
511 else
512 _LT_AC_TAGVAR(ld_shlibs, $1)=no
513 - fi
514 - ;;
515 + fi
516 + ;;
517 esac
518 AC_MSG_RESULT([$enable_shared])
519
520 @@ -8362,8 +8352,8 @@
521 # Check if GNU C++ uses GNU ld as the underlying linker, since the
522 # archiving commands below assume that GNU ld is being used.
523 if test "$with_gnu_ld" = yes; then
524 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
525 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
526 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
527 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
528
529 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
530 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
531 @@ -8389,7 +8379,7 @@
532 # linker, instead of GNU ld. If possible, this setting should
533 # overridden to take advantage of the native linker features on
534 # the platform it is being used on.
535 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
536 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
537 fi
538
539 # Commands to make compiler produce verbose output that lists
540 @@ -8419,8 +8409,22 @@
541 exp_sym_flag='-Bexport'
542 no_entry_flag=""
543 else
544 - # KDE requires run time linking. Make it the default.
545 - aix_use_runtimelinking=yes
546 + aix_use_runtimelinking=no
547 +
548 + # Test if we are trying to use run time linking or normal
549 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
550 + # need to do runtime linking.
551 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
552 + for ld_flag in $LDFLAGS; do
553 + case $ld_flag in
554 + *-brtl*)
555 + aix_use_runtimelinking=yes
556 + break
557 + ;;
558 + esac
559 + done
560 + esac
561 +
562 exp_sym_flag='-bexport'
563 no_entry_flag='-bnoentry'
564 fi
565 @@ -8466,15 +8470,16 @@
566 shared_flag='-G'
567 else
568 if test "$aix_use_runtimelinking" = yes; then
569 - shared_flag='-qmkshrobj ${wl}-G'
570 + shared_flag='${wl}-G'
571 else
572 - shared_flag='-qmkshrobj'
573 + shared_flag='${wl}-bM:SRE'
574 fi
575 fi
576 fi
577
578 - # Let the compiler handle the export list.
579 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
580 + # It seems that -bexpall does not export symbols beginning with
581 + # underscore (_), so it is better to generate a list of symbols to export.
582 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
583 if test "$aix_use_runtimelinking" = yes; then
584 # Warning - without using the other runtime loading flags (-brtl),
585 # -berok will link without error, but may produce a broken library.
586 @@ -8483,13 +8488,12 @@
587 _LT_AC_SYS_LIBPATH_AIX
588 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
589
590 - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
591 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
592 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
593 else
594 if test "$host_cpu" = ia64; then
595 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
596 _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
597 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
598 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
599 else
600 # Determine the default libpath from the value encoded in an empty executable.
601 _LT_AC_SYS_LIBPATH_AIX
602 @@ -8504,7 +8508,7 @@
603 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
604 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
605 # This is similar to how AIX traditionally builds it's shared libraries.
606 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
607 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
608 fi
609 fi
610 ;;
611 @@ -8521,12 +8525,12 @@
612 # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
613 # as there is no search path for DLLs.
614 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
615 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
616 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
617 _LT_AC_TAGVAR(always_export_symbols, $1)=no
618 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
619
620 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
621 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
622 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
623 # If the export-symbols file already is a .def file (1st line
624 # is EXPORTS), use it as is; otherwise, prepend...
625 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
626 @@ -8535,7 +8539,7 @@
627 echo EXPORTS > $output_objdir/$soname.def;
628 cat $export_symbols >> $output_objdir/$soname.def;
629 fi~
630 - $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
631 + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
632 else
633 _LT_AC_TAGVAR(ld_shlibs, $1)=no
634 fi
635 @@ -8546,20 +8550,20 @@
636 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
637 case "$host_os" in
638 rhapsody* | darwin1.[[012]])
639 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
640 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
641 ;;
642 *) # Darwin 1.3 on
643 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
644 - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
645 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
646 else
647 - case ${MACOSX_DEPLOYMENT_TARGET} in
648 - 10.[012])
649 - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
650 - ;;
651 - 10.*)
652 - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
653 - ;;
654 - esac
655 + case ${MACOSX_DEPLOYMENT_TARGET} in
656 + 10.[[012]])
657 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
658 + ;;
659 + 10.*)
660 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
661 + ;;
662 + esac
663 fi
664 ;;
665 esac
666 @@ -8569,19 +8573,19 @@
667 lt_int_apple_cc_single_mod=yes
668 fi
669 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
670 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
671 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
672 else
673 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
674 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
675 fi
676 - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
677 + _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
678
679 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
680 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
681 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
682 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
683 else
684 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
685 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
686 fi
687 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
688 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
689 _LT_AC_TAGVAR(hardcode_direct, $1)=no
690 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
691 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
692 @@ -8616,7 +8620,7 @@
693 freebsd-elf*)
694 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
695 ;;
696 - freebsd*)
697 + freebsd* | kfreebsd*-gnu)
698 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
699 # conventions
700 _LT_AC_TAGVAR(ld_shlibs, $1)=yes
701 @@ -8638,7 +8642,7 @@
702 _LT_AC_TAGVAR(ld_shlibs, $1)=no
703 ;;
704 aCC)
705 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
706 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
707 # Commands to make compiler produce verbose output that lists
708 # what "hidden" libraries, object files and flags are used when
709 # linking a shared library.
710 @@ -8647,11 +8651,11 @@
711 # explicitly linking system object files so we need to strip them
712 # from the output so that they don't get included in the library
713 # dependencies.
714 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
715 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
716 ;;
717 *)
718 if test "$GXX" = yes; then
719 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
720 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
721 else
722 # FIXME: insert proper C++ library support
723 _LT_AC_TAGVAR(ld_shlibs, $1)=no
724 @@ -8708,7 +8712,7 @@
725 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
726 ;;
727 *)
728 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
729 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
730 ;;
731 esac
732 # Commands to make compiler produce verbose output that lists
733 @@ -8729,7 +8733,7 @@
734 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
735 ;;
736 *)
737 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
738 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
739 ;;
740 esac
741 fi
742 @@ -8744,7 +8748,7 @@
743 case $cc_basename in
744 CC)
745 # SGI C++
746 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
747 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
748
749 # Archives containing C++ object files must be created using
750 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
751 @@ -8755,9 +8759,9 @@
752 *)
753 if test "$GXX" = yes; then
754 if test "$with_gnu_ld" = no; then
755 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
756 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
757 else
758 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
759 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
760 fi
761 fi
762 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
763 @@ -8774,8 +8778,8 @@
764 # KCC will only create a shared library if the output file
765 # ends with ".so" (or ".sl" for HP-UX), so rename the library
766 # to its proper name (with version) after linking.
767 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
768 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
769 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
770 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
771 # Commands to make compiler produce verbose output that lists
772 # what "hidden" libraries, object files and flags are used when
773 # linking a shared library.
774 @@ -8797,16 +8801,16 @@
775 # Intel C++
776 with_gnu_ld=yes
777 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
778 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
779 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
780 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
781 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
782 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
783 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
784 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
785 ;;
786 cxx)
787 # Compaq C++
788 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
789 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
790 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
791 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
792
793 runpath_var=LD_RUN_PATH
794 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
795 @@ -8844,7 +8848,7 @@
796 ;;
797 esac
798 ;;
799 - netbsd*)
800 + netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
801 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
802 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
803 wlarc=
804 @@ -8863,7 +8867,7 @@
805 # KCC will only create a shared library if the output file
806 # ends with ".so" (or ".sl" for HP-UX), so rename the library
807 # to its proper name (with version) after linking.
808 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
809 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
810
811 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
812 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
813 @@ -8880,7 +8884,7 @@
814 ;;
815 cxx)
816 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
817 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
818 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
819
820 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
821 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
822 @@ -8898,7 +8902,7 @@
823 *)
824 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
825 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
826 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
827 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
828
829 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
830 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
831 @@ -8923,7 +8927,7 @@
832 # KCC will only create a shared library if the output file
833 # ends with ".so" (or ".sl" for HP-UX), so rename the library
834 # to its proper name (with version) after linking.
835 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
836 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
837
838 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
839 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
840 @@ -8939,10 +8943,10 @@
841 ;;
842 cxx)
843 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
844 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
845 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
846 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
847 echo "-hidden">> $lib.exp~
848 - $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
849 + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
850 $rm $lib.exp'
851
852 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
853 @@ -8961,7 +8965,7 @@
854 *)
855 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
856 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
857 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
858 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
859
860 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
861 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
862 @@ -9018,9 +9022,9 @@
863 CC)
864 # Sun C++ 4.2, 5.x and Centerline C++
865 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
866 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
867 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
868 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
869 - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
870 + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
871
872 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
873 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
874 @@ -9054,7 +9058,7 @@
875 ;;
876 gcx)
877 # Green Hills C++ Compiler
878 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
879 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
880
881 # The C++ compiler must be used to create the archive.
882 _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
883 @@ -9064,9 +9068,9 @@
884 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
885 _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
886 if $CC --version | grep -v '^2\.7' > /dev/null; then
887 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
888 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
889 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
890 - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
891 + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
892
893 # Commands to make compiler produce verbose output that lists
894 # what "hidden" libraries, object files and flags are used when
895 @@ -9075,9 +9079,9 @@
896 else
897 # g++ 2.7 appears to require `-G' NOT `-shared' on this
898 # platform.
899 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
900 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
901 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
902 - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
903 + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
904
905 # Commands to make compiler produce verbose output that lists
906 # what "hidden" libraries, object files and flags are used when
907 @@ -9245,7 +9249,7 @@
908 fi
909 ;;
910
911 - *.$objext|*.$libext)
912 + *.$objext)
913 # This assumes that the test object file only shows up
914 # once in the compiler output.
915 if test "$p" = "conftest.$objext"; then
916 @@ -9354,7 +9358,7 @@
917 postinstall_cmds='$RANLIB $lib'
918 fi
919 ;;
920 -aix4*)
921 +aix4* | aix5*)
922 test "$enable_shared" = yes && enable_static=no
923 ;;
924 esac
925 @@ -9496,11 +9500,12 @@
926 # without removal of \ escapes.
927 if test -n "${ZSH_VERSION+set}" ; then
928 setopt NO_GLOB_SUBST
929 - fi
930 + fi
931 # Now quote all the things that may contain metacharacters while being
932 # careful not to overquote the AC_SUBSTed values. We take copies of the
933 # variables and quote the copies for generation of the libtool script.
934 - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
935 + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
936 + SED SHELL STRIP \
937 libname_spec library_names_spec soname_spec extract_expsyms_cmds \
938 old_striplib striplib file_magic_cmd finish_cmds finish_eval \
939 deplibs_check_method reload_flag reload_cmds need_locks \
940 @@ -9550,7 +9555,7 @@
941 _LT_AC_TAGVAR(archive_cmds, $1) | \
942 _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
943 _LT_AC_TAGVAR(module_cmds, $1) | \
944 - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
945 + _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
946 _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
947 _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
948 extract_expsyms_cmds | reload_cmds | finish_cmds | \
949 @@ -9681,7 +9686,7 @@
950 NM=$lt_NM
951
952 # A symbol stripping program
953 -STRIP=$STRIP
954 +STRIP=$lt_STRIP
955
956 # Used to examine libraries when file_magic_cmd begins "file"
957 MAGIC_CMD=$MAGIC_CMD
958 @@ -9712,7 +9717,7 @@
959 libext="$libext"
960
961 # Shared library suffix (normally ".so").
962 -shrext='$shrext'
963 +shrext_cmds='$shrext_cmds'
964
965 # Executable file suffix (normally "").
966 exeext="$exeext"
967 @@ -9956,7 +9961,10 @@
968 # If there is no Makefile yet, we rely on a make rule to execute
969 # `config.status --recheck' to rerun these tests and create the
970 # libtool script then.
971 - test -f Makefile && make "$ltmain"
972 + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
973 + if test -f "$ltmain_in"; then
974 + test -f Makefile && make "$ltmain"
975 + fi
976 fi
977 ])# AC_LIBTOOL_CONFIG
978
979 @@ -10029,7 +10037,7 @@
980 symcode='[[BCDEGQRST]]'
981 ;;
982 solaris* | sysv5*)
983 - symcode='[[BDT]]'
984 + symcode='[[BDRT]]'
985 ;;
986 sysv4)
987 symcode='[[DFNSTU]]'
988 @@ -10047,7 +10055,7 @@
989 # If we're using GNU nm, then use its standard symbol codes.
990 case `$NM -V 2>&1` in
991 *GNU* | *'with BFD'*)
992 - symcode='[[ABCDGISTW]]' ;;
993 + symcode='[[ABCDGIRSTW]]' ;;
994 esac
995
996 # Try without a prefix undercore, then with it.
997 @@ -10262,7 +10270,7 @@
998 ;;
999 esac
1000 ;;
1001 - freebsd*)
1002 + freebsd* | kfreebsd*-gnu)
1003 # FreeBSD uses GNU C++
1004 ;;
1005 hpux9* | hpux10* | hpux11*)
1006 @@ -10313,7 +10321,7 @@
1007 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1008 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1009 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
1010 - ;;
1011 + ;;
1012 cxx)
1013 # Compaq C++
1014 # Make sure the PIC flag is empty. It appears that all Alpha
1015 @@ -10338,7 +10346,7 @@
1016 ;;
1017 esac
1018 ;;
1019 - netbsd*)
1020 + netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
1021 ;;
1022 osf3* | osf4* | osf5*)
1023 case $cc_basename in
1024 @@ -10649,6 +10657,9 @@
1025 cygwin* | mingw*)
1026 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
1027 ;;
1028 + linux*)
1029 + _LT_AC_TAGVAR(link_all_deplibs, $1)=no
1030 + ;;
1031 *)
1032 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1033 ;;
1034 @@ -10673,7 +10684,7 @@
1035 _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
1036 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
1037 _LT_AC_TAGVAR(module_cmds, $1)=
1038 - _LT_AC_TAGVAR(module_expsym_cmds, $1)=
1039 + _LT_AC_TAGVAR(module_expsym_cmds, $1)=
1040 _LT_AC_TAGVAR(always_export_symbols, $1)=no
1041 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1042 # include_expsyms should be a list of space-separated symbols to be *always*
1043 @@ -10747,7 +10758,7 @@
1044 _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
1045 # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
1046 # support --undefined. This deserves some investigation. FIXME
1047 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
1048 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1049 else
1050 _LT_AC_TAGVAR(ld_shlibs, $1)=no
1051 fi
1052 @@ -10757,13 +10768,13 @@
1053 # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
1054 # as there is no search path for DLLs.
1055 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1056 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
1057 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
1058 _LT_AC_TAGVAR(always_export_symbols, $1)=no
1059 _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1060 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
1061
1062 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
1063 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
1064 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
1065 # If the export-symbols file already is a .def file (1st line
1066 # is EXPORTS), use it as is; otherwise, prepend...
1067 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
1068 @@ -10772,19 +10783,19 @@
1069 echo EXPORTS > $output_objdir/$soname.def;
1070 cat $export_symbols >> $output_objdir/$soname.def;
1071 fi~
1072 - $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
1073 + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
1074 else
1075 ld_shlibs=no
1076 fi
1077 ;;
1078
1079 - netbsd*)
1080 + netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
1081 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1082 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1083 wlarc=
1084 else
1085 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
1086 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1087 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1088 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1089 fi
1090 ;;
1091
1092 @@ -10802,8 +10813,8 @@
1093
1094 EOF
1095 elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1096 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
1097 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1098 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1099 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1100 else
1101 _LT_AC_TAGVAR(ld_shlibs, $1)=no
1102 fi
1103 @@ -10816,10 +10827,36 @@
1104 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1105 ;;
1106
1107 + linux*)
1108 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1109 + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1110 + _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
1111 + supports_anon_versioning=no
1112 + case `$LD -v 2>/dev/null` in
1113 + *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
1114 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
1115 + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
1116 + *\ 2.11.*) ;; # other 2.11 versions
1117 + *) supports_anon_versioning=yes ;;
1118 + esac
1119 + if test $supports_anon_versioning = yes; then
1120 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
1121 +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
1122 +$echo "local: *; };" >> $output_objdir/$libname.ver~
1123 + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
1124 + else
1125 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
1126 + fi
1127 + _LT_AC_TAGVAR(link_all_deplibs, $1)=no
1128 + else
1129 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
1130 + fi
1131 + ;;
1132 +
1133 *)
1134 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1135 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
1136 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1137 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1138 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1139 else
1140 _LT_AC_TAGVAR(ld_shlibs, $1)=no
1141 fi
1142 @@ -10869,9 +10906,20 @@
1143 else
1144 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
1145 fi
1146 + aix_use_runtimelinking=no
1147 +
1148 + # Test if we are trying to use run time linking or normal
1149 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1150 + # need to do runtime linking.
1151 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
1152 + for ld_flag in $LDFLAGS; do
1153 + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1154 + aix_use_runtimelinking=yes
1155 + break
1156 + fi
1157 + done
1158 + esac
1159
1160 - # KDE requires run time linking. Make it the default.
1161 - aix_use_runtimelinking=yes
1162 exp_sym_flag='-bexport'
1163 no_entry_flag='-bnoentry'
1164 fi
1165 @@ -10917,29 +10965,29 @@
1166 shared_flag='-G'
1167 else
1168 if test "$aix_use_runtimelinking" = yes; then
1169 - shared_flag='-qmkshrobj ${wl}-G'
1170 + shared_flag='${wl}-G'
1171 else
1172 - shared_flag='-qmkshrobj'
1173 + shared_flag='${wl}-bM:SRE'
1174 fi
1175 fi
1176 fi
1177
1178 - # Let the compiler handle the export list.
1179 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
1180 + # It seems that -bexpall does not export symbols beginning with
1181 + # underscore (_), so it is better to generate a list of symbols to export.
1182 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
1183 if test "$aix_use_runtimelinking" = yes; then
1184 # Warning - without using the other runtime loading flags (-brtl),
1185 # -berok will link without error, but may produce a broken library.
1186 _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
1187 # Determine the default libpath from the value encoded in an empty executable.
1188 - _LT_AC_SYS_LIBPATH_AIX
1189 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1190 - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
1191 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1192 + _LT_AC_SYS_LIBPATH_AIX
1193 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
1194 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
1195 else
1196 if test "$host_cpu" = ia64; then
1197 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
1198 _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
1199 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
1200 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
1201 else
1202 # Determine the default libpath from the value encoded in an empty executable.
1203 _LT_AC_SYS_LIBPATH_AIX
1204 @@ -10954,7 +11002,7 @@
1205 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
1206 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
1207 # This is similar to how AIX traditionally builds it's shared libraries.
1208 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
1209 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
1210 fi
1211 fi
1212 ;;
1213 @@ -10977,13 +11025,13 @@
1214 # hardcode_libdir_flag_spec is actually meaningless, as there is
1215 # no search path for DLLs.
1216 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
1217 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
1218 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
1219 # Tell ltmain to make .lib files, not .a files.
1220 libext=lib
1221 # Tell ltmain to make .dll files, not .so files.
1222 - shrext=".dll"
1223 + shrext_cmds=".dll"
1224 # FIXME: Setting linknames here is a bad hack.
1225 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
1226 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
1227 # The linker will automatically build a .lib file if we build a DLL.
1228 _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
1229 # FIXME: Should let the user specify the lib program.
1230 @@ -10997,21 +11045,21 @@
1231 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
1232 case "$host_os" in
1233 rhapsody* | darwin1.[[012]])
1234 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
1235 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
1236 ;;
1237 *) # Darwin 1.3 on
1238 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
1239 - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
1240 - else
1241 - case ${MACOSX_DEPLOYMENT_TARGET} in
1242 - 10.[012])
1243 - allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
1244 - ;;
1245 - 10.*)
1246 - allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
1247 - ;;
1248 - esac
1249 - fi
1250 + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
1251 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
1252 + else
1253 + case ${MACOSX_DEPLOYMENT_TARGET} in
1254 + 10.[[012]])
1255 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
1256 + ;;
1257 + 10.*)
1258 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
1259 + ;;
1260 + esac
1261 + fi
1262 ;;
1263 esac
1264 lt_int_apple_cc_single_mod=no
1265 @@ -11020,26 +11068,26 @@
1266 lt_int_apple_cc_single_mod=yes
1267 fi
1268 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
1269 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
1270 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1271 else
1272 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
1273 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1274 fi
1275 - _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
1276 + _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1277 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
1278 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
1279 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1280 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1281 else
1282 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1283 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1284 fi
1285 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1286 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1287 _LT_AC_TAGVAR(hardcode_direct, $1)=no
1288 _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
1289 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1290 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
1291 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
1292 - else
1293 + else
1294 _LT_AC_TAGVAR(ld_shlibs, $1)=no
1295 - fi
1296 + fi
1297 ;;
1298
1299 dgux*)
1300 @@ -11072,8 +11120,8 @@
1301 ;;
1302
1303 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
1304 - freebsd*)
1305 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
1306 + freebsd* | kfreebsd*-gnu)
1307 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
1308 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
1309 _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1310 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1311 @@ -11081,7 +11129,7 @@
1312
1313 hpux9*)
1314 if test "$GCC" = yes; then
1315 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1316 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1317 else
1318 _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
1319 fi
1320 @@ -11099,10 +11147,10 @@
1321 if test "$GCC" = yes -a "$with_gnu_ld" = no; then
1322 case "$host_cpu" in
1323 hppa*64*|ia64*)
1324 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
1325 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1326 ;;
1327 *)
1328 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
1329 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
1330 ;;
1331 esac
1332 else
1333 @@ -11149,7 +11197,7 @@
1334
1335 irix5* | irix6* | nonstopux*)
1336 if test "$GCC" = yes; then
1337 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1338 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1339 else
1340 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
1341 _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
1342 @@ -11159,7 +11207,7 @@
1343 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
1344 ;;
1345
1346 - netbsd*)
1347 + netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
1348 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1349 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1350 else
1351 @@ -11182,7 +11230,7 @@
1352 _LT_AC_TAGVAR(hardcode_direct, $1)=yes
1353 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1354 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1355 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
1356 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1357 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
1358 _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
1359 else
1360 @@ -11192,7 +11240,7 @@
1361 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
1362 ;;
1363 *)
1364 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
1365 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1366 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
1367 ;;
1368 esac
1369 @@ -11203,14 +11251,14 @@
1370 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
1371 _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
1372 _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
1373 - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
1374 + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
1375 _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
1376 ;;
1377
1378 osf3*)
1379 if test "$GCC" = yes; then
1380 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1381 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1382 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1383 else
1384 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
1385 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
1386 @@ -11222,7 +11270,7 @@
1387 osf4* | osf5*) # as osf3* with the addition of -msym flag
1388 if test "$GCC" = yes; then
1389 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
1390 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1391 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1392 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1393 else
1394 _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
1395 @@ -11247,9 +11295,9 @@
1396 solaris*)
1397 _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
1398 if test "$GCC" = yes; then
1399 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
1400 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1401 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
1402 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
1403 + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
1404 else
1405 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
1406 _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
1407 @@ -11269,7 +11317,7 @@
1408 if test "x$host_vendor" = xsequent; then
1409 # Use $CC to link under sequent, because it throws in some extra .o
1410 # files that make .init and .fini sections work.
1411 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
1412 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
1413 else
1414 _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
1415 fi
1416 @@ -11329,9 +11377,9 @@
1417 sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
1418 _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
1419 if test "$GCC" = yes; then
1420 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
1421 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1422 else
1423 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
1424 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
1425 fi
1426 runpath_var='LD_RUN_PATH'
1427 _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
1428 @@ -11389,7 +11437,7 @@
1429 AC_MSG_CHECKING([whether -lc should be explicitly linked in])
1430 $rm conftest*
1431 printf "$lt_simple_compile_test_code" > conftest.$ac_ext
1432 -
1433 +
1434 if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
1435 soname=conftest
1436 lib=conftest
1437 @@ -11548,8 +11596,8 @@
1438 fi
1439 done
1440 done
1441 -])
1442 SED=$lt_cv_path_SED
1443 +])
1444 AC_MSG_RESULT([$SED])
1445 ])
1446
1447 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.guess kdemultimedia-3.4.0/admin/config.guess
1448 --- kdemultimedia-3.4.0.orig/admin/config.guess 2004-08-02 16:17:40.000000000 +0200
1449 +++ kdemultimedia-3.4.0/admin/config.guess 2005-03-03 06:34:30.490126519 +0100
1450 @@ -3,7 +3,7 @@
1451 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1452 # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1453
1454 -timestamp='2004-06-24'
1455 +timestamp='2004-11-12'
1456
1457 # This file is free software; you can redistribute it and/or modify it
1458 # under the terms of the GNU General Public License as published by
1459 @@ -203,9 +203,6 @@
1460 amiga:OpenBSD:*:*)
1461 echo m68k-unknown-openbsd${UNAME_RELEASE}
1462 exit 0 ;;
1463 - arc:OpenBSD:*:*)
1464 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1465 - exit 0 ;;
1466 cats:OpenBSD:*:*)
1467 echo arm-unknown-openbsd${UNAME_RELEASE}
1468 exit 0 ;;
1469 @@ -230,18 +227,12 @@
1470 mvmeppc:OpenBSD:*:*)
1471 echo powerpc-unknown-openbsd${UNAME_RELEASE}
1472 exit 0 ;;
1473 - pmax:OpenBSD:*:*)
1474 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1475 - exit 0 ;;
1476 sgi:OpenBSD:*:*)
1477 - echo mipseb-unknown-openbsd${UNAME_RELEASE}
1478 + echo mips64-unknown-openbsd${UNAME_RELEASE}
1479 exit 0 ;;
1480 sun3:OpenBSD:*:*)
1481 echo m68k-unknown-openbsd${UNAME_RELEASE}
1482 exit 0 ;;
1483 - wgrisc:OpenBSD:*:*)
1484 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1485 - exit 0 ;;
1486 *:OpenBSD:*:*)
1487 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
1488 exit 0 ;;
1489 @@ -328,6 +319,9 @@
1490 *:OS/390:*:*)
1491 echo i370-ibm-openedition
1492 exit 0 ;;
1493 + *:z/VM:*:*)
1494 + echo s390-ibm-zvmoe
1495 + exit 0 ;;
1496 *:OS400:*:*)
1497 echo powerpc-ibm-os400
1498 exit 0 ;;
1499 @@ -351,7 +345,7 @@
1500 DRS?6000:unix:4.0:6*)
1501 echo sparc-icl-nx6
1502 exit 0 ;;
1503 - DRS?6000:UNIX_SV:4.2*:7*)
1504 + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
1505 case `/usr/bin/uname -p` in
1506 sparc) echo sparc-icl-nx7 && exit 0 ;;
1507 esac ;;
1508 @@ -833,6 +827,12 @@
1509 cris:Linux:*:*)
1510 echo cris-axis-linux-gnu
1511 exit 0 ;;
1512 + crisv32:Linux:*:*)
1513 + echo crisv32-axis-linux-gnu
1514 + exit 0 ;;
1515 + frv:Linux:*:*)
1516 + echo frv-unknown-linux-gnu
1517 + exit 0 ;;
1518 ia64:Linux:*:*)
1519 echo ${UNAME_MACHINE}-unknown-linux-gnu
1520 exit 0 ;;
1521 @@ -1081,7 +1081,7 @@
1522 exit 0 ;;
1523 M68*:*:R3V[5678]*:*)
1524 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1525 - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
1526 + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
1527 OS_REL=''
1528 test -r /etc/.relid \
1529 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1530 @@ -1179,9 +1179,10 @@
1531 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1532 exit 0 ;;
1533 *:Darwin:*:*)
1534 - case `uname -p` in
1535 + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1536 + case $UNAME_PROCESSOR in
1537 *86) UNAME_PROCESSOR=i686 ;;
1538 - powerpc) UNAME_PROCESSOR=powerpc ;;
1539 + unknown) UNAME_PROCESSOR=powerpc ;;
1540 esac
1541 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1542 exit 0 ;;
1543 @@ -1249,7 +1250,10 @@
1544 A*) echo alpha-dec-vms && exit 0 ;;
1545 I*) echo ia64-dec-vms && exit 0 ;;
1546 V*) echo vax-dec-vms && exit 0 ;;
1547 - esac
1548 + esac ;;
1549 + *:XENIX:*:SysV)
1550 + echo i386-pc-xenix
1551 + exit 0 ;;
1552 esac
1553
1554 #echo '(No uname command or uname output not recognized.)' 1>&2
1555 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.guess.cdbs-orig kdemultimedia-3.4.0/admin/config.guess.cdbs-orig
1556 --- kdemultimedia-3.4.0.orig/admin/config.guess.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
1557 +++ kdemultimedia-3.4.0/admin/config.guess.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
1558 @@ -0,0 +1,1449 @@
1559 +#! /bin/sh
1560 +# Attempt to guess a canonical system name.
1561 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1562 +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1563 +
1564 +timestamp='2004-06-24'
1565 +
1566 +# This file is free software; you can redistribute it and/or modify it
1567 +# under the terms of the GNU General Public License as published by
1568 +# the Free Software Foundation; either version 2 of the License, or
1569 +# (at your option) any later version.
1570 +#
1571 +# This program is distributed in the hope that it will be useful, but
1572 +# WITHOUT ANY WARRANTY; without even the implied warranty of
1573 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1574 +# General Public License for more details.
1575 +#
1576 +# You should have received a copy of the GNU General Public License
1577 +# along with this program; if not, write to the Free Software
1578 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1579 +#
1580 +# As a special exception to the GNU General Public License, if you
1581 +# distribute this file as part of a program that contains a
1582 +# configuration script generated by Autoconf, you may include it under
1583 +# the same distribution terms that you use for the rest of that program.
1584 +
1585 +# Originally written by Per Bothner <per@bothner.com>.
1586 +# Please send patches to <config-patches@gnu.org>. Submit a context
1587 +# diff and a properly formatted ChangeLog entry.
1588 +#
1589 +# This script attempts to guess a canonical system name similar to
1590 +# config.sub. If it succeeds, it prints the system name on stdout, and
1591 +# exits with 0. Otherwise, it exits with 1.
1592 +#
1593 +# The plan is that this can be called by configure scripts if you
1594 +# don't specify an explicit build system type.
1595 +
1596 +me=`echo "$0" | sed -e 's,.*/,,'`
1597 +
1598 +usage="\
1599 +Usage: $0 [OPTION]
1600 +
1601 +Output the configuration name of the system \`$me' is run on.
1602 +
1603 +Operation modes:
1604 + -h, --help print this help, then exit
1605 + -t, --time-stamp print date of last modification, then exit
1606 + -v, --version print version number, then exit
1607 +
1608 +Report bugs and patches to <config-patches@gnu.org>."
1609 +
1610 +version="\
1611 +GNU config.guess ($timestamp)
1612 +
1613 +Originally written by Per Bothner.
1614 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
1615 +Free Software Foundation, Inc.
1616 +
1617 +This is free software; see the source for copying conditions. There is NO
1618 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1619 +
1620 +help="
1621 +Try \`$me --help' for more information."
1622 +
1623 +# Parse command line
1624 +while test $# -gt 0 ; do
1625 + case $1 in
1626 + --time-stamp | --time* | -t )
1627 + echo "$timestamp" ; exit 0 ;;
1628 + --version | -v )
1629 + echo "$version" ; exit 0 ;;
1630 + --help | --h* | -h )
1631 + echo "$usage"; exit 0 ;;
1632 + -- ) # Stop option processing
1633 + shift; break ;;
1634 + - ) # Use stdin as input.
1635 + break ;;
1636 + -* )
1637 + echo "$me: invalid option $1$help" >&2
1638 + exit 1 ;;
1639 + * )
1640 + break ;;
1641 + esac
1642 +done
1643 +
1644 +if test $# != 0; then
1645 + echo "$me: too many arguments$help" >&2
1646 + exit 1
1647 +fi
1648 +
1649 +trap 'exit 1' 1 2 15
1650 +
1651 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
1652 +# compiler to aid in system detection is discouraged as it requires
1653 +# temporary files to be created and, as you can see below, it is a
1654 +# headache to deal with in a portable fashion.
1655 +
1656 +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
1657 +# use `HOST_CC' if defined, but it is deprecated.
1658 +
1659 +# Portable tmp directory creation inspired by the Autoconf team.
1660 +
1661 +set_cc_for_build='
1662 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
1663 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
1664 +: ${TMPDIR=/tmp} ;
1665 + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
1666 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
1667 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
1668 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
1669 +dummy=$tmp/dummy ;
1670 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
1671 +case $CC_FOR_BUILD,$HOST_CC,$CC in
1672 + ,,) echo "int x;" > $dummy.c ;
1673 + for c in cc gcc c89 c99 ; do
1674 + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
1675 + CC_FOR_BUILD="$c"; break ;
1676 + fi ;
1677 + done ;
1678 + if test x"$CC_FOR_BUILD" = x ; then
1679 + CC_FOR_BUILD=no_compiler_found ;
1680 + fi
1681 + ;;
1682 + ,,*) CC_FOR_BUILD=$CC ;;
1683 + ,*,*) CC_FOR_BUILD=$HOST_CC ;;
1684 +esac ;'
1685 +
1686 +# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
1687 +# (ghazi@noc.rutgers.edu 1994-08-24)
1688 +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
1689 + PATH=$PATH:/.attbin ; export PATH
1690 +fi
1691 +
1692 +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
1693 +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
1694 +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
1695 +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
1696 +
1697 +# Note: order is significant - the case branches are not exclusive.
1698 +
1699 +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1700 + *:NetBSD:*:*)
1701 + # NetBSD (nbsd) targets should (where applicable) match one or
1702 + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
1703 + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
1704 + # switched to ELF, *-*-netbsd* would select the old
1705 + # object file format. This provides both forward
1706 + # compatibility and a consistent mechanism for selecting the
1707 + # object file format.
1708 + #
1709 + # Note: NetBSD doesn't particularly care about the vendor
1710 + # portion of the name. We always set it to "unknown".
1711 + sysctl="sysctl -n hw.machine_arch"
1712 + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
1713 + /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
1714 + case "${UNAME_MACHINE_ARCH}" in
1715 + armeb) machine=armeb-unknown ;;
1716 + arm*) machine=arm-unknown ;;
1717 + sh3el) machine=shl-unknown ;;
1718 + sh3eb) machine=sh-unknown ;;
1719 + *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
1720 + esac
1721 + # The Operating System including object format, if it has switched
1722 + # to ELF recently, or will in the future.
1723 + case "${UNAME_MACHINE_ARCH}" in
1724 + arm*|i386|m68k|ns32k|sh3*|sparc|vax)
1725 + eval $set_cc_for_build
1726 + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
1727 + | grep __ELF__ >/dev/null
1728 + then
1729 + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
1730 + # Return netbsd for either. FIX?
1731 + os=netbsd
1732 + else
1733 + os=netbsdelf
1734 + fi
1735 + ;;
1736 + *)
1737 + os=netbsd
1738 + ;;
1739 + esac
1740 + # The OS release
1741 + # Debian GNU/NetBSD machines have a different userland, and
1742 + # thus, need a distinct triplet. However, they do not need
1743 + # kernel version information, so it can be replaced with a
1744 + # suitable tag, in the style of linux-gnu.
1745 + case "${UNAME_VERSION}" in
1746 + Debian*)
1747 + release='-gnu'
1748 + ;;
1749 + *)
1750 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1751 + ;;
1752 + esac
1753 + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
1754 + # contains redundant information, the shorter form:
1755 + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
1756 + echo "${machine}-${os}${release}"
1757 + exit 0 ;;
1758 + amd64:OpenBSD:*:*)
1759 + echo x86_64-unknown-openbsd${UNAME_RELEASE}
1760 + exit 0 ;;
1761 + amiga:OpenBSD:*:*)
1762 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1763 + exit 0 ;;
1764 + arc:OpenBSD:*:*)
1765 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1766 + exit 0 ;;
1767 + cats:OpenBSD:*:*)
1768 + echo arm-unknown-openbsd${UNAME_RELEASE}
1769 + exit 0 ;;
1770 + hp300:OpenBSD:*:*)
1771 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1772 + exit 0 ;;
1773 + luna88k:OpenBSD:*:*)
1774 + echo m88k-unknown-openbsd${UNAME_RELEASE}
1775 + exit 0 ;;
1776 + mac68k:OpenBSD:*:*)
1777 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1778 + exit 0 ;;
1779 + macppc:OpenBSD:*:*)
1780 + echo powerpc-unknown-openbsd${UNAME_RELEASE}
1781 + exit 0 ;;
1782 + mvme68k:OpenBSD:*:*)
1783 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1784 + exit 0 ;;
1785 + mvme88k:OpenBSD:*:*)
1786 + echo m88k-unknown-openbsd${UNAME_RELEASE}
1787 + exit 0 ;;
1788 + mvmeppc:OpenBSD:*:*)
1789 + echo powerpc-unknown-openbsd${UNAME_RELEASE}
1790 + exit 0 ;;
1791 + pmax:OpenBSD:*:*)
1792 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1793 + exit 0 ;;
1794 + sgi:OpenBSD:*:*)
1795 + echo mipseb-unknown-openbsd${UNAME_RELEASE}
1796 + exit 0 ;;
1797 + sun3:OpenBSD:*:*)
1798 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1799 + exit 0 ;;
1800 + wgrisc:OpenBSD:*:*)
1801 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1802 + exit 0 ;;
1803 + *:OpenBSD:*:*)
1804 + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
1805 + exit 0 ;;
1806 + *:ekkoBSD:*:*)
1807 + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
1808 + exit 0 ;;
1809 + macppc:MirBSD:*:*)
1810 + echo powerppc-unknown-mirbsd${UNAME_RELEASE}
1811 + exit 0 ;;
1812 + *:MirBSD:*:*)
1813 + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
1814 + exit 0 ;;
1815 + alpha:OSF1:*:*)
1816 + case $UNAME_RELEASE in
1817 + *4.0)
1818 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
1819 + ;;
1820 + *5.*)
1821 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
1822 + ;;
1823 + esac
1824 + # According to Compaq, /usr/sbin/psrinfo has been available on
1825 + # OSF/1 and Tru64 systems produced since 1995. I hope that
1826 + # covers most systems running today. This code pipes the CPU
1827 + # types through head -n 1, so we only detect the type of CPU 0.
1828 + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
1829 + case "$ALPHA_CPU_TYPE" in
1830 + "EV4 (21064)")
1831 + UNAME_MACHINE="alpha" ;;
1832 + "EV4.5 (21064)")
1833 + UNAME_MACHINE="alpha" ;;
1834 + "LCA4 (21066/21068)")
1835 + UNAME_MACHINE="alpha" ;;
1836 + "EV5 (21164)")
1837 + UNAME_MACHINE="alphaev5" ;;
1838 + "EV5.6 (21164A)")
1839 + UNAME_MACHINE="alphaev56" ;;
1840 + "EV5.6 (21164PC)")
1841 + UNAME_MACHINE="alphapca56" ;;
1842 + "EV5.7 (21164PC)")
1843 + UNAME_MACHINE="alphapca57" ;;
1844 + "EV6 (21264)")
1845 + UNAME_MACHINE="alphaev6" ;;
1846 + "EV6.7 (21264A)")
1847 + UNAME_MACHINE="alphaev67" ;;
1848 + "EV6.8CB (21264C)")
1849 + UNAME_MACHINE="alphaev68" ;;
1850 + "EV6.8AL (21264B)")
1851 + UNAME_MACHINE="alphaev68" ;;
1852 + "EV6.8CX (21264D)")
1853 + UNAME_MACHINE="alphaev68" ;;
1854 + "EV6.9A (21264/EV69A)")
1855 + UNAME_MACHINE="alphaev69" ;;
1856 + "EV7 (21364)")
1857 + UNAME_MACHINE="alphaev7" ;;
1858 + "EV7.9 (21364A)")
1859 + UNAME_MACHINE="alphaev79" ;;
1860 + esac
1861 + # A Pn.n version is a patched version.
1862 + # A Vn.n version is a released version.
1863 + # A Tn.n version is a released field test version.
1864 + # A Xn.n version is an unreleased experimental baselevel.
1865 + # 1.2 uses "1.2" for uname -r.
1866 + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1867 + exit 0 ;;
1868 + Alpha\ *:Windows_NT*:*)
1869 + # How do we know it's Interix rather than the generic POSIX subsystem?
1870 + # Should we change UNAME_MACHINE based on the output of uname instead
1871 + # of the specific Alpha model?
1872 + echo alpha-pc-interix
1873 + exit 0 ;;
1874 + 21064:Windows_NT:50:3)
1875 + echo alpha-dec-winnt3.5
1876 + exit 0 ;;
1877 + Amiga*:UNIX_System_V:4.0:*)
1878 + echo m68k-unknown-sysv4
1879 + exit 0;;
1880 + *:[Aa]miga[Oo][Ss]:*:*)
1881 + echo ${UNAME_MACHINE}-unknown-amigaos
1882 + exit 0 ;;
1883 + *:[Mm]orph[Oo][Ss]:*:*)
1884 + echo ${UNAME_MACHINE}-unknown-morphos
1885 + exit 0 ;;
1886 + *:OS/390:*:*)
1887 + echo i370-ibm-openedition
1888 + exit 0 ;;
1889 + *:OS400:*:*)
1890 + echo powerpc-ibm-os400
1891 + exit 0 ;;
1892 + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
1893 + echo arm-acorn-riscix${UNAME_RELEASE}
1894 + exit 0;;
1895 + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
1896 + echo hppa1.1-hitachi-hiuxmpp
1897 + exit 0;;
1898 + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
1899 + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
1900 + if test "`(/bin/universe) 2>/dev/null`" = att ; then
1901 + echo pyramid-pyramid-sysv3
1902 + else
1903 + echo pyramid-pyramid-bsd
1904 + fi
1905 + exit 0 ;;
1906 + NILE*:*:*:dcosx)
1907 + echo pyramid-pyramid-svr4
1908 + exit 0 ;;
1909 + DRS?6000:unix:4.0:6*)
1910 + echo sparc-icl-nx6
1911 + exit 0 ;;
1912 + DRS?6000:UNIX_SV:4.2*:7*)
1913 + case `/usr/bin/uname -p` in
1914 + sparc) echo sparc-icl-nx7 && exit 0 ;;
1915 + esac ;;
1916 + sun4H:SunOS:5.*:*)
1917 + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1918 + exit 0 ;;
1919 + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
1920 + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1921 + exit 0 ;;
1922 + i86pc:SunOS:5.*:*)
1923 + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1924 + exit 0 ;;
1925 + sun4*:SunOS:6*:*)
1926 + # According to config.sub, this is the proper way to canonicalize
1927 + # SunOS6. Hard to guess exactly what SunOS6 will be like, but
1928 + # it's likely to be more like Solaris than SunOS4.
1929 + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1930 + exit 0 ;;
1931 + sun4*:SunOS:*:*)
1932 + case "`/usr/bin/arch -k`" in
1933 + Series*|S4*)
1934 + UNAME_RELEASE=`uname -v`
1935 + ;;
1936 + esac
1937 + # Japanese Language versions have a version number like `4.1.3-JL'.
1938 + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
1939 + exit 0 ;;
1940 + sun3*:SunOS:*:*)
1941 + echo m68k-sun-sunos${UNAME_RELEASE}
1942 + exit 0 ;;
1943 + sun*:*:4.2BSD:*)
1944 + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1945 + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
1946 + case "`/bin/arch`" in
1947 + sun3)
1948 + echo m68k-sun-sunos${UNAME_RELEASE}
1949 + ;;
1950 + sun4)
1951 + echo sparc-sun-sunos${UNAME_RELEASE}
1952 + ;;
1953 + esac
1954 + exit 0 ;;
1955 + aushp:SunOS:*:*)
1956 + echo sparc-auspex-sunos${UNAME_RELEASE}
1957 + exit 0 ;;
1958 + # The situation for MiNT is a little confusing. The machine name
1959 + # can be virtually everything (everything which is not
1960 + # "atarist" or "atariste" at least should have a processor
1961 + # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
1962 + # to the lowercase version "mint" (or "freemint"). Finally
1963 + # the system name "TOS" denotes a system which is actually not
1964 + # MiNT. But MiNT is downward compatible to TOS, so this should
1965 + # be no problem.
1966 + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
1967 + echo m68k-atari-mint${UNAME_RELEASE}
1968 + exit 0 ;;
1969 + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
1970 + echo m68k-atari-mint${UNAME_RELEASE}
1971 + exit 0 ;;
1972 + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
1973 + echo m68k-atari-mint${UNAME_RELEASE}
1974 + exit 0 ;;
1975 + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
1976 + echo m68k-milan-mint${UNAME_RELEASE}
1977 + exit 0 ;;
1978 + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
1979 + echo m68k-hades-mint${UNAME_RELEASE}
1980 + exit 0 ;;
1981 + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
1982 + echo m68k-unknown-mint${UNAME_RELEASE}
1983 + exit 0 ;;
1984 + m68k:machten:*:*)
1985 + echo m68k-apple-machten${UNAME_RELEASE}
1986 + exit 0 ;;
1987 + powerpc:machten:*:*)
1988 + echo powerpc-apple-machten${UNAME_RELEASE}
1989 + exit 0 ;;
1990 + RISC*:Mach:*:*)
1991 + echo mips-dec-mach_bsd4.3
1992 + exit 0 ;;
1993 + RISC*:ULTRIX:*:*)
1994 + echo mips-dec-ultrix${UNAME_RELEASE}
1995 + exit 0 ;;
1996 + VAX*:ULTRIX*:*:*)
1997 + echo vax-dec-ultrix${UNAME_RELEASE}
1998 + exit 0 ;;
1999 + 2020:CLIX:*:* | 2430:CLIX:*:*)
2000 + echo clipper-intergraph-clix${UNAME_RELEASE}
2001 + exit 0 ;;
2002 + mips:*:*:UMIPS | mips:*:*:RISCos)
2003 + eval $set_cc_for_build
2004 + sed 's/^ //' << EOF >$dummy.c
2005 +#ifdef __cplusplus
2006 +#include <stdio.h> /* for printf() prototype */
2007 + int main (int argc, char *argv[]) {
2008 +#else
2009 + int main (argc, argv) int argc; char *argv[]; {
2010 +#endif
2011 + #if defined (host_mips) && defined (MIPSEB)
2012 + #if defined (SYSTYPE_SYSV)
2013 + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
2014 + #endif
2015 + #if defined (SYSTYPE_SVR4)
2016 + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
2017 + #endif
2018 + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
2019 + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
2020 + #endif
2021 + #endif
2022 + exit (-1);
2023 + }
2024 +EOF
2025 + $CC_FOR_BUILD -o $dummy $dummy.c \
2026 + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
2027 + && exit 0
2028 + echo mips-mips-riscos${UNAME_RELEASE}
2029 + exit 0 ;;
2030 + Motorola:PowerMAX_OS:*:*)
2031 + echo powerpc-motorola-powermax
2032 + exit 0 ;;
2033 + Motorola:*:4.3:PL8-*)
2034 + echo powerpc-harris-powermax
2035 + exit 0 ;;
2036 + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
2037 + echo powerpc-harris-powermax
2038 + exit 0 ;;
2039 + Night_Hawk:Power_UNIX:*:*)
2040 + echo powerpc-harris-powerunix
2041 + exit 0 ;;
2042 + m88k:CX/UX:7*:*)
2043 + echo m88k-harris-cxux7
2044 + exit 0 ;;
2045 + m88k:*:4*:R4*)
2046 + echo m88k-motorola-sysv4
2047 + exit 0 ;;
2048 + m88k:*:3*:R3*)
2049 + echo m88k-motorola-sysv3
2050 + exit 0 ;;
2051 + AViiON:dgux:*:*)
2052 + # DG/UX returns AViiON for all architectures
2053 + UNAME_PROCESSOR=`/usr/bin/uname -p`
2054 + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
2055 + then
2056 + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
2057 + [ ${TARGET_BINARY_INTERFACE}x = x ]
2058 + then
2059 + echo m88k-dg-dgux${UNAME_RELEASE}
2060 + else
2061 + echo m88k-dg-dguxbcs${UNAME_RELEASE}
2062 + fi
2063 + else
2064 + echo i586-dg-dgux${UNAME_RELEASE}
2065 + fi
2066 + exit 0 ;;
2067 + M88*:DolphinOS:*:*) # DolphinOS (SVR3)
2068 + echo m88k-dolphin-sysv3
2069 + exit 0 ;;
2070 + M88*:*:R3*:*)
2071 + # Delta 88k system running SVR3
2072 + echo m88k-motorola-sysv3
2073 + exit 0 ;;
2074 + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
2075 + echo m88k-tektronix-sysv3
2076 + exit 0 ;;
2077 + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
2078 + echo m68k-tektronix-bsd
2079 + exit 0 ;;
2080 + *:IRIX*:*:*)
2081 + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
2082 + exit 0 ;;
2083 + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
2084 + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
2085 + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
2086 + i*86:AIX:*:*)
2087 + echo i386-ibm-aix
2088 + exit 0 ;;
2089 + ia64:AIX:*:*)
2090 + if [ -x /usr/bin/oslevel ] ; then
2091 + IBM_REV=`/usr/bin/oslevel`
2092 + else
2093 + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
2094 + fi
2095 + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
2096 + exit 0 ;;
2097 + *:AIX:2:3)
2098 + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
2099 + eval $set_cc_for_build
2100 + sed 's/^ //' << EOF >$dummy.c
2101 + #include <sys/systemcfg.h>
2102 +
2103 + main()
2104 + {
2105 + if (!__power_pc())
2106 + exit(1);
2107 + puts("powerpc-ibm-aix3.2.5");
2108 + exit(0);
2109 + }
2110 +EOF
2111 + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
2112 + echo rs6000-ibm-aix3.2.5
2113 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
2114 + echo rs6000-ibm-aix3.2.4
2115 + else
2116 + echo rs6000-ibm-aix3.2
2117 + fi
2118 + exit 0 ;;
2119 + *:AIX:*:[45])
2120 + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
2121 + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
2122 + IBM_ARCH=rs6000
2123 + else
2124 + IBM_ARCH=powerpc
2125 + fi
2126 + if [ -x /usr/bin/oslevel ] ; then
2127 + IBM_REV=`/usr/bin/oslevel`
2128 + else
2129 + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
2130 + fi
2131 + echo ${IBM_ARCH}-ibm-aix${IBM_REV}
2132 + exit 0 ;;
2133 + *:AIX:*:*)
2134 + echo rs6000-ibm-aix
2135 + exit 0 ;;
2136 + ibmrt:4.4BSD:*|romp-ibm:BSD:*)
2137 + echo romp-ibm-bsd4.4
2138 + exit 0 ;;
2139 + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
2140 + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
2141 + exit 0 ;; # report: romp-ibm BSD 4.3
2142 + *:BOSX:*:*)
2143 + echo rs6000-bull-bosx
2144 + exit 0 ;;
2145 + DPX/2?00:B.O.S.:*:*)
2146 + echo m68k-bull-sysv3
2147 + exit 0 ;;
2148 + 9000/[34]??:4.3bsd:1.*:*)
2149 + echo m68k-hp-bsd
2150 + exit 0 ;;
2151 + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
2152 + echo m68k-hp-bsd4.4
2153 + exit 0 ;;
2154 + 9000/[34678]??:HP-UX:*:*)
2155 + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
2156 + case "${UNAME_MACHINE}" in
2157 + 9000/31? ) HP_ARCH=m68000 ;;
2158 + 9000/[34]?? ) HP_ARCH=m68k ;;
2159 + 9000/[678][0-9][0-9])
2160 + if [ -x /usr/bin/getconf ]; then
2161 + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
2162 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
2163 + case "${sc_cpu_version}" in
2164 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
2165 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
2166 + 532) # CPU_PA_RISC2_0
2167 + case "${sc_kernel_bits}" in
2168 + 32) HP_ARCH="hppa2.0n" ;;
2169 + 64) HP_ARCH="hppa2.0w" ;;
2170 + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
2171 + esac ;;
2172 + esac
2173 + fi
2174 + if [ "${HP_ARCH}" = "" ]; then
2175 + eval $set_cc_for_build
2176 + sed 's/^ //' << EOF >$dummy.c
2177 +
2178 + #define _HPUX_SOURCE
2179 + #include <stdlib.h>
2180 + #include <unistd.h>
2181 +
2182 + int main ()
2183 + {
2184 + #if defined(_SC_KERNEL_BITS)
2185 + long bits = sysconf(_SC_KERNEL_BITS);
2186 + #endif
2187 + long cpu = sysconf (_SC_CPU_VERSION);
2188 +
2189 + switch (cpu)
2190 + {
2191 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
2192 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
2193 + case CPU_PA_RISC2_0:
2194 + #if defined(_SC_KERNEL_BITS)
2195 + switch (bits)
2196 + {
2197 + case 64: puts ("hppa2.0w"); break;
2198 + case 32: puts ("hppa2.0n"); break;
2199 + default: puts ("hppa2.0"); break;
2200 + } break;
2201 + #else /* !defined(_SC_KERNEL_BITS) */
2202 + puts ("hppa2.0"); break;
2203 + #endif
2204 + default: puts ("hppa1.0"); break;
2205 + }
2206 + exit (0);
2207 + }
2208 +EOF
2209 + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
2210 + test -z "$HP_ARCH" && HP_ARCH=hppa
2211 + fi ;;
2212 + esac
2213 + if [ ${HP_ARCH} = "hppa2.0w" ]
2214 + then
2215 + # avoid double evaluation of $set_cc_for_build
2216 + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
2217 + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
2218 + then
2219 + HP_ARCH="hppa2.0w"
2220 + else
2221 + HP_ARCH="hppa64"
2222 + fi
2223 + fi
2224 + echo ${HP_ARCH}-hp-hpux${HPUX_REV}
2225 + exit 0 ;;
2226 + ia64:HP-UX:*:*)
2227 + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
2228 + echo ia64-hp-hpux${HPUX_REV}
2229 + exit 0 ;;
2230 + 3050*:HI-UX:*:*)
2231 + eval $set_cc_for_build
2232 + sed 's/^ //' << EOF >$dummy.c
2233 + #include <unistd.h>
2234 + int
2235 + main ()
2236 + {
2237 + long cpu = sysconf (_SC_CPU_VERSION);
2238 + /* The order matters, because CPU_IS_HP_MC68K erroneously returns
2239 + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
2240 + results, however. */
2241 + if (CPU_IS_PA_RISC (cpu))
2242 + {
2243 + switch (cpu)
2244 + {
2245 + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
2246 + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
2247 + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
2248 + default: puts ("hppa-hitachi-hiuxwe2"); break;
2249 + }
2250 + }
2251 + else if (CPU_IS_HP_MC68K (cpu))
2252 + puts ("m68k-hitachi-hiuxwe2");
2253 + else puts ("unknown-hitachi-hiuxwe2");
2254 + exit (0);
2255 + }
2256 +EOF
2257 + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
2258 + echo unknown-hitachi-hiuxwe2
2259 + exit 0 ;;
2260 + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
2261 + echo hppa1.1-hp-bsd
2262 + exit 0 ;;
2263 + 9000/8??:4.3bsd:*:*)
2264 + echo hppa1.0-hp-bsd
2265 + exit 0 ;;
2266 + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
2267 + echo hppa1.0-hp-mpeix
2268 + exit 0 ;;
2269 + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
2270 + echo hppa1.1-hp-osf
2271 + exit 0 ;;
2272 + hp8??:OSF1:*:*)
2273 + echo hppa1.0-hp-osf
2274 + exit 0 ;;
2275 + i*86:OSF1:*:*)
2276 + if [ -x /usr/sbin/sysversion ] ; then
2277 + echo ${UNAME_MACHINE}-unknown-osf1mk
2278 + else
2279 + echo ${UNAME_MACHINE}-unknown-osf1
2280 + fi
2281 + exit 0 ;;
2282 + parisc*:Lites*:*:*)
2283 + echo hppa1.1-hp-lites
2284 + exit 0 ;;
2285 + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
2286 + echo c1-convex-bsd
2287 + exit 0 ;;
2288 + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
2289 + if getsysinfo -f scalar_acc
2290 + then echo c32-convex-bsd
2291 + else echo c2-convex-bsd
2292 + fi
2293 + exit 0 ;;
2294 + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
2295 + echo c34-convex-bsd
2296 + exit 0 ;;
2297 + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
2298 + echo c38-convex-bsd
2299 + exit 0 ;;
2300 + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
2301 + echo c4-convex-bsd
2302 + exit 0 ;;
2303 + CRAY*Y-MP:*:*:*)
2304 + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2305 + exit 0 ;;
2306 + CRAY*[A-Z]90:*:*:*)
2307 + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
2308 + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
2309 + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
2310 + -e 's/\.[^.]*$/.X/'
2311 + exit 0 ;;
2312 + CRAY*TS:*:*:*)
2313 + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2314 + exit 0 ;;
2315 + CRAY*T3E:*:*:*)
2316 + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2317 + exit 0 ;;
2318 + CRAY*SV1:*:*:*)
2319 + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2320 + exit 0 ;;
2321 + *:UNICOS/mp:*:*)
2322 + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2323 + exit 0 ;;
2324 + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
2325 + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
2326 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2327 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
2328 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2329 + exit 0 ;;
2330 + 5000:UNIX_System_V:4.*:*)
2331 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2332 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
2333 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2334 + exit 0 ;;
2335 + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
2336 + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
2337 + exit 0 ;;
2338 + sparc*:BSD/OS:*:*)
2339 + echo sparc-unknown-bsdi${UNAME_RELEASE}
2340 + exit 0 ;;
2341 + *:BSD/OS:*:*)
2342 + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
2343 + exit 0 ;;
2344 + *:FreeBSD:*:*)
2345 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
2346 + exit 0 ;;
2347 + i*:CYGWIN*:*)
2348 + echo ${UNAME_MACHINE}-pc-cygwin
2349 + exit 0 ;;
2350 + i*:MINGW*:*)
2351 + echo ${UNAME_MACHINE}-pc-mingw32
2352 + exit 0 ;;
2353 + i*:PW*:*)
2354 + echo ${UNAME_MACHINE}-pc-pw32
2355 + exit 0 ;;
2356 + x86:Interix*:[34]*)
2357 + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
2358 + exit 0 ;;
2359 + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
2360 + echo i${UNAME_MACHINE}-pc-mks
2361 + exit 0 ;;
2362 + i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
2363 + # How do we know it's Interix rather than the generic POSIX subsystem?
2364 + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
2365 + # UNAME_MACHINE based on the output of uname instead of i386?
2366 + echo i586-pc-interix
2367 + exit 0 ;;
2368 + i*:UWIN*:*)
2369 + echo ${UNAME_MACHINE}-pc-uwin
2370 + exit 0 ;;
2371 + p*:CYGWIN*:*)
2372 + echo powerpcle-unknown-cygwin
2373 + exit 0 ;;
2374 + prep*:SunOS:5.*:*)
2375 + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2376 + exit 0 ;;
2377 + *:GNU:*:*)
2378 + # the GNU system
2379 + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
2380 + exit 0 ;;
2381 + *:GNU/*:*:*)
2382 + # other systems with GNU libc and userland
2383 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
2384 + exit 0 ;;
2385 + i*86:Minix:*:*)
2386 + echo ${UNAME_MACHINE}-pc-minix
2387 + exit 0 ;;
2388 + arm*:Linux:*:*)
2389 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2390 + exit 0 ;;
2391 + cris:Linux:*:*)
2392 + echo cris-axis-linux-gnu
2393 + exit 0 ;;
2394 + ia64:Linux:*:*)
2395 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2396 + exit 0 ;;
2397 + m32r*:Linux:*:*)
2398 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2399 + exit 0 ;;
2400 + m68*:Linux:*:*)
2401 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2402 + exit 0 ;;
2403 + mips:Linux:*:*)
2404 + eval $set_cc_for_build
2405 + sed 's/^ //' << EOF >$dummy.c
2406 + #undef CPU
2407 + #undef mips
2408 + #undef mipsel
2409 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2410 + CPU=mipsel
2411 + #else
2412 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2413 + CPU=mips
2414 + #else
2415 + CPU=
2416 + #endif
2417 + #endif
2418 +EOF
2419 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
2420 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
2421 + ;;
2422 + mips64:Linux:*:*)
2423 + eval $set_cc_for_build
2424 + sed 's/^ //' << EOF >$dummy.c
2425 + #undef CPU
2426 + #undef mips64
2427 + #undef mips64el
2428 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2429 + CPU=mips64el
2430 + #else
2431 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2432 + CPU=mips64
2433 + #else
2434 + CPU=
2435 + #endif
2436 + #endif
2437 +EOF
2438 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
2439 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
2440 + ;;
2441 + ppc:Linux:*:*)
2442 + echo powerpc-unknown-linux-gnu
2443 + exit 0 ;;
2444 + ppc64:Linux:*:*)
2445 + echo powerpc64-unknown-linux-gnu
2446 + exit 0 ;;
2447 + alpha:Linux:*:*)
2448 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
2449 + EV5) UNAME_MACHINE=alphaev5 ;;
2450 + EV56) UNAME_MACHINE=alphaev56 ;;
2451 + PCA56) UNAME_MACHINE=alphapca56 ;;
2452 + PCA57) UNAME_MACHINE=alphapca56 ;;
2453 + EV6) UNAME_MACHINE=alphaev6 ;;
2454 + EV67) UNAME_MACHINE=alphaev67 ;;
2455 + EV68*) UNAME_MACHINE=alphaev68 ;;
2456 + esac
2457 + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
2458 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
2459 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
2460 + exit 0 ;;
2461 + parisc:Linux:*:* | hppa:Linux:*:*)
2462 + # Look for CPU level
2463 + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
2464 + PA7*) echo hppa1.1-unknown-linux-gnu ;;
2465 + PA8*) echo hppa2.0-unknown-linux-gnu ;;
2466 + *) echo hppa-unknown-linux-gnu ;;
2467 + esac
2468 + exit 0 ;;
2469 + parisc64:Linux:*:* | hppa64:Linux:*:*)
2470 + echo hppa64-unknown-linux-gnu
2471 + exit 0 ;;
2472 + s390:Linux:*:* | s390x:Linux:*:*)
2473 + echo ${UNAME_MACHINE}-ibm-linux
2474 + exit 0 ;;
2475 + sh64*:Linux:*:*)
2476 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2477 + exit 0 ;;
2478 + sh*:Linux:*:*)
2479 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2480 + exit 0 ;;
2481 + sparc:Linux:*:* | sparc64:Linux:*:*)
2482 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2483 + exit 0 ;;
2484 + x86_64:Linux:*:*)
2485 + echo x86_64-unknown-linux-gnu
2486 + exit 0 ;;
2487 + i*86:Linux:*:*)
2488 + # The BFD linker knows what the default object file format is, so
2489 + # first see if it will tell us. cd to the root directory to prevent
2490 + # problems with other programs or directories called `ld' in the path.
2491 + # Set LC_ALL=C to ensure ld outputs messages in English.
2492 + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
2493 + | sed -ne '/supported targets:/!d
2494 + s/[ ][ ]*/ /g
2495 + s/.*supported targets: *//
2496 + s/ .*//
2497 + p'`
2498 + case "$ld_supported_targets" in
2499 + elf32-i386)
2500 + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
2501 + ;;
2502 + a.out-i386-linux)
2503 + echo "${UNAME_MACHINE}-pc-linux-gnuaout"
2504 + exit 0 ;;
2505 + coff-i386)
2506 + echo "${UNAME_MACHINE}-pc-linux-gnucoff"
2507 + exit 0 ;;
2508 + "")
2509 + # Either a pre-BFD a.out linker (linux-gnuoldld) or
2510 + # one that does not give us useful --help.
2511 + echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
2512 + exit 0 ;;
2513 + esac
2514 + # Determine whether the default compiler is a.out or elf
2515 + eval $set_cc_for_build
2516 + sed 's/^ //' << EOF >$dummy.c
2517 + #include <features.h>
2518 + #ifdef __ELF__
2519 + # ifdef __GLIBC__
2520 + # if __GLIBC__ >= 2
2521 + LIBC=gnu
2522 + # else
2523 + LIBC=gnulibc1
2524 + # endif
2525 + # else
2526 + LIBC=gnulibc1
2527 + # endif
2528 + #else
2529 + #ifdef __INTEL_COMPILER
2530 + LIBC=gnu
2531 + #else
2532 + LIBC=gnuaout
2533 + #endif
2534 + #endif
2535 + #ifdef __dietlibc__
2536 + LIBC=dietlibc
2537 + #endif
2538 +EOF
2539 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
2540 + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
2541 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
2542 + ;;
2543 + i*86:DYNIX/ptx:4*:*)
2544 + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
2545 + # earlier versions are messed up and put the nodename in both
2546 + # sysname and nodename.
2547 + echo i386-sequent-sysv4
2548 + exit 0 ;;
2549 + i*86:UNIX_SV:4.2MP:2.*)
2550 + # Unixware is an offshoot of SVR4, but it has its own version
2551 + # number series starting with 2...
2552 + # I am not positive that other SVR4 systems won't match this,
2553 + # I just have to hope. -- rms.
2554 + # Use sysv4.2uw... so that sysv4* matches it.
2555 + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
2556 + exit 0 ;;
2557 + i*86:OS/2:*:*)
2558 + # If we were able to find `uname', then EMX Unix compatibility
2559 + # is probably installed.
2560 + echo ${UNAME_MACHINE}-pc-os2-emx
2561 + exit 0 ;;
2562 + i*86:XTS-300:*:STOP)
2563 + echo ${UNAME_MACHINE}-unknown-stop
2564 + exit 0 ;;
2565 + i*86:atheos:*:*)
2566 + echo ${UNAME_MACHINE}-unknown-atheos
2567 + exit 0 ;;
2568 + i*86:syllable:*:*)
2569 + echo ${UNAME_MACHINE}-pc-syllable
2570 + exit 0 ;;
2571 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
2572 + echo i386-unknown-lynxos${UNAME_RELEASE}
2573 + exit 0 ;;
2574 + i*86:*DOS:*:*)
2575 + echo ${UNAME_MACHINE}-pc-msdosdjgpp
2576 + exit 0 ;;
2577 + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
2578 + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
2579 + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
2580 + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
2581 + else
2582 + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
2583 + fi
2584 + exit 0 ;;
2585 + i*86:*:5:[78]*)
2586 + case `/bin/uname -X | grep "^Machine"` in
2587 + *486*) UNAME_MACHINE=i486 ;;
2588 + *Pentium) UNAME_MACHINE=i586 ;;
2589 + *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
2590 + esac
2591 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
2592 + exit 0 ;;
2593 + i*86:*:3.2:*)
2594 + if test -f /usr/options/cb.name; then
2595 + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
2596 + echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
2597 + elif /bin/uname -X 2>/dev/null >/dev/null ; then
2598 + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
2599 + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
2600 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
2601 + && UNAME_MACHINE=i586
2602 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
2603 + && UNAME_MACHINE=i686
2604 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
2605 + && UNAME_MACHINE=i686
2606 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
2607 + else
2608 + echo ${UNAME_MACHINE}-pc-sysv32
2609 + fi
2610 + exit 0 ;;
2611 + pc:*:*:*)
2612 + # Left here for compatibility:
2613 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
2614 + # the processor, so we play safe by assuming i386.
2615 + echo i386-pc-msdosdjgpp
2616 + exit 0 ;;
2617 + Intel:Mach:3*:*)
2618 + echo i386-pc-mach3
2619 + exit 0 ;;
2620 + paragon:*:*:*)
2621 + echo i860-intel-osf1
2622 + exit 0 ;;
2623 + i860:*:4.*:*) # i860-SVR4
2624 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
2625 + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
2626 + else # Add other i860-SVR4 vendors below as they are discovered.
2627 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
2628 + fi
2629 + exit 0 ;;
2630 + mini*:CTIX:SYS*5:*)
2631 + # "miniframe"
2632 + echo m68010-convergent-sysv
2633 + exit 0 ;;
2634 + mc68k:UNIX:SYSTEM5:3.51m)
2635 + echo m68k-convergent-sysv
2636 + exit 0 ;;
2637 + M680?0:D-NIX:5.3:*)
2638 + echo m68k-diab-dnix
2639 + exit 0 ;;
2640 + M68*:*:R3V[5678]*:*)
2641 + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
2642 + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
2643 + OS_REL=''
2644 + test -r /etc/.relid \
2645 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
2646 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
2647 + && echo i486-ncr-sysv4.3${OS_REL} && exit 0
2648 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
2649 + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
2650 + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
2651 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
2652 + && echo i486-ncr-sysv4 && exit 0 ;;
2653 + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
2654 + echo m68k-unknown-lynxos${UNAME_RELEASE}
2655 + exit 0 ;;
2656 + mc68030:UNIX_System_V:4.*:*)
2657 + echo m68k-atari-sysv4
2658 + exit 0 ;;
2659 + TSUNAMI:LynxOS:2.*:*)
2660 + echo sparc-unknown-lynxos${UNAME_RELEASE}
2661 + exit 0 ;;
2662 + rs6000:LynxOS:2.*:*)
2663 + echo rs6000-unknown-lynxos${UNAME_RELEASE}
2664 + exit 0 ;;
2665 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
2666 + echo powerpc-unknown-lynxos${UNAME_RELEASE}
2667 + exit 0 ;;
2668 + SM[BE]S:UNIX_SV:*:*)
2669 + echo mips-dde-sysv${UNAME_RELEASE}
2670 + exit 0 ;;
2671 + RM*:ReliantUNIX-*:*:*)
2672 + echo mips-sni-sysv4
2673 + exit 0 ;;
2674 + RM*:SINIX-*:*:*)
2675 + echo mips-sni-sysv4
2676 + exit 0 ;;
2677 + *:SINIX-*:*:*)
2678 + if uname -p 2>/dev/null >/dev/null ; then
2679 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
2680 + echo ${UNAME_MACHINE}-sni-sysv4
2681 + else
2682 + echo ns32k-sni-sysv
2683 + fi
2684 + exit 0 ;;
2685 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
2686 + # says <Richard.M.Bartel@ccMail.Census.GOV>
2687 + echo i586-unisys-sysv4
2688 + exit 0 ;;
2689 + *:UNIX_System_V:4*:FTX*)
2690 + # From Gerald Hewes <hewes@openmarket.com>.
2691 + # How about differentiating between stratus architectures? -djm
2692 + echo hppa1.1-stratus-sysv4
2693 + exit 0 ;;
2694 + *:*:*:FTX*)
2695 + # From seanf@swdc.stratus.com.
2696 + echo i860-stratus-sysv4
2697 + exit 0 ;;
2698 + *:VOS:*:*)
2699 + # From Paul.Green@stratus.com.
2700 + echo hppa1.1-stratus-vos
2701 + exit 0 ;;
2702 + mc68*:A/UX:*:*)
2703 + echo m68k-apple-aux${UNAME_RELEASE}
2704 + exit 0 ;;
2705 + news*:NEWS-OS:6*:*)
2706 + echo mips-sony-newsos6
2707 + exit 0 ;;
2708 + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
2709 + if [ -d /usr/nec ]; then
2710 + echo mips-nec-sysv${UNAME_RELEASE}
2711 + else
2712 + echo mips-unknown-sysv${UNAME_RELEASE}
2713 + fi
2714 + exit 0 ;;
2715 + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
2716 + echo powerpc-be-beos
2717 + exit 0 ;;
2718 + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
2719 + echo powerpc-apple-beos
2720 + exit 0 ;;
2721 + BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
2722 + echo i586-pc-beos
2723 + exit 0 ;;
2724 + SX-4:SUPER-UX:*:*)
2725 + echo sx4-nec-superux${UNAME_RELEASE}
2726 + exit 0 ;;
2727 + SX-5:SUPER-UX:*:*)
2728 + echo sx5-nec-superux${UNAME_RELEASE}
2729 + exit 0 ;;
2730 + SX-6:SUPER-UX:*:*)
2731 + echo sx6-nec-superux${UNAME_RELEASE}
2732 + exit 0 ;;
2733 + Power*:Rhapsody:*:*)
2734 + echo powerpc-apple-rhapsody${UNAME_RELEASE}
2735 + exit 0 ;;
2736 + *:Rhapsody:*:*)
2737 + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
2738 + exit 0 ;;
2739 + *:Darwin:*:*)
2740 + case `uname -p` in
2741 + *86) UNAME_PROCESSOR=i686 ;;
2742 + powerpc) UNAME_PROCESSOR=powerpc ;;
2743 + esac
2744 + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
2745 + exit 0 ;;
2746 + *:procnto*:*:* | *:QNX:[0123456789]*:*)
2747 + UNAME_PROCESSOR=`uname -p`
2748 + if test "$UNAME_PROCESSOR" = "x86"; then
2749 + UNAME_PROCESSOR=i386
2750 + UNAME_MACHINE=pc
2751 + fi
2752 + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
2753 + exit 0 ;;
2754 + *:QNX:*:4*)
2755 + echo i386-pc-qnx
2756 + exit 0 ;;
2757 + NSR-?:NONSTOP_KERNEL:*:*)
2758 + echo nsr-tandem-nsk${UNAME_RELEASE}
2759 + exit 0 ;;
2760 + *:NonStop-UX:*:*)
2761 + echo mips-compaq-nonstopux
2762 + exit 0 ;;
2763 + BS2000:POSIX*:*:*)
2764 + echo bs2000-siemens-sysv
2765 + exit 0 ;;
2766 + DS/*:UNIX_System_V:*:*)
2767 + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
2768 + exit 0 ;;
2769 + *:Plan9:*:*)
2770 + # "uname -m" is not consistent, so use $cputype instead. 386
2771 + # is converted to i386 for consistency with other x86
2772 + # operating systems.
2773 + if test "$cputype" = "386"; then
2774 + UNAME_MACHINE=i386
2775 + else
2776 + UNAME_MACHINE="$cputype"
2777 + fi
2778 + echo ${UNAME_MACHINE}-unknown-plan9
2779 + exit 0 ;;
2780 + *:TOPS-10:*:*)
2781 + echo pdp10-unknown-tops10
2782 + exit 0 ;;
2783 + *:TENEX:*:*)
2784 + echo pdp10-unknown-tenex
2785 + exit 0 ;;
2786 + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
2787 + echo pdp10-dec-tops20
2788 + exit 0 ;;
2789 + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
2790 + echo pdp10-xkl-tops20
2791 + exit 0 ;;
2792 + *:TOPS-20:*:*)
2793 + echo pdp10-unknown-tops20
2794 + exit 0 ;;
2795 + *:ITS:*:*)
2796 + echo pdp10-unknown-its
2797 + exit 0 ;;
2798 + SEI:*:*:SEIUX)
2799 + echo mips-sei-seiux${UNAME_RELEASE}
2800 + exit 0 ;;
2801 + *:DragonFly:*:*)
2802 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
2803 + exit 0 ;;
2804 + *:*VMS:*:*)
2805 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
2806 + case "${UNAME_MACHINE}" in
2807 + A*) echo alpha-dec-vms && exit 0 ;;
2808 + I*) echo ia64-dec-vms && exit 0 ;;
2809 + V*) echo vax-dec-vms && exit 0 ;;
2810 + esac
2811 +esac
2812 +
2813 +#echo '(No uname command or uname output not recognized.)' 1>&2
2814 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
2815 +
2816 +eval $set_cc_for_build
2817 +cat >$dummy.c <<EOF
2818 +#ifdef _SEQUENT_
2819 +# include <sys/types.h>
2820 +# include <sys/utsname.h>
2821 +#endif
2822 +main ()
2823 +{
2824 +#if defined (sony)
2825 +#if defined (MIPSEB)
2826 + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
2827 + I don't know.... */
2828 + printf ("mips-sony-bsd\n"); exit (0);
2829 +#else
2830 +#include <sys/param.h>
2831 + printf ("m68k-sony-newsos%s\n",
2832 +#ifdef NEWSOS4
2833 + "4"
2834 +#else
2835 + ""
2836 +#endif
2837 + ); exit (0);
2838 +#endif
2839 +#endif
2840 +
2841 +#if defined (__arm) && defined (__acorn) && defined (__unix)
2842 + printf ("arm-acorn-riscix"); exit (0);
2843 +#endif
2844 +
2845 +#if defined (hp300) && !defined (hpux)
2846 + printf ("m68k-hp-bsd\n"); exit (0);
2847 +#endif
2848 +
2849 +#if defined (NeXT)
2850 +#if !defined (__ARCHITECTURE__)
2851 +#define __ARCHITECTURE__ "m68k"
2852 +#endif
2853 + int version;
2854 + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
2855 + if (version < 4)
2856 + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
2857 + else
2858 + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
2859 + exit (0);
2860 +#endif
2861 +
2862 +#if defined (MULTIMAX) || defined (n16)
2863 +#if defined (UMAXV)
2864 + printf ("ns32k-encore-sysv\n"); exit (0);
2865 +#else
2866 +#if defined (CMU)
2867 + printf ("ns32k-encore-mach\n"); exit (0);
2868 +#else
2869 + printf ("ns32k-encore-bsd\n"); exit (0);
2870 +#endif
2871 +#endif
2872 +#endif
2873 +
2874 +#if defined (__386BSD__)
2875 + printf ("i386-pc-bsd\n"); exit (0);
2876 +#endif
2877 +
2878 +#if defined (sequent)
2879 +#if defined (i386)
2880 + printf ("i386-sequent-dynix\n"); exit (0);
2881 +#endif
2882 +#if defined (ns32000)
2883 + printf ("ns32k-sequent-dynix\n"); exit (0);
2884 +#endif
2885 +#endif
2886 +
2887 +#if defined (_SEQUENT_)
2888 + struct utsname un;
2889 +
2890 + uname(&un);
2891 +
2892 + if (strncmp(un.version, "V2", 2) == 0) {
2893 + printf ("i386-sequent-ptx2\n"); exit (0);
2894 + }
2895 + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
2896 + printf ("i386-sequent-ptx1\n"); exit (0);
2897 + }
2898 + printf ("i386-sequent-ptx\n"); exit (0);
2899 +
2900 +#endif
2901 +
2902 +#if defined (vax)
2903 +# if !defined (ultrix)
2904 +# include <sys/param.h>
2905 +# if defined (BSD)
2906 +# if BSD == 43
2907 + printf ("vax-dec-bsd4.3\n"); exit (0);
2908 +# else
2909 +# if BSD == 199006
2910 + printf ("vax-dec-bsd4.3reno\n"); exit (0);
2911 +# else
2912 + printf ("vax-dec-bsd\n"); exit (0);
2913 +# endif
2914 +# endif
2915 +# else
2916 + printf ("vax-dec-bsd\n"); exit (0);
2917 +# endif
2918 +# else
2919 + printf ("vax-dec-ultrix\n"); exit (0);
2920 +# endif
2921 +#endif
2922 +
2923 +#if defined (alliant) && defined (i860)
2924 + printf ("i860-alliant-bsd\n"); exit (0);
2925 +#endif
2926 +
2927 + exit (1);
2928 +}
2929 +EOF
2930 +
2931 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
2932 +
2933 +# Apollos put the system type in the environment.
2934 +
2935 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
2936 +
2937 +# Convex versions that predate uname can use getsysinfo(1)
2938 +
2939 +if [ -x /usr/convex/getsysinfo ]
2940 +then
2941 + case `getsysinfo -f cpu_type` in
2942 + c1*)
2943 + echo c1-convex-bsd
2944 + exit 0 ;;
2945 + c2*)
2946 + if getsysinfo -f scalar_acc
2947 + then echo c32-convex-bsd
2948 + else echo c2-convex-bsd
2949 + fi
2950 + exit 0 ;;
2951 + c34*)
2952 + echo c34-convex-bsd
2953 + exit 0 ;;
2954 + c38*)
2955 + echo c38-convex-bsd
2956 + exit 0 ;;
2957 + c4*)
2958 + echo c4-convex-bsd
2959 + exit 0 ;;
2960 + esac
2961 +fi
2962 +
2963 +cat >&2 <<EOF
2964 +$0: unable to guess system type
2965 +
2966 +This script, last modified $timestamp, has failed to recognize
2967 +the operating system you are using. It is advised that you
2968 +download the most up to date version of the config scripts from
2969 +
2970 + ftp://ftp.gnu.org/pub/gnu/config/
2971 +
2972 +If the version you run ($0) is already up to date, please
2973 +send the following data and any information you think might be
2974 +pertinent to <config-patches@gnu.org> in order to provide the needed
2975 +information to handle your system.
2976 +
2977 +config.guess timestamp = $timestamp
2978 +
2979 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
2980 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
2981 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
2982 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
2983 +
2984 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
2985 +/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
2986 +
2987 +hostinfo = `(hostinfo) 2>/dev/null`
2988 +/bin/universe = `(/bin/universe) 2>/dev/null`
2989 +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
2990 +/bin/arch = `(/bin/arch) 2>/dev/null`
2991 +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
2992 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
2993 +
2994 +UNAME_MACHINE = ${UNAME_MACHINE}
2995 +UNAME_RELEASE = ${UNAME_RELEASE}
2996 +UNAME_SYSTEM = ${UNAME_SYSTEM}
2997 +UNAME_VERSION = ${UNAME_VERSION}
2998 +EOF
2999 +
3000 +exit 1
3001 +
3002 +# Local variables:
3003 +# eval: (add-hook 'write-file-hooks 'time-stamp)
3004 +# time-stamp-start: "timestamp='"
3005 +# time-stamp-format: "%:y-%02m-%02d"
3006 +# time-stamp-end: "'"
3007 +# End:
3008 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.sub kdemultimedia-3.4.0/admin/config.sub
3009 --- kdemultimedia-3.4.0.orig/admin/config.sub 2004-08-02 16:17:40.000000000 +0200
3010 +++ kdemultimedia-3.4.0/admin/config.sub 2005-03-03 06:34:30.501124641 +0100
3011 @@ -3,7 +3,7 @@
3012 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3013 # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
3014
3015 -timestamp='2004-06-24'
3016 +timestamp='2004-11-30'
3017
3018 # This file is (in principle) common to ALL GNU software.
3019 # The presence of a machine in this file suggests that SOME GNU software
3020 @@ -267,7 +267,7 @@
3021 | tahoe | thumb | tic4x | tic80 | tron \
3022 | v850 | v850e \
3023 | we32k \
3024 - | x86 | xscale | xstormy16 | xtensa \
3025 + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
3026 | z8k)
3027 basic_machine=$basic_machine-unknown
3028 ;;
3029 @@ -343,8 +343,8 @@
3030 | tron-* \
3031 | v850-* | v850e-* | vax-* \
3032 | we32k-* \
3033 - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
3034 - | xtensa-* \
3035 + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
3036 + | xstormy16-* | xtensa-* \
3037 | ymp-* \
3038 | z8k-*)
3039 ;;
3040 @@ -457,6 +457,9 @@
3041 crds | unos)
3042 basic_machine=m68k-crds
3043 ;;
3044 + crisv32 | crisv32-* | etraxfs*)
3045 + basic_machine=crisv32-axis
3046 + ;;
3047 cris | cris-* | etrax*)
3048 basic_machine=cris-axis
3049 ;;
3050 @@ -486,6 +489,10 @@
3051 basic_machine=m88k-motorola
3052 os=-sysv3
3053 ;;
3054 + djgpp)
3055 + basic_machine=i586-pc
3056 + os=-msdosdjgpp
3057 + ;;
3058 dpx20 | dpx20-*)
3059 basic_machine=rs6000-bull
3060 os=-bosx
3061 @@ -1026,6 +1033,10 @@
3062 basic_machine=hppa1.1-winbond
3063 os=-proelf
3064 ;;
3065 + xbox)
3066 + basic_machine=i686-pc
3067 + os=-mingw32
3068 + ;;
3069 xps | xps100)
3070 basic_machine=xps100-honeywell
3071 ;;
3072 @@ -1294,6 +1305,9 @@
3073 -kaos*)
3074 os=-kaos
3075 ;;
3076 + -zvmoe)
3077 + os=-zvmoe
3078 + ;;
3079 -none)
3080 ;;
3081 *)
3082 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.sub.cdbs-orig kdemultimedia-3.4.0/admin/config.sub.cdbs-orig
3083 --- kdemultimedia-3.4.0.orig/admin/config.sub.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
3084 +++ kdemultimedia-3.4.0/admin/config.sub.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
3085 @@ -0,0 +1,1552 @@
3086 +#! /bin/sh
3087 +# Configuration validation subroutine script.
3088 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3089 +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
3090 +
3091 +timestamp='2004-06-24'
3092 +
3093 +# This file is (in principle) common to ALL GNU software.
3094 +# The presence of a machine in this file suggests that SOME GNU software
3095 +# can handle that machine. It does not imply ALL GNU software can.
3096 +#
3097 +# This file is free software; you can redistribute it and/or modify
3098 +# it under the terms of the GNU General Public License as published by
3099 +# the Free Software Foundation; either version 2 of the License, or
3100 +# (at your option) any later version.
3101 +#
3102 +# This program is distributed in the hope that it will be useful,
3103 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
3104 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3105 +# GNU General Public License for more details.
3106 +#
3107 +# You should have received a copy of the GNU General Public License
3108 +# along with this program; if not, write to the Free Software
3109 +# Foundation, Inc., 59 Temple Place - Suite 330,
3110 +# Boston, MA 02111-1307, USA.
3111 +
3112 +# As a special exception to the GNU General Public License, if you
3113 +# distribute this file as part of a program that contains a
3114 +# configuration script generated by Autoconf, you may include it under
3115 +# the same distribution terms that you use for the rest of that program.
3116 +
3117 +# Please send patches to <config-patches@gnu.org>. Submit a context
3118 +# diff and a properly formatted ChangeLog entry.
3119 +#
3120 +# Configuration subroutine to validate and canonicalize a configuration type.
3121 +# Supply the specified configuration type as an argument.
3122 +# If it is invalid, we print an error message on stderr and exit with code 1.
3123 +# Otherwise, we print the canonical config type on stdout and succeed.
3124 +
3125 +# This file is supposed to be the same for all GNU packages
3126 +# and recognize all the CPU types, system types and aliases
3127 +# that are meaningful with *any* GNU software.
3128 +# Each package is responsible for reporting which valid configurations
3129 +# it does not support. The user should be able to distinguish
3130 +# a failure to support a valid configuration from a meaningless
3131 +# configuration.
3132 +
3133 +# The goal of this file is to map all the various variations of a given
3134 +# machine specification into a single specification in the form:
3135 +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
3136 +# or in some cases, the newer four-part form:
3137 +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
3138 +# It is wrong to echo any other type of specification.
3139 +
3140 +me=`echo "$0" | sed -e 's,.*/,,'`
3141 +
3142 +usage="\
3143 +Usage: $0 [OPTION] CPU-MFR-OPSYS
3144 + $0 [OPTION] ALIAS
3145 +
3146 +Canonicalize a configuration name.
3147 +
3148 +Operation modes:
3149 + -h, --help print this help, then exit
3150 + -t, --time-stamp print date of last modification, then exit
3151 + -v, --version print version number, then exit
3152 +
3153 +Report bugs and patches to <config-patches@gnu.org>."
3154 +
3155 +version="\
3156 +GNU config.sub ($timestamp)
3157 +
3158 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
3159 +Free Software Foundation, Inc.
3160 +
3161 +This is free software; see the source for copying conditions. There is NO
3162 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
3163 +
3164 +help="
3165 +Try \`$me --help' for more information."
3166 +
3167 +# Parse command line
3168 +while test $# -gt 0 ; do
3169 + case $1 in
3170 + --time-stamp | --time* | -t )
3171 + echo "$timestamp" ; exit 0 ;;
3172 + --version | -v )
3173 + echo "$version" ; exit 0 ;;
3174 + --help | --h* | -h )
3175 + echo "$usage"; exit 0 ;;
3176 + -- ) # Stop option processing
3177 + shift; break ;;
3178 + - ) # Use stdin as input.
3179 + break ;;
3180 + -* )
3181 + echo "$me: invalid option $1$help"
3182 + exit 1 ;;
3183 +
3184 + *local*)
3185 + # First pass through any local machine types.
3186 + echo $1
3187 + exit 0;;
3188 +
3189 + * )
3190 + break ;;
3191 + esac
3192 +done
3193 +
3194 +case $# in
3195 + 0) echo "$me: missing argument$help" >&2
3196 + exit 1;;
3197 + 1) ;;
3198 + *) echo "$me: too many arguments$help" >&2
3199 + exit 1;;
3200 +esac
3201 +
3202 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
3203 +# Here we must recognize all the valid KERNEL-OS combinations.
3204 +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
3205 +case $maybe_os in
3206 + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
3207 + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
3208 + os=-$maybe_os
3209 + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
3210 + ;;
3211 + *)
3212 + basic_machine=`echo $1 | sed 's/-[^-]*$//'`
3213 + if [ $basic_machine != $1 ]
3214 + then os=`echo $1 | sed 's/.*-/-/'`
3215 + else os=; fi
3216 + ;;
3217 +esac
3218 +
3219 +### Let's recognize common machines as not being operating systems so
3220 +### that things like config.sub decstation-3100 work. We also
3221 +### recognize some manufacturers as not being operating systems, so we
3222 +### can provide default operating systems below.
3223 +case $os in
3224 + -sun*os*)
3225 + # Prevent following clause from handling this invalid input.
3226 + ;;
3227 + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
3228 + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
3229 + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
3230 + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
3231 + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
3232 + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
3233 + -apple | -axis | -knuth | -cray)
3234 + os=
3235 + basic_machine=$1
3236 + ;;
3237 + -sim | -cisco | -oki | -wec | -winbond)
3238 + os=
3239 + basic_machine=$1
3240 + ;;
3241 + -scout)
3242 + ;;
3243 + -wrs)
3244 + os=-vxworks
3245 + basic_machine=$1
3246 + ;;
3247 + -chorusos*)
3248 + os=-chorusos
3249 + basic_machine=$1
3250 + ;;
3251 + -chorusrdb)
3252 + os=-chorusrdb
3253 + basic_machine=$1
3254 + ;;
3255 + -hiux*)
3256 + os=-hiuxwe2
3257 + ;;
3258 + -sco5)
3259 + os=-sco3.2v5
3260 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3261 + ;;
3262 + -sco4)
3263 + os=-sco3.2v4
3264 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3265 + ;;
3266 + -sco3.2.[4-9]*)
3267 + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
3268 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3269 + ;;
3270 + -sco3.2v[4-9]*)
3271 + # Don't forget version if it is 3.2v4 or newer.
3272 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3273 + ;;
3274 + -sco*)
3275 + os=-sco3.2v2
3276 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3277 + ;;
3278 + -udk*)
3279 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3280 + ;;
3281 + -isc)
3282 + os=-isc2.2
3283 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3284 + ;;
3285 + -clix*)
3286 + basic_machine=clipper-intergraph
3287 + ;;
3288 + -isc*)
3289 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3290 + ;;
3291 + -lynx*)
3292 + os=-lynxos
3293 + ;;
3294 + -ptx*)
3295 + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
3296 + ;;
3297 + -windowsnt*)
3298 + os=`echo $os | sed -e 's/windowsnt/winnt/'`
3299 + ;;
3300 + -psos*)
3301 + os=-psos
3302 + ;;
3303 + -mint | -mint[0-9]*)
3304 + basic_machine=m68k-atari
3305 + os=-mint
3306 + ;;
3307 +esac
3308 +
3309 +# Decode aliases for certain CPU-COMPANY combinations.
3310 +case $basic_machine in
3311 + # Recognize the basic CPU types without company name.
3312 + # Some are omitted here because they have special meanings below.
3313 + 1750a | 580 \
3314 + | a29k \
3315 + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
3316 + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
3317 + | am33_2.0 \
3318 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
3319 + | c4x | clipper \
3320 + | d10v | d30v | dlx | dsp16xx \
3321 + | fr30 | frv \
3322 + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
3323 + | i370 | i860 | i960 | ia64 \
3324 + | ip2k | iq2000 \
3325 + | m32r | m32rle | m68000 | m68k | m88k | mcore \
3326 + | mips | mipsbe | mipseb | mipsel | mipsle \
3327 + | mips16 \
3328 + | mips64 | mips64el \
3329 + | mips64vr | mips64vrel \
3330 + | mips64orion | mips64orionel \
3331 + | mips64vr4100 | mips64vr4100el \
3332 + | mips64vr4300 | mips64vr4300el \
3333 + | mips64vr5000 | mips64vr5000el \
3334 + | mipsisa32 | mipsisa32el \
3335 + | mipsisa32r2 | mipsisa32r2el \
3336 + | mipsisa64 | mipsisa64el \
3337 + | mipsisa64r2 | mipsisa64r2el \
3338 + | mipsisa64sb1 | mipsisa64sb1el \
3339 + | mipsisa64sr71k | mipsisa64sr71kel \
3340 + | mipstx39 | mipstx39el \
3341 + | mn10200 | mn10300 \
3342 + | msp430 \
3343 + | ns16k | ns32k \
3344 + | openrisc | or32 \
3345 + | pdp10 | pdp11 | pj | pjl \
3346 + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
3347 + | pyramid \
3348 + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
3349 + | sh64 | sh64le \
3350 + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
3351 + | strongarm \
3352 + | tahoe | thumb | tic4x | tic80 | tron \
3353 + | v850 | v850e \
3354 + | we32k \
3355 + | x86 | xscale | xstormy16 | xtensa \
3356 + | z8k)
3357 + basic_machine=$basic_machine-unknown
3358 + ;;
3359 + m6811 | m68hc11 | m6812 | m68hc12)
3360 + # Motorola 68HC11/12.
3361 + basic_machine=$basic_machine-unknown
3362 + os=-none
3363 + ;;
3364 + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
3365 + ;;
3366 +
3367 + # We use `pc' rather than `unknown'
3368 + # because (1) that's what they normally are, and
3369 + # (2) the word "unknown" tends to confuse beginning users.
3370 + i*86 | x86_64)
3371 + basic_machine=$basic_machine-pc
3372 + ;;
3373 + # Object if more than one company name word.
3374 + *-*-*)
3375 + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
3376 + exit 1
3377 + ;;
3378 + # Recognize the basic CPU types with company name.
3379 + 580-* \
3380 + | a29k-* \
3381 + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
3382 + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
3383 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
3384 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
3385 + | avr-* \
3386 + | bs2000-* \
3387 + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
3388 + | clipper-* | craynv-* | cydra-* \
3389 + | d10v-* | d30v-* | dlx-* \
3390 + | elxsi-* \
3391 + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
3392 + | h8300-* | h8500-* \
3393 + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
3394 + | i*86-* | i860-* | i960-* | ia64-* \
3395 + | ip2k-* | iq2000-* \
3396 + | m32r-* | m32rle-* \
3397 + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
3398 + | m88110-* | m88k-* | mcore-* \
3399 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
3400 + | mips16-* \
3401 + | mips64-* | mips64el-* \
3402 + | mips64vr-* | mips64vrel-* \
3403 + | mips64orion-* | mips64orionel-* \
3404 + | mips64vr4100-* | mips64vr4100el-* \
3405 + | mips64vr4300-* | mips64vr4300el-* \
3406 + | mips64vr5000-* | mips64vr5000el-* \
3407 + | mipsisa32-* | mipsisa32el-* \
3408 + | mipsisa32r2-* | mipsisa32r2el-* \
3409 + | mipsisa64-* | mipsisa64el-* \
3410 + | mipsisa64r2-* | mipsisa64r2el-* \
3411 + | mipsisa64sb1-* | mipsisa64sb1el-* \
3412 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
3413 + | mipstx39-* | mipstx39el-* \
3414 + | mmix-* \
3415 + | msp430-* \
3416 + | none-* | np1-* | ns16k-* | ns32k-* \
3417 + | orion-* \
3418 + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
3419 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
3420 + | pyramid-* \
3421 + | romp-* | rs6000-* \
3422 + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
3423 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
3424 + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
3425 + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
3426 + | tahoe-* | thumb-* \
3427 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
3428 + | tron-* \
3429 + | v850-* | v850e-* | vax-* \
3430 + | we32k-* \
3431 + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
3432 + | xtensa-* \
3433 + | ymp-* \
3434 + | z8k-*)
3435 + ;;
3436 + # Recognize the various machine names and aliases which stand
3437 + # for a CPU type and a company and sometimes even an OS.
3438 + 386bsd)
3439 + basic_machine=i386-unknown
3440 + os=-bsd
3441 + ;;
3442 + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
3443 + basic_machine=m68000-att
3444 + ;;
3445 + 3b*)
3446 + basic_machine=we32k-att
3447 + ;;
3448 + a29khif)
3449 + basic_machine=a29k-amd
3450 + os=-udi
3451 + ;;
3452 + abacus)
3453 + basic_machine=abacus-unknown
3454 + ;;
3455 + adobe68k)
3456 + basic_machine=m68010-adobe
3457 + os=-scout
3458 + ;;
3459 + alliant | fx80)
3460 + basic_machine=fx80-alliant
3461 + ;;
3462 + altos | altos3068)
3463 + basic_machine=m68k-altos
3464 + ;;
3465 + am29k)
3466 + basic_machine=a29k-none
3467 + os=-bsd
3468 + ;;
3469 + amd64)
3470 + basic_machine=x86_64-pc
3471 + ;;
3472 + amd64-*)
3473 + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
3474 + ;;
3475 + amdahl)
3476 + basic_machine=580-amdahl
3477 + os=-sysv
3478 + ;;
3479 + amiga | amiga-*)
3480 + basic_machine=m68k-unknown
3481 + ;;
3482 + amigaos | amigados)
3483 + basic_machine=m68k-unknown
3484 + os=-amigaos
3485 + ;;
3486 + amigaunix | amix)
3487 + basic_machine=m68k-unknown
3488 + os=-sysv4
3489 + ;;
3490 + apollo68)
3491 + basic_machine=m68k-apollo
3492 + os=-sysv
3493 + ;;
3494 + apollo68bsd)
3495 + basic_machine=m68k-apollo
3496 + os=-bsd
3497 + ;;
3498 + aux)
3499 + basic_machine=m68k-apple
3500 + os=-aux
3501 + ;;
3502 + balance)
3503 + basic_machine=ns32k-sequent
3504 + os=-dynix
3505 + ;;
3506 + c90)
3507 + basic_machine=c90-cray
3508 + os=-unicos
3509 + ;;
3510 + convex-c1)
3511 + basic_machine=c1-convex
3512 + os=-bsd
3513 + ;;
3514 + convex-c2)
3515 + basic_machine=c2-convex
3516 + os=-bsd
3517 + ;;
3518 + convex-c32)
3519 + basic_machine=c32-convex
3520 + os=-bsd
3521 + ;;
3522 + convex-c34)
3523 + basic_machine=c34-convex
3524 + os=-bsd
3525 + ;;
3526 + convex-c38)
3527 + basic_machine=c38-convex
3528 + os=-bsd
3529 + ;;
3530 + cray | j90)
3531 + basic_machine=j90-cray
3532 + os=-unicos
3533 + ;;
3534 + craynv)
3535 + basic_machine=craynv-cray
3536 + os=-unicosmp
3537 + ;;
3538 + cr16c)
3539 + basic_machine=cr16c-unknown
3540 + os=-elf
3541 + ;;
3542 + crds | unos)
3543 + basic_machine=m68k-crds
3544 + ;;
3545 + cris | cris-* | etrax*)
3546 + basic_machine=cris-axis
3547 + ;;
3548 + crx)
3549 + basic_machine=crx-unknown
3550 + os=-elf
3551 + ;;
3552 + da30 | da30-*)
3553 + basic_machine=m68k-da30
3554 + ;;
3555 + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
3556 + basic_machine=mips-dec
3557 + ;;
3558 + decsystem10* | dec10*)
3559 + basic_machine=pdp10-dec
3560 + os=-tops10
3561 + ;;
3562 + decsystem20* | dec20*)
3563 + basic_machine=pdp10-dec
3564 + os=-tops20
3565 + ;;
3566 + delta | 3300 | motorola-3300 | motorola-delta \
3567 + | 3300-motorola | delta-motorola)
3568 + basic_machine=m68k-motorola
3569 + ;;
3570 + delta88)
3571 + basic_machine=m88k-motorola
3572 + os=-sysv3
3573 + ;;
3574 + dpx20 | dpx20-*)
3575 + basic_machine=rs6000-bull
3576 + os=-bosx
3577 + ;;
3578 + dpx2* | dpx2*-bull)
3579 + basic_machine=m68k-bull
3580 + os=-sysv3
3581 + ;;
3582 + ebmon29k)
3583 + basic_machine=a29k-amd
3584 + os=-ebmon
3585 + ;;
3586 + elxsi)
3587 + basic_machine=elxsi-elxsi
3588 + os=-bsd
3589 + ;;
3590 + encore | umax | mmax)
3591 + basic_machine=ns32k-encore
3592 + ;;
3593 + es1800 | OSE68k | ose68k | ose | OSE)
3594 + basic_machine=m68k-ericsson
3595 + os=-ose
3596 + ;;
3597 + fx2800)
3598 + basic_machine=i860-alliant
3599 + ;;
3600 + genix)
3601 + basic_machine=ns32k-ns
3602 + ;;
3603 + gmicro)
3604 + basic_machine=tron-gmicro
3605 + os=-sysv
3606 + ;;
3607 + go32)
3608 + basic_machine=i386-pc
3609 + os=-go32
3610 + ;;
3611 + h3050r* | hiux*)
3612 + basic_machine=hppa1.1-hitachi
3613 + os=-hiuxwe2
3614 + ;;
3615 + h8300hms)
3616 + basic_machine=h8300-hitachi
3617 + os=-hms
3618 + ;;
3619 + h8300xray)
3620 + basic_machine=h8300-hitachi
3621 + os=-xray
3622 + ;;
3623 + h8500hms)
3624 + basic_machine=h8500-hitachi
3625 + os=-hms
3626 + ;;
3627 + harris)
3628 + basic_machine=m88k-harris
3629 + os=-sysv3
3630 + ;;
3631 + hp300-*)
3632 + basic_machine=m68k-hp
3633 + ;;
3634 + hp300bsd)
3635 + basic_machine=m68k-hp
3636 + os=-bsd
3637 + ;;
3638 + hp300hpux)
3639 + basic_machine=m68k-hp
3640 + os=-hpux
3641 + ;;
3642 + hp3k9[0-9][0-9] | hp9[0-9][0-9])
3643 + basic_machine=hppa1.0-hp
3644 + ;;
3645 + hp9k2[0-9][0-9] | hp9k31[0-9])
3646 + basic_machine=m68000-hp
3647 + ;;
3648 + hp9k3[2-9][0-9])
3649 + basic_machine=m68k-hp
3650 + ;;
3651 + hp9k6[0-9][0-9] | hp6[0-9][0-9])
3652 + basic_machine=hppa1.0-hp
3653 + ;;
3654 + hp9k7[0-79][0-9] | hp7[0-79][0-9])
3655 + basic_machine=hppa1.1-hp
3656 + ;;
3657 + hp9k78[0-9] | hp78[0-9])
3658 + # FIXME: really hppa2.0-hp
3659 + basic_machine=hppa1.1-hp
3660 + ;;
3661 + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
3662 + # FIXME: really hppa2.0-hp
3663 + basic_machine=hppa1.1-hp
3664 + ;;
3665 + hp9k8[0-9][13679] | hp8[0-9][13679])
3666 + basic_machine=hppa1.1-hp
3667 + ;;
3668 + hp9k8[0-9][0-9] | hp8[0-9][0-9])
3669 + basic_machine=hppa1.0-hp
3670 + ;;
3671 + hppa-next)
3672 + os=-nextstep3
3673 + ;;
3674 + hppaosf)
3675 + basic_machine=hppa1.1-hp
3676 + os=-osf
3677 + ;;
3678 + hppro)
3679 + basic_machine=hppa1.1-hp
3680 + os=-proelf
3681 + ;;
3682 + i370-ibm* | ibm*)
3683 + basic_machine=i370-ibm
3684 + ;;
3685 +# I'm not sure what "Sysv32" means. Should this be sysv3.2?
3686 + i*86v32)
3687 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
3688 + os=-sysv32
3689 + ;;
3690 + i*86v4*)
3691 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
3692 + os=-sysv4
3693 + ;;
3694 + i*86v)
3695 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
3696 + os=-sysv
3697 + ;;
3698 + i*86sol2)
3699 + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
3700 + os=-solaris2
3701 + ;;
3702 + i386mach)
3703 + basic_machine=i386-mach
3704 + os=-mach
3705 + ;;
3706 + i386-vsta | vsta)
3707 + basic_machine=i386-unknown
3708 + os=-vsta
3709 + ;;
3710 + iris | iris4d)
3711 + basic_machine=mips-sgi
3712 + case $os in
3713 + -irix*)
3714 + ;;
3715 + *)
3716 + os=-irix4
3717 + ;;
3718 + esac
3719 + ;;
3720 + isi68 | isi)
3721 + basic_machine=m68k-isi
3722 + os=-sysv
3723 + ;;
3724 + m88k-omron*)
3725 + basic_machine=m88k-omron
3726 + ;;
3727 + magnum | m3230)
3728 + basic_machine=mips-mips
3729 + os=-sysv
3730 + ;;
3731 + merlin)
3732 + basic_machine=ns32k-utek
3733 + os=-sysv
3734 + ;;
3735 + mingw32)
3736 + basic_machine=i386-pc
3737 + os=-mingw32
3738 + ;;
3739 + miniframe)
3740 + basic_machine=m68000-convergent
3741 + ;;
3742 + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
3743 + basic_machine=m68k-atari
3744 + os=-mint
3745 + ;;
3746 + mips3*-*)
3747 + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
3748 + ;;
3749 + mips3*)
3750 + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
3751 + ;;
3752 + monitor)
3753 + basic_machine=m68k-rom68k
3754 + os=-coff
3755 + ;;
3756 + morphos)
3757 + basic_machine=powerpc-unknown
3758 + os=-morphos
3759 + ;;
3760 + msdos)
3761 + basic_machine=i386-pc
3762 + os=-msdos
3763 + ;;
3764 + mvs)
3765 + basic_machine=i370-ibm
3766 + os=-mvs
3767 + ;;
3768 + ncr3000)
3769 + basic_machine=i486-ncr
3770 + os=-sysv4
3771 + ;;
3772 + netbsd386)
3773 + basic_machine=i386-unknown
3774 + os=-netbsd
3775 + ;;
3776 + netwinder)
3777 + basic_machine=armv4l-rebel
3778 + os=-linux
3779 + ;;
3780 + news | news700 | news800 | news900)
3781 + basic_machine=m68k-sony
3782 + os=-newsos
3783 + ;;
3784 + news1000)
3785 + basic_machine=m68030-sony
3786 + os=-newsos
3787 + ;;
3788 + news-3600 | risc-news)
3789 + basic_machine=mips-sony
3790 + os=-newsos
3791 + ;;
3792 + necv70)
3793 + basic_machine=v70-nec
3794 + os=-sysv
3795 + ;;
3796 + next | m*-next )
3797 + basic_machine=m68k-next
3798 + case $os in
3799 + -nextstep* )
3800 + ;;
3801 + -ns2*)
3802 + os=-nextstep2
3803 + ;;
3804 + *)
3805 + os=-nextstep3
3806 + ;;
3807 + esac
3808 + ;;
3809 + nh3000)
3810 + basic_machine=m68k-harris
3811 + os=-cxux
3812 + ;;
3813 + nh[45]000)
3814 + basic_machine=m88k-harris
3815 + os=-cxux
3816 + ;;
3817 + nindy960)
3818 + basic_machine=i960-intel
3819 + os=-nindy
3820 + ;;
3821 + mon960)
3822 + basic_machine=i960-intel
3823 + os=-mon960
3824 + ;;
3825 + nonstopux)
3826 + basic_machine=mips-compaq
3827 + os=-nonstopux
3828 + ;;
3829 + np1)
3830 + basic_machine=np1-gould
3831 + ;;
3832 + nsr-tandem)
3833 + basic_machine=nsr-tandem
3834 + ;;
3835 + op50n-* | op60c-*)
3836 + basic_machine=hppa1.1-oki
3837 + os=-proelf
3838 + ;;
3839 + or32 | or32-*)
3840 + basic_machine=or32-unknown
3841 + os=-coff
3842 + ;;
3843 + os400)
3844 + basic_machine=powerpc-ibm
3845 + os=-os400
3846 + ;;
3847 + OSE68000 | ose68000)
3848 + basic_machine=m68000-ericsson
3849 + os=-ose
3850 + ;;
3851 + os68k)
3852 + basic_machine=m68k-none
3853 + os=-os68k
3854 + ;;
3855 + pa-hitachi)
3856 + basic_machine=hppa1.1-hitachi
3857 + os=-hiuxwe2
3858 + ;;
3859 + paragon)
3860 + basic_machine=i860-intel
3861 + os=-osf
3862 + ;;
3863 + pbd)
3864 + basic_machine=sparc-tti
3865 + ;;
3866 + pbb)
3867 + basic_machine=m68k-tti
3868 + ;;
3869 + pc532 | pc532-*)
3870 + basic_machine=ns32k-pc532
3871 + ;;
3872 + pentium | p5 | k5 | k6 | nexgen | viac3)
3873 + basic_machine=i586-pc
3874 + ;;
3875 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
3876 + basic_machine=i686-pc
3877 + ;;
3878 + pentiumii | pentium2 | pentiumiii | pentium3)
3879 + basic_machine=i686-pc
3880 + ;;
3881 + pentium4)
3882 + basic_machine=i786-pc
3883 + ;;
3884 + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
3885 + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
3886 + ;;
3887 + pentiumpro-* | p6-* | 6x86-* | athlon-*)
3888 + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
3889 + ;;
3890 + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
3891 + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
3892 + ;;
3893 + pentium4-*)
3894 + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
3895 + ;;
3896 + pn)
3897 + basic_machine=pn-gould
3898 + ;;
3899 + power) basic_machine=power-ibm
3900 + ;;
3901 + ppc) basic_machine=powerpc-unknown
3902 + ;;
3903 + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
3904 + ;;
3905 + ppcle | powerpclittle | ppc-le | powerpc-little)
3906 + basic_machine=powerpcle-unknown
3907 + ;;
3908 + ppcle-* | powerpclittle-*)
3909 + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
3910 + ;;
3911 + ppc64) basic_machine=powerpc64-unknown
3912 + ;;
3913 + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
3914 + ;;
3915 + ppc64le | powerpc64little | ppc64-le | powerpc64-little)
3916 + basic_machine=powerpc64le-unknown
3917 + ;;
3918 + ppc64le-* | powerpc64little-*)
3919 + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
3920 + ;;
3921 + ps2)
3922 + basic_machine=i386-ibm
3923 + ;;
3924 + pw32)
3925 + basic_machine=i586-unknown
3926 + os=-pw32
3927 + ;;
3928 + rom68k)
3929 + basic_machine=m68k-rom68k
3930 + os=-coff
3931 + ;;
3932 + rm[46]00)
3933 + basic_machine=mips-siemens
3934 + ;;
3935 + rtpc | rtpc-*)
3936 + basic_machine=romp-ibm
3937 + ;;
3938 + s390 | s390-*)
3939 + basic_machine=s390-ibm
3940 + ;;
3941 + s390x | s390x-*)
3942 + basic_machine=s390x-ibm
3943 + ;;
3944 + sa29200)
3945 + basic_machine=a29k-amd
3946 + os=-udi
3947 + ;;
3948 + sb1)
3949 + basic_machine=mipsisa64sb1-unknown
3950 + ;;
3951 + sb1el)
3952 + basic_machine=mipsisa64sb1el-unknown
3953 + ;;
3954 + sei)
3955 + basic_machine=mips-sei
3956 + os=-seiux
3957 + ;;
3958 + sequent)
3959 + basic_machine=i386-sequent
3960 + ;;
3961 + sh)
3962 + basic_machine=sh-hitachi
3963 + os=-hms
3964 + ;;
3965 + sh64)
3966 + basic_machine=sh64-unknown
3967 + ;;
3968 + sparclite-wrs | simso-wrs)
3969 + basic_machine=sparclite-wrs
3970 + os=-vxworks
3971 + ;;
3972 + sps7)
3973 + basic_machine=m68k-bull
3974 + os=-sysv2
3975 + ;;
3976 + spur)
3977 + basic_machine=spur-unknown
3978 + ;;
3979 + st2000)
3980 + basic_machine=m68k-tandem
3981 + ;;
3982 + stratus)
3983 + basic_machine=i860-stratus
3984 + os=-sysv4
3985 + ;;
3986 + sun2)
3987 + basic_machine=m68000-sun
3988 + ;;
3989 + sun2os3)
3990 + basic_machine=m68000-sun
3991 + os=-sunos3
3992 + ;;
3993 + sun2os4)
3994 + basic_machine=m68000-sun
3995 + os=-sunos4
3996 + ;;
3997 + sun3os3)
3998 + basic_machine=m68k-sun
3999 + os=-sunos3
4000 + ;;
4001 + sun3os4)
4002 + basic_machine=m68k-sun
4003 + os=-sunos4
4004 + ;;
4005 + sun4os3)
4006 + basic_machine=sparc-sun
4007 + os=-sunos3
4008 + ;;
4009 + sun4os4)
4010 + basic_machine=sparc-sun
4011 + os=-sunos4
4012 + ;;
4013 + sun4sol2)
4014 + basic_machine=sparc-sun
4015 + os=-solaris2
4016 + ;;
4017 + sun3 | sun3-*)
4018 + basic_machine=m68k-sun
4019 + ;;
4020 + sun4)
4021 + basic_machine=sparc-sun
4022 + ;;
4023 + sun386 | sun386i | roadrunner)
4024 + basic_machine=i386-sun
4025 + ;;
4026 + sv1)
4027 + basic_machine=sv1-cray
4028 + os=-unicos
4029 + ;;
4030 + symmetry)
4031 + basic_machine=i386-sequent
4032 + os=-dynix
4033 + ;;
4034 + t3e)
4035 + basic_machine=alphaev5-cray
4036 + os=-unicos
4037 + ;;
4038 + t90)
4039 + basic_machine=t90-cray
4040 + os=-unicos
4041 + ;;
4042 + tic54x | c54x*)
4043 + basic_machine=tic54x-unknown
4044 + os=-coff
4045 + ;;
4046 + tic55x | c55x*)
4047 + basic_machine=tic55x-unknown
4048 + os=-coff
4049 + ;;
4050 + tic6x | c6x*)
4051 + basic_machine=tic6x-unknown
4052 + os=-coff
4053 + ;;
4054 + tx39)
4055 + basic_machine=mipstx39-unknown
4056 + ;;
4057 + tx39el)
4058 + basic_machine=mipstx39el-unknown
4059 + ;;
4060 + toad1)
4061 + basic_machine=pdp10-xkl
4062 + os=-tops20
4063 + ;;
4064 + tower | tower-32)
4065 + basic_machine=m68k-ncr
4066 + ;;
4067 + tpf)
4068 + basic_machine=s390x-ibm
4069 + os=-tpf
4070 + ;;
4071 + udi29k)
4072 + basic_machine=a29k-amd
4073 + os=-udi
4074 + ;;
4075 + ultra3)
4076 + basic_machine=a29k-nyu
4077 + os=-sym1
4078 + ;;
4079 + v810 | necv810)
4080 + basic_machine=v810-nec
4081 + os=-none
4082 + ;;
4083 + vaxv)
4084 + basic_machine=vax-dec
4085 + os=-sysv
4086 + ;;
4087 + vms)
4088 + basic_machine=vax-dec
4089 + os=-vms
4090 + ;;
4091 + vpp*|vx|vx-*)
4092 + basic_machine=f301-fujitsu
4093 + ;;
4094 + vxworks960)
4095 + basic_machine=i960-wrs
4096 + os=-vxworks
4097 + ;;
4098 + vxworks68)
4099 + basic_machine=m68k-wrs
4100 + os=-vxworks
4101 + ;;
4102 + vxworks29k)
4103 + basic_machine=a29k-wrs
4104 + os=-vxworks
4105 + ;;
4106 + w65*)
4107 + basic_machine=w65-wdc
4108 + os=-none
4109 + ;;
4110 + w89k-*)
4111 + basic_machine=hppa1.1-winbond
4112 + os=-proelf
4113 + ;;
4114 + xps | xps100)
4115 + basic_machine=xps100-honeywell
4116 + ;;
4117 + ymp)
4118 + basic_machine=ymp-cray
4119 + os=-unicos
4120 + ;;
4121 + z8k-*-coff)
4122 + basic_machine=z8k-unknown
4123 + os=-sim
4124 + ;;
4125 + none)
4126 + basic_machine=none-none
4127 + os=-none
4128 + ;;
4129 +
4130 +# Here we handle the default manufacturer of certain CPU types. It is in
4131 +# some cases the only manufacturer, in others, it is the most popular.
4132 + w89k)
4133 + basic_machine=hppa1.1-winbond
4134 + ;;
4135 + op50n)
4136 + basic_machine=hppa1.1-oki
4137 + ;;
4138 + op60c)
4139 + basic_machine=hppa1.1-oki
4140 + ;;
4141 + romp)
4142 + basic_machine=romp-ibm
4143 + ;;
4144 + mmix)
4145 + basic_machine=mmix-knuth
4146 + ;;
4147 + rs6000)
4148 + basic_machine=rs6000-ibm
4149 + ;;
4150 + vax)
4151 + basic_machine=vax-dec
4152 + ;;
4153 + pdp10)
4154 + # there are many clones, so DEC is not a safe bet
4155 + basic_machine=pdp10-unknown
4156 + ;;
4157 + pdp11)
4158 + basic_machine=pdp11-dec
4159 + ;;
4160 + we32k)
4161 + basic_machine=we32k-att
4162 + ;;
4163 + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
4164 + basic_machine=sh-unknown
4165 + ;;
4166 + sh64)
4167 + basic_machine=sh64-unknown
4168 + ;;
4169 + sparc | sparcv8 | sparcv9 | sparcv9b)
4170 + basic_machine=sparc-sun
4171 + ;;
4172 + cydra)
4173 + basic_machine=cydra-cydrome
4174 + ;;
4175 + orion)
4176 + basic_machine=orion-highlevel
4177 + ;;
4178 + orion105)
4179 + basic_machine=clipper-highlevel
4180 + ;;
4181 + mac | mpw | mac-mpw)
4182 + basic_machine=m68k-apple
4183 + ;;
4184 + pmac | pmac-mpw)
4185 + basic_machine=powerpc-apple
4186 + ;;
4187 + *-unknown)
4188 + # Make sure to match an already-canonicalized machine name.
4189 + ;;
4190 + *)
4191 + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
4192 + exit 1
4193 + ;;
4194 +esac
4195 +
4196 +# Here we canonicalize certain aliases for manufacturers.
4197 +case $basic_machine in
4198 + *-digital*)
4199 + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
4200 + ;;
4201 + *-commodore*)
4202 + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
4203 + ;;
4204 + *)
4205 + ;;
4206 +esac
4207 +
4208 +# Decode manufacturer-specific aliases for certain operating systems.
4209 +
4210 +if [ x"$os" != x"" ]
4211 +then
4212 +case $os in
4213 + # First match some system type aliases
4214 + # that might get confused with valid system types.
4215 + # -solaris* is a basic system type, with this one exception.
4216 + -solaris1 | -solaris1.*)
4217 + os=`echo $os | sed -e 's|solaris1|sunos4|'`
4218 + ;;
4219 + -solaris)
4220 + os=-solaris2
4221 + ;;
4222 + -svr4*)
4223 + os=-sysv4
4224 + ;;
4225 + -unixware*)
4226 + os=-sysv4.2uw
4227 + ;;
4228 + -gnu/linux*)
4229 + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
4230 + ;;
4231 + # First accept the basic system types.
4232 + # The portable systems comes first.
4233 + # Each alternative MUST END IN A *, to match a version number.
4234 + # -sysv* is not here because it comes later, after sysvr4.
4235 + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
4236 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
4237 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
4238 + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
4239 + | -aos* \
4240 + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
4241 + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
4242 + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
4243 + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
4244 + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
4245 + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
4246 + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
4247 + | -chorusos* | -chorusrdb* \
4248 + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
4249 + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
4250 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
4251 + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
4252 + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
4253 + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
4254 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
4255 + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
4256 + # Remember, each alternative MUST END IN *, to match a version number.
4257 + ;;
4258 + -qnx*)
4259 + case $basic_machine in
4260 + x86-* | i*86-*)
4261 + ;;
4262 + *)
4263 + os=-nto$os
4264 + ;;
4265 + esac
4266 + ;;
4267 + -nto-qnx*)
4268 + ;;
4269 + -nto*)
4270 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
4271 + ;;
4272 + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
4273 + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
4274 + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
4275 + ;;
4276 + -mac*)
4277 + os=`echo $os | sed -e 's|mac|macos|'`
4278 + ;;
4279 + -linux-dietlibc)
4280 + os=-linux-dietlibc
4281 + ;;
4282 + -linux*)
4283 + os=`echo $os | sed -e 's|linux|linux-gnu|'`
4284 + ;;
4285 + -sunos5*)
4286 + os=`echo $os | sed -e 's|sunos5|solaris2|'`
4287 + ;;
4288 + -sunos6*)
4289 + os=`echo $os | sed -e 's|sunos6|solaris3|'`
4290 + ;;
4291 + -opened*)
4292 + os=-openedition
4293 + ;;
4294 + -os400*)
4295 + os=-os400
4296 + ;;
4297 + -wince*)
4298 + os=-wince
4299 + ;;
4300 + -osfrose*)
4301 + os=-osfrose
4302 + ;;
4303 + -osf*)
4304 + os=-osf
4305 + ;;
4306 + -utek*)
4307 + os=-bsd
4308 + ;;
4309 + -dynix*)
4310 + os=-bsd
4311 + ;;
4312 + -acis*)
4313 + os=-aos
4314 + ;;
4315 + -atheos*)
4316 + os=-atheos
4317 + ;;
4318 + -syllable*)
4319 + os=-syllable
4320 + ;;
4321 + -386bsd)
4322 + os=-bsd
4323 + ;;
4324 + -ctix* | -uts*)
4325 + os=-sysv
4326 + ;;
4327 + -nova*)
4328 + os=-rtmk-nova
4329 + ;;
4330 + -ns2 )
4331 + os=-nextstep2
4332 + ;;
4333 + -nsk*)
4334 + os=-nsk
4335 + ;;
4336 + # Preserve the version number of sinix5.
4337 + -sinix5.*)
4338 + os=`echo $os | sed -e 's|sinix|sysv|'`
4339 + ;;
4340 + -sinix*)
4341 + os=-sysv4
4342 + ;;
4343 + -tpf*)
4344 + os=-tpf
4345 + ;;
4346 + -triton*)
4347 + os=-sysv3
4348 + ;;
4349 + -oss*)
4350 + os=-sysv3
4351 + ;;
4352 + -svr4)
4353 + os=-sysv4
4354 + ;;
4355 + -svr3)
4356 + os=-sysv3
4357 + ;;
4358 + -sysvr4)
4359 + os=-sysv4
4360 + ;;
4361 + # This must come after -sysvr4.
4362 + -sysv*)
4363 + ;;
4364 + -ose*)
4365 + os=-ose
4366 + ;;
4367 + -es1800*)
4368 + os=-ose
4369 + ;;
4370 + -xenix)
4371 + os=-xenix
4372 + ;;
4373 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
4374 + os=-mint
4375 + ;;
4376 + -aros*)
4377 + os=-aros
4378 + ;;
4379 + -kaos*)
4380 + os=-kaos
4381 + ;;
4382 + -none)
4383 + ;;
4384 + *)
4385 + # Get rid of the `-' at the beginning of $os.
4386 + os=`echo $os | sed 's/[^-]*-//'`
4387 + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
4388 + exit 1
4389 + ;;
4390 +esac
4391 +else
4392 +
4393 +# Here we handle the default operating systems that come with various machines.
4394 +# The value should be what the vendor currently ships out the door with their
4395 +# machine or put another way, the most popular os provided with the machine.
4396 +
4397 +# Note that if you're going to try to match "-MANUFACTURER" here (say,
4398 +# "-sun"), then you have to tell the case statement up towards the top
4399 +# that MANUFACTURER isn't an operating system. Otherwise, code above
4400 +# will signal an error saying that MANUFACTURER isn't an operating
4401 +# system, and we'll never get to this point.
4402 +
4403 +case $basic_machine in
4404 + *-acorn)
4405 + os=-riscix1.2
4406 + ;;
4407 + arm*-rebel)
4408 + os=-linux
4409 + ;;
4410 + arm*-semi)
4411 + os=-aout
4412 + ;;
4413 + c4x-* | tic4x-*)
4414 + os=-coff
4415 + ;;
4416 + # This must come before the *-dec entry.
4417 + pdp10-*)
4418 + os=-tops20
4419 + ;;
4420 + pdp11-*)
4421 + os=-none
4422 + ;;
4423 + *-dec | vax-*)
4424 + os=-ultrix4.2
4425 + ;;
4426 + m68*-apollo)
4427 + os=-domain
4428 + ;;
4429 + i386-sun)
4430 + os=-sunos4.0.2
4431 + ;;
4432 + m68000-sun)
4433 + os=-sunos3
4434 + # This also exists in the configure program, but was not the
4435 + # default.
4436 + # os=-sunos4
4437 + ;;
4438 + m68*-cisco)
4439 + os=-aout
4440 + ;;
4441 + mips*-cisco)
4442 + os=-elf
4443 + ;;
4444 + mips*-*)
4445 + os=-elf
4446 + ;;
4447 + or32-*)
4448 + os=-coff
4449 + ;;
4450 + *-tti) # must be before sparc entry or we get the wrong os.
4451 + os=-sysv3
4452 + ;;
4453 + sparc-* | *-sun)
4454 + os=-sunos4.1.1
4455 + ;;
4456 + *-be)
4457 + os=-beos
4458 + ;;
4459 + *-ibm)
4460 + os=-aix
4461 + ;;
4462 + *-knuth)
4463 + os=-mmixware
4464 + ;;
4465 + *-wec)
4466 + os=-proelf
4467 + ;;
4468 + *-winbond)
4469 + os=-proelf
4470 + ;;
4471 + *-oki)
4472 + os=-proelf
4473 + ;;
4474 + *-hp)
4475 + os=-hpux
4476 + ;;
4477 + *-hitachi)
4478 + os=-hiux
4479 + ;;
4480 + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
4481 + os=-sysv
4482 + ;;
4483 + *-cbm)
4484 + os=-amigaos
4485 + ;;
4486 + *-dg)
4487 + os=-dgux
4488 + ;;
4489 + *-dolphin)
4490 + os=-sysv3
4491 + ;;
4492 + m68k-ccur)
4493 + os=-rtu
4494 + ;;
4495 + m88k-omron*)
4496 + os=-luna
4497 + ;;
4498 + *-next )
4499 + os=-nextstep
4500 + ;;
4501 + *-sequent)
4502 + os=-ptx
4503 + ;;
4504 + *-crds)
4505 + os=-unos
4506 + ;;
4507 + *-ns)
4508 + os=-genix
4509 + ;;
4510 + i370-*)
4511 + os=-mvs
4512 + ;;
4513 + *-next)
4514 + os=-nextstep3
4515 + ;;
4516 + *-gould)
4517 + os=-sysv
4518 + ;;
4519 + *-highlevel)
4520 + os=-bsd
4521 + ;;
4522 + *-encore)
4523 + os=-bsd
4524 + ;;
4525 + *-sgi)
4526 + os=-irix
4527 + ;;
4528 + *-siemens)
4529 + os=-sysv4
4530 + ;;
4531 + *-masscomp)
4532 + os=-rtu
4533 + ;;
4534 + f30[01]-fujitsu | f700-fujitsu)
4535 + os=-uxpv
4536 + ;;
4537 + *-rom68k)
4538 + os=-coff
4539 + ;;
4540 + *-*bug)
4541 + os=-coff
4542 + ;;
4543 + *-apple)
4544 + os=-macos
4545 + ;;
4546 + *-atari*)
4547 + os=-mint
4548 + ;;
4549 + *)
4550 + os=-none
4551 + ;;
4552 +esac
4553 +fi
4554 +
4555 +# Here we handle the case where we know the os, and the CPU type, but not the
4556 +# manufacturer. We pick the logical manufacturer.
4557 +vendor=unknown
4558 +case $basic_machine in
4559 + *-unknown)
4560 + case $os in
4561 + -riscix*)
4562 + vendor=acorn
4563 + ;;
4564 + -sunos*)
4565 + vendor=sun
4566 + ;;
4567 + -aix*)
4568 + vendor=ibm
4569 + ;;
4570 + -beos*)
4571 + vendor=be
4572 + ;;
4573 + -hpux*)
4574 + vendor=hp
4575 + ;;
4576 + -mpeix*)
4577 + vendor=hp
4578 + ;;
4579 + -hiux*)
4580 + vendor=hitachi
4581 + ;;
4582 + -unos*)
4583 + vendor=crds
4584 + ;;
4585 + -dgux*)
4586 + vendor=dg
4587 + ;;
4588 + -luna*)
4589 + vendor=omron
4590 + ;;
4591 + -genix*)
4592 + vendor=ns
4593 + ;;
4594 + -mvs* | -opened*)
4595 + vendor=ibm
4596 + ;;
4597 + -os400*)
4598 + vendor=ibm
4599 + ;;
4600 + -ptx*)
4601 + vendor=sequent
4602 + ;;
4603 + -tpf*)
4604 + vendor=ibm
4605 + ;;
4606 + -vxsim* | -vxworks* | -windiss*)
4607 + vendor=wrs
4608 + ;;
4609 + -aux*)
4610 + vendor=apple
4611 + ;;
4612 + -hms*)
4613 + vendor=hitachi
4614 + ;;
4615 + -mpw* | -macos*)
4616 + vendor=apple
4617 + ;;
4618 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
4619 + vendor=atari
4620 + ;;
4621 + -vos*)
4622 + vendor=stratus
4623 + ;;
4624 + esac
4625 + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
4626 + ;;
4627 +esac
4628 +
4629 +echo $basic_machine$os
4630 +exit 0
4631 +
4632 +# Local variables:
4633 +# eval: (add-hook 'write-file-hooks 'time-stamp)
4634 +# time-stamp-start: "timestamp='"
4635 +# time-stamp-format: "%:y-%02m-%02d"
4636 +# time-stamp-end: "'"
4637 +# End:
4638 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in
4639 --- kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in 2005-02-25 18:23:19.000000000 +0100
4640 +++ kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in 2005-03-03 06:34:13.706991516 +0100
4641 @@ -1,9 +1,9 @@
4642 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
4643 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
4644 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
4645 # @configure_input@
4646
4647 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4648 -# 2003, 2004 Free Software Foundation, Inc.
4649 +# 2003, 2004, 2005 Free Software Foundation, Inc.
4650 # This Makefile.in is free software; the Free Software Foundation
4651 # gives unlimited permission to copy and/or distribute it,
4652 # with or without modifications, as long as this notice is preserved.
4653 @@ -87,18 +87,18 @@
4654 #>+ 2
4655 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
4656 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4657 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4658 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4659 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4660 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
4661 #>+ 3
4662 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4663 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4664 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4665 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4666 CXXLD = $(CXX)
4667 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4668 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4669 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4670 #>+ 2
4671 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4672 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4673 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4674 SOURCES = $(libarts_akode_la_SOURCES)
4675 DIST_SOURCES = $(libarts_akode_la_SOURCES)
4676 @@ -259,6 +259,9 @@
4677 LN_S = @LN_S@
4678 LTLIBOBJS = @LTLIBOBJS@
4679 MADLIBS = @MADLIBS@
4680 +MAINT = @MAINT@
4681 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
4682 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
4683 MAKEINFO = @MAKEINFO@
4684 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
4685 MCOPIDL = @MCOPIDL@
4686 @@ -525,7 +528,7 @@
4687
4688 .SUFFIXES:
4689 .SUFFIXES: .cc .cpp .lo .o .obj
4690 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
4691 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
4692 #>- @for dep in $?; do \
4693 #>- case '$(am__configure_deps)' in \
4694 #>- *$$dep*) \
4695 @@ -563,9 +566,9 @@
4696 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
4697 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4698
4699 -$(top_srcdir)/configure: $(am__configure_deps)
4700 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
4701 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4702 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4703 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
4704 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4705 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
4706 @$(NORMAL_INSTALL)
4707 @@ -899,7 +902,7 @@
4708
4709
4710 #>+ 2
4711 -KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodearts.idl akodeSpeexStreamPlayObject_impl.h arts_inputstream.h akodePlayObject.mcopclass akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h
4712 +KDE_DIST=akodeXiphPlayObject_impl.h akodeMPCPlayObject_impl.h Makefile.in akodearts.idl akodeSpeexStreamPlayObject_impl.h akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h
4713
4714 #>+ 3
4715 clean-closures:
4716 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/lib/Makefile.in kdemultimedia-3.4.0/akode/lib/Makefile.in
4717 --- kdemultimedia-3.4.0.orig/akode/lib/Makefile.in 2005-02-25 18:23:19.000000000 +0100
4718 +++ kdemultimedia-3.4.0/akode/lib/Makefile.in 2005-03-03 06:34:13.721988955 +0100
4719 @@ -1,9 +1,9 @@
4720 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
4721 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
4722 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
4723 # @configure_input@
4724
4725 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4726 -# 2003, 2004 Free Software Foundation, Inc.
4727 +# 2003, 2004, 2005 Free Software Foundation, Inc.
4728 # This Makefile.in is free software; the Free Software Foundation
4729 # gives unlimited permission to copy and/or distribute it,
4730 # with or without modifications, as long as this notice is preserved.
4731 @@ -93,18 +93,18 @@
4732 #>+ 2
4733 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
4734 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4735 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4736 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4737 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4738 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
4739 #>+ 3
4740 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4741 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4742 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4743 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4744 CXXLD = $(CXX)
4745 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4746 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4747 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4748 #>+ 2
4749 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4750 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4751 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4752 SOURCES = $(libakode_la_SOURCES)
4753 DIST_SOURCES = $(libakode_la_SOURCES)
4754 @@ -263,6 +263,9 @@
4755 LN_S = @LN_S@
4756 LTLIBOBJS = @LTLIBOBJS@
4757 MADLIBS = @MADLIBS@
4758 +MAINT = @MAINT@
4759 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
4760 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
4761 MAKEINFO = @MAKEINFO@
4762 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
4763 MCOPIDL = @MCOPIDL@
4764 @@ -539,7 +542,7 @@
4765
4766 .SUFFIXES:
4767 .SUFFIXES: .cpp .lo .o .obj
4768 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
4769 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
4770 #>- @for dep in $?; do \
4771 #>- case '$(am__configure_deps)' in \
4772 #>- *$$dep*) \
4773 @@ -577,9 +580,9 @@
4774 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
4775 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4776
4777 -$(top_srcdir)/configure: $(am__configure_deps)
4778 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
4779 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4780 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4781 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
4782 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4783 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
4784 @$(NORMAL_INSTALL)
4785 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/Makefile.in kdemultimedia-3.4.0/akode/Makefile.in
4786 --- kdemultimedia-3.4.0.orig/akode/Makefile.in 2005-02-25 18:23:19.000000000 +0100
4787 +++ kdemultimedia-3.4.0/akode/Makefile.in 2005-03-03 06:34:13.666998343 +0100
4788 @@ -1,9 +1,9 @@
4789 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
4790 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
4791 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
4792 # @configure_input@
4793
4794 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4795 -# 2003, 2004 Free Software Foundation, Inc.
4796 +# 2003, 2004, 2005 Free Software Foundation, Inc.
4797 # This Makefile.in is free software; the Free Software Foundation
4798 # gives unlimited permission to copy and/or distribute it,
4799 # with or without modifications, as long as this notice is preserved.
4800 @@ -216,6 +216,9 @@
4801 LN_S = @LN_S@
4802 LTLIBOBJS = @LTLIBOBJS@
4803 MADLIBS = @MADLIBS@
4804 +MAINT = @MAINT@
4805 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
4806 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
4807 MAKEINFO = @MAKEINFO@
4808 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
4809 MCOPIDL = @MCOPIDL@
4810 @@ -466,7 +469,7 @@
4811 all: docs-am all-recursive
4812
4813 .SUFFIXES:
4814 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
4815 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
4816 #>- @for dep in $?; do \
4817 #>- case '$(am__configure_deps)' in \
4818 #>- *$$dep*) \
4819 @@ -504,9 +507,9 @@
4820 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
4821 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4822
4823 -$(top_srcdir)/configure: $(am__configure_deps)
4824 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
4825 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4826 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4827 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
4828 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4829
4830 mostlyclean-libtool:
4831 @@ -526,7 +529,13 @@
4832 # (which will cause the Makefiles to be regenerated when you run `make');
4833 # (2) otherwise, pass the desired values on the `make' command line.
4834 $(RECURSIVE_TARGETS):
4835 - @set fnord $$MAKEFLAGS; amf=$$2; \
4836 + @failcom='exit 1'; \
4837 + for f in x $$MAKEFLAGS; do \
4838 + case $$f in \
4839 + *=* | --[!k]*);; \
4840 + *k*) failcom='fail=yes';; \
4841 + esac; \
4842 + done; \
4843 dot_seen=no; \
4844 target=`echo $@ | sed s/-recursive//`; \
4845 list='$(SUBDIRS)'; for subdir in $$list; do \
4846 @@ -538,7 +547,7 @@
4847 local_target="$$target"; \
4848 fi; \
4849 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4850 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
4851 + || eval $$failcom; \
4852 done; \
4853 if test "$$dot_seen" = "no"; then \
4854 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
4855 @@ -546,7 +555,13 @@
4856
4857 mostlyclean-recursive clean-recursive distclean-recursive \
4858 maintainer-clean-recursive:
4859 - @set fnord $$MAKEFLAGS; amf=$$2; \
4860 + @failcom='exit 1'; \
4861 + for f in x $$MAKEFLAGS; do \
4862 + case $$f in \
4863 + *=* | --[!k]*);; \
4864 + *k*) failcom='fail=yes';; \
4865 + esac; \
4866 + done; \
4867 dot_seen=no; \
4868 case "$@" in \
4869 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
4870 @@ -567,7 +582,7 @@
4871 local_target="$$target"; \
4872 fi; \
4873 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
4874 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
4875 + || eval $$failcom; \
4876 done && test -z "$$fail"
4877 tags-recursive:
4878 list='$(SUBDIRS)'; for subdir in $$list; do \
4879 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in
4880 --- kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in 2005-02-25 18:23:19.000000000 +0100
4881 +++ kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in 2005-03-03 06:34:13.742985371 +0100
4882 @@ -1,9 +1,9 @@
4883 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
4884 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
4885 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
4886 # @configure_input@
4887
4888 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4889 -# 2003, 2004 Free Software Foundation, Inc.
4890 +# 2003, 2004, 2005 Free Software Foundation, Inc.
4891 # This Makefile.in is free software; the Free Software Foundation
4892 # gives unlimited permission to copy and/or distribute it,
4893 # with or without modifications, as long as this notice is preserved.
4894 @@ -74,18 +74,18 @@
4895 #>+ 2
4896 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
4897 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4898 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4899 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4900 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4901 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
4902 #>+ 3
4903 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4904 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4905 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4906 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4907 CXXLD = $(CXX)
4908 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4909 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4910 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4911 #>+ 2
4912 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4913 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4914 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4915 SOURCES = $(libakode_alsa_sink_la_SOURCES)
4916 DIST_SOURCES = $(libakode_alsa_sink_la_SOURCES)
4917 @@ -242,6 +242,9 @@
4918 LN_S = @LN_S@
4919 LTLIBOBJS = @LTLIBOBJS@
4920 MADLIBS = @MADLIBS@
4921 +MAINT = @MAINT@
4922 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
4923 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
4924 MAKEINFO = @MAKEINFO@
4925 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
4926 MCOPIDL = @MCOPIDL@
4927 @@ -498,7 +501,7 @@
4928
4929 .SUFFIXES:
4930 .SUFFIXES: .cpp .lo .o .obj
4931 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
4932 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
4933 #>- @for dep in $?; do \
4934 #>- case '$(am__configure_deps)' in \
4935 #>- *$$dep*) \
4936 @@ -536,9 +539,9 @@
4937 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
4938 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4939
4940 -$(top_srcdir)/configure: $(am__configure_deps)
4941 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
4942 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4943 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
4944 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
4945 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
4946 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
4947 @$(NORMAL_INSTALL)
4948 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in
4949 --- kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in 2005-02-25 18:23:19.000000000 +0100
4950 +++ kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in 2005-03-03 06:34:13.754983323 +0100
4951 @@ -1,9 +1,9 @@
4952 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
4953 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
4954 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
4955 # @configure_input@
4956
4957 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4958 -# 2003, 2004 Free Software Foundation, Inc.
4959 +# 2003, 2004, 2005 Free Software Foundation, Inc.
4960 # This Makefile.in is free software; the Free Software Foundation
4961 # gives unlimited permission to copy and/or distribute it,
4962 # with or without modifications, as long as this notice is preserved.
4963 @@ -74,18 +74,18 @@
4964 #>+ 2
4965 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
4966 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4967 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4968 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4969 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4970 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
4971 #>+ 3
4972 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
4973 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
4974 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
4975 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
4976 CXXLD = $(CXX)
4977 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4978 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4979 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4980 #>+ 2
4981 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
4982 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
4983 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
4984 SOURCES = $(libakode_jack_sink_la_SOURCES)
4985 DIST_SOURCES = $(libakode_jack_sink_la_SOURCES)
4986 @@ -242,6 +242,9 @@
4987 LN_S = @LN_S@
4988 LTLIBOBJS = @LTLIBOBJS@
4989 MADLIBS = @MADLIBS@
4990 +MAINT = @MAINT@
4991 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
4992 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
4993 MAKEINFO = @MAKEINFO@
4994 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
4995 MCOPIDL = @MCOPIDL@
4996 @@ -498,7 +501,7 @@
4997
4998 .SUFFIXES:
4999 .SUFFIXES: .cpp .lo .o .obj
5000 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
5001 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
5002 #>- @for dep in $?; do \
5003 #>- case '$(am__configure_deps)' in \
5004 #>- *$$dep*) \
5005 @@ -536,9 +539,9 @@
5006 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5007 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5008
5009 -$(top_srcdir)/configure: $(am__configure_deps)
5010 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
5011 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5012 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5013 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
5014 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5015 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
5016 @$(NORMAL_INSTALL)
5017 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in kdemultimedia-3.4.0/akode/plugins/Makefile.in
5018 --- kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in 2005-02-25 18:23:19.000000000 +0100
5019 +++ kdemultimedia-3.4.0/akode/plugins/Makefile.in 2005-03-03 06:34:13.731987249 +0100
5020 @@ -1,9 +1,9 @@
5021 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
5022 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
5023 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
5024 # @configure_input@
5025
5026 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5027 -# 2003, 2004 Free Software Foundation, Inc.
5028 +# 2003, 2004, 2005 Free Software Foundation, Inc.
5029 # This Makefile.in is free software; the Free Software Foundation
5030 # gives unlimited permission to copy and/or distribute it,
5031 # with or without modifications, as long as this notice is preserved.
5032 @@ -217,6 +217,9 @@
5033 LN_S = @LN_S@
5034 LTLIBOBJS = @LTLIBOBJS@
5035 MADLIBS = @MADLIBS@
5036 +MAINT = @MAINT@
5037 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
5038 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
5039 MAKEINFO = @MAKEINFO@
5040 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
5041 MCOPIDL = @MCOPIDL@
5042 @@ -477,7 +480,7 @@
5043 all: docs-am all-recursive
5044
5045 .SUFFIXES:
5046 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
5047 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
5048 #>- @for dep in $?; do \
5049 #>- case '$(am__configure_deps)' in \
5050 #>- *$$dep*) \
5051 @@ -515,9 +518,9 @@
5052 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5053 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5054
5055 -$(top_srcdir)/configure: $(am__configure_deps)
5056 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
5057 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5058 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5059 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
5060 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5061
5062 mostlyclean-libtool:
5063 @@ -537,7 +540,13 @@
5064 # (which will cause the Makefiles to be regenerated when you run `make');
5065 # (2) otherwise, pass the desired values on the `make' command line.
5066 $(RECURSIVE_TARGETS):
5067 - @set fnord $$MAKEFLAGS; amf=$$2; \
5068 + @failcom='exit 1'; \
5069 + for f in x $$MAKEFLAGS; do \
5070 + case $$f in \
5071 + *=* | --[!k]*);; \
5072 + *k*) failcom='fail=yes';; \
5073 + esac; \
5074 + done; \
5075 dot_seen=no; \
5076 target=`echo $@ | sed s/-recursive//`; \
5077 list='$(SUBDIRS)'; for subdir in $$list; do \
5078 @@ -549,7 +558,7 @@
5079 local_target="$$target"; \
5080 fi; \
5081 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
5082 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
5083 + || eval $$failcom; \
5084 done; \
5085 if test "$$dot_seen" = "no"; then \
5086 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
5087 @@ -557,7 +566,13 @@
5088
5089 mostlyclean-recursive clean-recursive distclean-recursive \
5090 maintainer-clean-recursive:
5091 - @set fnord $$MAKEFLAGS; amf=$$2; \
5092 + @failcom='exit 1'; \
5093 + for f in x $$MAKEFLAGS; do \
5094 + case $$f in \
5095 + *=* | --[!k]*);; \
5096 + *k*) failcom='fail=yes';; \
5097 + esac; \
5098 + done; \
5099 dot_seen=no; \
5100 case "$@" in \
5101 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
5102 @@ -578,7 +593,7 @@
5103 local_target="$$target"; \
5104 fi; \
5105 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
5106 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
5107 + || eval $$failcom; \
5108 done && test -z "$$fail"
5109 tags-recursive:
5110 list='$(SUBDIRS)'; for subdir in $$list; do \
5111 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in
5112 --- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in 2005-02-25 18:23:19.000000000 +0100
5113 +++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in 2005-03-03 06:34:13.778979227 +0100
5114 @@ -1,9 +1,9 @@
5115 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
5116 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
5117 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
5118 # @configure_input@
5119
5120 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5121 -# 2003, 2004 Free Software Foundation, Inc.
5122 +# 2003, 2004, 2005 Free Software Foundation, Inc.
5123 # This Makefile.in is free software; the Free Software Foundation
5124 # gives unlimited permission to copy and/or distribute it,
5125 # with or without modifications, as long as this notice is preserved.
5126 @@ -75,18 +75,18 @@
5127 #>+ 2
5128 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
5129 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5130 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5131 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5132 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5133 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
5134 #>+ 3
5135 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5136 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5137 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5138 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5139 CXXLD = $(CXX)
5140 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5141 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5142 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5143 #>+ 2
5144 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5145 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5146 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5147 SOURCES = $(libakode_mpc_decoder_la_SOURCES)
5148 DIST_SOURCES = $(libakode_mpc_decoder_la_SOURCES)
5149 @@ -259,6 +259,9 @@
5150 LN_S = @LN_S@
5151 LTLIBOBJS = @LTLIBOBJS@
5152 MADLIBS = @MADLIBS@
5153 +MAINT = @MAINT@
5154 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
5155 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
5156 MAKEINFO = @MAKEINFO@
5157 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
5158 MCOPIDL = @MCOPIDL@
5159 @@ -518,7 +521,7 @@
5160
5161 .SUFFIXES:
5162 .SUFFIXES: .cpp .lo .o .obj
5163 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
5164 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
5165 #>- @for dep in $?; do \
5166 #>- case '$(am__configure_deps)' in \
5167 #>- *$$dep*) \
5168 @@ -556,9 +559,9 @@
5169 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5170 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5171
5172 -$(top_srcdir)/configure: $(am__configure_deps)
5173 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
5174 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5175 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5176 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
5177 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5178 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
5179 @$(NORMAL_INSTALL)
5180 @@ -656,7 +659,13 @@
5181 # (which will cause the Makefiles to be regenerated when you run `make');
5182 # (2) otherwise, pass the desired values on the `make' command line.
5183 $(RECURSIVE_TARGETS):
5184 - @set fnord $$MAKEFLAGS; amf=$$2; \
5185 + @failcom='exit 1'; \
5186 + for f in x $$MAKEFLAGS; do \
5187 + case $$f in \
5188 + *=* | --[!k]*);; \
5189 + *k*) failcom='fail=yes';; \
5190 + esac; \
5191 + done; \
5192 dot_seen=no; \
5193 target=`echo $@ | sed s/-recursive//`; \
5194 list='$(SUBDIRS)'; for subdir in $$list; do \
5195 @@ -668,7 +677,7 @@
5196 local_target="$$target"; \
5197 fi; \
5198 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
5199 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
5200 + || eval $$failcom; \
5201 done; \
5202 if test "$$dot_seen" = "no"; then \
5203 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
5204 @@ -676,7 +685,13 @@
5205
5206 mostlyclean-recursive clean-recursive distclean-recursive \
5207 maintainer-clean-recursive:
5208 - @set fnord $$MAKEFLAGS; amf=$$2; \
5209 + @failcom='exit 1'; \
5210 + for f in x $$MAKEFLAGS; do \
5211 + case $$f in \
5212 + *=* | --[!k]*);; \
5213 + *k*) failcom='fail=yes';; \
5214 + esac; \
5215 + done; \
5216 dot_seen=no; \
5217 case "$@" in \
5218 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
5219 @@ -697,7 +712,7 @@
5220 local_target="$$target"; \
5221 fi; \
5222 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
5223 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
5224 + || eval $$failcom; \
5225 done && test -z "$$fail"
5226 tags-recursive:
5227 list='$(SUBDIRS)'; for subdir in $$list; do \
5228 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in
5229 --- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-02-25 18:23:19.000000000 +0100
5230 +++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-03-03 06:34:13.789977350 +0100
5231 @@ -1,9 +1,9 @@
5232 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
5233 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
5234 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
5235 # @configure_input@
5236
5237 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5238 -# 2003, 2004 Free Software Foundation, Inc.
5239 +# 2003, 2004, 2005 Free Software Foundation, Inc.
5240 # This Makefile.in is free software; the Free Software Foundation
5241 # gives unlimited permission to copy and/or distribute it,
5242 # with or without modifications, as long as this notice is preserved.
5243 @@ -66,18 +66,18 @@
5244 #>+ 2
5245 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
5246 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5247 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5248 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5249 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5250 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
5251 #>+ 3
5252 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5253 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5254 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5255 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5256 CXXLD = $(CXX)
5257 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5258 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5259 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5260 #>+ 2
5261 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5262 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5263 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5264 SOURCES = $(libakode_mppdec_la_SOURCES)
5265 DIST_SOURCES = $(libakode_mppdec_la_SOURCES)
5266 @@ -234,6 +234,9 @@
5267 LN_S = @LN_S@
5268 LTLIBOBJS = @LTLIBOBJS@
5269 MADLIBS = @MADLIBS@
5270 +MAINT = @MAINT@
5271 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
5272 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
5273 MAKEINFO = @MAKEINFO@
5274 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
5275 MCOPIDL = @MCOPIDL@
5276 @@ -489,7 +492,7 @@
5277
5278 .SUFFIXES:
5279 .SUFFIXES: .cpp .lo .o .obj
5280 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
5281 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
5282 #>- @for dep in $?; do \
5283 #>- case '$(am__configure_deps)' in \
5284 #>- *$$dep*) \
5285 @@ -527,9 +530,9 @@
5286 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5287 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5288
5289 -$(top_srcdir)/configure: $(am__configure_deps)
5290 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
5291 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5292 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5293 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
5294 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5295
5296 clean-noinstLTLIBRARIES:
5297 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in
5298 --- kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-02-25 18:23:19.000000000 +0100
5299 +++ kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in 2005-03-03 06:34:13.806974448 +0100
5300 @@ -1,9 +1,9 @@
5301 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
5302 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
5303 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
5304 # @configure_input@
5305
5306 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5307 -# 2003, 2004 Free Software Foundation, Inc.
5308 +# 2003, 2004, 2005 Free Software Foundation, Inc.
5309 # This Makefile.in is free software; the Free Software Foundation
5310 # gives unlimited permission to copy and/or distribute it,
5311 # with or without modifications, as long as this notice is preserved.
5312 @@ -76,18 +76,18 @@
5313 #>+ 2
5314 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
5315 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5316 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5317 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5318 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5319 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
5320 #>+ 3
5321 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5322 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5323 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5324 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5325 CXXLD = $(CXX)
5326 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5327 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5328 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5329 #>+ 2
5330 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5331 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5332 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5333 SOURCES = $(libakode_mpeg_decoder_la_SOURCES)
5334 DIST_SOURCES = $(libakode_mpeg_decoder_la_SOURCES)
5335 @@ -246,6 +246,9 @@
5336 LN_S = @LN_S@
5337 LTLIBOBJS = @LTLIBOBJS@
5338 MADLIBS = @MADLIBS@
5339 +MAINT = @MAINT@
5340 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
5341 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
5342 MAKEINFO = @MAKEINFO@
5343 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
5344 MCOPIDL = @MCOPIDL@
5345 @@ -504,7 +507,7 @@
5346
5347 .SUFFIXES:
5348 .SUFFIXES: .cpp .lo .o .obj
5349 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
5350 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
5351 #>- @for dep in $?; do \
5352 #>- case '$(am__configure_deps)' in \
5353 #>- *$$dep*) \
5354 @@ -542,9 +545,9 @@
5355 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5356 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5357
5358 -$(top_srcdir)/configure: $(am__configure_deps)
5359 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
5360 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5361 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5362 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
5363 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5364 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
5365 @$(NORMAL_INSTALL)
5366 diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in
5367 --- kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in 2005-02-25 18:23:19.000000000 +0100
5368 +++ kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in 2005-03-03 06:34:13.818972400 +0100
5369 @@ -1,9 +1,9 @@
5370 -# Makefile.in generated by automake 1.9.1 from Makefile.am.
5371 +# Makefile.in generated by automake 1.9.5 from Makefile.am.
5372 # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
5373 # @configure_input@
5374
5375 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5376 -# 2003, 2004 Free Software Foundation, Inc.
5377 +# 2003, 2004, 2005 Free Software Foundation, Inc.
5378 # This Makefile.in is free software; the Free Software Foundation
5379 # gives unlimited permission to copy and/or distribute it,
5380 # with or without modifications, as long as this notice is preserved.
5381 @@ -74,18 +74,18 @@
5382 #>+ 2
5383 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
5384 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5385 -#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5386 +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5387 #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5388 #>- $(AM_CXXFLAGS) $(CXXFLAGS)
5389 #>+ 3
5390 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
5391 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
5392 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
5393 $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
5394 CXXLD = $(CXX)
5395 -#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5396 +#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5397 #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5398 #>+ 2
5399 -CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
5400 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
5401 $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
5402 SOURCES = $(libakode_oss_sink_la_SOURCES)
5403 DIST_SOURCES = $(libakode_oss_sink_la_SOURCES)
5404 @@ -242,6 +242,9 @@
5405 LN_S = @LN_S@
5406 LTLIBOBJS = @LTLIBOBJS@
5407 MADLIBS = @MADLIBS@
5408 +MAINT = @MAINT@
5409 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
5410 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
5411 MAKEINFO = @MAKEINFO@
5412 MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
5413 MCOPIDL = @MCOPIDL@
5414 @@ -498,7 +501,7 @@
5415
5416 .SUFFIXES:
5417 .SUFFIXES: .cpp .lo .o .obj
5418 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
5419 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
5420 #>- @for dep in $?; do \
5421 #>- case '$(am__configure_deps)' in \
5422 #>- *$$dep*) \
5423 @@ -536,9 +539,9 @@
5424 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5425 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5426
5427 -$(top_srcdir)/configure: $(am__configure_deps)
5428 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
5429 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5430 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
5431 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__acloca