Adjust a patch.

This commit is contained in:
bojan 2009-07-15 08:19:50 +00:00
parent 273d7f02a2
commit fd4048f21c
2 changed files with 6 additions and 22 deletions

View File

@ -1,26 +1,7 @@
--- apr-util-1.3.7/build/dso.m4.nodbmdso
+++ apr-util-1.3.7/build/dso.m4
@@ -27,10 +27,33 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
if test "$enable_util_dso" = "no"; then
apu_dso_build="0"
else
- apr_h="`$apr_config --includedir`/apr.h"
- apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`"
+ AC_CACHE_CHECK([whether APR has DSO support], [apu_cv_aprdso],
+ [apu_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $APR_INCLUDES"
+ AC_EGREP_CPP([yes], [#include "apr.h"
+#if APR_HAS_DSO
+yes
+#endif
+], [apu_cv_aprdso=yes], [apu_cv_aprdso=no])
+ CPPFLAGS=$apu_save_CPPFLAGS])
+
+ if test $apu_cv_aprdso = yes; then
+ apu_dso_build=1
+ else
+ apu_dso_build=0
+ fi
@@ -44,6 +44,16 @@ AC_DEFUN([APU_CHECK_UTIL_DSO], [
fi
fi
+

View File

@ -4,7 +4,7 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
Version: 1.3.8
Release: 1%{?dist}
Release: 2%{?dist}
License: ASL 2.0
Group: System Environment/Libraries
URL: http://apr.apache.org/
@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/*.m4
%changelog
* Wed Jul 15 2009 Bojan Smojver <bojan@rexursive.com> 1.3.8-2
- adjust apr-util-1.3.7-nodbmdso.patch
* Wed Jul 15 2009 Bojan Smojver <bojan@rexursive.com> 1.3.8-1
- bump up to 1.3.8