diff options
author | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
commit | 31f6eab32a26a658cbfb2db0d457cc1f87d23f0f (patch) | |
tree | 75f372ff22a94102ef2f9bd163febf54ac45e9d6 /app/lzo/autoconf/config.rpath | |
parent | 6057466bc8b4475bf4564b9143c60753c90f9aaa (diff) | |
parent | 7d8cde4f7ae769a3b6a25483d8bd0bb6c1551af9 (diff) |
Merge branch 'develop'
Diffstat (limited to 'app/lzo/autoconf/config.rpath')
-rwxr-xr-x | app/lzo/autoconf/config.rpath | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/app/lzo/autoconf/config.rpath b/app/lzo/autoconf/config.rpath index 8bd7f5d7..b625621f 100755 --- a/app/lzo/autoconf/config.rpath +++ b/app/lzo/autoconf/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2011 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -25,7 +25,7 @@ # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -367,11 +367,7 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) + freebsd2.[01]*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -548,13 +544,11 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; + freebsd[23].*) + library_names_spec='$libname$shrext$versuffix' + ;; freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac + library_names_spec='$libname$shrext' ;; gnu*) library_names_spec='$libname$shrext' |