From 825fba526ce816bd26887457e2f0f4ca05b1ccdd Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 1 Dec 2016 12:31:49 +0000 Subject: configure.ac: Don't use pkg-config to check for bdw-gc. * configure.ac: Don't use pkg-config to check for bdw-gc. * configure: Regenerate. config/ * pkg.m4: Remove. libobjc/ * configure.ac: Don't use pkg-config to check for bdw-gc. * configure: Regenerate. gcc/ * doc/install.texi: Don't use pkg-config to check for bdw-gc. From-SVN: r243108 --- libobjc/ChangeLog | 5 ++ libobjc/configure | 152 ++------------------------------------------------- libobjc/configure.ac | 11 +--- 3 files changed, 13 insertions(+), 155 deletions(-) (limited to 'libobjc') diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index f6eadaf..60dfc16 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2016-12-01 Matthias Klose + + * configure.ac: Don't use pkg-config to check for bdw-gc. + * configure: Regenerate. + 2016-11-30 Matthias Klose * configure.ac: Set BDW_GC_CFLAGS and BDW_GC_LIBS after checking diff --git a/libobjc/configure b/libobjc/configure index c617f27..62bdc2b 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -604,9 +604,6 @@ OBJC_BOEHM_GC_LIBS OBJC_BOEHM_GC_INCLUDES OBJC_BOEHM_GC OBJC_GCFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG SET_MAKE CPP OTOOL64 @@ -733,10 +730,7 @@ with_target_bdw_gc_lib host_alias target_alias CPP -CPPFLAGS -PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR' +CPPFLAGS' # Initialize some variables set by options. @@ -1395,11 +1389,6 @@ Some influential environment variables: CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor - PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -10601,7 +10590,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10604 "configure" +#line 10593 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10707,7 +10696,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10710 "configure" +#line 10699 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11540,139 +11529,8 @@ no) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bdw garbage collector" >&5 $as_echo_n "checking for bdw garbage collector... " >&6; } if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi -if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bdw-gc\""; } >&5 - ($PKG_CONFIG --exists --print-errors "bdw-gc") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - 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 + BDW_GC_CFLAGS= + BDW_GC_LIBS="-lgc" else if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then as_fn_error "found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing" "$LINENO" 5 diff --git a/libobjc/configure.ac b/libobjc/configure.ac index 2303143..3c13b33 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -18,8 +18,6 @@ #along with GCC; see the file COPYING3. If not see #. -m4_include([../config/pkg.m4]) - AC_PREREQ(2.64) AC_INIT(package-unused, version-unused,, libobjc) AC_CONFIG_SRCDIR([objc/objc.h]) @@ -223,12 +221,9 @@ no) *) AC_MSG_CHECKING([for bdw garbage collector]) 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]) - 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])) + dnl no bdw-gw options, assuming bdw-gc in default locations + BDW_GC_CFLAGS= + BDW_GC_LIBS="-lgc" else dnl bdw-gw options passed by configure flags if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then -- cgit v1.1