[GRASS-SVN] r39084 - grass/trunk

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-09-08 17:51:03 -0400 (Tue, 08 Sep 2009)
New Revision: 39084

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

Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2009-09-08 21:48:42 UTC (rev 39083)
+++ grass/trunk/configure	2009-09-08 21:51:03 UTC (rev 39084)
@@ -12124,7 +12124,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
@@ -15289,8 +15289,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
 
@@ -15497,9 +15497,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/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2009-09-08 21:48:42 UTC (rev 39083)
+++ grass/trunk/configure.in	2009-09-08 21:51:03 UTC (rev 39084)
@@ -1276,7 +1276,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
@@ -1768,8 +1768,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
 
@@ -1867,9 +1867,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