| author | pkidd <patrick.kidd@oracle.com> |
| Thu, 10 Mar 2016 08:38:19 -0800 | |
| branch | s11u3-sru |
| changeset 5573 | 56564f280aba |
| parent 3830 | d9fd82448491 |
| child 3995 | 7d35330d300c |
| child 7256 | c523ba6bf5f1 |
| permissions | -rw-r--r-- |
|
3830
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# Find bgc on Solaris using pkg-config |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
# This patch needs to be evaluated to see if it needs to be passed upstream. |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- w3m-0.5.2.orig/acinclude.m4 Fri Apr 7 08:21:11 2006 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ w3m-0.5.2/acinclude.m4 Thu Dec 4 09:32:08 2014 |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -426,6 +426,7 @@ |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
# ---------------------------------------------------------------- |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
AC_DEFUN([AC_W3M_GC], |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
[AC_MSG_CHECKING(GC library exists) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+AC_SUBST(LIBGC) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
AC_ARG_WITH(gc, |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
[ --with-gc[=PREFIX] libgc PREFIX], |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])], |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
@@ -456,7 +457,7 @@ |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
fi |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
fi |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
unset ac_cv_lib_gc_GC_init |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+ AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"]) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
if test x"$ac_cv_lib_gc_GC_init" = xno; then |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
AC_MSG_CHECKING(GC library location) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
AC_MSG_RESULT($with_gc) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
@@ -466,7 +467,7 @@ |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
LDFLAGS="$LDFLAGS -L$dir/lib" |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
AC_MSG_CHECKING($dir) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
unset ac_cv_lib_gc_GC_init |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
- AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+ AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break]) |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
LDFLAGS="$ldflags" |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
done |
|
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
if test x"$gclibdir" = xno; then |