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/acinclude.m4.orig 2015-02-16 18:50:30.208808821 -0800 |
7 +++ w3m-0.5.2/acinclude.m4 Thu Dec 4 09:32:08 2014 |
7 +++ w3m-0.5.3/acinclude.m4 2015-02-16 18:51:18.187408601 -0800 |
8 @@ -426,6 +426,7 @@ |
8 @@ -445,7 +445,7 @@ |
9 # ---------------------------------------------------------------- |
|
10 AC_DEFUN([AC_W3M_GC], |
|
11 [AC_MSG_CHECKING(GC library exists) |
|
12 +AC_SUBST(LIBGC) |
|
13 AC_ARG_WITH(gc, |
|
14 [ --with-gc[=PREFIX] libgc PREFIX], |
|
15 [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])], |
|
16 @@ -456,7 +457,7 @@ |
|
17 fi |
9 fi |
18 fi |
10 fi |
19 unset ac_cv_lib_gc_GC_init |
11 unset ac_cv_lib_gc_GC_init |
20 - AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) |
12 - AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"]) |
21 + AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"]) |
13 + AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"]) |
22 if test x"$ac_cv_lib_gc_GC_init" = xno; then |
14 if test x"$ac_cv_lib_gc_GC_init" = xno; then |
23 AC_MSG_CHECKING(GC library location) |
15 AC_MSG_CHECKING(GC library location) |
24 AC_MSG_RESULT($with_gc) |
16 AC_MSG_RESULT($with_gc) |
25 @@ -466,7 +467,7 @@ |
17 @@ -455,7 +455,7 @@ |
26 LDFLAGS="$LDFLAGS -L$dir/lib" |
18 LDFLAGS="$LDFLAGS -L$dir/lib" |
27 AC_MSG_CHECKING($dir) |
19 AC_MSG_CHECKING($dir) |
28 unset ac_cv_lib_gc_GC_init |
20 unset ac_cv_lib_gc_GC_init |
29 - AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) |
21 - AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break]) |
30 + AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break]) |
22 + AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break]) |
31 LDFLAGS="$ldflags" |
23 LDFLAGS="$ldflags" |
32 done |
24 done |
33 if test x"$gclibdir" = xno; then |
25 if test x"$gclibdir" = xno; then |