head	1.3;
access;
symbols
	pkgsrc-2014Q1:1.2.0.2
	pkgsrc-2014Q1-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2014.06.10.15.22.13;	author joerg;	state dead;
branches;
next	1.2;
commitid	djgMkPoOrhNxnZDx;

1.2
date	2014.03.10.13.55.25;	author jperkin;	state Exp;
branches;
next	1.1;
commitid	vieEpk995kM8R9sx;

1.1
date	2014.03.06.11.52.19;	author jperkin;	state Exp;
branches;
next	;
commitid	IIvuRoym37cNiDrx;


desc
@@


1.3
log
@Retire Apache 1.3 and 2.0.
@
text
@$NetBSD: patch-apr-util_configure,v 1.2 2014/03/10 13:55:25 jperkin Exp $

Search for builtin expat in /usr/lib64 and support .dylib.

--- apr-util/configure.orig	2013-06-28 17:48:52.000000000 +0000
+++ apr-util/configure
@@@@ -23132,6 +23132,16 @@@@ $as_echo_n "checking for Expat in $withv
             expat_include_dir="$abs_expatdir/include"
     expat_ldflags="-L$abs_expatdir/lib"
     expat_libs="-lexpat"
+  elif test -r "$abs_expatdir/include/expat.h" -a \
+    -r "$abs_expatdir/lib64/libexpat.a"; then
+            expat_include_dir="$abs_expatdir/include"
+    expat_ldflags="-L$abs_expatdir/lib64"
+    expat_libs="-lexpat"
+  elif test -r "$abs_expatdir/include/expat.h" -a \
+    -r "$abs_expatdir/lib/libexpat.dylib"; then
+            expat_include_dir="$abs_expatdir/include"
+    expat_ldflags="-L$abs_expatdir/lib"
+    expat_libs="-lexpat"
   elif test -r "$abs_expatdir/xmlparse.h"; then
         expat_include_dir="$abs_expatdir"
     expat_ldflags="-L$abs_expatdir"
@


1.2
log
@Support builtin libexpat on Darwin.
@
text
@d1 1
a1 1
$NetBSD: patch-apr-util_configure,v 1.1 2014/03/06 11:52:19 jperkin Exp $
@


1.1
log
@Search /usr/lib64 for builtin expat too, fixes 64-bit RHEL and clones.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
Search for builtin expat in /usr/lib64 too.
d7 1
a7 1
@@@@ -23132,6 +23132,11 @@@@ $as_echo_n "checking for Expat in $withv
d16 5
@