Makefile.am		Makefile.am
	SUBDIRS= probe crapi		SUBDIRS= probe crapi
	pkglibexecdir= $(libexecdir)/openscap		pkglibexecdir= $(libexecdir)/openscap
	pkglibexec_PROGRAMS=		pkglibexec_PROGRAMS=
	CFLAGS += @pthread_cflags@ -I$(top_srcdir)/src -I$(top_srcdir)/src/common -		CFLAGS += @xml2_CFLAGS@ @pthread_CFLAGS@ @pcre_CFLAGS@ \
	I$(top_srcdir)/src/common/public -I$(top_srcdir)/src/OVAL -I$(top_srcdir)/s		-DTHREAD_SAFE -DSEAP_THREAD_SAFE \
	rc/OVAL/public -I$(top_srcdir)/src/OVAL/probes/public -I$(top_srcdir)/src/O		-I$(top_srcdir)/src \
	VAL/probes/SEAP/public -I$(top_srcdir)/lib @pcre_cflags@ -DTHREAD_SAFE -DSE		-I$(top_srcdir)/src/common \
	AP_THREAD_SAFE @libxml_cflags@		-I$(top_srcdir)/src/common/public \
	LDFLAGS += @pthread_ldflags@		-I$(top_srcdir)/src/OVAL \
			-I$(top_srcdir)/src/OVAL/public \
			-I$(top_srcdir)/src/OVAL/probes/public \
			-I$(top_srcdir)/src/OVAL/probes/SEAP/public \
			-I$(top_srcdir)/lib
	LDADD= probe/libprobe.la @pcre_libs@ @sigwaitinfo_libs@		LDADD= probe/libprobe.la @sigwaitinfo_LIBS@
	if WANT_PROBES		if WANT_PROBES
	pkglibexec_PROGRAMS += probe_system_info		pkglibexec_PROGRAMS += probe_system_info
	probe_system_info_SOURCES= independent/system_info.c		probe_system_info_SOURCES= independent/system_info.c
	endif		endif
	if WANT_PROBES_INDEPENDENT		if WANT_PROBES_INDEPENDENT
			if probe_family_enabled
	pkglibexec_PROGRAMS += probe_family		pkglibexec_PROGRAMS += probe_family
	probe_family_SOURCES= independent/family.c		probe_family_SOURCES= independent/family.c
	probe_family_CFLAGS=		endif
	probe_family_LDFLAGS=
			if probe_textfilecontent_enabled
	pkglibexec_PROGRAMS += probe_textfilecontent		pkglibexec_PROGRAMS += probe_textfilecontent
	probe_textfilecontent_SOURCES= independent/textfilecontent.c		probe_textfilecontent_SOURCES= independent/textfilecontent.c
	probe_textfilecontent_CFLAGS= @pcre_cflags@		probe_textfilecontent_CFLAGS= @pcre_CFLAGS@
	probe_textfilecontent_LDFLAGS= @pcre_libs@		probe_textfilecontent_LDFLAGS= @pcre_LIBS@
			endif
			if probe_textfilecontent54_enabled
	pkglibexec_PROGRAMS += probe_textfilecontent54		pkglibexec_PROGRAMS += probe_textfilecontent54
	probe_textfilecontent54_SOURCES= independent/textfilecontent54.c		probe_textfilecontent54_SOURCES= independent/textfilecontent54.c
	probe_textfilecontent54_CFLAGS= @pcre_cflags@		probe_textfilecontent54_CFLAGS= @pcre_CFLAGS@
	probe_textfilecontent54_LDFLAGS= @pcre_libs@		probe_textfilecontent54_LDFLAGS= @pcre_LIBS@
			endif
			if probe_variable_enabled
			pkglibexec_PROGRAMS += probe_variable
			probe_variable_SOURCES= independent/variable.c
			endif
			if probe_xmlfilecontent_enabled
	pkglibexec_PROGRAMS += probe_xmlfilecontent		pkglibexec_PROGRAMS += probe_xmlfilecontent
	probe_xmlfilecontent_SOURCES= independent/xmlfilecontent.c		probe_xmlfilecontent_SOURCES= independent/xmlfilecontent.c
	probe_xmlfilecontent_CFLAGS= @libxml_cflags@		probe_xmlfilecontent_CFLAGS= @xml2_CFLAGS@
	probe_xmlfilecontent_LDFLAGS= @libxml_libs@		probe_xmlfilecontent_LDFLAGS= @xml2_LIBS@
			endif
			if probe_filehash_enabled
	pkglibexec_PROGRAMS += probe_filehash		pkglibexec_PROGRAMS += probe_filehash
	probe_filehash_SOURCES= independent/filehash.c		probe_filehash_SOURCES= independent/filehash.c
	probe_filehash_CFLAGS=
	probe_filehash_LDFLAGS= crapi/libcrapi.la		probe_filehash_LDFLAGS= crapi/libcrapi.la
			endif
			if probe_filehash58_enabled
			pkglibexec_PROGRAMS += probe_filehash58
			probe_filehash58_SOURCES= independent/filehash58.c
			probe_filehash58_LDFLAGS= crapi/libcrapi.la ../../common/liboscapcommon.la
			endif
			if probe_environmentvariable_enabled
			pkglibexec_PROGRAMS += probe_environmentvariable
			probe_environmentvariable_SOURCES= independent/environmentvariable.c
			endif
			if probe_environmentvariable58_enabled
			pkglibexec_PROGRAMS += probe_environmentvariable58
			probe_environmentvariable58_SOURCES= independent/environmentvariable58.c
			endif
	if HAVE_ODBX		if probe_sql_enabled
	pkglibexec_PROGRAMS += probe_sql		pkglibexec_PROGRAMS += probe_sql
	probe_sql_SOURCES= independent/sql.c		probe_sql_SOURCES= independent/sql.c
	probe_sql_CFLAGS= @libodbx_cflags@		probe_sql_CFLAGS= @odbx_CFLAGS@
	probe_sql_LDFLAGS= @libodbx_libs@		probe_sql_LDFLAGS= @odbx_LIBS@
			endif
			if probe_sql57_enabled
	pkglibexec_PROGRAMS += probe_sql57		pkglibexec_PROGRAMS += probe_sql57
	probe_sql57_SOURCES= independent/sql57.c		probe_sql57_SOURCES= independent/sql57.c
	probe_sql57_CFLAGS= @libodbx_cflags@		probe_sql57_CFLAGS= @odbx_CFLAGS@
	probe_sql57_LDFLAGS= @libodbx_libs@		probe_sql57_LDFLAGS= @odbx_LIBS@
	endif		endif
	if ENABLE_PROBE_LDAP57		if probe_ldap57_enabled
	pkglibexec_PROGRAMS += probe_ldap57		pkglibexec_PROGRAMS += probe_ldap57
	probe_ldap57_SOURCES= independent/ldap57.c		probe_ldap57_SOURCES= independent/ldap57.c
	probe_ldap57_CFLAGS= @libopenldap_cflags@		probe_ldap57_CFLAGS= @ldap_CFLAGS@ @lber_CFLAGS@
	probe_ldap57_LDFLAGS= @libopenldap_libs@		probe_ldap57_LDFLAGS= @ldap_LIBS@ @lber_LIBS@
	endif		endif
	endif		endif
	if WANT_PROBES_UNIX		if WANT_PROBES_UNIX
			if probe_dnscache_enabled
	pkglibexec_PROGRAMS += probe_dnscache		pkglibexec_PROGRAMS += probe_dnscache
	probe_dnscache_SOURCES= unix/dnscache.c		probe_dnscache_SOURCES= unix/dnscache.c
	probe_dnscache_CFLAGS=		endif
	probe_dnscache_LDFLAGS=
			if probe_runlevel_enabled
	pkglibexec_PROGRAMS += probe_runlevel		pkglibexec_PROGRAMS += probe_runlevel
	probe_runlevel_SOURCES= unix/runlevel.c		probe_runlevel_SOURCES= unix/runlevel.c
	probe_runlevel_CFLAGS=		endif
	probe_runlevel_LDFLAGS=
			if probe_file_enabled
	pkglibexec_PROGRAMS += probe_file		pkglibexec_PROGRAMS += probe_file
	probe_file_SOURCES= unix/file.c		probe_file_SOURCES= unix/file.c
	probe_file_CFLAGS= @libacl_cflags@		probe_file_CFLAGS= @acl_CFLAGS@
	probe_file_LDFLAGS= @libacl_libs@		probe_file_LDFLAGS= @acl_LIBS@
			endif
			if probe_fileextendedattribute_enabled
			pkglibexec_PROGRAMS += probe_fileextendedattribute
			probe_fileextendedattribute_SOURCES= unix/fileextendedattribute.c
			endif
			if probe_password_enabled
	pkglibexec_PROGRAMS += probe_password		pkglibexec_PROGRAMS += probe_password
	probe_password_SOURCES= unix/password.c		probe_password_SOURCES= unix/password.c
	probe_password_CFLAGS=		endif
	probe_password_LDFLAGS=
			if probe_process_enabled
	pkglibexec_PROGRAMS += probe_process		pkglibexec_PROGRAMS += probe_process
	probe_process_SOURCES= unix/process.c		probe_process_SOURCES= unix/process.c
	probe_process_CFLAGS=		endif
	probe_process_LDFLAGS=
			if probe_process58_enabled
			pkglibexec_PROGRAMS += probe_process58
			probe_process58_SOURCES= unix/process58.c unix/process58-capability.h
			probe_process58_CFLAGS= @selinux_CFLAGS@ @cap_CFLAGS@
			probe_process58_LDFLAGS= @selinux_LIBS@ @cap_LIBS@ ../../common/liboscapcom
			mon.la
			endif
			if probe_shadow_enabled
	pkglibexec_PROGRAMS += probe_shadow		pkglibexec_PROGRAMS += probe_shadow
	probe_shadow_SOURCES= unix/shadow.c		probe_shadow_SOURCES= unix/shadow.c
	probe_shadow_CFLAGS=		endif
	probe_shadow_LDFLAGS=
			if probe_uname_enabled
	pkglibexec_PROGRAMS += probe_uname		pkglibexec_PROGRAMS += probe_uname
	probe_uname_SOURCES= unix/uname.c		probe_uname_SOURCES= unix/uname.c
	probe_uname_CFLAGS=		endif
	probe_uname_LDFLAGS=
			if probe_interface_enabled
	pkglibexec_PROGRAMS += probe_interface		pkglibexec_PROGRAMS += probe_interface
	probe_interface_SOURCES= unix/interface.c		probe_interface_SOURCES= unix/interface.c
			endif
			if probe_xinetd_enabled
	pkglibexec_PROGRAMS += probe_xinetd		pkglibexec_PROGRAMS += probe_xinetd
	probe_xinetd_SOURCES = unix/xinetd.c		probe_xinetd_SOURCES = unix/xinetd.c
			endif
			if probe_sysctl_enabled
	pkglibexec_PROGRAMS += probe_sysctl		pkglibexec_PROGRAMS += probe_sysctl
	probe_sysctl_SOURCES= unix/sysctl.c		probe_sysctl_SOURCES= unix/sysctl.c
			endif
			if probe_routingtable_enabled
			pkglibexec_PROGRAMS += probe_routingtable
			probe_routingtable_SOURCES= unix/routingtable.c
			probe_routingtable_CFLAGS= @nl_CFLAGS@
			probe_routingtable_LDFLAGS= @nl_LIBS@
			endif
			if probe_gconf_enabled
			pkglibexec_PROGRAMS += probe_gconf
			probe_gconf_SOURCES= unix/gconf.c
			probe_gconf_CFLAGS= @gconf2_CFLAGS@
			probe_gconf_LDFLAGS= @gconf2_LIBS@
			endif
			#
			# Solaris
			#
			if WANT_PROBES_SOLARIS
			if probe_isainfo_enabled
			pkglibexec_PROGRAMS += probe_isainfo
			probe_isainfo_SOURCES= unix/solaris/isainfo.c
			endif
			if probe_package_enabled
			pkglibexec_PROGRAMS += probe_package
			probe_package_SOURCES= unix/solaris/package.c
			endif
			if probe_patch_enabled
			pkglibexec_PROGRAMS += probe_patch
			probe_patch_SOURCES= unix/solaris/patch.c
			endif
			if probe_smf_enabled
			pkglibexec_PROGRAMS += probe_smf
			probe_smf_SOURCES= unix/solaris/smf.c
			endif
			endif
			#
			# Linux
			#
	if WANT_PROBES_LINUX		if WANT_PROBES_LINUX
			if probe_partition_enabled
	pkglibexec_PROGRAMS += probe_partition		pkglibexec_PROGRAMS += probe_partition
	probe_partition_SOURCES= unix/linux/partition.c		probe_partition_SOURCES= unix/linux/partition.c
	probe_partition_CFLAGS= -DPROC_CHECK @pcre_cflags@ @libblkid_cflags@		probe_partition_CFLAGS= -DPROC_CHECK @pcre_CFLAGS@ @blkid_CFLAGS@
	probe_partition_LDFLAGS= @pcre_libs@ @libblkid_libs@		probe_partition_LDFLAGS= @pcre_LIBS@ @blkid_LIBS@
			endif
			if probe_inetlisteningservers_enabled
	pkglibexec_PROGRAMS += probe_inetlisteningservers		pkglibexec_PROGRAMS += probe_inetlisteningservers
	probe_inetlisteningservers_SOURCES= unix/linux/inetlisteningservers.c		probe_inetlisteningservers_SOURCES= unix/linux/inetlisteningservers.c
	probe_inetlisteningservers_CFLAGS=		endif
	probe_inetlisteningservers_LDFLAGS=
			if probe_iflisteners_enabled
			pkglibexec_PROGRAMS += probe_iflisteners
			probe_iflisteners_SOURCES= unix/linux/iflisteners.c unix/linux/iflisteners-
			proto.h
			probe_iflisteners_LDFLAGS= ../../common/liboscapcommon.la
			endif
	if ENABLE_PROBE_RPMINFO		if probe_selinuxboolean_enabled
			pkglibexec_PROGRAMS += probe_selinuxboolean
			probe_selinuxboolean_SOURCES= unix/linux/selinuxboolean.c
			probe_selinuxboolean_CFLAGS= @selinux_CFLAGS@
			probe_selinuxboolean_LDFLAGS= @selinux_LIBS@
			endif
			if probe_selinuxsecuritycontext_enabled
			pkglibexec_PROGRAMS += probe_selinuxsecuritycontext
			probe_selinuxsecuritycontext_SOURCES= unix/linux/selinuxsecuritycontext.c
			probe_selinuxsecuritycontext_CFLAGS= @selinux_CFLAGS@
			probe_selinuxsecuritycontext_LDFLAGS= @selinux_LIBS@
			endif
			if probe_rpminfo_enabled
	pkglibexec_PROGRAMS += probe_rpminfo		pkglibexec_PROGRAMS += probe_rpminfo
	probe_rpminfo_SOURCES= unix/linux/rpminfo.c		probe_rpminfo_SOURCES= unix/linux/rpminfo.c
	probe_rpminfo_CFLAGS= @rpm_cflags@		probe_rpminfo_CFLAGS= @rpm_CFLAGS@
	probe_rpminfo_LDFLAGS= @rpm_libs@		probe_rpminfo_LDFLAGS= @rpm_LIBS@
			endif
			if probe_rpmverify_enabled
			pkglibexec_PROGRAMS += probe_rpmverify
			probe_rpmverify_SOURCES= unix/linux/rpmverify.c
			probe_rpmverify_CFLAGS= @rpm_CFLAGS@
			probe_rpmverify_LDFLAGS= @rpm_LIBS@
	endif		endif
	if ENABLE_PROBE_DPKGINFO		if probe_dpkginfo_enabled
	pkglibexec_PROGRAMS += probe_dpkginfo		pkglibexec_PROGRAMS += probe_dpkginfo
	probe_dpkginfo_SOURCES= unix/linux/dpkginfo.c \		probe_dpkginfo_SOURCES= unix/linux/dpkginfo.c \
	unix/linux/dpkginfo-helper.cxx \		unix/linux/dpkginfo-helper.cxx \
	unix/linux/dpkginfo-helper.h		unix/linux/dpkginfo-helper.h
	probe_dpkginfo_CFLAGS= @deb_cflags@		probe_dpkginfo_CFLAGS= @apt_pkg_CFLAGS@
	probe_dpkginfo_CXXFLAGS= @deb_cflags@		probe_dpkginfo_CXXFLAGS= @apt_pkg_CFLAGS@
	probe_dpkginfo_LDFLAGS= @deb_libs@		probe_dpkginfo_LDFLAGS= @apt_pkg_LIBS@
	endif		endif
	endif		endif
	endif		endif
End of changes. 48 change blocks.
	49 lines changed or deleted		180 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/