You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2009/06/09 17:44:10 UTC
svn commit: r783048 - /apr/apr-util/branches/1.4.x/build/dso.m4
Author: jorton
Date: Tue Jun 9 15:44:09 2009
New Revision: 783048
URL: http://svn.apache.org/viewvc?rev=783048&view=rev
Log:
Merge r783046 from 1.3.x (sorry, doing this backwards):
* build/dso.m4 (APU_CHECK_UTIL_DSO): Use AC_EGREP_CPP to test the macros
in a header file, rather than awking it directly.
Modified:
apr/apr-util/branches/1.4.x/build/dso.m4
Modified: apr/apr-util/branches/1.4.x/build/dso.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/dso.m4?rev=783048&r1=783047&r2=783048&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/dso.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/dso.m4 Tue Jun 9 15:44:09 2009
@@ -27,8 +27,21 @@
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
fi
if test "$apu_dso_build" = "0"; then
Re: svn commit: r783048 - /apr/apr-util/branches/1.4.x/build/dso.m4
Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
jorton@apache.org wrote:
> Author: jorton
> Date: Tue Jun 9 15:44:09 2009
> New Revision: 783048
>
> URL: http://svn.apache.org/viewvc?rev=783048&view=rev
> Log:
> Merge r783046 from 1.3.x (sorry, doing this backwards):
Doesn't doing this wreak havoc on the svn:mergeinfo ?
--
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
Consultant - P6M7G8 Inc. http://p6m7g8.net
Senior Sys Admin - RideCharge, Inc. http://ridecharge.com
Contractor - PositiveEnergyUSA http://positiveenergyusa.com
ASF Member - Apache Software Foundation http://apache.org
FreeBSD Committer - FreeBSD Foundation http://freebsd.org
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.