View | Details | Raw Unified | Return to bug 4109
Collapse All | Expand All

(-)b/unbound-1.7.0/configure (-124 / +133 lines)
 Lines 670-678   SYSTEMD_DAEMON_LIBS Link Here 
670
SYSTEMD_DAEMON_CFLAGS
670
SYSTEMD_DAEMON_CFLAGS
671
SYSTEMD_LIBS
671
SYSTEMD_LIBS
672
SYSTEMD_CFLAGS
672
SYSTEMD_CFLAGS
673
PKG_CONFIG_LIBDIR
674
PKG_CONFIG_PATH
675
PKG_CONFIG
676
staticexe
673
staticexe
677
PC_LIBEVENT_DEPENDENCY
674
PC_LIBEVENT_DEPENDENCY
678
UNBOUND_EVENT_UNINSTALL
675
UNBOUND_EVENT_UNINSTALL
 Lines 697-702   swig Link Here 
697
SWIG_LIB
694
SWIG_LIB
698
SWIG
695
SWIG
699
PC_PY_DEPENDENCY
696
PC_PY_DEPENDENCY
697
PKG_CONFIG_LIBDIR
698
PKG_CONFIG_PATH
699
PKG_CONFIG
700
PY_MAJOR_VERSION
700
PY_MAJOR_VERSION
701
PYTHON_SITE_PKG
701
PYTHON_SITE_PKG
702
PYTHON_LDFLAGS
702
PYTHON_LDFLAGS
 Lines 16922-16928   $as_echo "#define HAVE_PYTHON 1" >>confdefs.h Link Here 
16922
        CPPFLAGS="$PYTHON_CPPFLAGS"
16922
        CPPFLAGS="$PYTHON_CPPFLAGS"
16923
      fi
16923
      fi
16924
      ub_have_python=yes
16924
      ub_have_python=yes
16925
      PC_PY_DEPENDENCY="python"
16925
16926
16927
16928
16929
16930
16931
16932
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
16933
	if test -n "$ac_tool_prefix"; then
16934
  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
16935
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
16936
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16937
$as_echo_n "checking for $ac_word... " >&6; }
16938
if ${ac_cv_path_PKG_CONFIG+:} false; then :
16939
  $as_echo_n "(cached) " >&6
16940
else
16941
  case $PKG_CONFIG in
16942
  [\\/]* | ?:[\\/]*)
16943
  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
16944
  ;;
16945
  *)
16946
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16947
for as_dir in $PATH
16948
do
16949
  IFS=$as_save_IFS
16950
  test -z "$as_dir" && as_dir=.
16951
    for ac_exec_ext in '' $ac_executable_extensions; do
16952
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16953
    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16954
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16955
    break 2
16956
  fi
16957
done
16958
  done
16959
IFS=$as_save_IFS
16960
16961
  ;;
16962
esac
16963
fi
16964
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
16965
if test -n "$PKG_CONFIG"; then
16966
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
16967
$as_echo "$PKG_CONFIG" >&6; }
16968
else
16969
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16970
$as_echo "no" >&6; }
16971
fi
16972
16973
16974
fi
16975
if test -z "$ac_cv_path_PKG_CONFIG"; then
16976
  ac_pt_PKG_CONFIG=$PKG_CONFIG
16977
  # Extract the first word of "pkg-config", so it can be a program name with args.
16978
set dummy pkg-config; ac_word=$2
16979
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16980
$as_echo_n "checking for $ac_word... " >&6; }
16981
if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
16982
  $as_echo_n "(cached) " >&6
16983
else
16984
  case $ac_pt_PKG_CONFIG in
16985
  [\\/]* | ?:[\\/]*)
16986
  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
16987
  ;;
16988
  *)
16989
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16990
for as_dir in $PATH
16991
do
16992
  IFS=$as_save_IFS
16993
  test -z "$as_dir" && as_dir=.
16994
    for ac_exec_ext in '' $ac_executable_extensions; do
16995
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16996
    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16997
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16998
    break 2
16999
  fi
17000
done
17001
  done
17002
IFS=$as_save_IFS
17003
17004
  ;;
17005
esac
17006
fi
17007
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
17008
if test -n "$ac_pt_PKG_CONFIG"; then
17009
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
17010
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
17011
else
17012
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17013
$as_echo "no" >&6; }
17014
fi
17015
17016
  if test "x$ac_pt_PKG_CONFIG" = x; then
17017
    PKG_CONFIG=""
17018
  else
17019
    case $cross_compiling:$ac_tool_warned in
17020
yes:)
17021
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
17022
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
17023
ac_tool_warned=yes ;;
17024
esac
17025
    PKG_CONFIG=$ac_pt_PKG_CONFIG
17026
  fi
17027
else
17028
  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
17029
fi
17030
17031
fi
17032
if test -n "$PKG_CONFIG"; then
17033
	_pkg_min_version=0.9.0
17034
	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
17035
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
17036
	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
17037
		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
17038
$as_echo "yes" >&6; }
17039
	else
17040
		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17041
$as_echo "no" >&6; }
17042
		PKG_CONFIG=""
17043
	fi
17044
fi
17045
if test -n "$PKG_CONFIG" && \
17046
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"python\${PY_MAJOR_VERSION}\"\""; } >&5
17047
  ($PKG_CONFIG --exists --print-errors ""python${PY_MAJOR_VERSION}"") 2>&5
17048
  ac_status=$?
17049
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
17050
  test $ac_status = 0; }; then
17051
  PC_PY_DEPENDENCY="python${PY_MAJOR_VERSION}"
17052
else
17053
  PC_PY_DEPENDENCY="python"
17054
fi
16926
17055
16927
17056
16928
      # Check for SWIG
17057
      # Check for SWIG
 Lines 18844-18969   else Link Here 
18844
fi
18973
fi
18845
18974
18846
have_systemd=no
18975
have_systemd=no
18847
18848
18849
18850
18851
18852
18853
18854
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
18855
	if test -n "$ac_tool_prefix"; then
18856
  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
18857
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
18858
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18859
$as_echo_n "checking for $ac_word... " >&6; }
18860
if ${ac_cv_path_PKG_CONFIG+:} false; then :
18861
  $as_echo_n "(cached) " >&6
18862
else
18863
  case $PKG_CONFIG in
18864
  [\\/]* | ?:[\\/]*)
18865
  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
18866
  ;;
18867
  *)
18868
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18869
for as_dir in $PATH
18870
do
18871
  IFS=$as_save_IFS
18872
  test -z "$as_dir" && as_dir=.
18873
    for ac_exec_ext in '' $ac_executable_extensions; do
18874
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18875
    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
18876
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18877
    break 2
18878
  fi
18879
done
18880
  done
18881
IFS=$as_save_IFS
18882
18883
  ;;
18884
esac
18885
fi
18886
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
18887
if test -n "$PKG_CONFIG"; then
18888
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
18889
$as_echo "$PKG_CONFIG" >&6; }
18890
else
18891
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18892
$as_echo "no" >&6; }
18893
fi
18894
18895
18896
fi
18897
if test -z "$ac_cv_path_PKG_CONFIG"; then
18898
  ac_pt_PKG_CONFIG=$PKG_CONFIG
18899
  # Extract the first word of "pkg-config", so it can be a program name with args.
18900
set dummy pkg-config; ac_word=$2
18901
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18902
$as_echo_n "checking for $ac_word... " >&6; }
18903
if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
18904
  $as_echo_n "(cached) " >&6
18905
else
18906
  case $ac_pt_PKG_CONFIG in
18907
  [\\/]* | ?:[\\/]*)
18908
  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
18909
  ;;
18910
  *)
18911
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18912
for as_dir in $PATH
18913
do
18914
  IFS=$as_save_IFS
18915
  test -z "$as_dir" && as_dir=.
18916
    for ac_exec_ext in '' $ac_executable_extensions; do
18917
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
18918
    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
18919
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18920
    break 2
18921
  fi
18922
done
18923
  done
18924
IFS=$as_save_IFS
18925
18926
  ;;
18927
esac
18928
fi
18929
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
18930
if test -n "$ac_pt_PKG_CONFIG"; then
18931
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
18932
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
18933
else
18934
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18935
$as_echo "no" >&6; }
18936
fi
18937
18938
  if test "x$ac_pt_PKG_CONFIG" = x; then
18939
    PKG_CONFIG=""
18940
  else
18941
    case $cross_compiling:$ac_tool_warned in
18942
yes:)
18943
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
18944
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
18945
ac_tool_warned=yes ;;
18946
esac
18947
    PKG_CONFIG=$ac_pt_PKG_CONFIG
18948
  fi
18949
else
18950
  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
18951
fi
18952
18953
fi
18954
if test -n "$PKG_CONFIG"; then
18955
	_pkg_min_version=0.9.0
18956
	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
18957
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
18958
	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
18959
		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
18960
$as_echo "yes" >&6; }
18961
	else
18962
		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18963
$as_echo "no" >&6; }
18964
		PKG_CONFIG=""
18965
	fi
18966
fi
18967
if test "x$enable_systemd" != xno; then :
18976
if test "x$enable_systemd" != xno; then :
18968
18977
18969
18978
(-)b/unbound-1.7.0/configure.ac (-2 / +5 lines)
 Lines 555-560   if test x_$withval != x_no; then Link Here 
555
   ub_test_python=yes
555
   ub_test_python=yes
556
fi
556
fi
557
557
558
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
559
558
# Check for Python & SWIG only on PyUnbound or PyModule
560
# Check for Python & SWIG only on PyUnbound or PyModule
559
if test x_$ub_test_python != x_no; then
561
if test x_$ub_test_python != x_no; then
560
562
 Lines 582-588   if test x_$ub_test_python != x_no; then Link Here 
582
        CPPFLAGS="$PYTHON_CPPFLAGS"
584
        CPPFLAGS="$PYTHON_CPPFLAGS"
583
      fi
585
      fi
584
      ub_have_python=yes
586
      ub_have_python=yes
585
      PC_PY_DEPENDENCY="python"
587
      PKG_CHECK_EXISTS(["python${PY_MAJOR_VERSION}"],
588
                       [PC_PY_DEPENDENCY="python${PY_MAJOR_VERSION}"],
589
                       [PC_PY_DEPENDENCY="python"])
586
      AC_SUBST(PC_PY_DEPENDENCY)
590
      AC_SUBST(PC_PY_DEPENDENCY)
587
591
588
      # Check for SWIG
592
      # Check for SWIG
589
- 

Return to bug 4109