You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/03/14 18:47:48 UTC
svn commit: r518236 - in /incubator/qpid/branches/qpid.0-9: ./
cpp/configure.ac
Author: aconway
Date: Wed Mar 14 10:47:47 2007
New Revision: 518236
URL: http://svn.apache.org/viewvc?view=rev&rev=518236
Log:
Merged revisions 507455 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r507455 | gsim | 2007-02-14 04:46:08 -0500 (Wed, 14 Feb 2007) | 8 lines
Applied patch from Jim Meyering, submitted on dev list:
2007-02-14 Jim Meyering <ji...@meyering.net>
* configure.ac: Use $enableval, not $enable_APR in the code
supporting --disable-apr and --enable-apr. The latter doesn't work.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/configure.ac
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 14 10:47:47 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374,499803,499845,499847,499864,506406,506967,506972
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439,498591,499049,499374,499803,499845,499847,499864,506406,506967,506972,507455
Modified: incubator/qpid/branches/qpid.0-9/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/configure.ac?view=diff&rev=518236&r1=518235&r2=518236
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/configure.ac (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/configure.ac Wed Mar 14 10:47:47 2007
@@ -103,18 +103,18 @@
AC_ARG_ENABLE(apr,
[ --enable-apr use the Apache Portable Runtime library (default)
--disable-apr do not use the Apache Portable Runtime library],
-[case $enable_APR in
+[case $enableval in
yes|no) ;;
- *) AC_MSG_ERROR([invalid APR enable/disable value: $enable_APR]) ;;
+ *) AC_MSG_ERROR([invalid APR enable/disable value: $enableval]) ;;
esac],
-[enable_APR=yes])
+[enableval=yes])
APR_MINIMUM_VERSION=1.2.2
AC_SUBST(APR_MINIMUM_VERSION)
AC_SUBST(APR_CXXFLAGS)
AC_SUBST(USE_APR)
-if test "$enable_APR" = yes; then
+if test "$enableval" = yes; then
PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1"
USE_APR=1