author | Rich Burridge <rich.burridge@oracle.com> |
Thu, 19 Mar 2015 16:43:24 -0700 | |
changeset 3995 | 7d35330d300c |
parent 3680 | 4dc408325e7e |
permissions | -rw-r--r-- |
3680
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# |
4dc408325e7e
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 |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# |
4dc408325e7e
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. |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
3995
7d35330d300c
20738232 w3m should be updated to version 0.5.3
Rich Burridge <rich.burridge@oracle.com>
parents:
3680
diff
changeset
|
6 |
--- w3m-0.5.3/acinclude.m4.orig 2015-02-16 18:50:30.208808821 -0800 |
7d35330d300c
20738232 w3m should be updated to version 0.5.3
Rich Burridge <rich.burridge@oracle.com>
parents:
3680
diff
changeset
|
7 |
+++ w3m-0.5.3/acinclude.m4 2015-02-16 18:51:18.187408601 -0800 |
7d35330d300c
20738232 w3m should be updated to version 0.5.3
Rich Burridge <rich.burridge@oracle.com>
parents:
3680
diff
changeset
|
8 |
@@ -445,7 +445,7 @@ |
3680
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
fi |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
fi |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
unset ac_cv_lib_gc_GC_init |
3995
7d35330d300c
20738232 w3m should be updated to version 0.5.3
Rich Burridge <rich.burridge@oracle.com>
parents:
3680
diff
changeset
|
12 |
- AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"]) |
3680
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+ AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"]) |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
if test x"$ac_cv_lib_gc_GC_init" = xno; then |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
AC_MSG_CHECKING(GC library location) |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
AC_MSG_RESULT($with_gc) |
3995
7d35330d300c
20738232 w3m should be updated to version 0.5.3
Rich Burridge <rich.burridge@oracle.com>
parents:
3680
diff
changeset
|
17 |
@@ -455,7 +455,7 @@ |
3680
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
LDFLAGS="$LDFLAGS -L$dir/lib" |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
AC_MSG_CHECKING($dir) |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
unset ac_cv_lib_gc_GC_init |
3995
7d35330d300c
20738232 w3m should be updated to version 0.5.3
Rich Burridge <rich.burridge@oracle.com>
parents:
3680
diff
changeset
|
21 |
- AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break]) |
3680
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+ AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break]) |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
LDFLAGS="$ldflags" |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
done |
4dc408325e7e
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
if test x"$gclibdir" = xno; then |