acinclude.m4
changeset 886 05c551e5bc64
parent 794 a5defa3b93e1
child 939 c7c04f811994
--- a/acinclude.m4	Fri Apr 30 18:33:30 2004 +0000
+++ b/acinclude.m4	Thu May 06 15:55:06 2004 +0000
@@ -1652,14 +1652,16 @@
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx)
-  version_type=linux
+*qnx* | *nto*)
+  version_type=qnx
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
   shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -2356,6 +2358,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+*qnx* | *nto*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 # This must be Linux ELF.
 linux*)
   case $host_cpu in
@@ -2382,10 +2388,6 @@
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
-nto-qnx)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
 openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
   lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
@@ -3614,6 +3616,8 @@
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
+  *qnx* | *nto*)
+    ;;
   *)
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -4729,6 +4733,10 @@
 	;;
       esac
       ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
     *)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
@@ -4768,6 +4776,10 @@
       freebsd*)
 	# FreeBSD uses GNU C++
 	;;
+      *qnx* | *nto*)
+	# QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
+        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
 	  CC)
@@ -4988,6 +5000,10 @@
 	;;
       esac
       ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
 
     *)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -5028,6 +5044,11 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
       ;;
 
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise it will coredumped.
+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
     irix5* | irix6* | nonstopux*)
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC (with -KPIC) is the default.