Browse code
second phase autoreconf (update m4 usage)
Kevin Lin authored on 2016/03/01 02:15:49Showing 2 changed files
| ... | ... |
@@ -698,6 +698,11 @@ BUILD_CLAMD_FALSE |
| 698 | 698 |
BUILD_CLAMD_TRUE |
| 699 | 699 |
CFGDIR |
| 700 | 700 |
DBDIR |
| 701 |
+INSTALL_SYSTEMD_UNITS_FALSE |
|
| 702 |
+INSTALL_SYSTEMD_UNITS_TRUE |
|
| 703 |
+systemdsystemunitdir |
|
| 704 |
+SYSTEMD_LIBS |
|
| 705 |
+SYSTEMD_CFLAGS |
|
| 701 | 706 |
ENABLE_UNRAR_FALSE |
| 702 | 707 |
ENABLE_UNRAR_TRUE |
| 703 | 708 |
HAVE_LIBBZ2_FALSE |
| ... | ... |
@@ -708,6 +713,7 @@ LIBBZ2 |
| 708 | 708 |
MAINT |
| 709 | 709 |
MAINTAINER_MODE_FALSE |
| 710 | 710 |
MAINTAINER_MODE_TRUE |
| 711 |
+pcreconfig |
|
| 711 | 712 |
HAVE_LIBXML2_FALSE |
| 712 | 713 |
HAVE_LIBXML2_TRUE |
| 713 | 714 |
XML_LIBS |
| ... | ... |
@@ -906,6 +912,7 @@ enable_bzip2 |
| 906 | 906 |
with_libbz2_prefix |
| 907 | 907 |
enable_unrar |
| 908 | 908 |
enable_getaddrinfo |
| 909 |
+with_systemdsystemunitdir |
|
| 909 | 910 |
enable_ipv6 |
| 910 | 911 |
enable_dns |
| 911 | 912 |
enable_fanotify |
| ... | ... |
@@ -950,7 +957,9 @@ PKG_CONFIG |
| 950 | 950 |
PKG_CONFIG_PATH |
| 951 | 951 |
PKG_CONFIG_LIBDIR |
| 952 | 952 |
CHECK_CFLAGS |
| 953 |
-CHECK_LIBS' |
|
| 953 |
+CHECK_LIBS |
|
| 954 |
+SYSTEMD_CFLAGS |
|
| 955 |
+SYSTEMD_LIBS' |
|
| 954 | 956 |
ac_subdirs_all=' |
| 955 | 957 |
libclamav/c++' |
| 956 | 958 |
|
| ... | ... |
@@ -1643,14 +1652,16 @@ Optional Packages: |
| 1643 | 1643 |
--with-libjson[=DIR] path to directory containing libjson |
| 1644 | 1644 |
[default=/usr/local or /usr if not found in |
| 1645 | 1645 |
/usr/local] |
| 1646 |
- --with-pcre[=DIR] path to directory containing libpcre library |
|
| 1647 |
- [default=/usr/local or /usr if not found in |
|
| 1648 |
- /usr/local] |
|
| 1646 |
+ --with-pcre[=DIR] path to directory containing libpcre library, |
|
| 1647 |
+ prioritizes PCRE2 over PCRE [default=search PATH |
|
| 1648 |
+ environment variable] |
|
| 1649 | 1649 |
--with-zlib[=DIR] path to directory containing zlib library |
| 1650 | 1650 |
[default=/usr/local or /usr if not found in |
| 1651 | 1651 |
/usr/local] |
| 1652 | 1652 |
--with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib |
| 1653 | 1653 |
--without-libbz2-prefix don't search for libbz2 in includedir and libdir |
| 1654 |
+ --with-systemdsystemunitdir=DIR |
|
| 1655 |
+ Directory for systemd service files |
|
| 1654 | 1656 |
--with-iconv supports iconv() [default=auto] |
| 1655 | 1657 |
--with-user[=uid] name of the clamav user [default=clamav] |
| 1656 | 1658 |
--with-group[=gid] name of the clamav group [default=clamav] |
| ... | ... |
@@ -1692,6 +1703,10 @@ Some influential environment variables: |
| 1692 | 1692 |
CHECK_CFLAGS |
| 1693 | 1693 |
C compiler flags for CHECK, overriding pkg-config |
| 1694 | 1694 |
CHECK_LIBS linker flags for CHECK, overriding pkg-config |
| 1695 |
+ SYSTEMD_CFLAGS |
|
| 1696 |
+ C compiler flags for SYSTEMD, overriding pkg-config |
|
| 1697 |
+ SYSTEMD_LIBS |
|
| 1698 |
+ linker flags for SYSTEMD, overriding pkg-config |
|
| 1695 | 1699 |
|
| 1696 | 1700 |
Use these variables to override the choices made by `configure' or to help |
| 1697 | 1701 |
it to find libraries and programs with nonstandard names/locations. |
| ... | ... |
@@ -17767,118 +17782,279 @@ LIBS="$save_LIBS" |
| 17767 | 17767 |
|
| 17768 | 17768 |
|
| 17769 | 17769 |
|
| 17770 |
-PCRE_HOME="" |
|
| 17771 | 17770 |
|
| 17772 | 17771 |
# Check whether --with-pcre was given. |
| 17773 | 17772 |
if test "${with_pcre+set}" = set; then :
|
| 17774 |
- withval=$with_pcre; |
|
| 17775 |
- PCRE_HOME=$withval |
|
| 17776 |
- |
|
| 17773 |
+ withval=$with_pcre; pcreser=$withval |
|
| 17777 | 17774 |
else |
| 17778 |
- |
|
| 17779 |
- PCRE_HOME="yes" |
|
| 17780 |
- |
|
| 17775 |
+ pcreser="yes" |
|
| 17781 | 17776 |
fi |
| 17782 | 17777 |
|
| 17783 | 17778 |
|
| 17784 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre installation" >&5
|
|
| 17785 |
-$as_echo_n "checking for libpcre installation... " >&6; } |
|
| 17786 |
-case "$PCRE_HOME" in |
|
| 17779 |
+case "$pcreser" in |
|
| 17787 | 17780 |
no) |
| 17788 |
- PCRE_HOME="" |
|
| 17781 |
+ pcreconfig="" |
|
| 17782 |
+ ;; |
|
| 17783 |
+yes) |
|
| 17784 |
+ # Extract the first word of "pcre2-config", so it can be a program name with args. |
|
| 17785 |
+set dummy pcre2-config; ac_word=$2 |
|
| 17786 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
| 17787 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
| 17788 |
+if ${ac_cv_path_pcreconfig+:} false; then :
|
|
| 17789 |
+ $as_echo_n "(cached) " >&6 |
|
| 17790 |
+else |
|
| 17791 |
+ case $pcreconfig in |
|
| 17792 |
+ [\\/]* | ?:[\\/]*) |
|
| 17793 |
+ ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path. |
|
| 17794 |
+ ;; |
|
| 17795 |
+ *) |
|
| 17796 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
| 17797 |
+for as_dir in $PATH |
|
| 17798 |
+do |
|
| 17799 |
+ IFS=$as_save_IFS |
|
| 17800 |
+ test -z "$as_dir" && as_dir=. |
|
| 17801 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
| 17802 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
| 17803 |
+ ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext" |
|
| 17804 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
| 17805 |
+ break 2 |
|
| 17806 |
+ fi |
|
| 17807 |
+done |
|
| 17808 |
+ done |
|
| 17809 |
+IFS=$as_save_IFS |
|
| 17810 |
+ |
|
| 17811 |
+ ;; |
|
| 17812 |
+esac |
|
| 17813 |
+fi |
|
| 17814 |
+pcreconfig=$ac_cv_path_pcreconfig |
|
| 17815 |
+if test -n "$pcreconfig"; then |
|
| 17816 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
|
|
| 17817 |
+$as_echo "$pcreconfig" >&6; } |
|
| 17818 |
+else |
|
| 17789 | 17819 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
| 17790 | 17820 |
$as_echo "no" >&6; } |
| 17821 |
+fi |
|
| 17822 |
+ |
|
| 17823 |
+ |
|
| 17824 |
+ if test "x$pcreconfig" = "x"; then |
|
| 17825 |
+ # Extract the first word of "pcre-config", so it can be a program name with args. |
|
| 17826 |
+set dummy pcre-config; ac_word=$2 |
|
| 17827 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
| 17828 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
| 17829 |
+if ${ac_cv_path_pcreconfig+:} false; then :
|
|
| 17830 |
+ $as_echo_n "(cached) " >&6 |
|
| 17831 |
+else |
|
| 17832 |
+ case $pcreconfig in |
|
| 17833 |
+ [\\/]* | ?:[\\/]*) |
|
| 17834 |
+ ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path. |
|
| 17791 | 17835 |
;; |
| 17792 |
-yes) |
|
| 17793 |
- PCRE_HOME=/usr/local |
|
| 17794 |
- if test ! -x "$PCRE_HOME/bin/pcre-config"; then |
|
| 17795 |
- PCRE_HOME=/usr |
|
| 17796 |
- if test ! -x "$PCRE_HOME/bin/pcre-config"; then |
|
| 17797 |
- PCRE_HOME="" |
|
| 17798 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 17836 |
+ *) |
|
| 17837 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
| 17838 |
+for as_dir in $PATH |
|
| 17839 |
+do |
|
| 17840 |
+ IFS=$as_save_IFS |
|
| 17841 |
+ test -z "$as_dir" && as_dir=. |
|
| 17842 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
| 17843 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
| 17844 |
+ ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext" |
|
| 17845 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
| 17846 |
+ break 2 |
|
| 17847 |
+ fi |
|
| 17848 |
+done |
|
| 17849 |
+ done |
|
| 17850 |
+IFS=$as_save_IFS |
|
| 17851 |
+ |
|
| 17852 |
+ ;; |
|
| 17853 |
+esac |
|
| 17854 |
+fi |
|
| 17855 |
+pcreconfig=$ac_cv_path_pcreconfig |
|
| 17856 |
+if test -n "$pcreconfig"; then |
|
| 17857 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
|
|
| 17858 |
+$as_echo "$pcreconfig" >&6; } |
|
| 17859 |
+else |
|
| 17860 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 17799 | 17861 |
$as_echo "no" >&6; } |
| 17800 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: cannot locate libpcre at /usr/local or /usr" >&5
|
|
| 17801 |
-$as_echo "$as_me: cannot locate libpcre at /usr/local or /usr" >&6;} |
|
| 17802 |
- fi |
|
| 17862 |
+fi |
|
| 17863 |
+ |
|
| 17864 |
+ |
|
| 17865 |
+ if test "x$pcreconfig" = "x"; then |
|
| 17866 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: cannot locate libpcre2 or libpcre within PATH" >&5
|
|
| 17867 |
+$as_echo "$as_me: cannot locate libpcre2 or libpcre within PATH" >&6;} |
|
| 17868 |
+ else |
|
| 17869 |
+ pcrelib="pcre" |
|
| 17870 |
+ fi |
|
| 17871 |
+ else |
|
| 17872 |
+ pcrelib="pcre2" |
|
| 17803 | 17873 |
fi |
| 17804 | 17874 |
;; |
| 17805 | 17875 |
"") |
| 17806 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
|
|
| 17807 |
-$as_echo "" >&6; } |
|
| 17808 | 17876 |
as_fn_error $? "cannot assign blank value to --with-pcre" "$LINENO" 5 |
| 17809 | 17877 |
;; |
| 17810 | 17878 |
*) |
| 17811 |
- PCRE_HOME="$withval" |
|
| 17812 |
- if test ! -x "$PCRE_HOME/bin/pcre-config"; then |
|
| 17813 |
- PCRE_HOME="" |
|
| 17814 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
|
|
| 17815 |
-$as_echo "not found" >&6; } |
|
| 17816 |
- as_fn_error $? "cannot locate libpcre at $withval" "$LINENO" 5 |
|
| 17879 |
+ # Extract the first word of "pcre2-config", so it can be a program name with args. |
|
| 17880 |
+set dummy pcre2-config; ac_word=$2 |
|
| 17881 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
| 17882 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
| 17883 |
+if ${ac_cv_path_pcreconfig+:} false; then :
|
|
| 17884 |
+ $as_echo_n "(cached) " >&6 |
|
| 17885 |
+else |
|
| 17886 |
+ case $pcreconfig in |
|
| 17887 |
+ [\\/]* | ?:[\\/]*) |
|
| 17888 |
+ ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path. |
|
| 17889 |
+ ;; |
|
| 17890 |
+ *) |
|
| 17891 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
| 17892 |
+for as_dir in $pcreser/bin |
|
| 17893 |
+do |
|
| 17894 |
+ IFS=$as_save_IFS |
|
| 17895 |
+ test -z "$as_dir" && as_dir=. |
|
| 17896 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
| 17897 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
| 17898 |
+ ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext" |
|
| 17899 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
| 17900 |
+ break 2 |
|
| 17817 | 17901 |
fi |
| 17902 |
+done |
|
| 17903 |
+ done |
|
| 17904 |
+IFS=$as_save_IFS |
|
| 17905 |
+ |
|
| 17818 | 17906 |
;; |
| 17819 | 17907 |
esac |
| 17820 |
- |
|
| 17821 |
-if test "x$PCRE_HOME" != "x"; then |
|
| 17822 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PCRE_HOME" >&5
|
|
| 17823 |
-$as_echo "using $PCRE_HOME" >&6; } |
|
| 17908 |
+fi |
|
| 17909 |
+pcreconfig=$ac_cv_path_pcreconfig |
|
| 17910 |
+if test -n "$pcreconfig"; then |
|
| 17911 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
|
|
| 17912 |
+$as_echo "$pcreconfig" >&6; } |
|
| 17913 |
+else |
|
| 17914 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 17915 |
+$as_echo "no" >&6; } |
|
| 17824 | 17916 |
fi |
| 17825 | 17917 |
|
| 17826 |
-found_pcre="no" |
|
| 17827 |
-PCRECONF_VERSION="" |
|
| 17828 |
-PCRE_CPPFLAGS="" |
|
| 17829 |
-PCRE_LIBS="" |
|
| 17830 |
-if test "x$PCRE_HOME" != "x"; then |
|
| 17831 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre-config version" >&5
|
|
| 17832 |
-$as_echo_n "checking pcre-config version... " >&6; } |
|
| 17833 |
- PCRECONF_VERSION="`$PCRE_HOME/bin/pcre-config --version`" |
|
| 17834 | 17918 |
|
| 17835 |
- if test "x$PCRECONF_VERSION" == "x"; then |
|
| 17836 |
- as_fn_error $? "pcre-config failed" "$LINENO" 5 |
|
| 17919 |
+ if test "x$pcreconfig" = "x"; then |
|
| 17920 |
+ # Extract the first word of "pcre-config", so it can be a program name with args. |
|
| 17921 |
+set dummy pcre-config; ac_word=$2 |
|
| 17922 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
| 17923 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
| 17924 |
+if ${ac_cv_path_pcreconfig+:} false; then :
|
|
| 17925 |
+ $as_echo_n "(cached) " >&6 |
|
| 17926 |
+else |
|
| 17927 |
+ case $pcreconfig in |
|
| 17928 |
+ [\\/]* | ?:[\\/]*) |
|
| 17929 |
+ ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path. |
|
| 17930 |
+ ;; |
|
| 17931 |
+ *) |
|
| 17932 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
| 17933 |
+for as_dir in $pcreser/bin |
|
| 17934 |
+do |
|
| 17935 |
+ IFS=$as_save_IFS |
|
| 17936 |
+ test -z "$as_dir" && as_dir=. |
|
| 17937 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
| 17938 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
| 17939 |
+ ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext" |
|
| 17940 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
| 17941 |
+ break 2 |
|
| 17837 | 17942 |
fi |
| 17943 |
+done |
|
| 17944 |
+ done |
|
| 17945 |
+IFS=$as_save_IFS |
|
| 17838 | 17946 |
|
| 17839 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRECONF_VERSION" >&5
|
|
| 17840 |
-$as_echo "$PCRECONF_VERSION" >&6; } |
|
| 17947 |
+ ;; |
|
| 17948 |
+esac |
|
| 17949 |
+fi |
|
| 17950 |
+pcreconfig=$ac_cv_path_pcreconfig |
|
| 17951 |
+if test -n "$pcreconfig"; then |
|
| 17952 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
|
|
| 17953 |
+$as_echo "$pcreconfig" >&6; } |
|
| 17954 |
+else |
|
| 17955 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 17956 |
+$as_echo "no" >&6; } |
|
| 17957 |
+fi |
|
| 17841 | 17958 |
|
| 17842 |
- pcrever_major=`echo "$PCRECONF_VERSION" | sed -e 's/\([0-9]*\).*/\1/'` |
|
| 17843 |
- pcrever_minor=`echo "$PCRECONF_VERSION" | sed -e 's/[0-9]*\.\([0-9]*\).*/\1/'` |
|
| 17844 | 17959 |
|
| 17845 |
- if test $pcrever_major -lt 6; then |
|
| 17846 |
- as_fn_error $? "This pcre version is missing features used by ClamAV. Please upgrade to a newer version: http://www.pcre.org." "$LINENO" 5 |
|
| 17847 |
- fi |
|
| 17848 |
- if test $pcrever_major -eq 6 && test $pcrever_minor -lt 5; then |
|
| 17849 |
- as_fn_error $? "This pcre version is missing features used by ClamAV. Please upgrade to a newer version: http://www.pcre.org." "$LINENO" 5 |
|
| 17960 |
+ if test "x$pcreconfig" = "x"; then |
|
| 17961 |
+ as_fn_error $? "cannot locate libpcre2 or libpcre at $pcreser" "$LINENO" 5 |
|
| 17962 |
+ else |
|
| 17963 |
+ pcrelib="pcre" |
|
| 17964 |
+ fi |
|
| 17965 |
+ else |
|
| 17966 |
+ pcrelib="pcre2" |
|
| 17850 | 17967 |
fi |
| 17968 |
+ ;; |
|
| 17969 |
+esac |
|
| 17851 | 17970 |
|
| 17852 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CVE-2015-3210" >&5
|
|
| 17971 |
+found_pcre="no" |
|
| 17972 |
+if test "x$pcreconfig" != "x"; then |
|
| 17973 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre-config version" >&5
|
|
| 17974 |
+$as_echo_n "checking pcre-config version... " >&6; } |
|
| 17975 |
+ pcre_version="`$pcreconfig --version`" |
|
| 17976 |
+ |
|
| 17977 |
+ if test "x$pcre_version" = "x"; then |
|
| 17978 |
+ as_fn_error $? "$pcreconfig failed" "$LINENO" 5 |
|
| 17979 |
+ fi |
|
| 17980 |
+ |
|
| 17981 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcre_version" >&5
|
|
| 17982 |
+$as_echo "$pcre_version" >&6; } |
|
| 17983 |
+ pcrever_major=`echo "$pcre_version" | sed -e 's/\([0-9]\+\).*/\1/'` |
|
| 17984 |
+ pcrever_minor=`echo "$pcre_version" | sed -e 's/[0-9]\+\.\([0-9]\+\).*/\1/'` |
|
| 17985 |
+ |
|
| 17986 |
+ if test "$pcrelib" = "pcre"; then |
|
| 17987 |
+ if test $pcrever_major -lt 6; then |
|
| 17988 |
+ as_fn_error $? "This pcre version is missing features used by ClamAV. Please upgrade to a newer version: http://www.pcre.org." "$LINENO" 5 |
|
| 17989 |
+ fi |
|
| 17990 |
+ if test $pcrever_major -eq 6 && test $pcrever_minor -lt 5; then |
|
| 17991 |
+ as_fn_error $? "This pcre version is missing features used by ClamAV. Please upgrade to a newer version: http://www.pcre.org." "$LINENO" 5 |
|
| 17992 |
+ fi |
|
| 17993 |
+ fi |
|
| 17994 |
+ |
|
| 17995 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CVE-2015-3210" >&5
|
|
| 17853 | 17996 |
$as_echo_n "checking for CVE-2015-3210... " >&6; } |
| 17854 |
- if test $pcrever_major -eq 8; then |
|
| 17855 |
- if test $pcrever_minor -gt 33 && test $pcrever_minor -lt 38; then |
|
| 17856 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
| 17857 |
-$as_echo "yes" >&6; } |
|
| 17858 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The installed pcre version may contain a security bug. Please upgrade to 8.38 or later: http://www.pcre.org." >&5
|
|
| 17859 |
-$as_echo "$as_me: WARNING: The installed pcre version may contain a security bug. Please upgrade to 8.38 or later: http://www.pcre.org." >&2;} |
|
| 17997 |
+ if test "$pcrelib" = "pcre2"; then |
|
| 17998 |
+ if test $pcrever_major -eq 10 && test $pcrever_minor -eq 10; then |
|
| 17999 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The installed pcre2 version may contain a security bug. Please upgrade to 10.20 or later: http://www.pcre.org." >&5
|
|
| 18000 |
+$as_echo "$as_me: WARNING: The installed pcre2 version may contain a security bug. Please upgrade to 10.20 or later: http://www.pcre.org." >&2;} |
|
| 18001 |
+ else |
|
| 18002 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
| 18003 |
+$as_echo "ok" >&6; } |
|
| 18004 |
+ fi |
|
| 17860 | 18005 |
else |
| 17861 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
| 18006 |
+ if test $pcrever_major -eq 8 && |
|
| 18007 |
+ test $pcrever_minor -gt 33 && test $pcrever_minor -lt 38; then |
|
| 18008 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The installed pcre version may contain a security bug. Please upgrade to 8.38 or later: http://www.pcre.org." >&5
|
|
| 18009 |
+$as_echo "$as_me: WARNING: The installed pcre version may contain a security bug. Please upgrade to 8.38 or later: http://www.pcre.org." >&2;} |
|
| 18010 |
+ else |
|
| 18011 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
| 17862 | 18012 |
$as_echo "ok" >&6; } |
| 18013 |
+ fi |
|
| 18014 |
+ fi |
|
| 18015 |
+ |
|
| 18016 |
+ found_pcre="yes" |
|
| 18017 |
+ PCRE_HOME="`$pcreconfig --prefix`" |
|
| 18018 |
+ PCRE_CPPFLAGS="`$pcreconfig --cflags`" |
|
| 18019 |
+ if test "$pcrelib" = "pcre2"; then |
|
| 18020 |
+ PCRE_LIBS="`$pcreconfig --libs8`" |
|
| 18021 |
+ else |
|
| 18022 |
+ PCRE_LIBS="`$pcreconfig --libs`" |
|
| 17863 | 18023 |
fi |
| 17864 |
- else |
|
| 17865 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
| 17866 |
-$as_echo "ok" >&6; }; |
|
| 17867 |
- fi |
|
| 17868 |
- found_pcre="yes" |
|
| 17869 |
- PCRE_CPPFLAGS="`$PCRE_HOME/bin/pcre-config --cflags`" |
|
| 17870 |
- PCRE_LIBS="`$PCRE_HOME/bin/pcre-config --libs`" |
|
| 17871 | 18024 |
|
| 18025 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: CFLAGS from pcre-config: $PCRE_CPPFLAGS" >&5
|
|
| 18026 |
+$as_echo "$as_me: CFLAGS from pcre-config: $PCRE_CPPFLAGS" >&6;} |
|
| 18027 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: LIBS from pcre-config: $PCRE_LIBS" >&5
|
|
| 18028 |
+$as_echo "$as_me: LIBS from pcre-config: $PCRE_LIBS" >&6;} |
|
| 17872 | 18029 |
fi |
| 17873 | 18030 |
|
| 17874 | 18031 |
have_pcre="no" |
| 17875 | 18032 |
if test "x$found_pcre" != "xno"; then |
| 17876 | 18033 |
save_CPPFLAGS="$CPPFLAGS" |
| 17877 |
- CPPFLAGS="$CPPFLAGS $PCRE_CPPFLAGS" |
|
| 18034 |
+ CPPFLAGS=$PCRE_CPPFLAGS |
|
| 17878 | 18035 |
save_LDFLAGS="$LDFLAGS" |
| 17879 |
- LDFLAGS="$LDFLAGS $PCRE_LIBS" |
|
| 18036 |
+ LDFLAGS=$PCRE_LIBS |
|
| 18037 |
+ |
|
| 18038 |
+ if test "$pcrelib" = "pcre2"; then |
|
| 17880 | 18039 |
|
| 17881 |
- ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" |
|
| 18040 |
+ have_pcre="yes" |
|
| 18041 |
+ else |
|
| 18042 |
+ ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default" |
|
| 17882 | 18043 |
if test "x$ac_cv_header_pcre_h" = xyes; then : |
| 17883 | 18044 |
have_pcre="yes" |
| 17884 | 18045 |
else |
| ... | ... |
@@ -17886,8 +18062,8 @@ else |
| 17886 | 17886 |
fi |
| 17887 | 17887 |
|
| 17888 | 17888 |
|
| 17889 |
- if test "x$have_pcre" = "xno"; then |
|
| 17890 |
- ac_fn_c_check_header_mongrel "$LINENO" "pcre/pcre.h" "ac_cv_header_pcre_pcre_h" "$ac_includes_default" |
|
| 17889 |
+ if test "x$have_pcre" = "xno"; then |
|
| 17890 |
+ ac_fn_c_check_header_mongrel "$LINENO" "pcre/pcre.h" "ac_cv_header_pcre_pcre_h" "$ac_includes_default" |
|
| 17891 | 17891 |
if test "x$ac_cv_header_pcre_pcre_h" = xyes; then : |
| 17892 | 17892 |
have_pcre="yes" |
| 17893 | 17893 |
else |
| ... | ... |
@@ -17895,10 +18071,10 @@ else |
| 17895 | 17895 |
fi |
| 17896 | 17896 |
|
| 17897 | 17897 |
|
| 17898 |
- fi |
|
| 17898 |
+ fi |
|
| 17899 | 17899 |
|
| 17900 |
- if test "x$have_pcre" = "xyes"; then |
|
| 17901 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
|
|
| 17900 |
+ if test "x$have_pcre" = "xyes"; then |
|
| 17901 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
|
|
| 17902 | 17902 |
$as_echo_n "checking for pcre_compile in -lpcre... " >&6; } |
| 17903 | 17903 |
if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
|
| 17904 | 17904 |
$as_echo_n "(cached) " >&6 |
| ... | ... |
@@ -17940,6 +18116,7 @@ else |
| 17940 | 17940 |
have_pcre="no" |
| 17941 | 17941 |
fi |
| 17942 | 17942 |
|
| 17943 |
+ fi |
|
| 17943 | 17944 |
fi |
| 17944 | 17945 |
|
| 17945 | 17946 |
CPPFLAGS="$save_CPPFLAGS" |
| ... | ... |
@@ -17950,8 +18127,17 @@ if test "x$have_pcre" = "xyes"; then |
| 17950 | 17950 |
|
| 17951 | 17951 |
$as_echo "#define HAVE_PCRE 1" >>confdefs.h |
| 17952 | 17952 |
|
| 17953 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with libpcre from $PCRE_HOME" >&5
|
|
| 17954 |
-$as_echo "$as_me: Compiling and linking with libpcre from $PCRE_HOME" >&6;} |
|
| 17953 |
+ |
|
| 17954 |
+ if test "$pcrelib" = "pcre2"; then |
|
| 17955 |
+ |
|
| 17956 |
+$as_echo "#define USING_PCRE2 1" >>confdefs.h |
|
| 17957 |
+ |
|
| 17958 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with pcre2 from $PCRE_HOME" >&5
|
|
| 17959 |
+$as_echo "$as_me: Compiling and linking with pcre2 from $PCRE_HOME" >&6;} |
|
| 17960 |
+ else |
|
| 17961 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with pcre from $PCRE_HOME" >&5
|
|
| 17962 |
+$as_echo "$as_me: Compiling and linking with pcre from $PCRE_HOME" >&6;} |
|
| 17963 |
+ fi |
|
| 17955 | 17964 |
fi |
| 17956 | 17965 |
|
| 17957 | 17966 |
|
| ... | ... |
@@ -19147,6 +19333,266 @@ $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h |
| 19147 | 19147 |
fi |
| 19148 | 19148 |
fi |
| 19149 | 19149 |
|
| 19150 |
+ |
|
| 19151 |
+pkg_failed=no |
|
| 19152 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
| 19153 |
+$as_echo_n "checking for SYSTEMD... " >&6; } |
|
| 19154 |
+ |
|
| 19155 |
+if test -n "$SYSTEMD_CFLAGS"; then |
|
| 19156 |
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" |
|
| 19157 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 19158 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 19159 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
|
|
| 19160 |
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 |
|
| 19161 |
+ ac_status=$? |
|
| 19162 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 19163 |
+ test $ac_status = 0; }; then |
|
| 19164 |
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` |
|
| 19165 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 19166 |
+else |
|
| 19167 |
+ pkg_failed=yes |
|
| 19168 |
+fi |
|
| 19169 |
+ else |
|
| 19170 |
+ pkg_failed=untried |
|
| 19171 |
+fi |
|
| 19172 |
+if test -n "$SYSTEMD_LIBS"; then |
|
| 19173 |
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" |
|
| 19174 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 19175 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 19176 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
|
|
| 19177 |
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 |
|
| 19178 |
+ ac_status=$? |
|
| 19179 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 19180 |
+ test $ac_status = 0; }; then |
|
| 19181 |
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` |
|
| 19182 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 19183 |
+else |
|
| 19184 |
+ pkg_failed=yes |
|
| 19185 |
+fi |
|
| 19186 |
+ else |
|
| 19187 |
+ pkg_failed=untried |
|
| 19188 |
+fi |
|
| 19189 |
+ |
|
| 19190 |
+ |
|
| 19191 |
+ |
|
| 19192 |
+if test $pkg_failed = yes; then |
|
| 19193 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 19194 |
+$as_echo "no" >&6; } |
|
| 19195 |
+ |
|
| 19196 |
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
|
| 19197 |
+ _pkg_short_errors_supported=yes |
|
| 19198 |
+else |
|
| 19199 |
+ _pkg_short_errors_supported=no |
|
| 19200 |
+fi |
|
| 19201 |
+ if test $_pkg_short_errors_supported = yes; then |
|
| 19202 |
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` |
|
| 19203 |
+ else |
|
| 19204 |
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` |
|
| 19205 |
+ fi |
|
| 19206 |
+ # Put the nasty error message in config.log where it belongs |
|
| 19207 |
+ echo "$SYSTEMD_PKG_ERRORS" >&5 |
|
| 19208 |
+ |
|
| 19209 |
+ |
|
| 19210 |
+pkg_failed=no |
|
| 19211 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
| 19212 |
+$as_echo_n "checking for SYSTEMD... " >&6; } |
|
| 19213 |
+ |
|
| 19214 |
+if test -n "$SYSTEMD_CFLAGS"; then |
|
| 19215 |
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" |
|
| 19216 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 19217 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 19218 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
| 19219 |
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 |
|
| 19220 |
+ ac_status=$? |
|
| 19221 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 19222 |
+ test $ac_status = 0; }; then |
|
| 19223 |
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` |
|
| 19224 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 19225 |
+else |
|
| 19226 |
+ pkg_failed=yes |
|
| 19227 |
+fi |
|
| 19228 |
+ else |
|
| 19229 |
+ pkg_failed=untried |
|
| 19230 |
+fi |
|
| 19231 |
+if test -n "$SYSTEMD_LIBS"; then |
|
| 19232 |
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" |
|
| 19233 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 19234 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 19235 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
| 19236 |
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 |
|
| 19237 |
+ ac_status=$? |
|
| 19238 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 19239 |
+ test $ac_status = 0; }; then |
|
| 19240 |
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` |
|
| 19241 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 19242 |
+else |
|
| 19243 |
+ pkg_failed=yes |
|
| 19244 |
+fi |
|
| 19245 |
+ else |
|
| 19246 |
+ pkg_failed=untried |
|
| 19247 |
+fi |
|
| 19248 |
+ |
|
| 19249 |
+ |
|
| 19250 |
+ |
|
| 19251 |
+if test $pkg_failed = yes; then |
|
| 19252 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 19253 |
+$as_echo "no" >&6; } |
|
| 19254 |
+ |
|
| 19255 |
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
|
| 19256 |
+ _pkg_short_errors_supported=yes |
|
| 19257 |
+else |
|
| 19258 |
+ _pkg_short_errors_supported=no |
|
| 19259 |
+fi |
|
| 19260 |
+ if test $_pkg_short_errors_supported = yes; then |
|
| 19261 |
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` |
|
| 19262 |
+ else |
|
| 19263 |
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` |
|
| 19264 |
+ fi |
|
| 19265 |
+ # Put the nasty error message in config.log where it belongs |
|
| 19266 |
+ echo "$SYSTEMD_PKG_ERRORS" >&5 |
|
| 19267 |
+ |
|
| 19268 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: systemd is not supported" >&5
|
|
| 19269 |
+$as_echo "systemd is not supported" >&6; } |
|
| 19270 |
+elif test $pkg_failed = untried; then |
|
| 19271 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 19272 |
+$as_echo "no" >&6; } |
|
| 19273 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: systemd is not supported" >&5
|
|
| 19274 |
+$as_echo "systemd is not supported" >&6; } |
|
| 19275 |
+else |
|
| 19276 |
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS |
|
| 19277 |
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS |
|
| 19278 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
| 19279 |
+$as_echo "yes" >&6; } |
|
| 19280 |
+ |
|
| 19281 |
+$as_echo "#define HAVE_SYSTEMD /**/" >>confdefs.h |
|
| 19282 |
+ |
|
| 19283 |
+fi |
|
| 19284 |
+elif test $pkg_failed = untried; then |
|
| 19285 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 19286 |
+$as_echo "no" >&6; } |
|
| 19287 |
+ |
|
| 19288 |
+pkg_failed=no |
|
| 19289 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
|
|
| 19290 |
+$as_echo_n "checking for SYSTEMD... " >&6; } |
|
| 19291 |
+ |
|
| 19292 |
+if test -n "$SYSTEMD_CFLAGS"; then |
|
| 19293 |
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" |
|
| 19294 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 19295 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 19296 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
| 19297 |
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 |
|
| 19298 |
+ ac_status=$? |
|
| 19299 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 19300 |
+ test $ac_status = 0; }; then |
|
| 19301 |
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` |
|
| 19302 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 19303 |
+else |
|
| 19304 |
+ pkg_failed=yes |
|
| 19305 |
+fi |
|
| 19306 |
+ else |
|
| 19307 |
+ pkg_failed=untried |
|
| 19308 |
+fi |
|
| 19309 |
+if test -n "$SYSTEMD_LIBS"; then |
|
| 19310 |
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" |
|
| 19311 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 19312 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 19313 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
|
|
| 19314 |
+ ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 |
|
| 19315 |
+ ac_status=$? |
|
| 19316 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 19317 |
+ test $ac_status = 0; }; then |
|
| 19318 |
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` |
|
| 19319 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 19320 |
+else |
|
| 19321 |
+ pkg_failed=yes |
|
| 19322 |
+fi |
|
| 19323 |
+ else |
|
| 19324 |
+ pkg_failed=untried |
|
| 19325 |
+fi |
|
| 19326 |
+ |
|
| 19327 |
+ |
|
| 19328 |
+ |
|
| 19329 |
+if test $pkg_failed = yes; then |
|
| 19330 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 19331 |
+$as_echo "no" >&6; } |
|
| 19332 |
+ |
|
| 19333 |
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
|
| 19334 |
+ _pkg_short_errors_supported=yes |
|
| 19335 |
+else |
|
| 19336 |
+ _pkg_short_errors_supported=no |
|
| 19337 |
+fi |
|
| 19338 |
+ if test $_pkg_short_errors_supported = yes; then |
|
| 19339 |
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` |
|
| 19340 |
+ else |
|
| 19341 |
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` |
|
| 19342 |
+ fi |
|
| 19343 |
+ # Put the nasty error message in config.log where it belongs |
|
| 19344 |
+ echo "$SYSTEMD_PKG_ERRORS" >&5 |
|
| 19345 |
+ |
|
| 19346 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: systemd is not supported" >&5
|
|
| 19347 |
+$as_echo "systemd is not supported" >&6; } |
|
| 19348 |
+elif test $pkg_failed = untried; then |
|
| 19349 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 19350 |
+$as_echo "no" >&6; } |
|
| 19351 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: systemd is not supported" >&5
|
|
| 19352 |
+$as_echo "systemd is not supported" >&6; } |
|
| 19353 |
+else |
|
| 19354 |
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS |
|
| 19355 |
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS |
|
| 19356 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
| 19357 |
+$as_echo "yes" >&6; } |
|
| 19358 |
+ |
|
| 19359 |
+$as_echo "#define HAVE_SYSTEMD /**/" >>confdefs.h |
|
| 19360 |
+ |
|
| 19361 |
+fi |
|
| 19362 |
+else |
|
| 19363 |
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS |
|
| 19364 |
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS |
|
| 19365 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
| 19366 |
+$as_echo "yes" >&6; } |
|
| 19367 |
+ |
|
| 19368 |
+$as_echo "#define HAVE_SYSTEMD /**/" >>confdefs.h |
|
| 19369 |
+ |
|
| 19370 |
+fi |
|
| 19371 |
+CLAMD_LIBS="$CLAMD_LIBS $SYSTEMD_LIBS" |
|
| 19372 |
+CFLAGS="$CFLAGS $SYSTEMD_CFLAGS" |
|
| 19373 |
+ |
|
| 19374 |
+ |
|
| 19375 |
+# Check whether --with-systemdsystemunitdir was given. |
|
| 19376 |
+if test "${with_systemdsystemunitdir+set}" = set; then :
|
|
| 19377 |
+ withval=$with_systemdsystemunitdir; |
|
| 19378 |
+else |
|
| 19379 |
+ with_systemdsystemunitdir=auto |
|
| 19380 |
+fi |
|
| 19381 |
+ |
|
| 19382 |
+if test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"; then : |
|
| 19383 |
+ |
|
| 19384 |
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) |
|
| 19385 |
+ if test "x$def_systemdsystemunitdir" = "x"; then : |
|
| 19386 |
+ if test "x$with_systemdsystemunitdir" = "xyes"; then : |
|
| 19387 |
+ as_fn_error $? "systemd support requested but pkg-config unable to query systemd package" "$LINENO" 5 |
|
| 19388 |
+fi |
|
| 19389 |
+ with_systemdsystemunitdir=no |
|
| 19390 |
+else |
|
| 19391 |
+ with_systemdsystemunitdir=$def_systemdsystemunitdir |
|
| 19392 |
+fi |
|
| 19393 |
+fi |
|
| 19394 |
+if test "x$with_systemdsystemunitdir" != "xno"; then : |
|
| 19395 |
+ systemdsystemunitdir=$with_systemdsystemunitdir |
|
| 19396 |
+ |
|
| 19397 |
+fi |
|
| 19398 |
+ if test "x$with_systemdsystemunitdir" != "xno"; then |
|
| 19399 |
+ INSTALL_SYSTEMD_UNITS_TRUE= |
|
| 19400 |
+ INSTALL_SYSTEMD_UNITS_FALSE='#' |
|
| 19401 |
+else |
|
| 19402 |
+ INSTALL_SYSTEMD_UNITS_TRUE='#' |
|
| 19403 |
+ INSTALL_SYSTEMD_UNITS_FALSE= |
|
| 19404 |
+fi |
|
| 19405 |
+ |
|
| 19406 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for systemd system unit installation directory... $with_systemdsystemunitdir" >&5
|
|
| 19407 |
+$as_echo "checking for systemd system unit installation directory... $with_systemdsystemunitdir" >&6; } |
|
| 19408 |
+ |
|
| 19409 |
+ |
|
| 19150 | 19410 |
# Check whether --enable-ipv6 was given. |
| 19151 | 19411 |
if test "${enable_ipv6+set}" = set; then :
|
| 19152 | 19412 |
enableval=$enable_ipv6; want_ipv6=$enableval |
| ... | ... |
@@ -23275,7 +23721,7 @@ else |
| 23275 | 23275 |
fi |
| 23276 | 23276 |
|
| 23277 | 23277 |
|
| 23278 |
-ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1" |
|
| 23278 |
+ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1" |
|
| 23279 | 23279 |
|
| 23280 | 23280 |
|
| 23281 | 23281 |
cat >confcache <<\_ACEOF |
| ... | ... |
@@ -23469,6 +23915,10 @@ if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
|
| 23469 | 23469 |
as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined. |
| 23470 | 23470 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| 23471 | 23471 |
fi |
| 23472 |
+if test -z "${INSTALL_SYSTEMD_UNITS_TRUE}" && test -z "${INSTALL_SYSTEMD_UNITS_FALSE}"; then
|
|
| 23473 |
+ as_fn_error $? "conditional \"INSTALL_SYSTEMD_UNITS\" was never defined. |
|
| 23474 |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
|
| 23475 |
+fi |
|
| 23472 | 23476 |
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
|
| 23473 | 23477 |
as_fn_error $? "conditional \"BUILD_CLAMD\" was never defined. |
| 23474 | 23478 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| ... | ... |
@@ -24363,9 +24813,12 @@ do |
| 24363 | 24363 |
"database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; |
| 24364 | 24364 |
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; |
| 24365 | 24365 |
"clamd/Makefile") CONFIG_FILES="$CONFIG_FILES clamd/Makefile" ;; |
| 24366 |
+ "clamd/clamav-daemon.service") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.service" ;; |
|
| 24367 |
+ "clamd/clamav-daemon.socket") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.socket" ;; |
|
| 24366 | 24368 |
"clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;; |
| 24367 | 24369 |
"clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;; |
| 24368 | 24370 |
"clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;; |
| 24371 |
+ "freshclam/clamav-freshclam.service") CONFIG_FILES="$CONFIG_FILES freshclam/clamav-freshclam.service" ;; |
|
| 24369 | 24372 |
"freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;; |
| 24370 | 24373 |
"sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;; |
| 24371 | 24374 |
"clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;; |
| ... | ... |
@@ -26115,6 +26568,10 @@ if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
|
| 26115 | 26115 |
as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined. |
| 26116 | 26116 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| 26117 | 26117 |
fi |
| 26118 |
+if test -z "${INSTALL_SYSTEMD_UNITS_TRUE}" && test -z "${INSTALL_SYSTEMD_UNITS_FALSE}"; then
|
|
| 26119 |
+ as_fn_error $? "conditional \"INSTALL_SYSTEMD_UNITS\" was never defined. |
|
| 26120 |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
|
| 26121 |
+fi |
|
| 26118 | 26122 |
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
|
| 26119 | 26123 |
as_fn_error $? "conditional \"BUILD_CLAMD\" was never defined. |
| 26120 | 26124 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| ... | ... |
@@ -27022,9 +27479,12 @@ do |
| 27022 | 27022 |
"database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; |
| 27023 | 27023 |
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; |
| 27024 | 27024 |
"clamd/Makefile") CONFIG_FILES="$CONFIG_FILES clamd/Makefile" ;; |
| 27025 |
+ "clamd/clamav-daemon.service") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.service" ;; |
|
| 27026 |
+ "clamd/clamav-daemon.socket") CONFIG_FILES="$CONFIG_FILES clamd/clamav-daemon.socket" ;; |
|
| 27025 | 27027 |
"clamdscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamdscan/Makefile" ;; |
| 27026 | 27028 |
"clamsubmit/Makefile") CONFIG_FILES="$CONFIG_FILES clamsubmit/Makefile" ;; |
| 27027 | 27029 |
"clamav-milter/Makefile") CONFIG_FILES="$CONFIG_FILES clamav-milter/Makefile" ;; |
| 27030 |
+ "freshclam/clamav-freshclam.service") CONFIG_FILES="$CONFIG_FILES freshclam/clamav-freshclam.service" ;; |
|
| 27028 | 27031 |
"freshclam/Makefile") CONFIG_FILES="$CONFIG_FILES freshclam/Makefile" ;; |
| 27029 | 27032 |
"sigtool/Makefile") CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;; |
| 27030 | 27033 |
"clamconf/Makefile") CONFIG_FILES="$CONFIG_FILES clamconf/Makefile" ;; |
| ... | ... |
@@ -5749,8 +5749,8 @@ maintainer-clean-generic: |
| 5749 | 5749 |
@echo "This command is intended for maintainers to use" |
| 5750 | 5750 |
@echo "it deletes files that may require special tools to rebuild." |
| 5751 | 5751 |
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
| 5752 |
-@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
|
| 5753 | 5752 |
@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
| 5753 |
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
|
| 5754 | 5754 |
clean: clean-am |
| 5755 | 5755 |
|
| 5756 | 5756 |
clean-am: clean-generic clean-libtool clean-local \ |