1 # |
1 # |
2 # Find bgc on Solaris using pkg-config |
2 # Find bgc on Solaris using pkg-config |
3 # |
3 # |
4 # This patch needs to be evaluated to see if it needs to be passed upstream. |
4 # This patch needs to be evaluated to see if it needs to be passed upstream. |
5 |
5 |
6 --- w3m-0.5.2.orig/acinclude.m4 Fri Apr 7 08:21:11 2006 |
6 --- w3m-0.5.3/configure.orig 2016-11-03 12:07:41.143467587 +0000 |
7 +++ w3m-0.5.2/acinclude.m4 Thu Dec 4 09:32:08 2014 |
7 +++ w3m-0.5.3/configure 2016-11-03 12:11:03.646007132 +0000 |
8 @@ -426,6 +426,7 @@ |
8 @@ -8209,7 +8209,7 @@ |
9 # ---------------------------------------------------------------- |
9 $as_echo_n "(cached) " >&6 |
10 AC_DEFUN([AC_W3M_GC], |
10 else |
11 [AC_MSG_CHECKING(GC library exists) |
11 ac_check_lib_save_LIBS=$LIBS |
12 +AC_SUBST(LIBGC) |
12 -LIBS="-lgc $LIBS" |
13 AC_ARG_WITH(gc, |
13 +LIBS="`pkg-config --libs bdw-gc` $LIBS" |
14 [ --with-gc[=PREFIX] libgc PREFIX], |
14 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
15 [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])], |
15 /* end confdefs.h. */ |
16 @@ -456,7 +457,7 @@ |
16 |
17 fi |
17 @@ -8240,7 +8240,7 @@ |
18 fi |
18 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5 |
19 unset ac_cv_lib_gc_GC_init |
19 $as_echo "$ac_cv_lib_gc_GC_init" >&6; } |
20 - AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) |
20 if test "x$ac_cv_lib_gc_GC_init" = x""yes; then : |
21 + AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"]) |
21 - LIBGC="-lgc" |
|
22 + LIBGC="`pkg-config --libs bdw-gc`" |
|
23 fi |
|
24 |
22 if test x"$ac_cv_lib_gc_GC_init" = xno; then |
25 if test x"$ac_cv_lib_gc_GC_init" = xno; then |
23 AC_MSG_CHECKING(GC library location) |
26 @@ -8261,7 +8261,7 @@ |
24 AC_MSG_RESULT($with_gc) |
27 $as_echo_n "(cached) " >&6 |
25 @@ -466,7 +467,7 @@ |
28 else |
26 LDFLAGS="$LDFLAGS -L$dir/lib" |
29 ac_check_lib_save_LIBS=$LIBS |
27 AC_MSG_CHECKING($dir) |
30 -LIBS="-lgc $LIBS" |
28 unset ac_cv_lib_gc_GC_init |
31 +LIBS="`pkg-config --libs bdw-gc` $LIBS" |
29 - AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) |
32 cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
30 + AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break]) |
33 /* end confdefs.h. */ |
|
34 |
|
35 @@ -8292,7 +8292,7 @@ |
|
36 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5 |
|
37 $as_echo "$ac_cv_lib_gc_GC_init" >&6; } |
|
38 if test "x$ac_cv_lib_gc_GC_init" = x""yes; then : |
|
39 - gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break |
|
40 + gclibdir="$dir/lib"; LIBGC="-L$dir/lib `pkg-config --libs bdw-gc`"; break |
|
41 fi |
|
42 |
31 LDFLAGS="$ldflags" |
43 LDFLAGS="$ldflags" |
32 done |
|
33 if test x"$gclibdir" = xno; then |
|