... | ... |
@@ -119,7 +119,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
119 | 119 |
$(top_srcdir)/docs/man/clamdtop.1.in \ |
120 | 120 |
$(top_srcdir)/docs/man/clamsubmit.1.in COPYING config/compile \ |
121 | 121 |
config/config.guess config/config.rpath config/config.sub \ |
122 |
- config/install-sh config/missing config/ylwrap \ |
|
122 |
+ config/depcomp config/install-sh config/missing config/ylwrap \ |
|
123 | 123 |
config/ltmain.sh $(top_srcdir)/config/compile \ |
124 | 124 |
$(top_srcdir)/config/config.guess \ |
125 | 125 |
$(top_srcdir)/config/config.rpath \ |
... | ... |
@@ -748,9 +748,6 @@ HAVE_LIBCHECK_TRUE |
748 | 748 |
CHECK_CPPFLAGS |
749 | 749 |
CHECK_LIBS |
750 | 750 |
CHECK_CFLAGS |
751 |
-PKG_CONFIG_LIBDIR |
|
752 |
-PKG_CONFIG_PATH |
|
753 |
-PKG_CONFIG |
|
754 | 751 |
BUILD_CONFIGURE_FLAGS |
755 | 752 |
VERSIONSCRIPT_FALSE |
756 | 753 |
VERSIONSCRIPT_TRUE |
... | ... |
@@ -762,6 +759,9 @@ YACC |
762 | 762 |
LEXLIB |
763 | 763 |
LEX_OUTPUT_ROOT |
764 | 764 |
LEX |
765 |
+PKG_CONFIG_LIBDIR |
|
766 |
+PKG_CONFIG_PATH |
|
767 |
+PKG_CONFIG |
|
765 | 768 |
LTDLOPEN |
766 | 769 |
LT_CONFIG_H |
767 | 770 |
CONVENIENCE_LTDL_FALSE |
... | ... |
@@ -980,11 +980,11 @@ LIBS |
980 | 980 |
CPPFLAGS |
981 | 981 |
CPP |
982 | 982 |
LT_SYS_LIBRARY_PATH |
983 |
-YACC |
|
984 |
-YFLAGS |
|
985 | 983 |
PKG_CONFIG |
986 | 984 |
PKG_CONFIG_PATH |
987 | 985 |
PKG_CONFIG_LIBDIR |
986 |
+YACC |
|
987 |
+YFLAGS |
|
988 | 988 |
CHECK_CFLAGS |
989 | 989 |
CHECK_LIBS |
990 | 990 |
SYSTEMD_CFLAGS |
... | ... |
@@ -1735,17 +1735,17 @@ Some influential environment variables: |
1735 | 1735 |
CPP C preprocessor |
1736 | 1736 |
LT_SYS_LIBRARY_PATH |
1737 | 1737 |
User-defined run-time library search path. |
1738 |
+ PKG_CONFIG path to pkg-config utility |
|
1739 |
+ PKG_CONFIG_PATH |
|
1740 |
+ directories to add to pkg-config's search path |
|
1741 |
+ PKG_CONFIG_LIBDIR |
|
1742 |
+ path overriding pkg-config's built-in search path |
|
1738 | 1743 |
YACC The `Yet Another Compiler Compiler' implementation to use. |
1739 | 1744 |
Defaults to the first program found out of: `bison -y', `byacc', |
1740 | 1745 |
`yacc'. |
1741 | 1746 |
YFLAGS The list of arguments that will be passed by default to $YACC. |
1742 | 1747 |
This script will default YFLAGS to the empty string to avoid a |
1743 | 1748 |
default value of `-d' given by some make applications. |
1744 |
- PKG_CONFIG path to pkg-config utility |
|
1745 |
- PKG_CONFIG_PATH |
|
1746 |
- directories to add to pkg-config's search path |
|
1747 |
- PKG_CONFIG_LIBDIR |
|
1748 |
- path overriding pkg-config's built-in search path |
|
1749 | 1749 |
CHECK_CFLAGS |
1750 | 1750 |
C compiler flags for CHECK, overriding pkg-config |
1751 | 1751 |
CHECK_LIBS linker flags for CHECK, overriding pkg-config |
... | ... |
@@ -13935,6 +13935,126 @@ eval "LTDLOPEN=\"$libname_spec\"" |
13935 | 13935 |
|
13936 | 13936 |
|
13937 | 13937 |
|
13938 |
+ |
|
13939 |
+ |
|
13940 |
+ |
|
13941 |
+ |
|
13942 |
+ |
|
13943 |
+ |
|
13944 |
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
|
13945 |
+ if test -n "$ac_tool_prefix"; then |
|
13946 |
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
|
13947 |
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
|
13948 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
13949 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
13950 |
+if ${ac_cv_path_PKG_CONFIG+:} false; then : |
|
13951 |
+ $as_echo_n "(cached) " >&6 |
|
13952 |
+else |
|
13953 |
+ case $PKG_CONFIG in |
|
13954 |
+ [\\/]* | ?:[\\/]*) |
|
13955 |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
|
13956 |
+ ;; |
|
13957 |
+ *) |
|
13958 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
13959 |
+for as_dir in $PATH |
|
13960 |
+do |
|
13961 |
+ IFS=$as_save_IFS |
|
13962 |
+ test -z "$as_dir" && as_dir=. |
|
13963 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
13964 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13965 |
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
13966 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
13967 |
+ break 2 |
|
13968 |
+ fi |
|
13969 |
+done |
|
13970 |
+ done |
|
13971 |
+IFS=$as_save_IFS |
|
13972 |
+ |
|
13973 |
+ ;; |
|
13974 |
+esac |
|
13975 |
+fi |
|
13976 |
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
|
13977 |
+if test -n "$PKG_CONFIG"; then |
|
13978 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
|
13979 |
+$as_echo "$PKG_CONFIG" >&6; } |
|
13980 |
+else |
|
13981 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
13982 |
+$as_echo "no" >&6; } |
|
13983 |
+fi |
|
13984 |
+ |
|
13985 |
+ |
|
13986 |
+fi |
|
13987 |
+if test -z "$ac_cv_path_PKG_CONFIG"; then |
|
13988 |
+ ac_pt_PKG_CONFIG=$PKG_CONFIG |
|
13989 |
+ # Extract the first word of "pkg-config", so it can be a program name with args. |
|
13990 |
+set dummy pkg-config; ac_word=$2 |
|
13991 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
13992 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
13993 |
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
|
13994 |
+ $as_echo_n "(cached) " >&6 |
|
13995 |
+else |
|
13996 |
+ case $ac_pt_PKG_CONFIG in |
|
13997 |
+ [\\/]* | ?:[\\/]*) |
|
13998 |
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
|
13999 |
+ ;; |
|
14000 |
+ *) |
|
14001 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
14002 |
+for as_dir in $PATH |
|
14003 |
+do |
|
14004 |
+ IFS=$as_save_IFS |
|
14005 |
+ test -z "$as_dir" && as_dir=. |
|
14006 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
14007 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
14008 |
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
14009 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
14010 |
+ break 2 |
|
14011 |
+ fi |
|
14012 |
+done |
|
14013 |
+ done |
|
14014 |
+IFS=$as_save_IFS |
|
14015 |
+ |
|
14016 |
+ ;; |
|
14017 |
+esac |
|
14018 |
+fi |
|
14019 |
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
|
14020 |
+if test -n "$ac_pt_PKG_CONFIG"; then |
|
14021 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
|
14022 |
+$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
|
14023 |
+else |
|
14024 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
14025 |
+$as_echo "no" >&6; } |
|
14026 |
+fi |
|
14027 |
+ |
|
14028 |
+ if test "x$ac_pt_PKG_CONFIG" = x; then |
|
14029 |
+ PKG_CONFIG="" |
|
14030 |
+ else |
|
14031 |
+ case $cross_compiling:$ac_tool_warned in |
|
14032 |
+yes:) |
|
14033 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
|
14034 |
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
|
14035 |
+ac_tool_warned=yes ;; |
|
14036 |
+esac |
|
14037 |
+ PKG_CONFIG=$ac_pt_PKG_CONFIG |
|
14038 |
+ fi |
|
14039 |
+else |
|
14040 |
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
|
14041 |
+fi |
|
14042 |
+ |
|
14043 |
+fi |
|
14044 |
+if test -n "$PKG_CONFIG"; then |
|
14045 |
+ _pkg_min_version=0.16 |
|
14046 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
|
14047 |
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
|
14048 |
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
|
14049 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
|
14050 |
+$as_echo "yes" >&6; } |
|
14051 |
+ else |
|
14052 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
14053 |
+$as_echo "no" >&6; } |
|
14054 |
+ PKG_CONFIG="" |
|
14055 |
+ fi |
|
14056 |
+fi |
|
14057 |
+ |
|
13938 | 14058 |
ac_ext=c |
13939 | 14059 |
ac_cpp='$CPP $CPPFLAGS' |
13940 | 14060 |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
... | ... |
@@ -16760,126 +16880,6 @@ fi |
16760 | 16760 |
if test "$enable_check_ut" != "no" ; then |
16761 | 16761 |
|
16762 | 16762 |
|
16763 |
- |
|
16764 |
- |
|
16765 |
- |
|
16766 |
- |
|
16767 |
- |
|
16768 |
- |
|
16769 |
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
|
16770 |
- if test -n "$ac_tool_prefix"; then |
|
16771 |
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
|
16772 |
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
|
16773 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
16774 |
-$as_echo_n "checking for $ac_word... " >&6; } |
|
16775 |
-if ${ac_cv_path_PKG_CONFIG+:} false; then : |
|
16776 |
- $as_echo_n "(cached) " >&6 |
|
16777 |
-else |
|
16778 |
- case $PKG_CONFIG in |
|
16779 |
- [\\/]* | ?:[\\/]*) |
|
16780 |
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
|
16781 |
- ;; |
|
16782 |
- *) |
|
16783 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
16784 |
-for as_dir in $PATH |
|
16785 |
-do |
|
16786 |
- IFS=$as_save_IFS |
|
16787 |
- test -z "$as_dir" && as_dir=. |
|
16788 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
|
16789 |
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
16790 |
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
16791 |
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
16792 |
- break 2 |
|
16793 |
- fi |
|
16794 |
-done |
|
16795 |
- done |
|
16796 |
-IFS=$as_save_IFS |
|
16797 |
- |
|
16798 |
- ;; |
|
16799 |
-esac |
|
16800 |
-fi |
|
16801 |
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
|
16802 |
-if test -n "$PKG_CONFIG"; then |
|
16803 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 |
|
16804 |
-$as_echo "$PKG_CONFIG" >&6; } |
|
16805 |
-else |
|
16806 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
16807 |
-$as_echo "no" >&6; } |
|
16808 |
-fi |
|
16809 |
- |
|
16810 |
- |
|
16811 |
-fi |
|
16812 |
-if test -z "$ac_cv_path_PKG_CONFIG"; then |
|
16813 |
- ac_pt_PKG_CONFIG=$PKG_CONFIG |
|
16814 |
- # Extract the first word of "pkg-config", so it can be a program name with args. |
|
16815 |
-set dummy pkg-config; ac_word=$2 |
|
16816 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
16817 |
-$as_echo_n "checking for $ac_word... " >&6; } |
|
16818 |
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
|
16819 |
- $as_echo_n "(cached) " >&6 |
|
16820 |
-else |
|
16821 |
- case $ac_pt_PKG_CONFIG in |
|
16822 |
- [\\/]* | ?:[\\/]*) |
|
16823 |
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. |
|
16824 |
- ;; |
|
16825 |
- *) |
|
16826 |
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
16827 |
-for as_dir in $PATH |
|
16828 |
-do |
|
16829 |
- IFS=$as_save_IFS |
|
16830 |
- test -z "$as_dir" && as_dir=. |
|
16831 |
- for ac_exec_ext in '' $ac_executable_extensions; do |
|
16832 |
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
16833 |
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
|
16834 |
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
16835 |
- break 2 |
|
16836 |
- fi |
|
16837 |
-done |
|
16838 |
- done |
|
16839 |
-IFS=$as_save_IFS |
|
16840 |
- |
|
16841 |
- ;; |
|
16842 |
-esac |
|
16843 |
-fi |
|
16844 |
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG |
|
16845 |
-if test -n "$ac_pt_PKG_CONFIG"; then |
|
16846 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 |
|
16847 |
-$as_echo "$ac_pt_PKG_CONFIG" >&6; } |
|
16848 |
-else |
|
16849 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
16850 |
-$as_echo "no" >&6; } |
|
16851 |
-fi |
|
16852 |
- |
|
16853 |
- if test "x$ac_pt_PKG_CONFIG" = x; then |
|
16854 |
- PKG_CONFIG="" |
|
16855 |
- else |
|
16856 |
- case $cross_compiling:$ac_tool_warned in |
|
16857 |
-yes:) |
|
16858 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
|
16859 |
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
|
16860 |
-ac_tool_warned=yes ;; |
|
16861 |
-esac |
|
16862 |
- PKG_CONFIG=$ac_pt_PKG_CONFIG |
|
16863 |
- fi |
|
16864 |
-else |
|
16865 |
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" |
|
16866 |
-fi |
|
16867 |
- |
|
16868 |
-fi |
|
16869 |
-if test -n "$PKG_CONFIG"; then |
|
16870 |
- _pkg_min_version=0.9.0 |
|
16871 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 |
|
16872 |
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } |
|
16873 |
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
|
16874 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
|
16875 |
-$as_echo "yes" >&6; } |
|
16876 |
- else |
|
16877 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
16878 |
-$as_echo "no" >&6; } |
|
16879 |
- PKG_CONFIG="" |
|
16880 |
- fi |
|
16881 |
-fi |
|
16882 |
- |
|
16883 | 16763 |
pkg_failed=no |
16884 | 16764 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 |
16885 | 16765 |
$as_echo_n "checking for CHECK... " >&6; } |