Browse code

autoreconf

Kevin Lin authored on 2016/04/06 02:19:53
Showing 2 changed files
... ...
@@ -18497,8 +18497,17 @@ $as_echo_n "checking pcre-config version... " >&6; }
18497 18497
 
18498 18498
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcre_version" >&5
18499 18499
 $as_echo "$pcre_version" >&6; }
18500
-    pcrever_major=`echo "$pcre_version" | sed -re 's/([0-9]+).*/\1/'`
18501
-    pcrever_minor=`echo "$pcre_version" | sed -re 's/[0-9]+\.([0-9]+).*/\1/'`
18500
+
18501
+    case $host_os in
18502
+      darwin* )
18503
+        pcrever_major=`echo "$pcre_version" | sed -Ee 's/([0-9]+).*/\1/'`
18504
+        pcrever_minor=`echo "$pcre_version" | sed -Ee 's/[0-9]+\.([0-9]+).*/\1/'`
18505
+        ;;
18506
+      *)
18507
+        pcrever_major=`echo "$pcre_version" | sed -re 's/([0-9]+).*/\1/'`
18508
+        pcrever_minor=`echo "$pcre_version" | sed -re 's/[0-9]+\.([0-9]+).*/\1/'`
18509
+        ;;
18510
+    esac
18502 18511
 
18503 18512
         if test "$pcrelib" = "pcre"; then
18504 18513
         if test $pcrever_major -lt 6; then
... ...
@@ -16553,10 +16553,21 @@ else
16553 16553
 fi
16554 16554
 
16555 16555
 llvmver_val=`echo "$llvmver" | sed -e 's/svn//g'`
16556
-llvmver_sval=`echo "$llvmver_val" | sed -re 's/[0-9]+//' | sed -e 's/^\.//'`
16557
-llvmver_major=`echo "$llvmver_val"  | sed -re 's/([0-9]+).*/\1/'`
16558
-llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([0-9]+).*/\1/'`
16559
-llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[0-9]+//' | sed -e 's/^\.//' | sed -re 's/([0-9]+).*/\1/'`
16556
+
16557
+case $host_os in
16558
+  darwin* )
16559
+    llvmver_sval=`echo "$llvmver_val" | sed -Ee 's/[0-9]+//' | sed -e 's/^\.//'`
16560
+    llvmver_major=`echo "$llvmver_val"  | sed -Ee 's/([0-9]+).*/\1/'`
16561
+    llvmver_minor=`echo "$llvmver_sval" | sed -Ee 's/([0-9]+).*/\1/'`
16562
+    llvmver_patch=`echo "$llvmver_sval" | sed -Ee 's/[0-9]+//' | sed -e 's/^\.//' | sed -Ee 's/([0-9]+).*/\1/'`
16563
+    ;;
16564
+  *)
16565
+    llvmver_sval=`echo "$llvmver_val" | sed -re 's/[0-9]+//' | sed -e 's/^\.//'`
16566
+    llvmver_major=`echo "$llvmver_val"  | sed -re 's/([0-9]+).*/\1/'`
16567
+    llvmver_minor=`echo "$llvmver_sval" | sed -re 's/([0-9]+).*/\1/'`
16568
+    llvmver_patch=`echo "$llvmver_sval" | sed -re 's/[0-9]+//' | sed -e 's/^\.//' | sed -re 's/([0-9]+).*/\1/'`
16569
+    ;;
16570
+esac
16560 16571
 llvmver_suffix=
16561 16572
 if test "x$llvmver_patch" = "x"; then
16562 16573
     llvmver_patch=0