diff options
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 6 | ||||
| -rwxr-xr-x | libobjc/configure | 2 | ||||
| -rw-r--r-- | libobjc/configure.ac | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 1b9a506e15d..f6eadaf259e 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -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 diff --git a/libobjc/configure b/libobjc/configure index 251ad6b723d..c617f27ae0f 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -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 diff --git a/libobjc/configure.ac b/libobjc/configure.ac index 89075c2fcfd..23031437977 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -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 |