Browse Source

Fix kvirc FTBFS


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1247958 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
a16843922c
16 changed files with 22079 additions and 16166 deletions
  1. 6432
    5015
      acinclude.m4
  2. 815
    117
      aclocal.m4
  3. 127
    50
      admin/Makefile.in
  4. 171
    132
      admin/config.guess
  5. 187
    52
      admin/config.sub
  6. 136
    36
      admin/depcomp
  7. 357
    160
      admin/install-sh
  8. 5568
    4191
      admin/libtool.m4.in
  9. 53
    19
      admin/libtool/Makefile.in
  10. 477
    385
      admin/libtool/config.guess
  11. 273
    69
      admin/libtool/config.sub
  12. 7353
    5870
      admin/ltmain.sh
  13. 60
    44
      admin/missing
  14. 30
    8
      src/config.h.in
  15. 39
    17
      src/kvi_configstatus.h
  16. 1
    1
      src/modules/options/instances.h

+ 6432
- 5015
acinclude.m4
File diff suppressed because it is too large
View File


+ 815
- 117
aclocal.m4
File diff suppressed because it is too large
View File


+ 127
- 50
admin/Makefile.in View File

@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.10 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
6
+# Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
15 16
 @SET_MAKE@
16 17
 VPATH = @srcdir@
17 18
 pkgdatadir = $(datadir)/@PACKAGE@
18
-pkglibdir = $(libdir)/@PACKAGE@
19 19
 pkgincludedir = $(includedir)/@PACKAGE@
20
+pkglibdir = $(libdir)/@PACKAGE@
21
+pkglibexecdir = $(libexecdir)/@PACKAGE@
20 22
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21 23
 install_sh_DATA = $(install_sh) -c -m 644
22 24
 install_sh_PROGRAM = $(install_sh) -c
@@ -43,6 +45,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
43 45
 mkinstalldirs = $(install_sh) -d
44 46
 CONFIG_HEADER = $(top_builddir)/src/config.h
45 47
 CONFIG_CLEAN_FILES =
48
+CONFIG_CLEAN_VPATH_FILES =
46 49
 SOURCES =
47 50
 DIST_SOURCES =
48 51
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -54,10 +57,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
54 57
 	ps-recursive uninstall-recursive
55 58
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
56 59
   distclean-recursive maintainer-clean-recursive
60
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
61
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
62
+	distdir
57 63
 ETAGS = etags
58 64
 CTAGS = ctags
59 65
 DIST_SUBDIRS = $(SUBDIRS)
60 66
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
67
+am__relativize = \
68
+  dir0=`pwd`; \
69
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
70
+  sed_rest='s,^[^/]*/*,,'; \
71
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
72
+  sed_butlast='s,/*[^/]*$$,,'; \
73
+  while test -n "$$dir1"; do \
74
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
75
+    if test "$$first" != "."; then \
76
+      if test "$$first" = ".."; then \
77
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
78
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
79
+      else \
80
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
81
+        if test "$$first2" = "$$first"; then \
82
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
83
+        else \
84
+          dir2="../$$dir2"; \
85
+        fi; \
86
+        dir0="$$dir0"/"$$first"; \
87
+      fi; \
88
+    fi; \
89
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
90
+  done; \
91
+  reldir="$$dir2"
61 92
 ACLOCAL = @ACLOCAL@
62 93
 AMTAR = @AMTAR@
63 94
 AR = @AR@
@@ -77,37 +108,47 @@ CXXFLAGS = @CXXFLAGS@
77 108
 CYGPATH_W = @CYGPATH_W@
78 109
 DEFS = @DEFS@
79 110
 DEPDIR = @DEPDIR@
80
-ECHO = @ECHO@
111
+DSYMUTIL = @DSYMUTIL@
112
+DUMPBIN = @DUMPBIN@
81 113
 ECHO_C = @ECHO_C@
82 114
 ECHO_N = @ECHO_N@
83 115
 ECHO_T = @ECHO_T@
84 116
 EGREP = @EGREP@
85 117
 EXEEXT = @EXEEXT@
86
-F77 = @F77@
87
-FFLAGS = @FFLAGS@
118
+FGREP = @FGREP@
88 119
 GREP = @GREP@
89 120
 INSTALL = @INSTALL@
90 121
 INSTALL_DATA = @INSTALL_DATA@
91 122
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
92 123
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
93 124
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
125
+LD = @LD@
94 126
 LDFLAGS = @LDFLAGS@
95 127
 LIBOBJS = @LIBOBJS@
96 128
 LIBS = @LIBS@
97 129
 LIBTOOL = @LIBTOOL@
130
+LIPO = @LIPO@
98 131
 LN_S = @LN_S@
99 132
 LTLIBOBJS = @LTLIBOBJS@
133
+MAINT = @MAINT@
100 134
 MAKEINFO = @MAKEINFO@
101 135
 MKDIR_P = @MKDIR_P@
136
+NM = @NM@
137
+NMEDIT = @NMEDIT@
138
+OBJDUMP = @OBJDUMP@
102 139
 OBJEXT = @OBJEXT@
140
+OTOOL = @OTOOL@
141
+OTOOL64 = @OTOOL64@
103 142
 PACKAGE = @PACKAGE@
104 143
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
105 144
 PACKAGE_NAME = @PACKAGE_NAME@
106 145
 PACKAGE_STRING = @PACKAGE_STRING@
107 146
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
147
+PACKAGE_URL = @PACKAGE_URL@
108 148
 PACKAGE_VERSION = @PACKAGE_VERSION@
109 149
 PATH_SEPARATOR = @PATH_SEPARATOR@
110 150
 RANLIB = @RANLIB@
151
+SED = @SED@
111 152
 SET_MAKE = @SET_MAKE@
112 153
 SHELL = @SHELL@
113 154
 SS_CPPFLAGS = @SS_CPPFLAGS@
@@ -136,7 +177,7 @@ abs_top_builddir = @abs_top_builddir@
136 177
 abs_top_srcdir = @abs_top_srcdir@
137 178
 ac_ct_CC = @ac_ct_CC@
138 179
 ac_ct_CXX = @ac_ct_CXX@
139
-ac_ct_F77 = @ac_ct_F77@
180
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
140 181
 am__include = @am__include@
141 182
 am__leading_dot = @am__leading_dot@
142 183
 am__quote = @am__quote@
@@ -188,6 +229,7 @@ libexecdir = @libexecdir@
188 229
 licensedir = @licensedir@
189 230
 localedir = @localedir@
190 231
 localstatedir = @localstatedir@
232
+lt_ECHO = @lt_ECHO@
191 233
 mandir = @mandir@
192 234
 mimelnkdir = @mimelnkdir@
193 235
 mkdir_p = @mkdir_p@
@@ -210,6 +252,7 @@ target_cpu = @target_cpu@
210 252
 target_os = @target_os@
211 253
 target_vendor = @target_vendor@
212 254
 themedir = @themedir@
255
+top_build_prefix = @top_build_prefix@
213 256
 top_builddir = @top_builddir@
214 257
 top_srcdir = @top_srcdir@
215 258
 topdir = @topdir@
@@ -222,18 +265,18 @@ EXTRA_DIST = acinclude.m4.in libtool.m4.in gendoc.pl gensrc.pl \
222 265
 all: all-recursive
223 266
 
224 267
 .SUFFIXES:
225
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
268
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
226 269
 	@for dep in $?; do \
227 270
 	  case '$(am__configure_deps)' in \
228 271
 	    *$$dep*) \
229
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
230
-		&& exit 0; \
272
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
273
+	        && { if test -f $@; then exit 0; else break; fi; }; \
231 274
 	      exit 1;; \
232 275
 	  esac; \
233 276
 	done; \
234
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  admin/Makefile'; \
235
-	cd $(top_srcdir) && \
236
-	  $(AUTOMAKE) --gnu  admin/Makefile
277
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu admin/Makefile'; \
278
+	$(am__cd) $(top_srcdir) && \
279
+	  $(AUTOMAKE) --gnu admin/Makefile
237 280
 .PRECIOUS: Makefile
238 281
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
239 282
 	@case '$?' in \
@@ -247,10 +290,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
247 290
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
248 291
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
249 292
 
250
-$(top_srcdir)/configure:  $(am__configure_deps)
293
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
251 294
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
252
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
295
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
253 296
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
297
+$(am__aclocal_m4_deps):
254 298
 
255 299
 mostlyclean-libtool:
256 300
 	-rm -f *.lo
@@ -265,7 +309,7 @@ clean-libtool:
265 309
 #     (which will cause the Makefiles to be regenerated when you run `make');
266 310
 # (2) otherwise, pass the desired values on the `make' command line.
267 311
 $(RECURSIVE_TARGETS):
268
-	@failcom='exit 1'; \
312
+	@fail= failcom='exit 1'; \
269 313
 	for f in x $$MAKEFLAGS; do \
270 314
 	  case $$f in \
271 315
 	    *=* | --[!k]*);; \
@@ -282,7 +326,7 @@ $(RECURSIVE_TARGETS):
282 326
 	  else \
283 327
 	    local_target="$$target"; \
284 328
 	  fi; \
285
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
329
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
286 330
 	  || eval $$failcom; \
287 331
 	done; \
288 332
 	if test "$$dot_seen" = "no"; then \
@@ -290,7 +334,7 @@ $(RECURSIVE_TARGETS):
290 334
 	fi; test -z "$$fail"
291 335
 
292 336
 $(RECURSIVE_CLEAN_TARGETS):
293
-	@failcom='exit 1'; \
337
+	@fail= failcom='exit 1'; \
294 338
 	for f in x $$MAKEFLAGS; do \
295 339
 	  case $$f in \
296 340
 	    *=* | --[!k]*);; \
@@ -316,16 +360,16 @@ $(RECURSIVE_CLEAN_TARGETS):
316 360
 	  else \
317 361
 	    local_target="$$target"; \
318 362
 	  fi; \
319
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
363
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
320 364
 	  || eval $$failcom; \
321 365
 	done && test -z "$$fail"
322 366
 tags-recursive:
323 367
 	list='$(SUBDIRS)'; for subdir in $$list; do \
324
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
368
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
325 369
 	done
326 370
 ctags-recursive:
327 371
 	list='$(SUBDIRS)'; for subdir in $$list; do \
328
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
372
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
329 373
 	done
330 374
 
331 375
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -333,14 +377,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
333 377
 	unique=`for i in $$list; do \
334 378
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
335 379
 	  done | \
336
-	  $(AWK) '    { files[$$0] = 1; } \
337
-	       END { for (i in files) print i; }'`; \
380
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
381
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
338 382
 	mkid -fID $$unique
339 383
 tags: TAGS
340 384
 
341 385
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
342 386
 		$(TAGS_FILES) $(LISP)
343
-	tags=; \
387
+	set x; \
344 388
 	here=`pwd`; \
345 389
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
346 390
 	  include_option=--etags-include; \
@@ -352,39 +396,43 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
352 396
 	list='$(SUBDIRS)'; for subdir in $$list; do \
353 397
 	  if test "$$subdir" = .; then :; else \
354 398
 	    test ! -f $$subdir/TAGS || \
355
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
399
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
356 400
 	  fi; \
357 401
 	done; \
358 402
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
359 403
 	unique=`for i in $$list; do \
360 404
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
361 405
 	  done | \
362
-	  $(AWK) '    { files[$$0] = 1; } \
363
-	       END { for (i in files) print i; }'`; \
364
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
406
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
407
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
408
+	shift; \
409
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
365 410
 	  test -n "$$unique" || unique=$$empty_fix; \
366
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
367
-	    $$tags $$unique; \
411
+	  if test $$# -gt 0; then \
412
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
413
+	      "$$@" $$unique; \
414
+	  else \
415
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
416
+	      $$unique; \
417
+	  fi; \
368 418
 	fi
369 419
 ctags: CTAGS
370 420
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
371 421
 		$(TAGS_FILES) $(LISP)
372
-	tags=; \
373
-	here=`pwd`; \
374 422
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
375 423
 	unique=`for i in $$list; do \
376 424
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
377 425
 	  done | \
378
-	  $(AWK) '    { files[$$0] = 1; } \
379
-	       END { for (i in files) print i; }'`; \
380
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
426
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
427
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
428
+	test -z "$(CTAGS_ARGS)$$unique" \
381 429
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
382
-	     $$tags $$unique
430
+	     $$unique
383 431
 
384 432
 GTAGS:
385 433
 	here=`$(am__cd) $(top_builddir) && pwd` \
386
-	  && cd $(top_srcdir) \
387
-	  && gtags -i $(GTAGS_ARGS) $$here
434
+	  && $(am__cd) $(top_srcdir) \
435
+	  && gtags -i $(GTAGS_ARGS) "$$here"
388 436
 
389 437
 distclean-tags:
390 438
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -405,29 +453,44 @@ distdir: $(DISTFILES)
405 453
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
406 454
 	  if test -d $$d/$$file; then \
407 455
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
456
+	    if test -d "$(distdir)/$$file"; then \
457
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
458
+	    fi; \
408 459
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
409
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
460
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
461
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
410 462
 	    fi; \
411
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
463
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
412 464
 	  else \
413
-	    test -f $(distdir)/$$file \
414
-	    || cp -p $$d/$$file $(distdir)/$$file \
465
+	    test -f "$(distdir)/$$file" \
466
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
415 467
 	    || exit 1; \
416 468
 	  fi; \
417 469
 	done
418
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
470
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
419 471
 	  if test "$$subdir" = .; then :; else \
420 472
 	    test -d "$(distdir)/$$subdir" \
421 473
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
422 474
 	    || exit 1; \
423
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
424
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
425
-	    (cd $$subdir && \
475
+	  fi; \
476
+	done
477
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
478
+	  if test "$$subdir" = .; then :; else \
479
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
480
+	    $(am__relativize); \
481
+	    new_distdir=$$reldir; \
482
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
483
+	    $(am__relativize); \
484
+	    new_top_distdir=$$reldir; \
485
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
486
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
487
+	    ($(am__cd) $$subdir && \
426 488
 	      $(MAKE) $(AM_MAKEFLAGS) \
427
-	        top_distdir="$$top_distdir" \
428
-	        distdir="$$distdir/$$subdir" \
489
+	        top_distdir="$$new_top_distdir" \
490
+	        distdir="$$new_distdir" \
429 491
 		am__remove_distdir=: \
430 492
 		am__skip_length_check=: \
493
+		am__skip_mode_fix=: \
431 494
 	        distdir) \
432 495
 	      || exit 1; \
433 496
 	  fi; \
@@ -457,6 +520,7 @@ clean-generic:
457 520
 
458 521
 distclean-generic:
459 522
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
523
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
460 524
 
461 525
 maintainer-clean-generic:
462 526
 	@echo "This command is intended for maintainers to use"
@@ -475,6 +539,8 @@ dvi-am:
475 539
 
476 540
 html: html-recursive
477 541
 
542
+html-am:
543
+
478 544
 info: info-recursive
479 545
 
480 546
 info-am:
@@ -483,18 +549,28 @@ install-data-am:
483 549
 
484 550
 install-dvi: install-dvi-recursive
485 551
 
552
+install-dvi-am:
553
+
486 554
 install-exec-am:
487 555
 
488 556
 install-html: install-html-recursive
489 557
 
558
+install-html-am:
559
+
490 560
 install-info: install-info-recursive
491 561
 
562
+install-info-am:
563
+
492 564
 install-man:
493 565
 
494 566
 install-pdf: install-pdf-recursive
495 567
 
568
+install-pdf-am:
569
+
496 570
 install-ps: install-ps-recursive
497 571
 
572
+install-ps-am:
573
+
498 574
 installcheck-am:
499 575
 
500 576
 maintainer-clean: maintainer-clean-recursive
@@ -515,8 +591,8 @@ ps-am:
515 591
 
516 592
 uninstall-am:
517 593
 
518
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
519
-	install-strip
594
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
595
+	install-am install-strip tags-recursive
520 596
 
521 597
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
522 598
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -535,6 +611,7 @@ uninstall-am:
535 611
 
536 612
 objprelink: objprelink.c
537 613
 	$(CC) -o $@ -O2 $< /usr/lib/libbfd.a /usr/lib/libiberty.a
614
+
538 615
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
539 616
 # Otherwise a system limit (for SysV at least) may be exceeded.
540 617
 .NOEXPORT:

+ 171
- 132
admin/config.guess View File

@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
+#   Free Software Foundation, Inc.
5 6
 
6
-timestamp='2005-07-08'
7
+timestamp='2009-12-30'
7 8
 
8 9
 # This file is free software; you can redistribute it and/or modify it
9 10
 # under the terms of the GNU General Public License as published by
@@ -26,16 +27,16 @@ timestamp='2005-07-08'
26 27
 # the same distribution terms that you use for the rest of that program.
27 28
 
28 29
 
29
-# Originally written by Per Bothner <per@bothner.com>.
30
-# Please send patches to <config-patches@gnu.org>.  Submit a context
31
-# diff and a properly formatted ChangeLog entry.
30
+# Originally written by Per Bothner.  Please send patches (context
31
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
32
+# entry.
32 33
 #
33 34
 # This script attempts to guess a canonical system name similar to
34 35
 # config.sub.  If it succeeds, it prints the system name on stdout, and
35 36
 # exits with 0.  Otherwise, it exits with 1.
36 37
 #
37
-# The plan is that this can be called by configure scripts if you
38
-# don't specify an explicit build system type.
38
+# You can get the latest version of this script from:
39
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
39 40
 
40 41
 me=`echo "$0" | sed -e 's,.*/,,'`
41 42
 
@@ -55,8 +56,9 @@ version="\
55 56
 GNU config.guess ($timestamp)
56 57
 
57 58
 Originally written by Per Bothner.
58
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
59
-Free Software Foundation, Inc.
59
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
60
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
61
+Software Foundation, Inc.
60 62
 
61 63
 This is free software; see the source for copying conditions.  There is NO
62 64
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +108,7 @@ set_cc_for_build='
106 108
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
107 109
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
108 110
 : ${TMPDIR=/tmp} ;
109
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
111
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
110 112
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
111 113
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
112 114
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -160,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
160 162
 	    arm*) machine=arm-unknown ;;
161 163
 	    sh3el) machine=shl-unknown ;;
162 164
 	    sh3eb) machine=sh-unknown ;;
165
+	    sh5el) machine=sh5le-unknown ;;
163 166
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
164 167
 	esac
165 168
 	# The Operating System including object format, if it has switched
@@ -168,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
168 171
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
169 172
 		eval $set_cc_for_build
170 173
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
171
-			| grep __ELF__ >/dev/null
174
+			| grep -q __ELF__
172 175
 		then
173 176
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
174 177
 		    # Return netbsd for either.  FIX?
@@ -206,8 +209,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
206 209
     *:ekkoBSD:*:*)
207 210
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
208 211
 	exit ;;
212
+    *:SolidBSD:*:*)
213
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
214
+	exit ;;
209 215
     macppc:MirBSD:*:*)
210
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
216
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
211 217
 	exit ;;
212 218
     *:MirBSD:*:*)
213 219
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -319,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
319 325
 	case `/usr/bin/uname -p` in
320 326
 	    sparc) echo sparc-icl-nx7; exit ;;
321 327
 	esac ;;
328
+    s390x:SunOS:*:*)
329
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
330
+	exit ;;
322 331
     sun4H:SunOS:5.*:*)
323 332
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
324 333
 	exit ;;
325 334
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
326 335
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
327 336
 	exit ;;
328
-    i86pc:SunOS:5.*:*)
329
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
337
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
338
+	echo i386-pc-auroraux${UNAME_RELEASE}
339
+	exit ;;
340
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
341
+	eval $set_cc_for_build
342
+	SUN_ARCH="i386"
343
+	# If there is a compiler, see if it is configured for 64-bit objects.
344
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
345
+	# This test works for both compilers.
346
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
347
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
348
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
349
+		grep IS_64BIT_ARCH >/dev/null
350
+	    then
351
+		SUN_ARCH="x86_64"
352
+	    fi
353
+	fi
354
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
330 355
 	exit ;;
331 356
     sun4*:SunOS:6*:*)
332 357
 	# According to config.sub, this is the proper way to canonicalize
@@ -527,7 +552,7 @@ EOF
527 552
 		echo rs6000-ibm-aix3.2
528 553
 	fi
529 554
 	exit ;;
530
-    *:AIX:*:[45])
555
+    *:AIX:*:[456])
531 556
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
532 557
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
533 558
 		IBM_ARCH=rs6000
@@ -635,7 +660,7 @@ EOF
635 660
 	    # => hppa64-hp-hpux11.23
636 661
 
637 662
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
638
-		grep __LP64__ >/dev/null
663
+		grep -q __LP64__
639 664
 	    then
640 665
 		HP_ARCH="hppa2.0w"
641 666
 	    else
@@ -764,12 +789,19 @@ EOF
764 789
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
765 790
 	exit ;;
766 791
     *:FreeBSD:*:*)
767
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
792
+	case ${UNAME_MACHINE} in
793
+	    pc98)
794
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
795
+	    amd64)
796
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
797
+	    *)
798
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
799
+	esac
768 800
 	exit ;;
769 801
     i*:CYGWIN*:*)
770 802
 	echo ${UNAME_MACHINE}-pc-cygwin
771 803
 	exit ;;
772
-    i*:MINGW*:*)
804
+    *:MINGW*:*)
773 805
 	echo ${UNAME_MACHINE}-pc-mingw32
774 806
 	exit ;;
775 807
     i*:windows32*:*)
@@ -779,12 +811,24 @@ EOF
779 811
     i*:PW*:*)
780 812
 	echo ${UNAME_MACHINE}-pc-pw32
781 813
 	exit ;;
782
-    x86:Interix*:[34]*)
783
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
784
-	exit ;;
814
+    *:Interix*:*)
815
+    	case ${UNAME_MACHINE} in
816
+	    x86)
817
+		echo i586-pc-interix${UNAME_RELEASE}
818
+		exit ;;
819
+	    authenticamd | genuineintel | EM64T)
820
+		echo x86_64-unknown-interix${UNAME_RELEASE}
821
+		exit ;;
822
+	    IA64)
823
+		echo ia64-unknown-interix${UNAME_RELEASE}
824
+		exit ;;
825
+	esac ;;
785 826
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
786 827
 	echo i${UNAME_MACHINE}-pc-mks
787 828
 	exit ;;
829
+    8664:Windows_NT:*)
830
+	echo x86_64-pc-mks
831
+	exit ;;
788 832
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
789 833
 	# How do we know it's Interix rather than the generic POSIX subsystem?
790 834
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -794,7 +838,7 @@ EOF
794 838
     i*:UWIN*:*)
795 839
 	echo ${UNAME_MACHINE}-pc-uwin
796 840
 	exit ;;
797
-    amd64:CYGWIN*:*:*)
841
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
798 842
 	echo x86_64-unknown-cygwin
799 843
 	exit ;;
800 844
     p*:CYGWIN*:*)
@@ -814,7 +858,31 @@ EOF
814 858
     i*86:Minix:*:*)
815 859
 	echo ${UNAME_MACHINE}-pc-minix
816 860
 	exit ;;
861
+    alpha:Linux:*:*)
862
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
863
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
864
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
865
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
866
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
867
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
868
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
869
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
870
+        esac
871
+	objdump --private-headers /bin/sh | grep -q ld.so.1
872
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
873
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
874
+	exit ;;
817 875
     arm*:Linux:*:*)
876
+	eval $set_cc_for_build
877
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
878
+	    | grep -q __ARM_EABI__
879
+	then
880
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
881
+	else
882
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
883
+	fi
884
+	exit ;;
885
+    avr32*:Linux:*:*)
818 886
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
819 887
 	exit ;;
820 888
     cris:Linux:*:*)
@@ -826,6 +894,17 @@ EOF
826 894
     frv:Linux:*:*)
827 895
     	echo frv-unknown-linux-gnu
828 896
 	exit ;;
897
+    i*86:Linux:*:*)
898
+	LIBC=gnu
899
+	eval $set_cc_for_build
900
+	sed 's/^	//' << EOF >$dummy.c
901
+	#ifdef __dietlibc__
902
+	LIBC=dietlibc
903
+	#endif
904
+EOF
905
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
906
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
907
+	exit ;;
829 908
     ia64:Linux:*:*)
830 909
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
831 910
 	exit ;;
@@ -835,63 +914,33 @@ EOF
835 914
     m68*:Linux:*:*)
836 915
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
837 916
 	exit ;;
838
-    mips:Linux:*:*)
839
-	eval $set_cc_for_build
840
-	sed 's/^	//' << EOF >$dummy.c
841
-	#undef CPU
842
-	#undef mips
843
-	#undef mipsel
844
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
845
-	CPU=mipsel
846
-	#else
847
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
848
-	CPU=mips
849
-	#else
850
-	CPU=
851
-	#endif
852
-	#endif
853
-EOF
854
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
855
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
856
-	;;
857
-    mips64:Linux:*:*)
917
+    mips:Linux:*:* | mips64:Linux:*:*)
858 918
 	eval $set_cc_for_build
859 919
 	sed 's/^	//' << EOF >$dummy.c
860 920
 	#undef CPU
861
-	#undef mips64
862
-	#undef mips64el
921
+	#undef ${UNAME_MACHINE}
922
+	#undef ${UNAME_MACHINE}el
863 923
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
864
-	CPU=mips64el
924
+	CPU=${UNAME_MACHINE}el
865 925
 	#else
866 926
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
867
-	CPU=mips64
927
+	CPU=${UNAME_MACHINE}
868 928
 	#else
869 929
 	CPU=
870 930
 	#endif
871 931
 	#endif
872 932
 EOF
873
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
933
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
874 934
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
875 935
 	;;
876
-    ppc:Linux:*:*)
877
-	echo powerpc-unknown-linux-gnu
936
+    or32:Linux:*:*)
937
+	echo or32-unknown-linux-gnu
878 938
 	exit ;;
879
-    ppc64:Linux:*:*)
880
-	echo powerpc64-unknown-linux-gnu
939
+    padre:Linux:*:*)
940
+	echo sparc-unknown-linux-gnu
881 941
 	exit ;;
882
-    alpha:Linux:*:*)
883
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
884
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
885
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
886
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
887
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
888
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
889
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
890
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
891
-        esac
892
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
893
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
894
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
942
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
943
+	echo hppa64-unknown-linux-gnu
895 944
 	exit ;;
896 945
     parisc:Linux:*:* | hppa:Linux:*:*)
897 946
 	# Look for CPU level
@@ -901,8 +950,11 @@ EOF
901 950
 	  *)    echo hppa-unknown-linux-gnu ;;
902 951
 	esac
903 952
 	exit ;;
904
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
905
-	echo hppa64-unknown-linux-gnu
953
+    ppc64:Linux:*:*)
954
+	echo powerpc64-unknown-linux-gnu
955
+	exit ;;
956
+    ppc:Linux:*:*)
957
+	echo powerpc-unknown-linux-gnu
906 958
 	exit ;;
907 959
     s390:Linux:*:* | s390x:Linux:*:*)
908 960
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -916,68 +968,15 @@ EOF
916 968
     sparc:Linux:*:* | sparc64:Linux:*:*)
917 969
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
918 970
 	exit ;;
971
+    vax:Linux:*:*)
972
+	echo ${UNAME_MACHINE}-dec-linux-gnu
973
+	exit ;;
919 974
     x86_64:Linux:*:*)
920 975
 	echo x86_64-unknown-linux-gnu
921 976
 	exit ;;
922
-    i*86:Linux:*:*)
923
-	# The BFD linker knows what the default object file format is, so
924
-	# first see if it will tell us. cd to the root directory to prevent
925
-	# problems with other programs or directories called `ld' in the path.
926
-	# Set LC_ALL=C to ensure ld outputs messages in English.
927
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
928
-			 | sed -ne '/supported targets:/!d
929
-				    s/[ 	][ 	]*/ /g
930
-				    s/.*supported targets: *//
931
-				    s/ .*//
932
-				    p'`
933
-        case "$ld_supported_targets" in
934
-	  elf32-i386)
935
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
936
-		;;
937
-	  a.out-i386-linux)
938
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
939
-		exit ;;
940
-	  coff-i386)
941
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
942
-		exit ;;
943
-	  "")
944
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
945
-		# one that does not give us useful --help.
946
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
947
-		exit ;;
948
-	esac
949
-	# Determine whether the default compiler is a.out or elf
950
-	eval $set_cc_for_build
951
-	sed 's/^	//' << EOF >$dummy.c
952
-	#include <features.h>
953
-	#ifdef __ELF__
954
-	# ifdef __GLIBC__
955
-	#  if __GLIBC__ >= 2
956
-	LIBC=gnu
957
-	#  else
958
-	LIBC=gnulibc1
959
-	#  endif
960
-	# else
961
-	LIBC=gnulibc1
962
-	# endif
963
-	#else
964
-	#ifdef __INTEL_COMPILER
965
-	LIBC=gnu
966
-	#else
967
-	LIBC=gnuaout
968
-	#endif
969
-	#endif
970
-	#ifdef __dietlibc__
971
-	LIBC=dietlibc
972
-	#endif
973
-EOF
974
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
975
-	test x"${LIBC}" != x && {
976
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
977
-		exit
978
-	}
979
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
980
-	;;
977
+    xtensa*:Linux:*:*)
978
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
979
+	exit ;;
981 980
     i*86:DYNIX/ptx:4*:*)
982 981
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
983 982
 	# earlier versions are messed up and put the nodename in both
@@ -1006,7 +1005,7 @@ EOF
1006 1005
     i*86:syllable:*:*)
1007 1006
 	echo ${UNAME_MACHINE}-pc-syllable
1008 1007
 	exit ;;
1009
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1008
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1010 1009
 	echo i386-unknown-lynxos${UNAME_RELEASE}
1011 1010
 	exit ;;
1012 1011
     i*86:*DOS:*:*)
@@ -1050,8 +1049,11 @@ EOF
1050 1049
     pc:*:*:*)
1051 1050
 	# Left here for compatibility:
1052 1051
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
1053
-        # the processor, so we play safe by assuming i386.
1054
-	echo i386-pc-msdosdjgpp
1052
+        # the processor, so we play safe by assuming i586.
1053
+	# Note: whatever this is, it MUST be the same as what config.sub
1054
+	# prints for the "djgpp" host, or else GDB configury will decide that
1055
+	# this is a cross-build.
1056
+	echo i586-pc-msdosdjgpp
1055 1057
         exit ;;
1056 1058
     Intel:Mach:3*:*)
1057 1059
 	echo i386-pc-mach3
@@ -1089,6 +1091,16 @@ EOF
1089 1091
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1090 1092
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1091 1093
           && { echo i486-ncr-sysv4; exit; } ;;
1094
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1095
+	OS_REL='.3'
1096
+	test -r /etc/.relid \
1097
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1098
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1099
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1100
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1101
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1102
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1103
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1092 1104
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1093 1105
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
1094 1106
 	exit ;;
@@ -1101,7 +1113,7 @@ EOF
1101 1113
     rs6000:LynxOS:2.*:*)
1102 1114
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1103 1115
 	exit ;;
1104
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1116
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1105 1117
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1106 1118
 	exit ;;
1107 1119
     SM[BE]S:UNIX_SV:*:*)
@@ -1164,6 +1176,9 @@ EOF
1164 1176
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1165 1177
 	echo i586-pc-beos
1166 1178
 	exit ;;
1179
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
1180
+	echo i586-pc-haiku
1181
+	exit ;;
1167 1182
     SX-4:SUPER-UX:*:*)
1168 1183
 	echo sx4-nec-superux${UNAME_RELEASE}
1169 1184
 	exit ;;
@@ -1173,6 +1188,15 @@ EOF
1173 1188
     SX-6:SUPER-UX:*:*)
1174 1189
 	echo sx6-nec-superux${UNAME_RELEASE}
1175 1190
 	exit ;;
1191
+    SX-7:SUPER-UX:*:*)
1192
+	echo sx7-nec-superux${UNAME_RELEASE}
1193
+	exit ;;
1194
+    SX-8:SUPER-UX:*:*)
1195
+	echo sx8-nec-superux${UNAME_RELEASE}
1196
+	exit ;;
1197
+    SX-8R:SUPER-UX:*:*)
1198
+	echo sx8r-nec-superux${UNAME_RELEASE}
1199
+	exit ;;
1176 1200
     Power*:Rhapsody:*:*)
1177 1201
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1178 1202
 	exit ;;
@@ -1182,7 +1206,16 @@ EOF
1182 1206
     *:Darwin:*:*)
1183 1207
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1184 1208
 	case $UNAME_PROCESSOR in
1185
-	    *86) UNAME_PROCESSOR=i686 ;;
1209
+	    i386)
1210
+		eval $set_cc_for_build
1211
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1212
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1213
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1214
+		      grep IS_64BIT_ARCH >/dev/null
1215
+		  then
1216
+		      UNAME_PROCESSOR="x86_64"
1217
+		  fi
1218
+		fi ;;
1186 1219
 	    unknown) UNAME_PROCESSOR=powerpc ;;
1187 1220
 	esac
1188 1221
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1261,6 +1294,12 @@ EOF
1261 1294
     i*86:skyos:*:*)
1262 1295
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1263 1296
 	exit ;;
1297
+    i*86:rdos:*:*)
1298
+	echo ${UNAME_MACHINE}-pc-rdos
1299
+	exit ;;
1300
+    i*86:AROS:*:*)
1301
+	echo ${UNAME_MACHINE}-pc-aros
1302
+	exit ;;
1264 1303
 esac
1265 1304
 
1266 1305
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1421,9 +1460,9 @@ This script, last modified $timestamp, has failed to recognize
1421 1460
 the operating system you are using. It is advised that you
1422 1461
 download the most up to date version of the config scripts from
1423 1462
 
1424
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1463
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1425 1464
 and
1426
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1465
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1427 1466
 
1428 1467
 If the version you run ($0) is already up to date, please
1429 1468
 send the following data and any information you think might be

+ 187
- 52
admin/config.sub View File

@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
+#   Free Software Foundation, Inc.
5 6
 
6
-timestamp='2005-07-08'
7
+timestamp='2010-01-22'
7 8
 
8 9
 # This file is (in principle) common to ALL GNU software.
9 10
 # The presence of a machine in this file suggests that SOME GNU software
@@ -31,13 +32,16 @@ timestamp='2005-07-08'
31 32
 
32 33
 
33 34
 # Please send patches to <config-patches@gnu.org>.  Submit a context
34
-# diff and a properly formatted ChangeLog entry.
35
+# diff and a properly formatted GNU ChangeLog entry.
35 36
 #
36 37
 # Configuration subroutine to validate and canonicalize a configuration type.
37 38
 # Supply the specified configuration type as an argument.
38 39
 # If it is invalid, we print an error message on stderr and exit with code 1.
39 40
 # Otherwise, we print the canonical config type on stdout and succeed.
40 41
 
42
+# You can get the latest version of this script from:
43
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
+
41 45
 # This file is supposed to be the same for all GNU packages
42 46
 # and recognize all the CPU types, system types and aliases
43 47
 # that are meaningful with *any* GNU software.
@@ -71,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
71 75
 version="\
72 76
 GNU config.sub ($timestamp)
73 77
 
74
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
75
-Free Software Foundation, Inc.
78
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
79
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
80
+Software Foundation, Inc.
76 81
 
77 82
 This is free software; see the source for copying conditions.  There is NO
78 83
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -119,8 +124,10 @@ esac
119 124
 # Here we must recognize all the valid KERNEL-OS combinations.
120 125
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
121 126
 case $maybe_os in
122
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
123
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
127
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
128
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
129
+  kopensolaris*-gnu* | \
130
+  storm-chaos* | os2-emx* | rtmk-nova*)
124 131
     os=-$maybe_os
125 132
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
126 133
     ;;
@@ -146,10 +153,13 @@ case $os in
146 153
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
147 154
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
148 155
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
149
-	-apple | -axis | -knuth | -cray)
156
+	-apple | -axis | -knuth | -cray | -microblaze)
150 157
 		os=
151 158
 		basic_machine=$1
152 159
 		;;
160
+        -bluegene*)
161
+	        os=-cnk
162
+		;;
153 163
 	-sim | -cisco | -oki | -wec | -winbond)
154 164
 		os=
155 165
 		basic_machine=$1
@@ -171,6 +181,10 @@ case $os in
171 181
 	-hiux*)
172 182
 		os=-hiuxwe2
173 183
 		;;
184
+	-sco6)
185
+		os=-sco5v6
186
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
187
+		;;
174 188
 	-sco5)
175 189
 		os=-sco3.2v5
176 190
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +201,10 @@ case $os in
187 201
 		# Don't forget version if it is 3.2v4 or newer.
188 202
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
189 203
 		;;
204
+	-sco5v6*)
205
+		# Don't forget version if it is 3.2v4 or newer.
206
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
207
+		;;
190 208
 	-sco*)
191 209
 		os=-sco3.2v2
192 210
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,20 +249,24 @@ case $basic_machine in
231 249
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
232 250
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
233 251
 	| am33_2.0 \
234
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
252
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
235 253
 	| bfin \
236 254
 	| c4x | clipper \
237 255
 	| d10v | d30v | dlx | dsp16xx \
238
-	| fr30 | frv \
256
+	| fido | fr30 | frv \
239 257
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
240 258
 	| i370 | i860 | i960 | ia64 \
241 259
 	| ip2k | iq2000 \
242
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
260
+	| lm32 \
261
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
262
+	| maxq | mb | microblaze | mcore | mep | metag \
243 263
 	| mips | mipsbe | mipseb | mipsel | mipsle \
244 264
 	| mips16 \
245 265
 	| mips64 | mips64el \
246
-	| mips64vr | mips64vrel \
266
+	| mips64octeon | mips64octeonel \
247 267
 	| mips64orion | mips64orionel \
268
+	| mips64r5900 | mips64r5900el \
269
+	| mips64vr | mips64vrel \
248 270
 	| mips64vr4100 | mips64vr4100el \
249 271
 	| mips64vr4300 | mips64vr4300el \
250 272
 	| mips64vr5000 | mips64vr5000el \
@@ -257,35 +279,40 @@ case $basic_machine in
257 279
 	| mipsisa64sr71k | mipsisa64sr71kel \
258 280
 	| mipstx39 | mipstx39el \
259 281
 	| mn10200 | mn10300 \
260
-	| ms1 \
282
+	| moxie \
283
+	| mt \
261 284
 	| msp430 \
285
+	| nios | nios2 \
262 286
 	| ns16k | ns32k \
263 287
 	| or32 \
264 288
 	| pdp10 | pdp11 | pj | pjl \
265 289
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
266 290
 	| pyramid \
267
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
291
+	| rx \
292
+	| score \
293
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
268 294
 	| sh64 | sh64le \
269
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
270
-	| sparcv8 | sparcv9 | sparcv9b \
271
-	| strongarm \
295
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
296
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
297
+	| spu | strongarm \
272 298
 	| tahoe | thumb | tic4x | tic80 | tron \
299
+	| ubicom32 \
273 300
 	| v850 | v850e \
274 301
 	| we32k \
275
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
276
-	| z8k)
277
-		basic_machine=$basic_machine-unknown
278
-		;;
279
-	m32c)
302
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
303
+	| z8k | z80)
280 304
 		basic_machine=$basic_machine-unknown
281 305
 		;;
282
-	m6811 | m68hc11 | m6812 | m68hc12)
306
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
283 307
 		# Motorola 68HC11/12.
284 308
 		basic_machine=$basic_machine-unknown
285 309
 		os=-none
286 310
 		;;
287 311
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
288 312
 		;;
313
+	ms1)
314
+		basic_machine=mt-unknown
315
+		;;
289 316
 
290 317
 	# We use `pc' rather than `unknown'
291 318
 	# because (1) that's what they normally are, and
@@ -305,25 +332,28 @@ case $basic_machine in
305 332
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
306 333
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
307 334
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
308
-	| avr-* \
335
+	| avr-* | avr32-* \
309 336
 	| bfin-* | bs2000-* \
310 337
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
311 338
 	| clipper-* | craynv-* | cydra-* \
312 339
 	| d10v-* | d30v-* | dlx-* \
313 340
 	| elxsi-* \
314
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
341
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
315 342
 	| h8300-* | h8500-* \
316 343
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
317 344
 	| i*86-* | i860-* | i960-* | ia64-* \
318 345
 	| ip2k-* | iq2000-* \
319
-	| m32r-* | m32rle-* \
346
+	| lm32-* \
347
+	| m32c-* | m32r-* | m32rle-* \
320 348
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
321
-	| m88110-* | m88k-* | maxq-* | mcore-* \
349
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
322 350
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
323 351
 	| mips16-* \
324 352
 	| mips64-* | mips64el-* \
325
-	| mips64vr-* | mips64vrel-* \
353
+	| mips64octeon-* | mips64octeonel-* \
326 354
 	| mips64orion-* | mips64orionel-* \
355
+	| mips64r5900-* | mips64r5900el-* \
356
+	| mips64vr-* | mips64vrel-* \
327 357
 	| mips64vr4100-* | mips64vr4100el-* \
328 358
 	| mips64vr4300-* | mips64vr4300el-* \
329 359
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -336,30 +366,35 @@ case $basic_machine in
336 366
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
337 367
 	| mipstx39-* | mipstx39el-* \
338 368
 	| mmix-* \
339
-	| ms1-* \
369
+	| mt-* \
340 370
 	| msp430-* \
371
+	| nios-* | nios2-* \
341 372
 	| none-* | np1-* | ns16k-* | ns32k-* \
342 373
 	| orion-* \
343 374
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
344 375
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
345 376
 	| pyramid-* \
346
-	| romp-* | rs6000-* \
347
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
377
+	| romp-* | rs6000-* | rx-* \
378
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
348 379
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
349
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
380
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
350 381
 	| sparclite-* \
351
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
382
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
352 383
 	| tahoe-* | thumb-* \
353 384
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
385
+	| tile-* | tilegx-* \
354 386
 	| tron-* \
387
+	| ubicom32-* \
355 388
 	| v850-* | v850e-* | vax-* \
356 389
 	| we32k-* \
357
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
358
-	| xstormy16-* | xtensa-* \
390
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
391
+	| xstormy16-* | xtensa*-* \
359 392
 	| ymp-* \
360
-	| z8k-*)
393
+	| z8k-* | z80-*)
361 394
 		;;
362
-	m32c-*)
395
+	# Recognize the basic CPU types without company name, with glob match.
396
+	xtensa*)
397
+		basic_machine=$basic_machine-unknown
363 398
 		;;
364 399
 	# Recognize the various machine names and aliases which stand
365 400
 	# for a CPU type and a company and sometimes even an OS.
@@ -423,6 +458,10 @@ case $basic_machine in
423 458
 		basic_machine=m68k-apollo
424 459
 		os=-bsd
425 460
 		;;
461
+	aros)
462
+		basic_machine=i386-pc
463
+		os=-aros
464
+		;;
426 465
 	aux)
427 466
 		basic_machine=m68k-apple
428 467
 		os=-aux
@@ -431,10 +470,26 @@ case $basic_machine in
431 470
 		basic_machine=ns32k-sequent
432 471
 		os=-dynix
433 472
 		;;
473
+	blackfin)
474
+		basic_machine=bfin-unknown
475
+		os=-linux
476
+		;;
477
+	blackfin-*)
478
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
479
+		os=-linux
480
+		;;
481
+	bluegene*)
482
+		basic_machine=powerpc-ibm
483
+		os=-cnk
484
+		;;
434 485
 	c90)
435 486
 		basic_machine=c90-cray
436 487
 		os=-unicos
437 488
 		;;
489
+        cegcc)
490
+		basic_machine=arm-unknown
491
+		os=-cegcc
492
+		;;
438 493
 	convex-c1)
439 494
 		basic_machine=c1-convex
440 495
 		os=-bsd
@@ -463,8 +518,8 @@ case $basic_machine in
463 518
 		basic_machine=craynv-cray
464 519
 		os=-unicosmp
465 520
 		;;
466
-	cr16c)
467
-		basic_machine=cr16c-unknown
521
+	cr16)
522
+		basic_machine=cr16-unknown
468 523
 		os=-elf
469 524
 		;;
470 525
 	crds | unos)
@@ -502,6 +557,10 @@ case $basic_machine in
502 557
 		basic_machine=m88k-motorola
503 558
 		os=-sysv3
504 559
 		;;
560
+	dicos)
561
+		basic_machine=i686-pc
562
+		os=-dicos
563
+		;;
505 564
 	djgpp)
506 565
 		basic_machine=i586-pc
507 566
 		os=-msdosdjgpp
@@ -656,6 +715,14 @@ case $basic_machine in
656 715
 		basic_machine=m68k-isi
657 716
 		os=-sysv
658 717
 		;;
718
+	m68knommu)
719
+		basic_machine=m68k-unknown
720
+		os=-linux
721
+		;;
722
+	m68knommu-*)
723
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
724
+		os=-linux
725
+		;;
659 726
 	m88k-omron*)
660 727
 		basic_machine=m88k-omron
661 728
 		;;
@@ -667,10 +734,17 @@ case $basic_machine in
667 734
 		basic_machine=ns32k-utek
668 735
 		os=-sysv
669 736
 		;;
737
+        microblaze)
738
+		basic_machine=microblaze-xilinx
739
+		;;
670 740
 	mingw32)
671 741
 		basic_machine=i386-pc
672 742
 		os=-mingw32
673 743
 		;;
744
+	mingw32ce)
745
+		basic_machine=arm-unknown
746
+		os=-mingw32ce
747
+		;;
674 748
 	miniframe)
675 749
 		basic_machine=m68000-convergent
676 750
 		;;
@@ -696,6 +770,9 @@ case $basic_machine in
696 770
 		basic_machine=i386-pc
697 771
 		os=-msdos
698 772
 		;;
773
+	ms1-*)
774
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
775
+		;;
699 776
 	mvs)
700 777
 		basic_machine=i370-ibm
701 778
 		os=-mvs
@@ -794,6 +871,14 @@ case $basic_machine in
794 871
 		basic_machine=i860-intel
795 872
 		os=-osf
796 873
 		;;
874
+	parisc)
875
+		basic_machine=hppa-unknown
876
+		os=-linux
877
+		;;
878
+	parisc-*)
879
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
880
+		os=-linux
881
+		;;
797 882
 	pbd)
798 883
 		basic_machine=sparc-tti
799 884
 		;;
@@ -803,6 +888,12 @@ case $basic_machine in
803 888
 	pc532 | pc532-*)
804 889
 		basic_machine=ns32k-pc532
805 890
 		;;
891
+	pc98)
892
+		basic_machine=i386-pc
893
+		;;
894
+	pc98-*)
895
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
896
+		;;
806 897
 	pentium | p5 | k5 | k6 | nexgen | viac3)
807 898
 		basic_machine=i586-pc
808 899
 		;;
@@ -859,6 +950,10 @@ case $basic_machine in
859 950
 		basic_machine=i586-unknown
860 951
 		os=-pw32
861 952
 		;;
953
+	rdos)
954
+		basic_machine=i386-pc
955
+		os=-rdos
956
+		;;
862 957
 	rom68k)
863 958
 		basic_machine=m68k-rom68k
864 959
 		os=-coff
@@ -885,6 +980,10 @@ case $basic_machine in
885 980
 	sb1el)
886 981
 		basic_machine=mipsisa64sb1el-unknown
887 982
 		;;
983
+	sde)
984
+		basic_machine=mipsisa32-sde
985
+		os=-elf
986
+		;;
888 987
 	sei)
889 988
 		basic_machine=mips-sei
890 989
 		os=-seiux
@@ -896,6 +995,9 @@ case $basic_machine in
896 995
 		basic_machine=sh-hitachi
897 996
 		os=-hms
898 997
 		;;
998
+	sh5el)
999
+		basic_machine=sh5le-unknown
1000
+		;;
899 1001
 	sh64)
900 1002
 		basic_machine=sh64-unknown
901 1003
 		;;
@@ -985,6 +1087,15 @@ case $basic_machine in
985 1087
 		basic_machine=tic6x-unknown
986 1088
 		os=-coff
987 1089
 		;;
1090
+        # This must be matched before tile*.
1091
+        tilegx*)
1092
+		basic_machine=tilegx-unknown
1093
+		os=-linux-gnu
1094
+		;;
1095
+	tile*)
1096
+		basic_machine=tile-unknown
1097
+		os=-linux-gnu
1098
+		;;
988 1099
 	tx39)
989 1100
 		basic_machine=mipstx39-unknown
990 1101
 		;;
@@ -1060,6 +1171,10 @@ case $basic_machine in
1060 1171
 		basic_machine=z8k-unknown
1061 1172
 		os=-sim
1062 1173
 		;;
1174
+	z80-*-coff)
1175
+		basic_machine=z80-unknown
1176
+		os=-sim
1177
+		;;
1063 1178
 	none)
1064 1179
 		basic_machine=none-none
1065 1180
 		os=-none
@@ -1098,10 +1213,10 @@ case $basic_machine in
1098 1213
 	we32k)
1099 1214
 		basic_machine=we32k-att
1100 1215
 		;;
1101
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1216
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1102 1217
 		basic_machine=sh-unknown
1103 1218
 		;;
1104
-	sparc | sparcv8 | sparcv9 | sparcv9b)
1219
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1105 1220
 		basic_machine=sparc-sun
1106 1221
 		;;
1107 1222
 	cydra)
@@ -1148,6 +1263,9 @@ case $os in
1148 1263
         # First match some system type aliases
1149 1264
         # that might get confused with valid system types.
1150 1265
 	# -solaris* is a basic system type, with this one exception.
1266
+        -auroraux)
1267
+	        os=-auroraux
1268
+		;;
1151 1269
 	-solaris1 | -solaris1.*)
1152 1270
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
1153 1271
 		;;
@@ -1168,27 +1286,30 @@ case $os in
1168 1286
 	# Each alternative MUST END IN A *, to match a version number.
1169 1287
 	# -sysv* is not here because it comes later, after sysvr4.
1170 1288
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1171
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1172
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1289
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1290
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1291
+	      | -sym* | -kopensolaris* \
1173 1292
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1174
-	      | -aos* \
1293
+	      | -aos* | -aros* \
1175 1294
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1176 1295
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1177
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1296
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1297
+	      | -openbsd* | -solidbsd* \
1178 1298
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1179 1299
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1180 1300
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1181 1301
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1182
-	      | -chorusos* | -chorusrdb* \
1302
+	      | -chorusos* | -chorusrdb* | -cegcc* \
1183 1303
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1184
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1304
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1305
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
1185 1306
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1186 1307
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1187 1308
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1188 1309
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1189 1310
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1190 1311
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1191
-	      | -skyos* | -haiku*)
1312
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1192 1313
 	# Remember, each alternative MUST END IN *, to match a version number.
1193 1314
 		;;
1194 1315
 	-qnx*)
@@ -1318,6 +1439,11 @@ case $os in
1318 1439
 	-zvmoe)
1319 1440
 		os=-zvmoe
1320 1441
 		;;
1442
+	-dicos*)
1443
+		os=-dicos
1444
+		;;
1445
+        -nacl*)
1446
+	        ;;
1321 1447
 	-none)
1322 1448
 		;;
1323 1449
 	*)
@@ -1340,6 +1466,12 @@ else
1340 1466
 # system, and we'll never get to this point.
1341 1467
 
1342 1468
 case $basic_machine in
1469
+        score-*)
1470
+		os=-elf
1471
+		;;
1472
+        spu-*)
1473
+		os=-elf
1474
+		;;
1343 1475
 	*-acorn)
1344 1476
 		os=-riscix1.2
1345 1477
 		;;
@@ -1349,9 +1481,9 @@ case $basic_machine in
1349 1481
 	arm*-semi)
1350 1482
 		os=-aout
1351 1483
 		;;
1352
-    c4x-* | tic4x-*)
1353
-        os=-coff
1354
-        ;;
1484
+        c4x-* | tic4x-*)
1485
+        	os=-coff
1486
+		;;
1355 1487
 	# This must come before the *-dec entry.
1356 1488
 	pdp10-*)
1357 1489
 		os=-tops20
@@ -1377,6 +1509,9 @@ case $basic_machine in
1377 1509
 	m68*-cisco)
1378 1510
 		os=-aout
1379 1511
 		;;
1512
+        mep-*)
1513
+		os=-elf
1514
+		;;
1380 1515
 	mips*-cisco)
1381 1516
 		os=-elf
1382 1517
 		;;
@@ -1506,7 +1641,7 @@ case $basic_machine in
1506 1641
 			-sunos*)
1507 1642
 				vendor=sun
1508 1643
 				;;
1509
-			-aix*)
1644
+			-cnk*|-aix*)
1510 1645
 				vendor=ibm
1511 1646
 				;;
1512 1647
 			-beos*)

+ 136
- 36
admin/depcomp View File

@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # depcomp - compile a program generating dependencies as side-effects
3 3
 
4
-scriptversion=2005-07-09.11
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
6
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
7
+# Software Foundation, Inc.
7 8
 
8 9
 # This program is free software; you can redistribute it and/or modify
9 10
 # it under the terms of the GNU General Public License as published by
@@ -16,9 +17,7 @@ scriptversion=2005-07-09.11
16 17
 # GNU General Public License for more details.
17 18
 
18 19
 # You should have received a copy of the GNU General Public License
19
-# along with this program; if not, write to the Free Software
20
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
21
-# 02110-1301, USA.
20
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22 21
 
23 22
 # As a special exception to the GNU General Public License, if you
24 23
 # distribute this file as part of a program that contains a
@@ -86,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
86 85
    depmode=dashmstdout
87 86
 fi
88 87
 
88
+cygpath_u="cygpath -u -f -"
89
+if test "$depmode" = msvcmsys; then
90
+   # This is just like msvisualcpp but w/o cygpath translation.
91
+   # Just convert the backslash-escaped backslashes to single forward
92
+   # slashes to satisfy depend.m4
93
+   cygpath_u="sed s,\\\\\\\\,/,g"
94
+   depmode=msvisualcpp
95
+fi
96
+
89 97
 case "$depmode" in
90 98
 gcc3)
91 99
 ## gcc 3 implements dependency tracking that does exactly what
92 100
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
93 101
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
94
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
102
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
103
+## the command line argument order; so add the flags where they
104
+## appear in depend2.am.  Note that the slowdown incurred here
105
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
106
+  for arg
107
+  do
108
+    case $arg in
109
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
110
+    *)  set fnord "$@" "$arg" ;;
111
+    esac
112
+    shift # fnord
113
+    shift # $arg
114
+  done
115
+  "$@"
95 116
   stat=$?
96 117
   if test $stat -eq 0; then :
97 118
   else
@@ -178,14 +199,14 @@ sgi)
178 199
 ' < "$tmpdepfile" \
179 200
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
180 201
     tr '
181
-' ' ' >> $depfile
182
-    echo >> $depfile
202
+' ' ' >> "$depfile"
203
+    echo >> "$depfile"
183 204
 
184 205
     # The second pass generates a dummy entry for each header file.
185 206
     tr ' ' '
186 207
 ' < "$tmpdepfile" \
187 208
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
188
-   >> $depfile
209
+   >> "$depfile"
189 210
   else
190 211
     # The sourcefile does not contain any dependencies, so just
191 212
     # store a dummy comment line, to avoid errors with the Makefile
@@ -201,34 +222,39 @@ aix)
201 222
   # current directory.  Also, the AIX compiler puts `$object:' at the
202 223
   # start of each line; $object doesn't have directory information.
203 224
   # Version 6 uses the directory in both cases.
204
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
205
-  tmpdepfile="$stripped.u"
225
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
226
+  test "x$dir" = "x$object" && dir=
227
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
206 228
   if test "$libtool" = yes; then
229
+    tmpdepfile1=$dir$base.u
230
+    tmpdepfile2=$base.u
231
+    tmpdepfile3=$dir.libs/$base.u
207 232
     "$@" -Wc,-M
208 233
   else
234
+    tmpdepfile1=$dir$base.u
235
+    tmpdepfile2=$dir$base.u
236
+    tmpdepfile3=$dir$base.u
209 237
     "$@" -M
210 238
   fi
211 239
   stat=$?
212 240
 
213
-  if test -f "$tmpdepfile"; then :
214
-  else
215
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
216
-    tmpdepfile="$stripped.u"
217
-  fi
218
-
219 241
   if test $stat -eq 0; then :
220 242
   else
221
-    rm -f "$tmpdepfile"
243
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
222 244
     exit $stat
223 245
   fi
224 246
 
247
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
248
+  do
249
+    test -f "$tmpdepfile" && break
250
+  done
225 251
   if test -f "$tmpdepfile"; then
226
-    outname="$stripped.o"
227 252
     # Each line is of the form `foo.o: dependent.h'.
228 253
     # Do two passes, one to just change these to
229 254
     # `$object: dependent.h' and one to simply `dependent.h:'.
230
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
231
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
255
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
256
+    # That's a tab and a space in the [].
257
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
232 258
   else
233 259
     # The sourcefile does not contain any dependencies, so just
234 260
     # store a dummy comment line, to avoid errors with the Makefile
@@ -276,6 +302,51 @@ icc)
276 302
   rm -f "$tmpdepfile"
277 303
   ;;
278 304
 
305
+hp2)
306
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
307
+  # compilers, which have integrated preprocessors.  The correct option
308
+  # to use with these is +Maked; it writes dependencies to a file named
309
+  # 'foo.d', which lands next to the object file, wherever that
310
+  # happens to be.
311
+  # Much of this is similar to the tru64 case; see comments there.
312
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
313
+  test "x$dir" = "x$object" && dir=
314
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
315
+  if test "$libtool" = yes; then
316
+    tmpdepfile1=$dir$base.d
317
+    tmpdepfile2=$dir.libs/$base.d
318
+    "$@" -Wc,+Maked
319
+  else
320
+    tmpdepfile1=$dir$base.d
321
+    tmpdepfile2=$dir$base.d
322
+    "$@" +Maked
323
+  fi
324
+  stat=$?
325
+  if test $stat -eq 0; then :
326
+  else
327
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
328
+     exit $stat
329
+  fi
330
+
331
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
332
+  do
333
+    test -f "$tmpdepfile" && break
334
+  done
335
+  if test -f "$tmpdepfile"; then
336
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
337
+    # Add `dependent.h:' lines.
338
+    sed -ne '2,${
339
+	       s/^ *//
340
+	       s/ \\*$//
341
+	       s/$/:/
342
+	       p
343
+	     }' "$tmpdepfile" >> "$depfile"
344
+  else
345
+    echo "#dummy" > "$depfile"
346
+  fi
347
+  rm -f "$tmpdepfile" "$tmpdepfile2"
348
+  ;;
349
+
279 350
 tru64)
280 351
    # The Tru64 compiler uses -MD to generate dependencies as a side
281 352
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +359,13 @@ tru64)
288 359
 
289 360
    if test "$libtool" = yes; then
290 361
       # With Tru64 cc, shared objects can also be used to make a
291
-      # static library.  This mecanism is used in libtool 1.4 series to
362
+      # static library.  This mechanism is used in libtool 1.4 series to
292 363
       # handle both shared and static libraries in a single compilation.
293 364
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
294 365
       #
295 366
       # With libtool 1.5 this exception was removed, and libtool now
296 367
       # generates 2 separate objects for the 2 libraries.  These two
297
-      # compilations output dependencies in in $dir.libs/$base.o.d and
368
+      # compilations output dependencies in $dir.libs/$base.o.d and
298 369
       # in $dir$base.o.d.  We have to check for both files, because
299 370
       # one of the two compilations can be disabled.  We should prefer
300 371
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
@@ -345,7 +416,7 @@ dashmstdout)
345 416
 
346 417
   # Remove the call to Libtool.
347 418
   if test "$libtool" = yes; then
348
-    while test $1 != '--mode=compile'; do
419
+    while test "X$1" != 'X--mode=compile'; do
349 420
       shift
350 421
     done
351 422
     shift
@@ -396,32 +467,39 @@ makedepend)
396 467
   "$@" || exit $?
397 468
   # Remove any Libtool call
398 469
   if test "$libtool" = yes; then
399
-    while test $1 != '--mode=compile'; do
470
+    while test "X$1" != 'X--mode=compile'; do
400 471
       shift
401 472
     done
402 473
     shift
403 474
   fi
404 475
   # X makedepend
405 476
   shift
406
-  cleared=no
407
-  for arg in "$@"; do
477
+  cleared=no eat=no
478
+  for arg
479
+  do
408 480
     case $cleared in
409 481
     no)
410 482
       set ""; shift
411 483
       cleared=yes ;;
412 484
     esac
485
+    if test $eat = yes; then
486
+      eat=no
487
+      continue
488
+    fi
413 489
     case "$arg" in
414 490
     -D*|-I*)
415 491
       set fnord "$@" "$arg"; shift ;;
416 492
     # Strip any option that makedepend may not understand.  Remove
417 493
     # the object too, otherwise makedepend will parse it as a source file.
494
+    -arch)
495
+      eat=yes ;;
418 496
     -*|$object)
419 497
       ;;
420 498
     *)
421 499
       set fnord "$@" "$arg"; shift ;;
422 500
     esac
423 501
   done
424
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
502
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
425 503
   touch "$tmpdepfile"
426 504
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
427 505
   rm -f "$depfile"
@@ -441,7 +519,7 @@ cpp)
441 519
 
442 520
   # Remove the call to Libtool.
443 521
   if test "$libtool" = yes; then
444
-    while test $1 != '--mode=compile'; do
522
+    while test "X$1" != 'X--mode=compile'; do
445 523
       shift
446 524
     done
447 525
     shift
@@ -479,13 +557,27 @@ cpp)
479 557
 
480 558
 msvisualcpp)
481 559
   # Important note: in order to support this mode, a compiler *must*
482
-  # always write the preprocessed file to stdout, regardless of -o,
483
-  # because we must use -o when running libtool.
560
+  # always write the preprocessed file to stdout.
484 561
   "$@" || exit $?
562
+
563
+  # Remove the call to Libtool.
564
+  if test "$libtool" = yes; then
565
+    while test "X$1" != 'X--mode=compile'; do
566
+      shift
567
+    done
568
+    shift
569
+  fi
570
+
485 571
   IFS=" "
486 572
   for arg
487 573
   do
488 574
     case "$arg" in
575
+    -o)
576
+      shift
577
+      ;;
578
+    $object)
579
+      shift
580
+      ;;
489 581
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
490 582
 	set fnord "$@"
491 583
 	shift
@@ -498,16 +590,23 @@ msvisualcpp)
498 590
 	;;
499 591
     esac
500 592
   done
501
-  "$@" -E |
502
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
593
+  "$@" -E 2>/dev/null |
594
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
503 595
   rm -f "$depfile"
504 596
   echo "$object : \\" > "$depfile"
505
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
597
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
506 598
   echo "	" >> "$depfile"
507
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
599
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
508 600
   rm -f "$tmpdepfile"
509 601
   ;;
510 602
 
603
+msvcmsys)
604
+  # This case exists only to let depend.m4 do its work.  It works by
605
+  # looking at the text of this script.  This case will never be run,
606
+  # since it is checked for above.
607
+  exit 1
608
+  ;;
609
+
511 610
 none)
512 611
   exec "$@"
513 612
   ;;
@@ -526,5 +625,6 @@ exit 0
526 625
 # eval: (add-hook 'write-file-hooks 'time-stamp)
527 626
 # time-stamp-start: "scriptversion="
528 627
 # time-stamp-format: "%:y-%02m-%02d.%02H"
529
-# time-stamp-end: "$"
628
+# time-stamp-time-zone: "UTC"
629
+# time-stamp-end: "; # UTC"
530 630
 # End:

+ 357
- 160
admin/install-sh View File

@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # install - install a program, script, or datafile
3 3
 
4
-scriptversion=2005-05-14.22
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6 6
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
7 7
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22
39 39
 # when there is no Makefile.
40 40
 #
41 41
 # This script is compatible with the BSD install script, but was written
42
-# from scratch.  It can only install one file at a time, a restriction
43
-# shared with many OS's install programs.
42
+# from scratch.
43
+
44
+nl='
45
+'
46
+IFS=" ""	$nl"
44 47
 
45 48
 # set DOITPROG to echo to test this script
46 49
 
47 50
 # Don't use :- since 4.3BSD and earlier shells don't like it.
48
-doit="${DOITPROG-}"
51
+doit=${DOITPROG-}
52
+if test -z "$doit"; then
53
+  doit_exec=exec
54
+else
55
+  doit_exec=$doit
56
+fi
49 57
 
50
-# put in absolute paths if you don't have them in your path; or use env. vars.
58
+# Put in absolute file names if you don't have them in your path;
59
+# or use environment vars.
60
+
61
+chgrpprog=${CHGRPPROG-chgrp}
62
+chmodprog=${CHMODPROG-chmod}
63
+chownprog=${CHOWNPROG-chown}
64
+cmpprog=${CMPPROG-cmp}
65
+cpprog=${CPPROG-cp}
66
+mkdirprog=${MKDIRPROG-mkdir}
67
+mvprog=${MVPROG-mv}
68
+rmprog=${RMPROG-rm}
69
+stripprog=${STRIPPROG-strip}
70
+
71
+posix_glob='?'
72
+initialize_posix_glob='
73
+  test "$posix_glob" != "?" || {
74
+    if (set -f) 2>/dev/null; then
75
+      posix_glob=
76
+    else
77
+      posix_glob=:
78
+    fi
79
+  }
80
+'
51 81
 
52
-mvprog="${MVPROG-mv}"
53
-cpprog="${CPPROG-cp}"
54
-chmodprog="${CHMODPROG-chmod}"
55
-chownprog="${CHOWNPROG-chown}"
56
-chgrpprog="${CHGRPPROG-chgrp}"
57
-stripprog="${STRIPPROG-strip}"
58
-rmprog="${RMPROG-rm}"
59
-mkdirprog="${MKDIRPROG-mkdir}"
82
+posix_mkdir=
83
+
84
+# Desired mode of installed file.
85
+mode=0755
60 86
 
61
-chmodcmd="$chmodprog 0755"
62
-chowncmd=
63 87
 chgrpcmd=
64
-stripcmd=
88
+chmodcmd=$chmodprog
89
+chowncmd=
90
+mvcmd=$mvprog
65 91
 rmcmd="$rmprog -f"
66
-mvcmd="$mvprog"
92
+stripcmd=
93
+
67 94
 src=
68 95
 dst=
69 96
 dir_arg=
70
-dstarg=
97
+dst_arg=
98
+
99
+copy_on_change=false
71 100
 no_target_directory=
72 101
 
73
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
102
+usage="\
103
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
74 104
    or: $0 [OPTION]... SRCFILES... DIRECTORY
75 105
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
76 106
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
80 110
 In the 4th, create DIRECTORIES.
81 111
 
82 112
 Options:
83
--c         (ignored)
84
--d         create directories instead of installing files.
85
--g GROUP   $chgrpprog installed files to GROUP.
86
--m MODE    $chmodprog installed files to MODE.
87
--o USER    $chownprog installed files to USER.
88
--s         $stripprog installed files.
89
--t DIRECTORY  install into DIRECTORY.
90
--T         report an error if DSTFILE is a directory.
91
---help     display this help and exit.
92
---version  display version info and exit.
113
+     --help     display this help and exit.
114
+     --version  display version info and exit.
115
+
116
+  -c            (ignored)
117
+  -C            install only if different (preserve the last data modification time)
118
+  -d            create directories instead of installing files.
119
+  -g GROUP      $chgrpprog installed files to GROUP.
120
+  -m MODE       $chmodprog installed files to MODE.
121
+  -o USER       $chownprog installed files to USER.
122
+  -s            $stripprog installed files.
123
+  -t DIRECTORY  install into DIRECTORY.
124
+  -T            report an error if DSTFILE is a directory.
93 125
 
94 126
 Environment variables override the default commands:
95
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
127
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
128
+  RMPROG STRIPPROG
96 129
 "
97 130
 
98
-while test -n "$1"; do
131
+while test $# -ne 0; do
99 132
   case $1 in
100
-    -c) shift
101
-        continue;;
133
+    -c) ;;
134
+
135
+    -C) copy_on_change=true;;
102 136
 
103
-    -d) dir_arg=true
104
-        shift
105
-        continue;;
137
+    -d) dir_arg=true;;
106 138
 
107 139
     -g) chgrpcmd="$chgrpprog $2"
108
-        shift
109
-        shift
110
-        continue;;
140
+	shift;;
111 141
 
112 142
     --help) echo "$usage"; exit $?;;
113 143
 
114
-    -m) chmodcmd="$chmodprog $2"
115
-        shift
116
-        shift
117
-        continue;;
144
+    -m) mode=$2
145
+	case $mode in
146
+	  *' '* | *'	'* | *'
147
+'*	  | *'*'* | *'?'* | *'['*)
148
+	    echo "$0: invalid mode: $mode" >&2
149
+	    exit 1;;
150
+	esac
151
+	shift;;
118 152
 
119 153
     -o) chowncmd="$chownprog $2"
120
-        shift
121
-        shift
122
-        continue;;
154
+	shift;;
123 155
 
124
-    -s) stripcmd=$stripprog
125
-        shift
126
-        continue;;
156
+    -s) stripcmd=$stripprog;;
127 157
 
128
-    -t) dstarg=$2
129
-	shift
130
-	shift
131
-	continue;;
158
+    -t) dst_arg=$2
159
+	shift;;
132 160
 
133
-    -T) no_target_directory=true
134
-	shift
135
-	continue;;
161
+    -T) no_target_directory=true;;
136 162
 
137 163
     --version) echo "$0 $scriptversion"; exit $?;;
138 164
 
139
-    *)  # When -d is used, all remaining arguments are directories to create.
140
-	# When -t is used, the destination is already specified.
141
-	test -n "$dir_arg$dstarg" && break
142
-        # Otherwise, the last argument is the destination.  Remove it from $@.
143
-	for arg
144
-	do
145
-          if test -n "$dstarg"; then
146
-	    # $@ is not empty: it contains at least $arg.
147
-	    set fnord "$@" "$dstarg"
148
-	    shift # fnord
149
-	  fi
150
-	  shift # arg
151
-	  dstarg=$arg
152
-	done
165
+    --)	shift
153 166
 	break;;
167
+
168
+    -*)	echo "$0: invalid option: $1" >&2
169
+	exit 1;;
170
+
171
+    *)  break;;
154 172
   esac
173
+  shift
155 174
 done
156 175
 
157
-if test -z "$1"; then
176
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
177
+  # When -d is used, all remaining arguments are directories to create.
178
+  # When -t is used, the destination is already specified.
179
+  # Otherwise, the last argument is the destination.  Remove it from $@.
180
+  for arg
181
+  do
182
+    if test -n "$dst_arg"; then
183
+      # $@ is not empty: it contains at least $arg.
184
+      set fnord "$@" "$dst_arg"
185
+      shift # fnord
186
+    fi
187
+    shift # arg
188
+    dst_arg=$arg
189
+  done
190
+fi
191
+
192
+if test $# -eq 0; then
158 193
   if test -z "$dir_arg"; then
159 194
     echo "$0: no input file specified." >&2
160 195
     exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
164 199
   exit 0
165 200
 fi
166 201
 
202
+if test -z "$dir_arg"; then
203
+  trap '(exit $?); exit' 1 2 13 15
204
+
205
+  # Set umask so as not to create temps with too-generous modes.
206
+  # However, 'strip' requires both read and write access to temps.
207
+  case $mode in
208
+    # Optimize common cases.
209
+    *644) cp_umask=133;;
210
+    *755) cp_umask=22;;
211
+
212
+    *[0-7])
213
+      if test -z "$stripcmd"; then
214
+	u_plus_rw=
215
+      else
216
+	u_plus_rw='% 200'
217
+      fi
218
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
219
+    *)
220
+      if test -z "$stripcmd"; then
221
+	u_plus_rw=
222
+      else
223
+	u_plus_rw=,u+rw
224
+      fi
225
+      cp_umask=$mode$u_plus_rw;;
226
+  esac
227
+fi
228
+
167 229
 for src
168 230
 do
169 231
   # Protect names starting with `-'.
170 232
   case $src in
171
-    -*) src=./$src ;;
233
+    -*) src=./$src;;
172 234
   esac
173 235
 
174 236
   if test -n "$dir_arg"; then
175 237
     dst=$src
176
-    src=
177
-
178
-    if test -d "$dst"; then
179
-      mkdircmd=:
180
-      chmodcmd=
181
-    else
182
-      mkdircmd=$mkdirprog
183
-    fi
238
+    dstdir=$dst
239
+    test -d "$dstdir"
240
+    dstdir_status=$?
184 241
   else
242
+
185 243
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
186 244
     # might cause directories to be created, which would be especially bad
187 245
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@ do
190 248
       exit 1
191 249
     fi
192 250
 
193
-    if test -z "$dstarg"; then
251
+    if test -z "$dst_arg"; then
194 252
       echo "$0: no destination specified." >&2
195 253
       exit 1
196 254
     fi
197 255
 
198
-    dst=$dstarg
256
+    dst=$dst_arg
199 257
     # Protect names starting with `-'.
200 258
     case $dst in
201
-      -*) dst=./$dst ;;
259
+      -*) dst=./$dst;;
202 260
     esac
203 261
 
204 262
     # If destination is a directory, append the input filename; won't work
205 263
     # if double slashes aren't ignored.
206 264
     if test -d "$dst"; then
207 265
       if test -n "$no_target_directory"; then
208
-	echo "$0: $dstarg: Is a directory" >&2
266
+	echo "$0: $dst_arg: Is a directory" >&2
209 267
 	exit 1
210 268
       fi
211
-      dst=$dst/`basename "$src"`
269
+      dstdir=$dst
270
+      dst=$dstdir/`basename "$src"`
271
+      dstdir_status=0
272
+    else
273
+      # Prefer dirname, but fall back on a substitute if dirname fails.
274
+      dstdir=`
275
+	(dirname "$dst") 2>/dev/null ||
276
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
277
+	     X"$dst" : 'X\(//\)[^/]' \| \
278
+	     X"$dst" : 'X\(//\)$' \| \
279
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
280
+	echo X"$dst" |
281
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
282
+		   s//\1/
283
+		   q
284
+		 }
285
+		 /^X\(\/\/\)[^/].*/{
286
+		   s//\1/
287
+		   q
288
+		 }
289
+		 /^X\(\/\/\)$/{
290
+		   s//\1/
291
+		   q
292
+		 }
293
+		 /^X\(\/\).*/{
294
+		   s//\1/
295
+		   q
296
+		 }
297
+		 s/.*/./; q'
298
+      `
299
+
300
+      test -d "$dstdir"
301
+      dstdir_status=$?
212 302
     fi
213 303
   fi
214 304
 
215
-  # This sed command emulates the dirname command.
216
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
305
+  obsolete_mkdir_used=false
306
+
307
+  if test $dstdir_status != 0; then
308
+    case $posix_mkdir in
309
+      '')
310
+	# Create intermediate dirs using mode 755 as modified by the umask.
311
+	# This is like FreeBSD 'install' as of 1997-10-28.
312
+	umask=`umask`
313
+	case $stripcmd.$umask in
314
+	  # Optimize common cases.
315
+	  *[2367][2367]) mkdir_umask=$umask;;
316
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
317
+
318
+	  *[0-7])
319
+	    mkdir_umask=`expr $umask + 22 \
320
+	      - $umask % 100 % 40 + $umask % 20 \
321
+	      - $umask % 10 % 4 + $umask % 2
322
+	    `;;
323
+	  *) mkdir_umask=$umask,go-w;;
324
+	esac
325
+
326
+	# With -d, create the new directory with the user-specified mode.
327
+	# Otherwise, rely on $mkdir_umask.
328
+	if test -n "$dir_arg"; then
329
+	  mkdir_mode=-m$mode
330
+	else
331
+	  mkdir_mode=
332
+	fi
333
+
334
+	posix_mkdir=false
335
+	case $umask in
336
+	  *[123567][0-7][0-7])
337
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
338
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
339
+	    ;;
340
+	  *)
341
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
342
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
343
+
344
+	    if (umask $mkdir_umask &&
345
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
346
+	    then
347
+	      if test -z "$dir_arg" || {
348
+		   # Check for POSIX incompatibilities with -m.
349
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
350
+		   # other-writeable bit of parent directory when it shouldn't.
351
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
352
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
353
+		   case $ls_ld_tmpdir in
354
+		     d????-?r-*) different_mode=700;;
355
+		     d????-?--*) different_mode=755;;
356
+		     *) false;;
357
+		   esac &&
358
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
359
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
360
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
361
+		   }
362
+		 }
363
+	      then posix_mkdir=:
364
+	      fi
365
+	      rmdir "$tmpdir/d" "$tmpdir"
366
+	    else
367
+	      # Remove any dirs left behind by ancient mkdir implementations.
368
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
369
+	    fi
370
+	    trap '' 0;;
371
+	esac;;
372
+    esac
217 373
 
218
-  # Make sure that the destination directory exists.
374
+    if
375
+      $posix_mkdir && (
376
+	umask $mkdir_umask &&
377
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
378
+      )
379
+    then :
380
+    else
219 381
 
220
-  # Skip lots of stat calls in the usual case.
221
-  if test ! -d "$dstdir"; then
222
-    defaultIFS='
223
-	 '
224
-    IFS="${IFS-$defaultIFS}"
382
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
383
+      # or it failed possibly due to a race condition.  Create the
384
+      # directory the slow way, step by step, checking for races as we go.
225 385
 
226
-    oIFS=$IFS
227
-    # Some sh's can't handle IFS=/ for some reason.
228
-    IFS='%'
229
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
230
-    shift
231
-    IFS=$oIFS
386
+      case $dstdir in
387
+	/*) prefix='/';;
388
+	-*) prefix='./';;
389
+	*)  prefix='';;
390
+      esac
232 391
 
233
-    pathcomp=
392
+      eval "$initialize_posix_glob"
234 393
 
235
-    while test $# -ne 0 ; do
236
-      pathcomp=$pathcomp$1
394
+      oIFS=$IFS
395
+      IFS=/
396
+      $posix_glob set -f
397
+      set fnord $dstdir
237 398
       shift
238
-      if test ! -d "$pathcomp"; then
239
-        $mkdirprog "$pathcomp"
240
-	# mkdir can fail with a `File exist' error in case several
241
-	# install-sh are creating the directory concurrently.  This
242
-	# is OK.
243
-	test -d "$pathcomp" || exit
399
+      $posix_glob set +f
400
+      IFS=$oIFS
401
+
402
+      prefixes=
403
+
404
+      for d
405
+      do
406
+	test -z "$d" && continue
407
+
408
+	prefix=$prefix$d
409
+	if test -d "$prefix"; then
410
+	  prefixes=
411
+	else
412
+	  if $posix_mkdir; then
413
+	    (umask=$mkdir_umask &&
414
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
415
+	    # Don't fail if two instances are running concurrently.
416
+	    test -d "$prefix" || exit 1
417
+	  else
418
+	    case $prefix in
419
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
420
+	      *) qprefix=$prefix;;
421
+	    esac
422
+	    prefixes="$prefixes '$qprefix'"
423
+	  fi
424
+	fi
425
+	prefix=$prefix/
426
+      done
427
+
428
+      if test -n "$prefixes"; then
429
+	# Don't fail if two instances are running concurrently.
430
+	(umask $mkdir_umask &&
431
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
432
+	  test -d "$dstdir" || exit 1
433
+	obsolete_mkdir_used=true
244 434
       fi
245
-      pathcomp=$pathcomp/
246
-    done
435
+    fi
247 436
   fi
248 437
 
249 438
   if test -n "$dir_arg"; then
250
-    $doit $mkdircmd "$dst" \
251
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
252
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
253
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
254
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
255
-
439
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
440
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
441
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
442
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
256 443
   else
257
-    dstfile=`basename "$dst"`
258 444
 
259 445
     # Make a couple of temp file names in the proper directory.
260 446
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@ do
262 448
 
263 449
     # Trap to clean up those temp files at exit.
264 450
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
265
-    trap '(exit $?); exit' 1 2 13 15
266 451
 
267 452
     # Copy the file name to the temp name.
268
-    $doit $cpprog "$src" "$dsttmp" &&
453
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
269 454
 
270 455
     # and set any options; do chmod last to preserve setuid bits.
271 456
     #
@@ -273,51 +458,63 @@ do
273 458
     # ignore errors from any of these, just make sure not to ignore
274 459
     # errors from the above "$doit $cpprog $src $dsttmp" command.
275 460
     #
276
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
277
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
278
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
279
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
280
-
281
-    # Now rename the file to the real destination.
282
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
283
-      || {
284
-	   # The rename failed, perhaps because mv can't rename something else
285
-	   # to itself, or perhaps because mv is so ancient that it does not
286
-	   # support -f.
287
-
288
-	   # Now remove or move aside any old file at destination location.
289
-	   # We try this two ways since rm can't unlink itself on some
290
-	   # systems and the destination file might be busy for other
291
-	   # reasons.  In this case, the final cleanup might fail but the new
292
-	   # file should still install successfully.
293
-	   {
294
-	     if test -f "$dstdir/$dstfile"; then
295
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
296
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
297
-	       || {
298
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
299
-		 (exit 1); exit 1
300
-	       }
301
-	     else
302
-	       :
303
-	     fi
304
-	   } &&
305
-
306
-	   # Now rename the file to the real destination.
307
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
308
-	 }
309
-    }
310
-  fi || { (exit 1); exit 1; }
461
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
462
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
463
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
464
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
465
+
466
+    # If -C, don't bother to copy if it wouldn't change the file.
467
+    if $copy_on_change &&
468
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
469
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
470
+
471
+       eval "$initialize_posix_glob" &&
472
+       $posix_glob set -f &&
473
+       set X $old && old=:$2:$4:$5:$6 &&
474
+       set X $new && new=:$2:$4:$5:$6 &&
475
+       $posix_glob set +f &&
476
+
477
+       test "$old" = "$new" &&
478
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
479
+    then
480
+      rm -f "$dsttmp"
481
+    else
482
+      # Rename the file to the real destination.
483
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
484
+
485
+      # The rename failed, perhaps because mv can't rename something else
486
+      # to itself, or perhaps because mv is so ancient that it does not
487
+      # support -f.
488
+      {
489
+	# Now remove or move aside any old file at destination location.
490
+	# We try this two ways since rm can't unlink itself on some
491
+	# systems and the destination file might be busy for other
492
+	# reasons.  In this case, the final cleanup might fail but the new
493
+	# file should still install successfully.
494
+	{
495
+	  test ! -f "$dst" ||
496
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
497
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
498
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
499
+	  } ||
500
+	  { echo "$0: cannot unlink or rename $dst" >&2
501
+	    (exit 1); exit 1
502
+	  }
503
+	} &&
504
+
505
+	# Now rename the file to the real destination.
506
+	$doit $mvcmd "$dsttmp" "$dst"
507
+      }
508
+    fi || exit 1
509
+
510
+    trap '' 0
511
+  fi
311 512
 done
312 513
 
313
-# The final little trick to "correctly" pass the exit status to the exit trap.
314
-{
315
-  (exit 0); exit 0
316
-}
317
-
318 514
 # Local variables:
319 515
 # eval: (add-hook 'write-file-hooks 'time-stamp)
320 516
 # time-stamp-start: "scriptversion="
321 517
 # time-stamp-format: "%:y-%02m-%02d.%02H"
322
-# time-stamp-end: "$"
518
+# time-stamp-time-zone: "UTC"
519
+# time-stamp-end: "; # UTC"
323 520
 # End:

+ 5568
- 4191
admin/libtool.m4.in
File diff suppressed because it is too large
View File


+ 53
- 19
admin/libtool/Makefile.in View File

@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.10 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
6
+# Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
15 16
 @SET_MAKE@
16 17
 VPATH = @srcdir@
17 18
 pkgdatadir = $(datadir)/@PACKAGE@
18
-pkglibdir = $(libdir)/@PACKAGE@
19 19
 pkgincludedir = $(includedir)/@PACKAGE@
20
+pkglibdir = $(libdir)/@PACKAGE@
21
+pkglibexecdir = $(libexecdir)/@PACKAGE@
20 22
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21 23
 install_sh_DATA = $(install_sh) -c -m 644
22 24
 install_sh_PROGRAM = $(install_sh) -c
@@ -43,6 +45,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
43 45
 mkinstalldirs = $(install_sh) -d
44 46
 CONFIG_HEADER = $(top_builddir)/src/config.h
45 47
 CONFIG_CLEAN_FILES =
48
+CONFIG_CLEAN_VPATH_FILES =
46 49
 SOURCES =
47 50
 DIST_SOURCES =
48 51
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -65,37 +68,47 @@ CXXFLAGS = @CXXFLAGS@