| author | Rich Burridge <rich.burridge@oracle.com> |
| Mon, 07 Nov 2016 13:42:00 -0800 | |
| branch | s11u3-sru |
| changeset 7256 | c523ba6bf5f1 |
| parent 3830 | d9fd82448491 |
| 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 |
|
|
7256
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
6 |
--- w3m-0.5.3/configure.orig 2016-11-03 12:07:41.143467587 +0000 |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
7 |
+++ w3m-0.5.3/configure 2016-11-03 12:11:03.646007132 +0000 |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
8 |
@@ -8209,7 +8209,7 @@ |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
9 |
$as_echo_n "(cached) " >&6 |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
10 |
else |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
11 |
ac_check_lib_save_LIBS=$LIBS |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
12 |
-LIBS="-lgc $LIBS" |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
13 |
+LIBS="`pkg-config --libs bdw-gc` $LIBS" |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
14 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
15 |
/* end confdefs.h. */ |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
16 |
|
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
17 |
@@ -8240,7 +8240,7 @@ |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
18 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
|
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
19 |
$as_echo "$ac_cv_lib_gc_GC_init" >&6; } |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
20 |
if test "x$ac_cv_lib_gc_GC_init" = x""yes; then : |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
21 |
- LIBGC="-lgc" |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
22 |
+ LIBGC="`pkg-config --libs bdw-gc`" |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
23 |
fi |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
24 |
|
|
3830
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
if test x"$ac_cv_lib_gc_GC_init" = xno; then |
|
7256
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
26 |
@@ -8261,7 +8261,7 @@ |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
27 |
$as_echo_n "(cached) " >&6 |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
28 |
else |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
29 |
ac_check_lib_save_LIBS=$LIBS |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
30 |
-LIBS="-lgc $LIBS" |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
31 |
+LIBS="`pkg-config --libs bdw-gc` $LIBS" |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
32 |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
33 |
/* end confdefs.h. */ |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
34 |
|
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
35 |
@@ -8292,7 +8292,7 @@ |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
36 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
|
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
37 |
$as_echo "$ac_cv_lib_gc_GC_init" >&6; } |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
38 |
if test "x$ac_cv_lib_gc_GC_init" = x""yes; then : |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
39 |
- gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
40 |
+ gclibdir="$dir/lib"; LIBGC="-L$dir/lib `pkg-config --libs bdw-gc`"; break |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
41 |
fi |
|
c523ba6bf5f1
25042812 Update w3m to version 0.5.3-31
Rich Burridge <rich.burridge@oracle.com>
parents:
3830
diff
changeset
|
42 |
|
|
3830
d9fd82448491
20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
43 |
LDFLAGS="$ldflags" |