commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r811007 - /commons/sandbox/runtime/trunk/src/main/native/configure
Date Thu, 03 Sep 2009 16:00:42 GMT
Author: mturk
Date: Thu Sep  3 16:00:42 2009
New Revision: 811007

URL: http://svn.apache.org/viewvc?rev=811007&view=rev
Log:
Finally fix the $ in var parsing

Modified:
    commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=811007&r1=811006&r2=811007&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Thu Sep  3 16:00:42 2009
@@ -380,8 +380,8 @@
         varadds cppopts -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED
         varadds ccflags -fPIC -O3 -Wall -g
         varadds ldflags -lrt -lpthread -ldl
-        varadds shflags -shared -fPIC -Wl,-soname '-Wl,\$@'
-        varadds exflags '-Wl,-rpath -Wl,\$(PREFIX)/\$(LIBDIR):.'
+        varadds shflags -shared -fPIC -Wl,-soname '-Wl,??@'
+        varadds exflags '-Wl,-rpath -Wl,??(PREFIX)/??(LIBDIR):.'
         test ".$java_pinc" = . && java_pinc=linux
         ;;
     linux-cc )
@@ -393,7 +393,7 @@
         varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
         varadds ldflags -lpthread -ldl
         varadds shflags -G -KPIC -dy
-        varadds exflags '-R:\$(PREFIX)/\$(LIBDIR):.'
+        varadds exflags '-R:??(PREFIX)/??(LIBDIR):.'
         test ".$cxx_set" = .no && cxx=CC
         cpp="cc -E"
         as=cc
@@ -404,9 +404,9 @@
         varadds cppopts -DDARWIN=$r
         varadds ccflags -fPIC -O3 -g
         varadds ldflags -lpthread -ldl
-        varadds exflags '-Wl,-rpath -Wl,\$(PREFIX)/\$(LIBDIR):.'
+        varadds exflags '-Wl,-rpath -Wl,??(PREFIX)/??(LIBDIR):.'
         if [ ".$has_jni" = .yes ]; then so=".jnilib"; else so=".dynlib"; fi
-        varadds shflags -dynamiclib -flat_namespace -undefined suppress -fPIC -Wl,-dylib_install_name
'-Wl,\$@'
+        varadds shflags -dynamiclib -flat_namespace -undefined suppress -fPIC -Wl,-dylib_install_name
'-Wl,??@'
         ;;
     solaris-cc )
         r="`uname -r | sed 's/5.//'`"
@@ -425,7 +425,7 @@
         varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
         varadds ldflags -lrt -ldl -lthread -lsendfile -lsocket -lnsl
         varadds shflags -G -KPIC -dy
-        varadds exflags '-R:\$(PREFIX)/\$(LIBDIR):.'
+        varadds exflags '-R:??(PREFIX)/??(LIBDIR):.'
         test ".$cxx_set" = .no && cxx=CC
         cpp="cc -E"
         as=cc
@@ -498,10 +498,11 @@
     hpux64-cc    )
         varadds ccflags +DD64
         varadds shflags +DD64
+        varadds exflags +DD64
         ;;
     windows-cl   )
         varadds asflags -coff -Cx -Zm -Di386 -DQUIET -D?QUIET
-        varadds ccflags -D_X86_=1
+        varadds cppopts -D_X86_=1
         varadds shflags /MACHINE:X86
         varadds arflags /MACHINE:X86
         as=ml.exe
@@ -509,11 +510,11 @@
     windows64-cl )
         varadds ccflags -DWIN64 -D_WIN64
         if [ ".$mach" = .ia64 ]; then
-            varadds ccflags -D_IA64_=1
+            varadds cppopts -D_IA64_=1
             varadds shflags /MACHINE:IA64
             varadds arflags /MACHINE:IA64
         else
-            varadds ccflags -D_AMD64_=1
+            varadds cppopts -D_AMD64_=1
             varadds shflags /MACHINE:AMD64
             varadds arflags /MACHINE:AMD64
         fi
@@ -522,6 +523,7 @@
     *64-*        )
         varadds ccflags -m64
         varadds shflags -m64
+        varadds exflags -m64
         ;;
 esac
 
@@ -917,6 +919,9 @@
     test "`which $ranlib 2>/dev/null`" || ranlib=echo
 fi
 
+shflags=`echo $shflags | sed 's/??/\\$/g'`
+exflags=`echo $exflags | sed 's/??/\\$/g'`
+
 for m in $makefiles
 do
     sed -e 's|@cc@|'"$cc"'|g' \



Mime
View raw message