From: Shawn Routhier <sar@isc.org>
Date: Wed, 16 Jan 2013 20:31:13 +0000 (-0800)
Subject: [master]
X-Git-Tag: v4_3_0a1~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5bc8b1a37b938508791a194141e7dcaeb19020c;p=thirdparty%2Fdhcp.git

[master]
When checking to see if atf is available also check the
lib64 directory.
[rt32206]
---

diff --git a/RELNOTES b/RELNOTES
index 72a963db5..eea084bdd 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -58,6 +58,11 @@ work on other platforms. Please report any problems and suggested fixes to
   server code no longer use MAX_PATH constant that is not defined on
   GNU/Hurd systems. [ISC-Bugs 25979]
 
+			Changes since 4.2.5
+
+- Add check for 64-bit package for atf.
+  [ISC-BUGS #32206]
+
 			Changes since 4.2.4
 
 - Correct code to calculate timing values in client to compare
diff --git a/configure.ac b/configure.ac
index 35833f4eb..86f9d2845 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,8 @@ if test "$atf_path" != "no" ; then
     if test "$atf_path" != "yes" ; then
         if test -f $atf_path/lib/pkgconfig/atf-c.pc ; then
             atf_pcp=$atf_path/lib/pkgconfig
+        elif test -f $atf_path/lib64/pkgconfig/atf-c.pc ; then
+            atf_pcp=$atf_path/lib64/pkgconfig
         fi
     else
         # Not specified, try some common paths
@@ -201,6 +203,8 @@ if test "$atf_path" != "no" ; then
         do
             if test -f $d/lib/pkgconfig/atf-c.pc ; then
                 atf_pcp=$d/lib/pkgconfig
+            elif test -f $d/lib64/pkgconfig/atf-c.pc ; then
+                atf_pcp=$d/lib64/pkgconfig
             fi
         done
     fi