activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r592790 - /activemq/activemq-cpp/trunk/m4/find_decaf.m4
Date Wed, 07 Nov 2007 15:42:07 GMT
Author: tabish
Date: Wed Nov  7 07:42:05 2007
New Revision: 592790

URL: http://svn.apache.org/viewvc?rev=592790&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Modified:
    activemq/activemq-cpp/trunk/m4/find_decaf.m4

Modified: activemq/activemq-cpp/trunk/m4/find_decaf.m4
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/m4/find_decaf.m4?rev=592790&r1=592789&r2=592790&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/m4/find_decaf.m4 (original)
+++ activemq/activemq-cpp/trunk/m4/find_decaf.m4 Wed Nov  7 07:42:05 2007
@@ -74,18 +74,7 @@
          acceptable_majors="0 1"],
          [acceptable_majors="$4"])
 
-  decaf_temp_acceptable_decaf_config=""
-  for decaf_temp_major in $acceptable_majors
-  do
-    case $decaf_temp_major in
-      0)
-      decaf_temp_acceptable_decaf_config="$decaf_temp_acceptable_decaf_config decaf-config"
-      ;;
-      *)
-      decaf_temp_acceptable_decaf_config="$decaf_temp_acceptable_decaf_config decaf-$decaf_temp_major-config"
-      ;;
-    esac
-  done
+  decaf_temp_acceptable_decaf_config="decaf-config"
 
   AC_MSG_CHECKING(for DECAF)
   AC_ARG_WITH(decaf,
@@ -143,18 +132,8 @@
     if test "$decaf_found" = "no" && test -d "$1"; then
       decaf_temp_abs_srcdir="`cd $1 && pwd`"
       decaf_found="reconfig"
-      decaf_bundled_major="`sed -n '/#define.*DECAF_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
\"$1/include/decaf_version.h\"`"
-      case $decaf_bundled_major in
-        "")
-          AC_MSG_ERROR([failed to find major version of bundled Decaf])
-        ;;
-        0)
-          decaf_temp_decaf_config_file="decaf-config"
-        ;;
-        *)
-          decaf_temp_decaf_config_file="decaf-$decaf_bundled_major-config"
-        ;;
-      esac
+      decaf_temp_decaf_config_file="decaf-config"
+
       if test -n "$2"; then
         decaf_config="$2/$decaf_temp_decaf_config_file"
       else



Mime
View raw message