svn commit: r686846 - /incubator/qpid/trunk/qpid/cpp/configure.ac

[ac...@apache.org]

Author: aconway
Date: Mon Aug 18 11:52:39 2008
New Revision: 686846

URL: http://svn.apache.org/viewvc?rev=686846&view=rev
Log:
Configure --without-cpg by default for M3.

Modified:
    incubator/qpid/trunk/qpid/cpp/configure.ac

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?rev=686846&r1=686845&r2=686846&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Mon Aug 18 11:52:39 2008
@@ -175,14 +175,12 @@
     no) with_CPG=no ;; 
     *) AC_MSG_ERROR([Bad value ${withval} for --with-cpg option]) ;;
    esac],
-   [		   # not specified - enable if libs/headers available.
-    with_CPG=yes
-    AC_CHECK_LIB([cpg],[cpg_local_get],,[with_CPG=no])
-    AC_CHECK_HEADERS([openais/cpg.h],,[with_CPG=no])
+   [		   # not specified - default no
+    with_CPG=no
    ]
 )
-# Remove from LIBS, we will link it explicitly in make files.
 LIBS=$tmp_LIBS
+
 AM_CONDITIONAL([CPG], [test x$with_CPG = xyes])
 if test x$with_CPG = xyes; then
   CPPFLAGS+=" -DCPG"