Mercurial > hg > xemacs-beta
comparison aclocal.m4 @ 2651:3580ae2ce979
[xemacs-hg @ 2005-03-11 11:18:44 by malcolmp]
Upgrade from autoconf 2.13 to autoconf 2.59.
author | malcolmp |
---|---|
date | Fri, 11 Mar 2005 11:20:34 +0000 |
parents | 9402c85dcf6f |
children | b145b32294ff |
comparison
equal
deleted
inserted
replaced
2650:fc554bcc59e7 | 2651:3580ae2ce979 |
---|---|
37 dll_ldflags= | 37 dll_ldflags= |
38 dll_cflags= | 38 dll_cflags= |
39 dll_post= | 39 dll_post= |
40 dll_ldo="-o" | 40 dll_ldo="-o" |
41 ld_dynamic_link_flags= | 41 ld_dynamic_link_flags= |
42 xehost=$canonical | 42 xehost=$ac_cv_build |
43 xealias=$internal_configuration | 43 xealias=$ac_cv_build_alias |
44 | 44 |
45 AC_CHECKING([how to build dynamic libraries for ${xehost}]) | 45 AC_CHECKING([how to build dynamic libraries for ${xehost}]) |
46 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. | 46 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. |
47 case "$xehost" in | 47 case "$xehost" in |
48 *-*-linux-gnu*) ;; | 48 *-*-linux-gnu*) ;; |
49 *-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` | 49 *-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` |
50 esac | 50 esac |
51 | 51 |
52 changequote(<<, >>)dnl | 52 xehost_cpu=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'` |
53 xehost_cpu=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | 53 xehost_vendor=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'` |
54 xehost_vendor=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | 54 xehost_os=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'` |
55 xehost_os=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | |
56 changequote([, ])dnl | |
57 | 55 |
58 case "$xehost_os" in | 56 case "$xehost_os" in |
59 aix3*) | 57 aix3*) |
60 # AIX sometimes has problems with the GCC collect2 program. For some | 58 # AIX sometimes has problems with the GCC collect2 program. For some |
61 # reason, if we set the COLLECT_NAMES environment variable, the problems | 59 # reason, if we set the COLLECT_NAMES environment variable, the problems |
69 | 67 |
70 # Now see if the compiler is really GCC. | 68 # Now see if the compiler is really GCC. |
71 if test "$GCC" = "yes"; then | 69 if test "$GCC" = "yes"; then |
72 XEGCC=yes | 70 XEGCC=yes |
73 else | 71 else |
74 AC_MSG_CHECKING(checking whether we are using GNU C) | 72 AC_MSG_CHECKING([whether we are using GNU C]) |
75 AC_EGREP_CPP(yes,[ | 73 AC_EGREP_CPP(yes,[ |
76 #ifdef __GNUC__ | 74 #ifdef __GNUC__ |
77 yes; | 75 yes; |
78 #endif | 76 #endif |
79 ],XEGCC=yes, XEGCC=no) | 77 ],XEGCC=yes, XEGCC=no) |
80 AC_MSG_RESULT([${XEGCC}]) | 78 AC_MSG_RESULT([${XEGCC}]) |
81 fi | 79 fi |
82 | 80 |
83 AC_MSG_CHECKING(how to produce PIC code) | 81 AC_MSG_CHECKING([how to produce PIC code]) |
84 wl= | 82 wl= |
85 | 83 |
86 can_build_shared=yes | 84 can_build_shared=yes |
87 if test "$XEGCC" = yes -o "$__ICC" = yes; then | 85 if test "$XEGCC" = yes -o "$__ICC" = yes; then |
88 wl='-Wl,' | 86 wl='-Wl,' |
243 dnl | 241 dnl |
244 if test "$can_build_shared" = "yes"; then | 242 if test "$can_build_shared" = "yes"; then |
245 cc_produces_so=no | 243 cc_produces_so=no |
246 xldf= | 244 xldf= |
247 xcldf= | 245 xcldf= |
248 AC_MSG_CHECKING(if C compiler can produce shared libraries) | 246 AC_MSG_CHECKING([if C compiler can produce shared libraries]) |
249 if test "$XEGCC" = yes -o "$__ICC" = yes; then | 247 if test "$XEGCC" = yes -o "$__ICC" = yes; then |
250 case "$xehost_os" in | 248 case "$xehost_os" in |
251 *darwin*) | 249 *darwin*) |
252 xcldf='-bundle' | 250 xcldf='-bundle' |
253 xldf='-bundle -bundle_loader ../../src/xemacs' | 251 xldf='-bundle -bundle_loader ../../src/xemacs' |
316 LTLD=$LD | 314 LTLD=$LD |
317 if test -z "$LTLD"; then | 315 if test -z "$LTLD"; then |
318 ac_prog=ld | 316 ac_prog=ld |
319 if test "$XEGCC" = yes; then | 317 if test "$XEGCC" = yes; then |
320 # Check if gcc -print-prog-name=ld gives a path. | 318 # Check if gcc -print-prog-name=ld gives a path. |
321 AC_MSG_CHECKING(for ld used by GCC) | 319 AC_MSG_CHECKING([for ld used by GCC]) |
322 ac_prog=`($CC -print-prog-name=ld) 2>&5` | 320 ac_prog=`($CC -print-prog-name=ld) 2>&5` |
323 case "$ac_prog" in | 321 case "$ac_prog" in |
324 # Accept absolute paths. | 322 # Accept absolute paths. |
325 /*) | 323 /*) |
326 if test -z "$LTLD"; then | 324 if test -z "$LTLD"; then |
341 # If it is relative, then search for the first ld in PATH. | 339 # If it is relative, then search for the first ld in PATH. |
342 with_gnu_ld=unknown | 340 with_gnu_ld=unknown |
343 ;; | 341 ;; |
344 esac | 342 esac |
345 else | 343 else |
346 AC_MSG_CHECKING(for GNU ld) | 344 AC_MSG_CHECKING([for GNU ld]) |
347 fi | 345 fi |
348 | 346 |
349 if test -z "$LTLD"; then | 347 if test -z "$LTLD"; then |
350 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | 348 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" |
351 for ac_dir in $PATH; do | 349 for ac_dir in $PATH; do |
381 dnl Order of the tests changed somewhat to prevent repetition | 379 dnl Order of the tests changed somewhat to prevent repetition |
382 dnl | 380 dnl |
383 ld_dynamic_link_flags= | 381 ld_dynamic_link_flags= |
384 | 382 |
385 # Check to see if it really is or isn't GNU ld. | 383 # Check to see if it really is or isn't GNU ld. |
386 AC_MSG_CHECKING(if the linker is GNU ld) | 384 AC_MSG_CHECKING([if the linker is GNU ld]) |
387 # I'd rather use --version here, but apparently some GNU ld's only accept -v. | 385 # I'd rather use --version here, but apparently some GNU ld's only accept -v. |
388 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then | 386 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then |
389 xe_gnu_ld=yes | 387 xe_gnu_ld=yes |
390 else | 388 else |
391 xe_gnu_ld=no | 389 xe_gnu_ld=no |
416 can_build_shared=yes | 414 can_build_shared=yes |
417 ld_shlibs=yes | 415 ld_shlibs=yes |
418 else | 416 else |
419 # OK - only NOW do we futz about with ld. | 417 # OK - only NOW do we futz about with ld. |
420 # See if the linker supports building shared libraries. | 418 # See if the linker supports building shared libraries. |
421 AC_MSG_CHECKING(whether the linker supports shared libraries) | 419 AC_MSG_CHECKING([whether the linker supports shared libraries]) |
422 dll_ld=$CC | 420 dll_ld=$CC |
423 dll_ldflags=$LDFLAGS | 421 dll_ldflags=$LDFLAGS |
424 ld_shlibs=yes | 422 ld_shlibs=yes |
425 can_build_shared=yes | 423 can_build_shared=yes |
426 if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then | 424 if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then |