| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | Fix glib cross compile |
| 2 | |
| 3 | Uses proper PKG_CONFIG_PATH when cross-compiling |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | Signed-of-by: Aws Ismail <aws.ismail@windriver.com> |
| 8 | |
| 9 | diff --git a/configure.ac b/configure.ac |
| 10 | index b5f5aad..f5a5b74 100644 |
| 11 | --- a/configure.ac |
| 12 | +++ b/configure.ac |
| 13 | @@ -110,13 +110,13 @@ else |
| 14 | *** GLIB is always available from ftp://ftp.gtk.org/.]) |
| 15 | fi |
| 16 | |
| 17 | -exact_version=`pkg-config --modversion $GLIB`; |
| 18 | -GLIB_CFLAGS=`pkg-config --cflags $GLIB $GTHREAD` |
| 19 | -GLIB_LIBS=`pkg-config --libs $GLIB $GTHREAD` |
| 20 | -GLIB_ONLY_CFLAGS=`pkg-config --cflags $GLIB` |
| 21 | -GLIB_ONLY_LIBS=`pkg-config --libs $GLIB` |
| 22 | -GMODULE_ONLY_CFLAGS=`pkg-config --cflags $GMODULE` |
| 23 | -GMODULE_ONLY_LIBS=`pkg-config --libs $GMODULE` |
| 24 | +exact_version=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --modversion $GLIB`; |
| 25 | +GLIB_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags $GLIB $GTHREAD` |
| 26 | +GLIB_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs $GLIB $GTHREAD` |
| 27 | +GLIB_ONLY_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags $GLIB` |
| 28 | +GLIB_ONLY_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs $GLIB` |
| 29 | +GMODULE_ONLY_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags $GMODULE` |
| 30 | +GMODULE_ONLY_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs $GMODULE` |
| 31 | |
| 32 | # On some versions of Solaris the pkg-config file for gthread-2.0 contains a |
| 33 | # compiler option, '-mt', that is incompatible with gcc |