trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1212339 - in /trafficserver/traffic/trunk: CHANGES build/pcre.m4
Date Fri, 09 Dec 2011 11:48:45 GMT
Author: igalic
Date: Fri Dec  9 11:48:45 2011
New Revision: 1212339

URL: http://svn.apache.org/viewvc?rev=1212339&view=rev
Log:
TS-1039: PATCH: use pcre-config to find libpcre
Author: James Peach 
Review/Test: igalic

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/build/pcre.m4

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1212339&r1=1212338&r2=1212339&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Dec  9 11:48:45 2011
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.2
+  *) [TS-1039] use pcre-config to find libpcre
+   Author: James Peach
 
   *) [TS-1037] Fix for computing local machine address (was ignoring
    general addresses).

Modified: trafficserver/traffic/trunk/build/pcre.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/pcre.m4?rev=1212339&r1=1212338&r2=1212339&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/pcre.m4 (original)
+++ trafficserver/traffic/trunk/build/pcre.m4 Fri Dec  9 11:48:45 2011
@@ -43,6 +43,15 @@ AC_ARG_WITH(pcre, [AC_HELP_STRING([--wit
       esac
     fi
   fi
+],
+[
+  AC_CHECK_PROG(PCRE_CONFIG, pcre-config, pcre-config)
+  if test "x$PCRE_CONFIG" != "x"; then
+    enable_pcre=yes
+    pcre_base_dir="`$PCRE_CONFIG --prefix`"
+    pcre_include="`$PCRE_CONFIG --cflags | sed -es/-I//`"
+    pcre_ldflags="`$PCRE_CONFIG --libs | sed -es/-lpcre// -es/-L//`"
+  fi
 ])
 
 if test "x$pcre_base_dir" = "x"; then
@@ -66,6 +75,7 @@ if test "x$pcre_base_dir" = "x"; then
     AC_MSG_RESULT([$pcre_base_dir])
   fi
 else
+  AC_MSG_CHECKING(for pcre headers in $pcre_include)
   if test -d $pcre_include && test -d $pcre_ldflags && ( test -f $pcre_include/pcre.h
|| test -f $pcre_include/pcre/pcre.h ); then
     AC_MSG_RESULT([ok])
   else



Mime
View raw message