configure.ac: Set BDW_GC_CFLAGS and BDW_GC_LIBS after checking for the existence of the...

2016-11-30  Matthias Klose  <doko@ubuntu.com>

        * configure.ac: Set BDW_GC_CFLAGS and BDW_GC_LIBS after checking
        for the existence of the pkg-config modules.
        * Regenerate.

From-SVN: r243037
This commit is contained in:
Matthias Klose 2016-11-30 16:39:30 +00:00 committed by Matthias Klose
parent 3ba9051e44
commit de683d58cf
3 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2016-11-30 Matthias Klose <doko@ubuntu.com>
* configure.ac: Set BDW_GC_CFLAGS and BDW_GC_LIBS after checking
for the existence of the pkg-config modules.
* Regenerate.
2016-11-30 Jakub Jelinek <jakub@redhat.com>
* configure.ac (--enable-objc-gc): If not given, default to

2
libobjc/configure vendored
View File

@ -11668,6 +11668,8 @@ if test -n "$PKG_CONFIG" && \
test $ac_status = 0; }; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using bdw-gc pkg-config module" >&5
$as_echo "using bdw-gc pkg-config module" >&6; }
BDW_GC_CFLAGS=`$PKG_CONFIG --cflags bdw-gc`
BDW_GC_LIBS=`$PKG_CONFIG --libs bdw-gc`
else
as_fn_error "no --with-target-bdw-gc options and no bdw-gc pkg-config module found" "$LINENO" 5
fi

View File

@ -225,7 +225,9 @@ no)
if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
dnl no bdw-gw options, fall back to the bdw-gc pkg-config module
PKG_CHECK_EXISTS(bdw-gc,
AC_MSG_RESULT([using bdw-gc pkg-config module]),
[AC_MSG_RESULT([using bdw-gc pkg-config module])
BDW_GC_CFLAGS=`$PKG_CONFIG --cflags bdw-gc`
BDW_GC_LIBS=`$PKG_CONFIG --libs bdw-gc`],
AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found]))
else
dnl bdw-gw options passed by configure flags