| 1 |
diff -upNr xapian-core-1.0.5.orign/xapian-config.in xapian-core-1.0.5/xapian-config.in |
| 2 |
--- xapian-core-1.0.5.orign/xapian-config.in 2007-12-21 04:01:25.000000000 +0100 |
| 3 |
+++ xapian-core-1.0.5/xapian-config.in 2007-12-26 23:58:34.000000000 +0100 |
| 4 |
@@ -61,24 +61,6 @@ is_uninstalled() |
| 5 |
|
| 6 |
need_explicit_dependencies() |
| 7 |
{ |
| 8 |
- # For static libraries, we need to explicitly link with dependency_libs |
| 9 |
- # on all platforms. If we only have static libraries, then "$dlname" |
| 10 |
- # will be empty. |
| 11 |
- extract_dlname "@libdir@/libxapian.la" |
| 12 |
- [ -n "$dlname" ] || return 0 # "true" |
| 13 |
- |
| 14 |
- # If libtool has been patched to give link_all_deplibs=no, don't link them. |
| 15 |
- [ no != "@link_all_deplibs_CXX@" ] || return 1 # "false" |
| 16 |
- |
| 17 |
- # Handle cases which libtool thinks are "unknown", but we know are "no". |
| 18 |
- if [ yes != "@link_all_deplibs_CXX@" ]; then |
| 19 |
- case "@host_os@" in |
| 20 |
- linux* | k*bsd*-gnu) |
| 21 |
- # We don't need dependency_libs for shared libraries on these |
| 22 |
- # platforms, but upstream libtool doesn't know this (yet). |
| 23 |
- return 1 ;; # "false" |
| 24 |
- esac |
| 25 |
- fi |
| 26 |
return 0 # "true" |
| 27 |
} |
| 28 |
|
| 29 |
@@ -91,7 +73,6 @@ set_F_to_extra_ldflags() { |
| 30 |
# -L option required (if any). |
| 31 |
set_L_to_library_path() { |
| 32 |
L= |
| 33 |
- [ /usr/lib != "@libdir@" ] && L="-L@libdir@ " |
| 34 |
} |
| 35 |
|
| 36 |
# -I options for compiling against an uninstalled xapian. |
| 37 |
@@ -227,10 +208,6 @@ while [ 0 != "$#" ] ; do |
| 38 |
set_F_to_extra_ldflags |
| 39 |
set_L_to_library_path |
| 40 |
D= |
| 41 |
- if need_explicit_dependencies ; then |
| 42 |
- extract_dependency_libs "@libdir@/libxapian.la" |
| 43 |
- [ -n "$dependency_libs" ] && D=" $dependency_libs" |
| 44 |
- fi |
| 45 |
echo "$F$L-lxapian$D" |
| 46 |
;; |
| 47 |
|
| 48 |
@@ -245,22 +222,6 @@ while [ 0 != "$#" ] ; do |
| 49 |
continue |
| 50 |
fi |
| 51 |
|
| 52 |
- # If we need to pull in dependency_libs, we need libxapian.la. |
| 53 |
- # Otherwise just use the appropriate -L and -l options. |
| 54 |
- # Upstream libtool currently never sets link_all_deplibs_CXX=no. |
| 55 |
- # Some Linux distros patch libtool to return no, and some have an |
| 56 |
- # unhelpful policy of not packaging .la files in an attempt to work |
| 57 |
- # around this. So avoiding using libtool here gives more consistent |
| 58 |
- # behaviour. |
| 59 |
- if need_explicit_dependencies ; then |
| 60 |
- if [ -f "@libdir@/libxapian.la" ]; then |
| 61 |
- echo "${F}@libdir@/libxapian.la" |
| 62 |
- continue |
| 63 |
- fi |
| 64 |
- |
| 65 |
- echo "$0: Can't find libxapian.la to link against." 1>&2 |
| 66 |
- exit 1 |
| 67 |
- fi |
| 68 |
|
| 69 |
set_L_to_library_path |
| 70 |
echo "$F$L-lxapian" |
Parent Directory
| 
Revision Log
| 
Revision Graph
