acinclude.m4
changeset 886 05c551e5bc64
parent 794 a5defa3b93e1
child 939 c7c04f811994
     1.1 --- a/acinclude.m4	Fri Apr 30 18:33:30 2004 +0000
     1.2 +++ b/acinclude.m4	Thu May 06 15:55:06 2004 +0000
     1.3 @@ -1652,14 +1652,16 @@
     1.4    shlibpath_overrides_runpath=yes
     1.5    ;;
     1.6  
     1.7 -nto-qnx)
     1.8 -  version_type=linux
     1.9 +*qnx* | *nto*)
    1.10 +  version_type=qnx
    1.11    need_lib_prefix=no
    1.12    need_version=no
    1.13 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    1.14 -  soname_spec='${libname}${release}${shared_ext}$major'
    1.15 +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
    1.16 +  soname_spec='${libname}${release}.so$major'
    1.17    shlibpath_var=LD_LIBRARY_PATH
    1.18 -  shlibpath_overrides_runpath=yes
    1.19 +  shlibpath_overrides_runpath=no
    1.20 +  hardcode_into_libs=yes
    1.21 +  dynamic_linker='ldqnx.so'
    1.22    ;;
    1.23  
    1.24  openbsd*)
    1.25 @@ -2356,6 +2358,10 @@
    1.26    lt_cv_deplibs_check_method=pass_all
    1.27    ;;
    1.28  
    1.29 +*qnx* | *nto*)
    1.30 +  lt_cv_deplibs_check_method=pass_all
    1.31 +  ;;
    1.32 +
    1.33  # This must be Linux ELF.
    1.34  linux*)
    1.35    case $host_cpu in
    1.36 @@ -2382,10 +2388,6 @@
    1.37    lt_cv_file_magic_test_file=/usr/lib/libnls.so
    1.38    ;;
    1.39  
    1.40 -nto-qnx)
    1.41 -  lt_cv_deplibs_check_method=unknown
    1.42 -  ;;
    1.43 -
    1.44  openbsd*)
    1.45    lt_cv_file_magic_cmd=/usr/bin/file
    1.46    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
    1.47 @@ -3614,6 +3616,8 @@
    1.48      # FIXME: insert proper C++ library support
    1.49      _LT_AC_TAGVAR(ld_shlibs, $1)=no
    1.50      ;;
    1.51 +  *qnx* | *nto*)
    1.52 +    ;;
    1.53    *)
    1.54      # FIXME: insert proper C++ library support
    1.55      _LT_AC_TAGVAR(ld_shlibs, $1)=no
    1.56 @@ -4729,6 +4733,10 @@
    1.57  	;;
    1.58        esac
    1.59        ;;
    1.60 +    *qnx* | *nto*)
    1.61 +      # QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
    1.62 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
    1.63 +      ;;
    1.64      *)
    1.65        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
    1.66        ;;
    1.67 @@ -4768,6 +4776,10 @@
    1.68        freebsd*)
    1.69  	# FreeBSD uses GNU C++
    1.70  	;;
    1.71 +      *qnx* | *nto*)
    1.72 +	# QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
    1.73 +        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
    1.74 +        ;;
    1.75        hpux9* | hpux10* | hpux11*)
    1.76  	case $cc_basename in
    1.77  	  CC)
    1.78 @@ -4988,6 +5000,10 @@
    1.79  	;;
    1.80        esac
    1.81        ;;
    1.82 +    *qnx* | *nto*)
    1.83 +      # QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
    1.84 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
    1.85 +      ;;
    1.86  
    1.87      *)
    1.88        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
    1.89 @@ -5028,6 +5044,11 @@
    1.90        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
    1.91        ;;
    1.92  
    1.93 +    *qnx* | *nto*)
    1.94 +      # QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
    1.95 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
    1.96 +      ;;
    1.97 +
    1.98      irix5* | irix6* | nonstopux*)
    1.99        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
   1.100        # PIC (with -KPIC) is the default.