Skip to content
This repository
Browse code

Merge pull request #215 from davidvossel/spec_fedora19_update

Updates to spec and configure.ac for building against fedora 19
  • Loading branch information...
commit 75afe09fdaaea3a9dbed7edca84b95aa1b37b053 2 parents 0c39611 + 65da3a1
David Vossel davidvossel authored

Showing 2 changed files with 4 additions and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  configure.ac
  2. +3 0  resource-agents.spec.in
2  configure.ac
@@ -705,7 +705,7 @@ AM_CONDITIONAL(USE_LIBNET, test "x$libnet_version" != "xnone" )
705 705 dnl ************************************************************************
706 706 dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
707 707 AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
708   -AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes )
  708 +AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes && test "$ac_cv_header_heartbeat_glue_config_h" = yes)
709 709
710 710 dnl ========================================================================
711 711 dnl Compiler flags
3  resource-agents.spec.in
@@ -116,6 +116,9 @@ Group: Productivity/Clustering/HA
116 116 %endif
117 117 Obsoletes: heartbeat-ldirectord <= %{version}
118 118 Provides: heartbeat-ldirectord = %{version}
  119 +%if 0%{?fedora} > 18 || 0%{?centos_version} > 6 || 0%{?rhel} > 6
  120 +BuildRequires: perl-podlators
  121 +%endif
119 122 Requires: %{SSLeay} perl-libwww-perl perl-MailTools
120 123 Requires: ipvsadm logrotate
121 124 %if 0%{?fedora_version}

0 comments on commit 75afe09

Please sign in to comment.
Something went wrong with that request. Please try again.