[GRASS-SVN] r39085 - grass/branches/releasebranch_6_4

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-09-08 17:52:28 -0400 (Tue, 08 Sep 2009)
New Revision: 39085

Modified:
   grass/branches/releasebranch_6_4/configure
   grass/branches/releasebranch_6_4/configure.in
Log:
remove BSD option from OSX arch sed commands (from dev6 r39083)

Modified: grass/branches/releasebranch_6_4/configure
===================================================================
--- grass/branches/releasebranch_6_4/configure	2009-09-08 21:51:03 UTC (rev 39084)
+++ grass/branches/releasebranch_6_4/configure	2009-09-08 21:52:28 UTC (rev 39085)
@@ -12299,7 +12299,7 @@
   LDFLAGS=
   save_CFLAGS="$CFLAGS"
   CFLAGS=
-  tlib=`echo "$TCLLIB" | sed -E -e 's/-l//' -e 's/^ +//' -e 's/ +$//'`
+  tlib=`echo "$TCLLIB" | sed -e 's/-l//' -e 's/^  *//' -e 's/  *$//'`
   for a in i386 ppc x86_64 ppc64
   do
     # add only if in MACOSX_ARCHS
@@ -15996,8 +15996,8 @@
     # shouldn't have arch flags in C/LD flags on OSX
     for a in i386 ppc x86_64 ppc64
     do
-      PYTHONCFLAGS=`echo "$PYTHONCFLAGS" | sed -E "s/-arch +$a//g"`
-      PYTHONLDFLAGS=`echo "$PYTHONLDFLAGS" | sed -E "s/-arch +$a//g"`
+      PYTHONCFLAGS=`echo "$PYTHONCFLAGS" | sed "s/-arch  *$a//g"`
+      PYTHONLDFLAGS=`echo "$PYTHONLDFLAGS" | sed "s/-arch  *$a//g"`
     done
   fi
 
@@ -16204,9 +16204,9 @@
  # shouldn't have arch flags in C/LD flags on OSX
  for a in i386 ppc x86_64 ppc64
  do
-   WXWIDGETSCXXFLAGS=`echo "$WXWIDGETSCXXFLAGS" | sed -E "s/-arch +$a//g"`
-   WXWIDGETSCPPFLAGS=`echo "$WXWIDGETSCPPFLAGS" | sed -E "s/-arch +$a//g"`
-   WXWIDGETSLIB=`echo "$WXWIDGETSLIB" | sed -E "s/-arch +$a//g"`
+   WXWIDGETSCXXFLAGS=`echo "$WXWIDGETSCXXFLAGS" | sed "s/-arch  *$a//g"`
+   WXWIDGETSCPPFLAGS=`echo "$WXWIDGETSCPPFLAGS" | sed "s/-arch  *$a//g"`
+   WXWIDGETSLIB=`echo "$WXWIDGETSLIB" | sed "s/-arch  *$a//g"`
  done
 
   # check for available OSX archs in wxPython

Modified: grass/branches/releasebranch_6_4/configure.in
===================================================================
--- grass/branches/releasebranch_6_4/configure.in	2009-09-08 21:51:03 UTC (rev 39084)
+++ grass/branches/releasebranch_6_4/configure.in	2009-09-08 21:52:28 UTC (rev 39085)
@@ -1292,7 +1292,7 @@
   LDFLAGS=
   save_CFLAGS="$CFLAGS"
   CFLAGS=
-  tlib=`echo "$TCLLIB" | sed -E -e 's/-l//' -e 's/^ +//' -e 's/ +$//'`
+  tlib=`echo "$TCLLIB" | sed -e 's/-l//' -e 's/^  *//' -e 's/  *$//'`
   for a in i386 ppc x86_64 ppc64
   do
     # add only if in MACOSX_ARCHS
@@ -1821,8 +1821,8 @@
     # shouldn't have arch flags in C/LD flags on OSX
     for a in i386 ppc x86_64 ppc64
     do
-      PYTHONCFLAGS=`echo "$PYTHONCFLAGS" | sed -E "s/-arch +$a//g"`
-      PYTHONLDFLAGS=`echo "$PYTHONLDFLAGS" | sed -E "s/-arch +$a//g"`
+      PYTHONCFLAGS=`echo "$PYTHONCFLAGS" | sed "s/-arch  *$a//g"`
+      PYTHONLDFLAGS=`echo "$PYTHONLDFLAGS" | sed "s/-arch  *$a//g"`
     done
   fi
 
@@ -1920,9 +1920,9 @@
  # shouldn't have arch flags in C/LD flags on OSX
  for a in i386 ppc x86_64 ppc64
  do
-   WXWIDGETSCXXFLAGS=`echo "$WXWIDGETSCXXFLAGS" | sed -E "s/-arch +$a//g"`
-   WXWIDGETSCPPFLAGS=`echo "$WXWIDGETSCPPFLAGS" | sed -E "s/-arch +$a//g"`
-   WXWIDGETSLIB=`echo "$WXWIDGETSLIB" | sed -E "s/-arch +$a//g"`
+   WXWIDGETSCXXFLAGS=`echo "$WXWIDGETSCXXFLAGS" | sed "s/-arch  *$a//g"`
+   WXWIDGETSCPPFLAGS=`echo "$WXWIDGETSCPPFLAGS" | sed "s/-arch  *$a//g"`
+   WXWIDGETSLIB=`echo "$WXWIDGETSLIB" | sed "s/-arch  *$a//g"`
  done
 
   # check for available OSX archs in wxPython