comparison aclocal.m4 @ 4765:1257b938f03a

automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Fri, 04 Dec 2009 10:59:45 +0900
parents aa5ed11f473b
children 8b63e21b0436
comparison
equal deleted inserted replaced
4764:dec62ca5a899 4765:1257b938f03a
52 52
53 xehost_cpu=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'` 53 xehost_cpu=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`
54 xehost_vendor=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'` 54 xehost_vendor=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`
55 xehost_os=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'` 55 xehost_os=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`
56 56
57 case "$xehost_os" in
58 aix3*)
59 # AIX sometimes has problems with the GCC collect2 program. For some
60 # reason, if we set the COLLECT_NAMES environment variable, the problems
61 # vanish in a puff of smoke.
62 if test "${COLLECT_NAMES+set}" != set; then
63 COLLECT_NAMES=
64 export COLLECT_NAMES
65 fi
66 ;;
67 esac
68
69 # Now see if the compiler is really GCC. 57 # Now see if the compiler is really GCC.
70 if test "$GCC" = "yes"; then 58 if test "$GCC" = "yes"; then
71 XEGCC=yes 59 XEGCC=yes
72 else 60 else
73 AC_MSG_CHECKING([whether we are using GNU C]) 61 AC_MSG_CHECKING([whether we are using GNU C])
85 can_build_shared=yes 73 can_build_shared=yes
86 if test "$XEGCC" = yes -o "$__ICC" = yes; then 74 if test "$XEGCC" = yes -o "$__ICC" = yes; then
87 wl='-Wl,' 75 wl='-Wl,'
88 76
89 case "$xehost_os" in 77 case "$xehost_os" in
90 aix[[3-9]]* | irix[[5-9]]* | osf[[3-9]]) 78 aix[[4-9]]* | irix[[5-9]]* | osf[[3-9]])
91 # PIC is the default for these OSes. 79 # PIC is the default for these OSes.
92 ;; 80 ;;
93 81
94 *darwin*) dll_cflags='-dynamic' 82 *darwin*) dll_cflags='-dynamic'
95 ;; 83 ;;
111 ;; 99 ;;
112 esac 100 esac
113 else 101 else
114 # PORTME Check for PIC flags for the system compiler. 102 # PORTME Check for PIC flags for the system compiler.
115 case "$xehost_os" in 103 case "$xehost_os" in
116 hpux9* | hpux1[[0-9]]*) 104 hpux1[[0-9]]*)
117 # Is there a better link_static_flag that works with the bundled CC? 105 # Is there a better link_static_flag that works with the bundled CC?
118 wl='-Wl,' 106 wl='-Wl,'
119 dll_cflags='+Z' 107 dll_cflags='+Z'
120 ;; 108 ;;
121 109
131 osf[[3-9]]*) 119 osf[[3-9]]*)
132 # All OSF/1 code is PIC. 120 # All OSF/1 code is PIC.
133 wl='-Wl,' 121 wl='-Wl,'
134 ;; 122 ;;
135 123
136 aix[[3-9]]*) 124 aix[[4-9]]*)
137 # All AIX code is PIC. 125 # All AIX code is PIC.
138 wl='-Wl,' 126 wl='-Wl,'
139 ;; 127 ;;
140 128
141 sco3.2v5*) 129 sco3.2v5*)
159 ;; 147 ;;
160 148
161 solaris2*) 149 solaris2*)
162 dll_cflags='-KPIC' 150 dll_cflags='-KPIC'
163 wl='-Wl,' 151 wl='-Wl,'
164 ;;
165
166 sunos4*)
167 dll_cflags='-PIC'
168 wl='-Qoption ld '
169 ;; 152 ;;
170 153
171 uts4*) 154 uts4*)
172 dll_cflags='-pic' 155 dll_cflags='-pic'
173 ;; 156 ;;
256 xldf="-shared" 239 xldf="-shared"
257 ;; 240 ;;
258 esac 241 esac
259 else # Not using GCC 242 else # Not using GCC
260 case "$xehost_os" in 243 case "$xehost_os" in
261 aix[[3-9]]*) 244 aix[[4-9]]*)
262 xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc" 245 xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
263 xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc" 246 xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
264 ;; 247 ;;
265 248
266 freebsd2* | netbsd* | openbsd*) 249 freebsd2* | netbsd* | openbsd*)
283 ;; 266 ;;
284 267
285 sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7* | uts4*) 268 sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7* | uts4*)
286 xcldf="-G" 269 xcldf="-G"
287 xldf="-G" 270 xldf="-G"
288 ;;
289
290 sunos4*)
291 xcldf="${wl}-assert ${wl}pure-text ${wl}-Bstatic"
292 xldf="-assert pure-text -Bstatic"
293 ;; 271 ;;
294 esac 272 esac
295 fi # End if if we are using gcc 273 fi # End if if we are using gcc
296 274
297 if test -n "$xcldf"; then 275 if test -n "$xcldf"; then
391 xe_gnu_ld=no 369 xe_gnu_ld=no
392 fi 370 fi
393 AC_MSG_RESULT([${xe_gnu_ld}]) 371 AC_MSG_RESULT([${xe_gnu_ld}])
394 372
395 case "$xehost_os" in 373 case "$xehost_os" in
396 amigaos* | sunos4*) 374 amigaos*)
397 # On these operating systems, we should treat GNU ld like the system ld. 375 # On this operating system, we should treat GNU ld like the system ld.
398 gnu_ld_acts_native=yes 376 gnu_ld_acts_native=yes
399 ;; 377 ;;
400 *) 378 *)
401 gnu_ld_acts_native=no 379 gnu_ld_acts_native=no
402 ;; 380 ;;
433 ld_shlibs=no 411 ld_shlibs=no
434 fi 412 fi
435 else 413 else
436 # PORTME fill in a description of your system's linker (not GNU ld) 414 # PORTME fill in a description of your system's linker (not GNU ld)
437 case "$xehost_os" in 415 case "$xehost_os" in
438 aix3*)
439 dll_ld=$LTLD
440 dll_ldflags=$xldf
441 ;;
442
443 aix[[4-9]]*) 416 aix[[4-9]]*)
444 dll_ldflags=$xcldf 417 dll_ldflags=$xcldf
445 ;; 418 ;;
446 419
447 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor 420 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
499 dll_ld=$CC 472 dll_ld=$CC
500 ;; 473 ;;
501 *) dll_ldflags="-G" 474 *) dll_ldflags="-G"
502 ;; 475 ;;
503 esac 476 esac
504 ;;
505
506 sunos4*)
507 if test "$XEGCC" = yes; then
508 dll_ld=$CC
509 else
510 dll_ld=$LTLD
511 fi
512 dll_ldflags=$xldf
513 ;; 477 ;;
514 478
515 uts4*) 479 uts4*)
516 dll_ld=$LTLD 480 dll_ld=$LTLD
517 dll_ldflags="-G" 481 dll_ldflags="-G"
599 563
600 solaris2* | solaris7*) 564 solaris2* | solaris7*)
601 ld_dynamic_link_flags= 565 ld_dynamic_link_flags=
602 ;; 566 ;;
603 567
604 sco3.2v5* | unixware* | sysv5* | sysv4*) 568 unixware* | sysv5* | sysv4*)
605 ld_dynamic_link_flags="${wl}-Bexport" 569 ld_dynamic_link_flags="${wl}-Bexport"
606 ;; 570 ;;
607 571
608 sunos4*)
609 ld_dynamic_link_flags=
610 ;;
611
612 uts4*) 572 uts4*)
613 ld_dynamic_link_flags=
614 ;;
615
616 bsdi*)
617 ld_dynamic_link_flags= 573 ld_dynamic_link_flags=
618 ;; 574 ;;
619 575
620 esac 576 esac
621 fi # End of if -z ld_dynamic_link_flags 577 fi # End of if -z ld_dynamic_link_flags