| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 26 Apr 2011 13:46:50 -0700 | |
| changeset 203 | 887f23af6934 |
| permissions | -rw-r--r-- |
|
203
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
--- build/libtool.m4.orig Fri Aug 8 23:08:06 2008 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
+++ build/libtool.m4 Mon Feb 2 23:27:08 2009 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
@@ -1806,6 +1806,19 @@ |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
shlibpath_var=LD_LIBRARY_PATH |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
shlibpath_overrides_runpath=yes |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
hardcode_into_libs=yes |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+ sys_lib_search_path_spec="/lib /usr/lib" |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+ # Find out which ABI we are using. |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
+ echo 'int i;' > conftest.$ac_ext |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
+ if AC_TRY_EVAL(ac_compile); then |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+ case `/usr/bin/file conftest.o` in |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+ *64-bit*) |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ MACH_TYPE=`/usr/bin/isainfo -n` |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ sys_lib_search_path_spec="/lib/${MACH_TYPE} /usr/lib/${MACH_TYPE}"
|
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ ;; |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ esac |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ fi |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ rm -rf conftest* |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
# ldd complains unless libraries are executable |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
postinstall_cmds='chmod +x $lib' |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
;; |