[PATCH mesa] Include search for non pkg-config libtalloc.

[Trevor Woerner]

On Wed, Sep 8, 2010 at 6:41 PM, Eric Anholt <eric at anholt.net> wrote:
> You should be able to make your build succeed with the TALLOC_LIBS and
> TALLOC_CFLAGS environment variables already.  See ./configure --help.

Thanks. I'm not all that familiar with pkg-config.

Unfortunately the following doesn't seem to work either:
$ export TALLOC_LIBS=-ltalloc
$ export TALLOC_CFLAGS=""
$ util/modular/build.sh -o mesa/mesa $PREFIX

checking for TALLOC... configure: error: Package requirements (talloc)
were not met:

No package 'talloc' found

Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively, you may set the environment variables TALLOC_CFLAGS
and TALLOC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.

To what should I set those environment variables to get this to work?

> But if you want a fallback for distro shortcomings, please make it a
> fallback from pkg-config checking, rather than something that overrides
> pkg-config checking, as this patch would break PKG_CONFIG_PATH
> ./configure, for example.

Would the following be a better patch (sorry, just a cut-and-paste for now)?

diff --git a/configure.ac b/configure.ac
index a7ee0f5..f4202e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,7 +486,9 @@ xxlib|xdri|xosmesa)
     ;;
 esac

-PKG_CHECK_MODULES([TALLOC], [talloc])
+PKG_CHECK_MODULES([TALLOC], [talloc], [],
+    [AC_SEARCH_LIBS([talloc_version_major],[talloc],[TALLOC_LIBS="-ltalloc"
TALLOC_CFLAGS=""],
+       [AC_MSG_ERROR([Can't find TALLOC])])])
 AC_SUBST([TALLOC_LIBS])
 AC_SUBST([TALLOC_CFLAGS])